[evolution] Updated Irish translation

[Seán de Búrca <sdeburca src gnome org>]

commit a4bbf48ae1101d0ec2e299501f966ba4b0f5820c
Author: Seán de Búrca <leftmostcat gmail com>
Date:   Tue Sep 3 17:41:32 2013 -0600

    Updated Irish translation

 po/ga.po |23812 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 11842 insertions(+), 11970 deletions(-)
---
diff --git a/po/ga.po b/po/ga.po
index a4e5ff3..010692a 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,621 +1,613 @@
 # Irish translations for evolution package.
-# Copyright (C) 2001-2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution package.
 # Alastair McKinstry <mckinstry computer org>, 2001.
 # David O'Callaghan <david ocallaghan cs tcd ie>, 2003.
-# Seán de Búrca <leftmostcat gmail com>, 2007-2011, 2011.
+# Seán de Búrca <leftmostcat gmail com>, 2007-2013.
 #
-#: ../shell/main.c:570
+#: ../shell/main.c:557
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:46-0600\n"
-"PO-Revision-Date: 2011-09-26 21:48-0600\n"
+"POT-Creation-Date: 2013-09-03 16:47-0600\n"
+"PO-Revision-Date: 2013-09-03 17:40-0600\n"
 "Last-Translator: Seán de Búrca <leftmostcat gmail com>\n"
 "Language-Team: Irish <gaeilge-gnulinux lists sourceforge net>\n"
 "Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n"
-"%10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
+"4;\n"
+
+#: ../addressbook/addressbook.error.xml.h:1
+msgid "This address book could not be opened."
+msgstr ""
 
-#. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
-"different address book from the side bar in the Contacts view."
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
+msgid "Failed to authenticate with LDAP server."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid ""
-"A contact list named '{0}' is already in this contact list. Would you like "
-"to add it anyway?"
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:5
-msgid "Add with duplicates"
+msgid "This address book server does not have any suggested search bases."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:6
-msgid "Address '{0}' already exists."
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:7
-msgid "Cannot add new contact"
+msgid "This server does not support LDAPv3 schema information."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid "Cannot move contact."
-msgstr "Ní féidir teagmháil a bhogadh."
+msgid "Could not get schema information for LDAP server."
+msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:9
-msgid "Category editor not available."
+msgid "LDAP server did not respond with valid schema information."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
+msgid "Could not remove address book."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid "Could not get schema information for LDAP server."
-msgstr ""
+msgid "Delete address book '{0}'?"
+msgstr "Scrios leabhar seoltaí '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:12
-msgid "Could not remove address book."
-msgstr ""
+msgid "This address book will be removed permanently."
+msgstr "Bainfear an leabhar seoltaí seo go buan."
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
+msgid "Do _Not Delete"
+msgstr "_Ná Scrios"
 
 #: ../addressbook/addressbook.error.xml.h:14
-msgid "Delete address book '{0}'?"
+#, fuzzy
+msgid "Delete remote address book &quot;{0}&quot;?"
 msgstr "Scrios leabhar seoltaí '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../calendar/calendar.error.xml.h:37 ../mail/mail.error.xml.h:45
-msgid "Do _Not Delete"
-msgstr "_Ná Scrios"
+msgid ""
+"This will permanently remove the address book &quot;{0}&quot; from the "
+"server. Are you sure you want to proceed?"
+msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:16
-msgid "Error saving {0} to {1}: {2}"
-msgstr "Earráid agus {0} á shábháil go {1}: {2}"
+#: ../calendar/calendar.error.xml.h:61
+msgid "_Delete From Server"
+msgstr "_Scrios ón bhFreastalaí"
 
 #: ../addressbook/addressbook.error.xml.h:17
-msgid "Failed to authenticate with LDAP server."
+msgid "Category editor not available."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:18
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
-msgid "Failed to delete contact"
+msgid "Unable to open address book"
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "GroupWise Address book creation:"
+msgid "Unable to perform search."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:20
-msgid "LDAP server did not respond with valid schema information."
+msgid "Would you like to save your changes?"
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "List '{0}' is already in this contact list."
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid "Skip duplicates"
-msgstr ""
+msgid "_Discard"
+msgstr "_Caith uait"
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid "Some addresses already exist in this contact list."
-msgstr ""
+msgid "Cannot move contact."
+msgstr "Ní féidir teagmháil a bhogadh."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "Some features may not work properly with your current server"
+msgid ""
+"You are attempting to move a contact from one address book to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid "The Evolution address book has quit unexpectedly."
-msgstr ""
-
-#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 
+#: ../addressbook/addressbook.error.xml.h:26
+msgid "_Resize"
+msgstr "_Athraigh méid"
+
 #: ../addressbook/addressbook.error.xml.h:27
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
+msgid "_Use as it is"
+msgstr "Ú_sáid mar atá sé"
 
 #: ../addressbook/addressbook.error.xml.h:28
-msgid "This address book could not be opened."
-msgstr ""
+msgid "_Do not save"
+msgstr "_Ná sábháil"
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "This address book server does not have any suggested search bases."
-msgstr ""
+msgid "Unable to save {0}."
+msgstr "Ní féidir {0} a shábháil."
 
 #: ../addressbook/addressbook.error.xml.h:30
-msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
+msgid "Error saving {0} to {1}: {2}"
+msgstr "Earráid agus {0} á shábháil go {1}: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:31
-msgid "This address book will be removed permanently."
-msgstr "Bainfear an leabhar seoltaí seo go buan."
+msgid "Address '{0}' already exists."
+msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "This server does not support LDAPv3 schema information."
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:33
-msgid "Unable to open address book"
-msgstr ""
+#: ../e-util/e-name-selector-dialog.c:988 ../mail/em-vfolder-editor-rule.c:397
+msgid "_Add"
+msgstr "Cuir _Leis"
 
 #: ../addressbook/addressbook.error.xml.h:34
-msgid "Unable to perform search."
+msgid "Some addresses already exist in this contact list."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid "Unable to save {0}."
-msgstr "Ní féidir {0} a shábháil."
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:36
-msgid "Would you like to save your changes?"
+msgid "Skip duplicates"
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"You are attempting to move a contact from one address book to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
+msgid "Add with duplicates"
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:38
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
+msgid "List '{0}' is already in this contact list."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:39
 msgid ""
-"You are trying to add addresses that are part of this list already. Would "
-"you like to add them anyway?"
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:40
-msgid "You do not have permission to delete contacts in this address book."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1252
+msgid "Failed to delete contact"
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:41
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
 
-#. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:43
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+#: ../addressbook/addressbook.error.xml.h:42
+msgid "Cannot add new contact"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:618
-#: ../widgets/table/e-table-config.ui.h:18
-msgid "_Add"
-msgstr "Cuir _Leis"
-
-#: ../addressbook/addressbook.error.xml.h:45
-msgid "_Discard"
-msgstr "_Caith uait"
-
-#: ../addressbook/addressbook.error.xml.h:46
-msgid "_Do not save"
-msgstr "_Ná sábháil"
-
-#: ../addressbook/addressbook.error.xml.h:47
-msgid "_Resize"
-msgstr "_Athraigh méid"
-
-#: ../addressbook/addressbook.error.xml.h:48
-msgid "_Use as it is"
-msgstr "Ú_sáid mar atá sé"
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:44
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:715
-#: ../calendar/gui/e-calendar-view.c:2104
-msgid "Anniversary"
-msgstr "Cothrom Lae"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:635
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:657
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2943
+msgid "Contact Editor"
+msgstr "Eagarthóir Teagmhálacha"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * which, so long as it has an icon.  We're just interested in
-#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:714
-#: ../calendar/gui/e-calendar-view.c:2103 ../capplet/anjal-settings-main.c:79
-#: ../shell/main.c:140
-msgid "Birthday"
-msgstr "Breithlá"
+msgid "Image"
+msgstr "Íomhá"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+msgid "Nic_kname:"
+msgstr "_Leasainm:"
 
-#. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-msgid "Blog:"
-msgstr "Blag:"
+msgid "_File under:"
+msgstr "C_omhdaigh faoi:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+msgid "_Where:"
+msgstr "_Cén Áit:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "_Catagóirí..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-msgid "Calendar:"
-msgstr "Féilire:"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:991
-msgid "Contact"
-msgstr "Teagmháil"
+msgid "Full _Name..."
+msgstr "Ainm _Iomlán..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2925
-msgid "Contact Editor"
-msgstr "Eagarthóir Teagmhálacha"
+msgid "_Wants to receive HTML mail"
+msgstr "Ba _mhaith leis post HTML a fháil"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:386
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
-#: ../addressbook/gui/widgets/eab-contact-display.c:1019
-#: ../smime/lib/e-cert.c:837
+#: ../addressbook/gui/merging/eab-contact-merging.c:407
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:590
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:942
+#: ../smime/lib/e-asn1-object.c:395
 msgid "Email"
 msgstr "Ríomhphost"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-msgid "Free/Busy:"
-msgstr "Saor/Gnóthach:"
+msgid "Telephone"
+msgstr "Teileafón"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
-msgid "Full _Name..."
-msgstr "Ainm _Iomlán..."
+msgid "Instant Messaging"
+msgstr "Cur Teachtaireachtaí Meandaracha"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
-#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1323
-#: ../widgets/misc/e-contact-map.c:295
-msgid "Home"
-msgstr "Baile"
+#: ../addressbook/importers/evolution-vcard-importer.c:1001
+msgid "Contact"
+msgstr "Teagmháil"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-msgid "Home Page:"
-msgstr "Leathanach Baile:"
+msgid "_Home Page:"
+msgstr "_Leathanach Baile:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-msgid "Image"
-msgstr "Íomhá"
+#: ../calendar/gui/dialogs/event-page.c:709
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../modules/itip-formatter/itip-view.c:1877
+msgid "_Calendar:"
+msgstr "_Féilire:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-msgid "Instant Messaging"
-msgstr "Cur Teachtaireachtaí Meandaracha"
+msgid "_Free/Busy:"
+msgstr "S_aor/Gnóthach:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
-msgid "Job"
-msgstr "Post"
+msgid "_Video Chat:"
+msgstr "Comhrá _Físe:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
-msgid "Mailing Address"
-msgstr "Seoladh Poist"
+msgid "Home Page:"
+msgstr "Leathanach Baile:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../calendar/gui/dialogs/task-details-page.ui.h:11
-msgid "Miscellaneous"
-msgstr "Éagsúil"
+#: ../modules/cal-config-google/evolution-cal-config-google.c:97
+msgid "Calendar:"
+msgstr "Féilire:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-msgid "Nic_kname:"
-msgstr "_Leasainm:"
+msgid "Free/Busy:"
+msgstr "Saor/Gnóthach:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-msgid "Notes"
-msgstr "Nótaí"
+msgid "Video Chat:"
+msgstr "Comhrá Físe:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
-#: ../addressbook/gui/widgets/eab-contact-display.c:79
-#: ../addressbook/gui/widgets/eab-contact-display.c:409
-#: ../calendar/gui/e-calendar-view.c:1806
-msgid "Other"
-msgstr "Eile"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
-msgid "Personal Information"
-msgstr "Eolas Pearsanta"
+msgid "_Blog:"
+msgstr "_Blag:"
 
+#. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
-msgid "Telephone"
-msgstr "Teileafón"
+msgid "Blog:"
+msgstr "Blag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Video Chat:"
-msgstr "Comhrá Físe:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Seoltaí Gréasáin"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web addresses"
 msgstr "Seoltaí gréasáin"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "_Profession:"
+msgstr "_Gairm:"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:694
-#: ../addressbook/gui/widgets/eab-contact-display.c:1320
-#: ../widgets/misc/e-contact-map.c:303
-msgid "Work"
-msgstr "Obair"
+msgctxt "Job"
+msgid "_Title:"
+msgstr "_Teideal:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
-msgid "_Address:"
-msgstr "S_eoladh:"
+msgid "_Company:"
+msgstr "Co_mhlacht:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
-msgid "_Anniversary:"
-msgstr "Cothrom _Lae:"
+msgid "_Department:"
+msgstr "_Roinn:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-msgid "_Assistant:"
-msgstr "Cú_ntóir:"
+msgid "_Manager:"
+msgstr "_Bainisteoir:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
-msgid "_Birthday:"
-msgstr "_Breithlá:"
+msgid "_Assistant:"
+msgstr "Cú_ntóir:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-msgid "_Blog:"
-msgstr "_Blag:"
+msgid "Job"
+msgstr "Post"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:710
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-#: ../plugins/itip-formatter/itip-view.c:1963
-msgid "_Calendar:"
-msgstr "_Féilire:"
+msgid "_Office:"
+msgstr "_Oifig:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
-msgid "_City:"
-msgstr "_Cathair:"
+msgid "_Spouse:"
+msgstr "Cé_ile:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
-msgid "_Company:"
-msgstr "Co_mhlacht:"
+msgid "_Birthday:"
+msgstr "_Breithlá:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
-msgid "_Country:"
-msgstr "_Tír:"
+msgid "_Anniversary:"
+msgstr "Cothrom _Lae:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-msgid "_Department:"
-msgstr "_Roinn:"
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
+#: ../calendar/gui/e-calendar-view.c:2244
+msgid "Anniversary"
+msgstr "Cothrom Lae"
 
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-msgid "_File under:"
-msgstr "C_omhdaigh faoi:"
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
+#: ../calendar/gui/e-calendar-view.c:2243 ../shell/main.c:128
+msgid "Birthday"
+msgstr "Breithlá"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-msgid "_Free/Busy:"
-msgstr "S_aor/Gnóthach:"
+msgid "Miscellaneous"
+msgstr "Éagsúil"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
-msgid "_Home Page:"
-msgstr "_Leathanach Baile:"
+msgid "Personal Information"
+msgstr "Eolas Pearsanta"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
-msgid "_Manager:"
-msgstr "_Bainisteoir:"
+msgid "_City:"
+msgstr "_Cathair:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
-msgid "_Office:"
-msgstr "_Oifig:"
+msgid "_Zip/Postal Code:"
+msgstr "_Cód Zip/Poist:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
-msgid "_PO Box:"
-msgstr "Bosca _Phoist:"
+msgid "_State/Province:"
+msgstr "_Stát/Cúige:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
-msgid "_Profession:"
-msgstr "_Gairm:"
+msgid "_Country:"
+msgstr "_Tír:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
-msgid "_Spouse:"
-msgstr "Cé_ile:"
+msgid "_PO Box:"
+msgstr "Bosca _Phoist:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
-msgid "_State/Province:"
-msgstr "_Stát/Cúige:"
+msgid "_Address:"
+msgstr "S_eoladh:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
-msgid "_Title:"
-msgstr "_Teideal:"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/e-contact-map.c:308
+#: ../addressbook/gui/widgets/eab-contact-display.c:357
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+msgid "Home"
+msgstr "Baile"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-msgid "_Video Chat:"
-msgstr "Comhrá _Físe:"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/e-contact-map.c:316
+#: ../addressbook/gui/widgets/eab-contact-display.c:354
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+msgid "Work"
+msgstr "Obair"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-msgid "_Wants to receive HTML mail"
-msgstr "Ba _mhaith leis post HTML a fháil"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:368
+#: ../calendar/gui/e-cal-model.c:3963
+msgid "Other"
+msgstr "Eile"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
-msgid "_Where:"
-msgstr "_Cén Áit:"
+msgid "Mailing Address"
+msgstr "Seoladh Poist"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
-msgid "_Zip/Postal Code:"
-msgstr "_Cód Zip/Poist:"
+msgid "Notes"
+msgstr "Nótaí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:469
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:227
+#: ../addressbook/gui/widgets/eab-gui-util.c:498
 msgid "Error adding contact"
 msgstr "Earráid agus teagmháil á chur leis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:242
 msgid "Error modifying contact"
 msgstr "Earráid agus teagmháil á athrú"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Error removing contact"
 msgstr "Earráid agus teagmháil á bhaint"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:651
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2937
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Eagarthóir Teagmhálacha - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3463
 msgid "Please select an image for this contact"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3464
 msgid "_No image"
 msgstr "_Gan íomhá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3805
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3811
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3819
+#, c-format
+msgid "'%s' cannot be a future date"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3827
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3840
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3854
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "Is folamh é %s'%s'"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3869
 msgid "Invalid contact."
 msgstr "Teagmháil neamhbhailí."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:440
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:457
 msgid "_Edit Full"
 msgstr "Cuir Ainm Iomlán in _Eagar"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
 msgid "_Full name"
 msgstr "_Ainm iomlán"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:499
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:523
 msgid "E_mail"
 msgstr "_Ríomhphost"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:536
 msgid "_Select Address Book"
 msgstr "_Roghnaigh Leabhar Seoltaí"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
-msgid "Dr."
+msgid "Mr."
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:2
-msgid "Esq."
+msgid "Mrs."
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Full Name"
-msgstr "Ainm Iomlán"
+msgid "Ms."
+msgstr ""
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:4
-msgid "I"
+msgid "Miss"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:5
-msgid "II"
+msgid "Dr."
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:6
-msgid "III"
+msgid "Sr."
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:7
@@ -623,156 +615,173 @@ msgid "Jr."
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:8
-msgid "Miss"
+msgid "I"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:9
-msgid "Mr."
+msgid "II"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:10
-msgid "Mrs."
+msgid "III"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:11
-msgid "Ms."
+msgid "Esq."
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:12
-msgid "Sr."
-msgstr ""
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Full Name"
+msgstr "Ainm Iomlán"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "Cé_adainm:"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:14
-msgid "_Last:"
-msgstr "_Sloinne:"
+msgctxt "FullName"
+msgid "_Title:"
+msgstr "_Teideal:"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_Lárainm:"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:16
+msgid "_Last:"
+msgstr "_Sloinne:"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Suffix:"
 msgstr "_Iarmhír:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:742
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:818
 msgid "Contact List Editor"
 msgstr "Eagarthóir Liosta Teagmhálacha"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
-#, fuzzy
+msgid "_List name:"
+msgstr "Ainm _liosta:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "Members"
-msgstr "_Baill"
+msgstr "Baill"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
-msgid "_List name:"
-msgstr "Ainm _liosta:"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+msgid "Add an email to the List"
+msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:163
-msgid "_Select..."
-msgstr "_Roghnaigh..."
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Cóipeáil rudaí go dtí an gearrthaisce."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
-msgid "_Type an email address or drag a contact into the list below:"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+msgid "Insert email addresses from Address Book"
 msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:865
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+msgid "_Select..."
+msgstr "_Roghnaigh..."
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:941
 msgid "Contact List Members"
 msgstr "Baill Liosta Teagmhálacha"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1440
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1475
+msgid "_Members"
+msgstr "_Baill"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1594
 msgid "Error adding list"
 msgstr "Earráid agus liosta á chur leis"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1455
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1609
 msgid "Error modifying list"
 msgstr "Earráid agus liosta á athrú"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1470
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1624
 msgid "Error removing list"
 msgstr "Earráid agus liosta á bhaint"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1601
-msgid "_Members"
-msgstr "_Baill"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-msgid "Changed Contact:"
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
-msgid "Conflicting Contact:"
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+msgid ""
+"The name or email of this contact already exists in this folder. Would you "
+"like to save the changes anyway?"
 msgstr ""
 
+#. Translators: Heading of the contact which has same name or email address in this folder already.
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
-msgid "Duplicate Contact Detected"
+msgid "Conflicting Contact:"
 msgstr ""
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
-msgid ""
-"The name or email of this contact already exists in this folder. Would you "
-"like to save the changes anyway?"
+msgid "Changed Contact:"
 msgstr ""
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-msgid "New Contact:"
-msgstr "Teagmháil Nua:"
+#: ../addressbook/gui/merging/eab-contact-merging.c:362
+msgid "_Merge"
+msgstr "Cu_maisc"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
-msgid "Original Contact:"
-msgstr "Bunteagmháil:"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:5
+msgid "Original Contact:"
+msgstr "Bunteagmháil:"
+
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:332
-msgid "_Merge"
-msgstr "Cu_maisc"
+msgid "New Contact:"
+msgstr "Teagmháil Nua:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:315
+#: ../addressbook/gui/merging/eab-contact-merging.c:344
 msgid "Merge Contact"
 msgstr "Cumaisc Teagmháil"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:1059
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
-msgid "Any field contains"
-msgstr "Aon réimse ina bhfuil"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1149
+msgid "Name contains"
+msgstr "Ainm ina bhfuil"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../modules/addressbook/e-book-shell-view-actions.c:1142
 msgid "Email begins with"
 msgstr "Tosaíonn ríomhphost le"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:1073
-msgid "Name contains"
-msgstr "Ainm ina bhfuil"
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../modules/addressbook/e-book-shell-view-actions.c:1135
+#: ../modules/calendar/e-cal-shell-view-actions.c:1772
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:990
+msgid "Any field contains"
+msgstr "Aon réimse ina bhfuil"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:157
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Gan teagmhálacha"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:161
+#: ../addressbook/gui/widgets/e-addressbook-model.c:167
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -782,77 +791,77 @@ msgstr[2] "%d theagmháil"
 msgstr[3] "%d dteagmháil"
 msgstr[4] "%d teagmháil"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:357
+#: ../addressbook/gui/widgets/e-addressbook-model.c:367
 msgid "Error getting book view"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:771
+#: ../addressbook/gui/widgets/e-addressbook-model.c:814
 msgid "Search Interrupted"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
 msgid "Error modifying card"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:624
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 #, fuzzy
 msgid "Cut selected contacts to the clipboard"
 msgstr "Gearr téacs roghnaithe go dtí an gearrthaisce"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:630
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
 #, fuzzy
 msgid "Copy selected contacts to the clipboard"
 msgstr "Cóipeáil téacs roghnaithe go dtí an gearrthaisce"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../addressbook/gui/widgets/e-addressbook-view.c:661
 #, fuzzy
 msgid "Paste contacts from the clipboard"
 msgstr "Greamaigh tascanna ón ngearrthaisce"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:642
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#: ../addressbook/gui/widgets/e-addressbook-view.c:667
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
 msgid "Delete selected contacts"
 msgstr "Scrios teagmhálacha roghnaithe"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+#: ../addressbook/gui/widgets/e-addressbook-view.c:673
 #, fuzzy
 msgid "Select all visible contacts"
 msgstr "Roghnaigh gach teagmháil"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 #, fuzzy
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "An bhfuil tú cinnte gur mhaith leat an {0} tasc seo a scriosadh?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 #, fuzzy
 msgid "Are you sure you want to delete this contact list?"
 msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
 #, fuzzy, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 #, fuzzy
 msgid "Are you sure you want to delete these contacts?"
 msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
 #, fuzzy
 msgid "Are you sure you want to delete this contact?"
 msgstr ""
 "An bhfuil tú cinnte gur mian leat\n"
 "an cuntas \"%1\" a scriosadh?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1322
 #, fuzzy, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -866,154 +875,111 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1486
 msgid "_Don't Display"
 msgstr "_Ná Taispeáin"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1487
 msgid "Display _All Contacts"
 msgstr "Taispeáin _Gach Teagmháil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:685
-msgid "Assistant"
-msgstr "Cúntóir"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Fón Chúntóir"
+msgid "File As"
+msgstr "Sábháil Mar"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Facs Gnó"
+msgid "Given Name"
+msgstr "Ainm"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Fón Gnó"
+msgid "Family Name"
+msgstr "Sloinne"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Fón Gnó 2"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Fón Aisghlaoigh"
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
+msgid "Nickname"
+msgstr "Leasainm"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Fón Cairr"
+msgid "Email 2"
+msgstr "Ríomhphost 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-memo-table.etspec.h:1
-msgid "Categories"
-msgstr "Catagóirí"
+msgid "Email 3"
+msgstr "Ríomhphost 3"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:680
-msgid "Company"
-msgstr "Comhlacht"
+msgid "Assistant Phone"
+msgstr "Fón Chúntóir"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-msgid "Company Phone"
-msgstr "Fón Comhlachta"
+msgid "Business Phone"
+msgstr "Fón Gnó"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Business Phone 2"
+msgstr "Fón Gnó 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 2"
-msgstr "Ríomhphost 2"
+msgid "Business Fax"
+msgstr "Facs Gnó"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Email 3"
-msgstr "Ríomhphost 3"
+msgid "Callback Phone"
+msgstr "Fón Aisghlaoigh"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "Family Name"
-msgstr "Sloinne"
+msgid "Car Phone"
+msgstr "Fón Cairr"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
-msgid "File As"
-msgstr "Sábháil Mar"
+msgid "Company Phone"
+msgstr "Fón Comhlachta"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Home Phone"
+msgstr "Fón Baile"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Given Name"
-msgstr "Ainm"
+msgid "Home Phone 2"
+msgstr "Fón Baile 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Facs Baile"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone"
-msgstr "Fón Baile"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Home Phone 2"
-msgstr "Fón Baile 2"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "Fón ISDN"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Journal"
-msgstr "Iris"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:684
-msgid "Manager"
-msgstr "Bainisteoir"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:712
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
 msgid "Mobile Phone"
 msgstr "Fón Póca"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-msgid "Nickname"
-msgstr "Leasainm"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:739
-msgid "Note"
-msgstr "Nóta"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Oifig"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Other Phone"
+msgstr "Fón Eile"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Other Fax"
 msgstr "Facs Eile"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Fón Eile"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Pager"
 msgstr "Glaoire"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Primary Phone"
 msgstr "Príomhfhón"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Radio"
 msgstr "Raidió"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:610
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Ról"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:716
-msgid "Spouse"
-msgstr "Céile"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Telex"
+msgstr "Telex"
 
 #. Translators: This is a vcard standard and stands for the type of
 #. phone used by the hearing impaired. TTY stands for "teletype"
@@ -1021,34 +987,81 @@ msgstr "Céile"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
-msgid "Telex"
-msgstr "Telex"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
+msgid "Company"
+msgstr "Comhlacht"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "Unit"
+msgstr "Aonad"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "Oifig"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Teideal"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-msgid "Unit"
-msgstr "Aonad"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: ../calendar/gui/e-meeting-list-view.c:666
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Role"
+msgstr "Ról"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
+msgid "Manager"
+msgstr "Bainisteoir"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
+msgid "Assistant"
+msgstr "Cúntóir"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Suíomh Gréasáin"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:192
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Journal"
+msgstr "Iris"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:89
+msgid "Categories"
+msgstr "Catagóirí"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
+msgid "Spouse"
+msgstr "Céile"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:718
+msgid "Note"
+msgstr "Nóta"
+
+#: ../addressbook/gui/widgets/e-contact-map-window.c:364
+msgid "Contacts Map"
+msgstr "Léarscáil Teagmhálacha"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
 "Searching for the Contacts..."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1057,7 +1070,7 @@ msgid ""
 "or double-click here to create a new Contact."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../addressbook/gui/widgets/e-minicard-view.c:197
 msgid ""
 "\n"
 "\n"
@@ -1071,36 +1084,42 @@ msgstr ""
 "\n"
 "Déchliceáil anseo chun Teagmháil nua a chruthú."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../addressbook/gui/widgets/e-minicard-view.c:201
 msgid ""
 "\n"
 "\n"
 "Search for the Contact."
 msgstr ""
+"\n"
+"\n"
+"Cuardaigh an Teagmháil."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:204
+#: ../addressbook/gui/widgets/e-minicard-view.c:203
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
+"\n"
+"\n"
+"Níl aon mhír le taispeáint san amharc seo."
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:93
 msgid "Work Email"
 msgstr "Ríomhphost Oibre"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:94
 msgid "Home Email"
 msgstr "Ríomhphost Baile"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:819
+#: ../addressbook/gui/widgets/e-minicard.c:95
+#: ../addressbook/gui/widgets/e-minicard.c:828
 msgid "Other Email"
 msgstr "Ríomhphost Eile"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
-#: ../addressbook/gui/widgets/ea-minicard-view.c:187
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:194
 msgid "evolution address book"
 msgstr "leabhar seoltaí evolution"
 
@@ -1112,7 +1131,7 @@ msgstr "Teagmháil Nua"
 msgid "New Contact List"
 msgstr "Liosta Teagmhálacha Nua"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:170
+#: ../addressbook/gui/widgets/ea-minicard-view.c:177
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1123,172 +1142,162 @@ msgstr[1] ""
 msgid "Open"
 msgstr "Oscail"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:156
+#: ../addressbook/gui/widgets/ea-minicard.c:160
 msgid "Contact List: "
 msgstr "Liosta Teagmhálacha: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:157
+#: ../addressbook/gui/widgets/ea-minicard.c:161
 msgid "Contact: "
 msgstr "Teagmháil: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:183
+#: ../addressbook/gui/widgets/ea-minicard.c:188
 msgid "evolution minicard"
 msgstr "mion-charta evolution"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:150
 msgid "Copy _Email Address"
 msgstr "Cóipeáil _Seoladh Ríomhphoist"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:184
-#: ../widgets/misc/e-web-view.c:432
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:152
+#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:307
 msgid "Copy the email address to the clipboard"
-msgstr "Cóipeáil rudaí go dtí an gearrthaisce."
+msgstr "Cóipeáil an seoladh ríomhphoist go dtí an ghearrthaisce"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:189
-#: ../widgets/misc/e-web-view.c:437
+#: ../addressbook/gui/widgets/eab-contact-display.c:157
+#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:312
 msgid "_Send New Message To..."
 msgstr "_Seol Teachtaireacht Nua Chuig..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:191
-#: ../widgets/misc/e-web-view.c:439
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:159
+#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:314
 msgid "Send a mail message to this address"
-msgstr "Post an sceál seo"
+msgstr "Seol teachtaireacht ríomhphoist chuig an seoladh seo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:215
-#, fuzzy
+# Notes:
+# Add Note
+#
+# Format:
+# C
+#
+# Paths:
+# ../addressbook/gui/widgets/eab-contact-display.c:291
+# ../e-util/e-web-view-gtkhtml.c:970
+# ../e-util/e-web-view.c:934
+#: ../addressbook/gui/widgets/eab-contact-display.c:291
+#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:934
+#, c-format
+msgid "Click to mail %s"
+msgstr "Cliceáil chun ríomhphost a sheoladh chuig %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:137
 msgid "Open map"
-msgstr "_Oscail Meamram"
+msgstr "Oscail léarscáil"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:529
 msgid "List Members:"
-msgstr "Liosta Ball"
+msgstr "Liostáil Baill:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:681
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
 msgid "Department"
 msgstr "Roinn"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:682
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
 msgid "Profession"
 msgstr "Gairm"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
 msgid "Position"
 msgstr "Ionad"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:686
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
 msgid "Video Chat"
 msgstr "Comhrá Físe"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:687
-#: ../calendar/gui/dialogs/calendar-setup.c:449
-#: ../modules/calendar/e-cal-shell-view-actions.c:232
-#: ../modules/calendar/e-cal-shell-view-actions.c:261
-#: ../modules/calendar/e-cal-shell-view.c:517
-#: ../modules/online-accounts/e-online-accounts-google.c:294
-#: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:528
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
+#: ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view.c:591
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "Féilire"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:688
-#: ../calendar/gui/dialogs/event-editor.c:123
-#: ../calendar/gui/dialogs/event-editor.c:350
-#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
+#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:343
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Saor/Gnóthach"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:689
-#: ../addressbook/gui/widgets/eab-contact-display.c:711
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
 msgid "Phone"
 msgstr "Fón"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
 msgid "Fax"
 msgstr "Facs"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:691
-#: ../addressbook/gui/widgets/eab-contact-display.c:713
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
 msgid "Address"
 msgstr "Seoladh"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:708
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
 msgid "Home Page"
 msgstr "Leathanach Baile"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:709
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
 msgid "Web Log"
 msgstr "Loga Gréasáin"
 
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person memo list
-#. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
-#: ../capplet/settings/mail-capplet-shell.c:385
-#: ../modules/addressbook/e-book-shell-backend.c:120
-#: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:138
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:122
-#: ../modules/calendar/e-memo-shell-migrate.c:120
-#: ../modules/calendar/e-task-shell-backend.c:122
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
 msgid "Personal"
 msgstr "Pearsanta"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:986
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:906
 msgid "List Members"
 msgstr "Liosta Ball"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1004
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:927
 msgid "Job Title"
 msgstr "Teideal Poist"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1041
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:968
 msgid "Home page"
 msgstr "Leathanach Baile"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1050
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:978
 msgid "Blog"
 msgstr "Blag"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1248
-#: ../widgets/misc/e-web-view.c:980
-#, fuzzy, c-format
-msgid "Click to mail %s"
-msgstr "Seol ríomhphost chuig '%1'"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
+#: ../addressbook/gui/widgets/eab-gui-util.c:123
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the address book once in online mode to download its contents."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:142
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:155
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "Detailed error message:"
 msgstr ""
 
@@ -1332,1137 +1341,1060 @@ msgstr ""
 msgid "card.vcf"
 msgstr "carta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:314
 msgid "Select Address Book"
 msgstr "Roghnaigh Leabhar Seoltaí"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
 msgid "list"
 msgstr "liosta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:552
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Move contact to"
 msgstr "Bog teagmháil go"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:554
+#: ../addressbook/gui/widgets/eab-gui-util.c:588
 msgid "Copy contact to"
 msgstr "Cóipeáil teagmháil go"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:557
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "Move contacts to"
 msgstr "Bog teagmhálacha go"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:559
+#: ../addressbook/gui/widgets/eab-gui-util.c:593
 msgid "Copy contacts to"
 msgstr "Cóipeáil teagmhálacha go"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
-msgid "Card View"
-msgstr "Amharc Carta"
-
-#: ../addressbook/importers/evolution-csv-importer.c:748
-#: ../addressbook/importers/evolution-ldif-importer.c:546
-#: ../addressbook/importers/evolution-vcard-importer.c:280
-#: ../calendar/importers/icalendar-importer.c:413
-#: ../calendar/importers/icalendar-importer.c:902
-#: ../calendar/importers/icalendar-importer.c:941 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:744
+#: ../addressbook/importers/evolution-ldif-importer.c:543
+#: ../addressbook/importers/evolution-vcard-importer.c:279
+#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:935
+#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Á Iompórtáil..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1072
-msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr "CSV nó Táb Outlook (.csv, .tab)"
+#: ../addressbook/importers/evolution-csv-importer.c:1079
+msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
+msgstr "CSV nó Táb Teagmhálacha Outlook (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1073
-msgid "Outlook CSV and Tab Importer"
-msgstr "Iompórtálaí CSV agus Táib Outlook"
+#: ../addressbook/importers/evolution-csv-importer.c:1080
+msgid "Outlook Contacts CSV and Tab Importer"
+msgstr "Iompórtálaí CSV agus Tháb Teagmhálacha Outlook"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1081
-msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr "CSV nó Táb Mozilla (.csv, .tab)"
+#: ../addressbook/importers/evolution-csv-importer.c:1088
+msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
+msgstr "CSV nó Táb Teagmhálacha Mozilla (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
-msgid "Mozilla CSV and Tab Importer"
-msgstr "Iompórtálaí CSV agus Táib Mozilla"
+#: ../addressbook/importers/evolution-csv-importer.c:1089
+msgid "Mozilla Contacts CSV and Tab Importer"
+msgstr "Iompórtálaí CSV agus Tháb Teagmhálacha Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
-msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr "CSV nó Táb Evolution (.csv, .tab)"
+#: ../addressbook/importers/evolution-csv-importer.c:1097
+msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
+msgstr "CSV nó Táb Teagmhálacha Evolution (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
-msgid "Evolution CSV and Tab Importer"
-msgstr "Iompórtálaí CSV agus Táib Evolution"
+#: ../addressbook/importers/evolution-csv-importer.c:1098
+msgid "Evolution Contacts CSV and Tab Importer"
+msgstr "Iompórtálaí CSV agus Tháb Teagmhálacha Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:796
+#: ../addressbook/importers/evolution-ldif-importer.c:801
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:797
+#: ../addressbook/importers/evolution-ldif-importer.c:802
 msgid "Evolution LDIF importer"
 msgstr "Iompórtálaí LDIF Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:658
+#: ../addressbook/importers/evolution-vcard-importer.c:664
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:659
+#: ../addressbook/importers/evolution-vcard-importer.c:665
 msgid "Evolution vCard Importer"
 msgstr "Iompórtálaí vCard Evolution"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:719
+#: ../addressbook/printing/e-contact-print.c:764
 #, c-format
 msgid "Page %d"
 msgstr "Leathanach %d"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
-msgid "Can not open file"
-msgstr "Ní féidir comhad a oscailt"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#, fuzzy, c-format
-msgid "Couldn't get list of address books: %s"
-msgstr "Níorbh fhéidir liosta leabhar seoltaí a fháil"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/event-page.c:2923
-#: ../calendar/gui/dialogs/memo-page.c:938
-#: ../calendar/gui/dialogs/task-page.c:1765 ../em-format/em-format.c:2324
-#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:659
-#: ../plugins/caldav/caldav-browse-server.c:220
-#: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
-#: ../smime/gui/certificate-manager.c:314
-msgid "Unknown error"
-msgstr "Earráid anaithnid"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#, fuzzy, c-format
-msgid "Failed to open client '%s': %s"
-msgstr "Comhad féilire le luchtú"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "Sonraigh an comhad aschurtha seachas aschur caighdeánach"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "COMHADASCHURTHA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "Liostáil fillteáin leabhar seoltaí logánta"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
 msgstr "Taispeáin cartaí mar chomhad vcard nó csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:68
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:71
-msgid "Export in asynchronous mode"
-msgstr "Easpórtáil i mód aisioncronach"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:74
-msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
-msgstr ""
-
-#: ../addressbook/tools/evolution-addressbook-export.c:76
-msgid "NUMBER"
-msgstr "UIMHIR"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:139
+#: ../addressbook/tools/evolution-addressbook-export.c:136
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:150
 msgid "Only support csv or vcard format."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:162
-msgid "In async mode, output must be file."
+#: ../addressbook/tools/evolution-addressbook-export.c:181
+msgid "Unhandled error"
+msgstr "Earráid gan láimhseáil"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:625
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
+msgid "Can not open file"
+msgstr "Ní féidir comhad a oscailt"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:76
+#, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "Theip ar oscailt chliaint '%s': %s"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:106
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "nóiméad"
+msgstr[1] "nóiméad"
+msgstr[2] "nóiméad"
+msgstr[3] "nóiméad"
+msgstr[4] "nóiméad"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:119
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "uair"
+msgstr[1] "uair"
+msgstr[2] "uaire"
+msgstr[3] "n-uaire"
+msgstr[4] "uair"
+
+#. 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/alarm-notify/alarm-notify-dialog.c:132
+#: ../calendar/gui/dialogs/recurrence-page.c:1248
+msgid "day"
+msgid_plural "days"
+msgstr[0] "lá"
+msgstr[1] "lá"
+msgstr[2] "lá"
+msgstr[3] "lá"
+msgstr[4] "lá"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:329
+msgid "Start time"
+msgstr "Am tosaigh"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:1
+msgid "Appointments"
+msgstr "Coinní"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr "Díbir _Uile"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:3
+msgid "_Snooze"
+msgstr "_Cuir ina Chodladh"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:165
+msgid "_Dismiss"
+msgstr "_Díbir"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/alarm-notify/alarm-queue.c:1821
+#: ../calendar/alarm-notify/alarm-queue.c:1831
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:190
+#: ../modules/itip-formatter/itip-view.c:1489
+#: ../modules/itip-formatter/itip-view.c:1600
+msgid "Location:"
+msgstr "Suíomh:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+msgid "location of appointment"
+msgstr "suíomh na coinne"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+msgid "Snooze _time:"
+msgstr "_Am codlata:"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
+#: ../e-util/e-interval-chooser.c:143
+#: ../modules/calendar/e-cal-shell-view-actions.c:352
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+msgid "days"
+msgstr "lá"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
+#: ../e-util/e-interval-chooser.c:141
+msgid "hours"
+msgstr "uair"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
+#: ../e-util/e-interval-chooser.c:139
+#: ../mail/e-mail-config-provider-page.c:527
+msgid "minutes"
+msgstr "nóiméad"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1663
+#: ../calendar/alarm-notify/alarm-queue.c:1801
+msgid "No summary available."
+msgstr "Gan achoimre le fáil."
+
+#: ../calendar/alarm-notify/alarm-queue.c:1672
+#: ../calendar/alarm-notify/alarm-queue.c:1674
+msgid "No description available."
+msgstr "Gan chur síos le fáil."
+
+#: ../calendar/alarm-notify/alarm-queue.c:1682
+msgid "No location information available."
+msgstr "Gan eolas suímh le fáil."
+
+#: ../calendar/alarm-notify/alarm-queue.c:1687
+#: ../calendar/alarm-notify/alarm-queue.c:1792
+#: ../calendar/alarm-notify/alarm-queue.c:2133
+msgid "Evolution Reminders"
+msgstr "Meabhrúcháin Evolution"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1731
+#, c-format
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "Tá %d mheabhrúchán agat"
+msgstr[1] "Tá %d mheabhrúchán agat"
+msgstr[2] "Tá %d mheabhrúchán agat"
+msgstr[3] "Tá %d meabhrúchán agat"
+msgstr[4] "Tá %d meabhrúchán agat"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1953
+msgid "Warning"
+msgstr "Rabhadh"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1959
+#, c-format
+msgid ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:170
-msgid "In normal mode, there is no need for the size option."
+#: ../calendar/alarm-notify/alarm-queue.c:1974
+msgid "Do not ask me about this program again."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:201
-msgid "Unhandled error"
-msgstr "Earráid gan láimhseáil"
+#: ../calendar/alarm-notify/util.c:44
+msgid "invalid time"
+msgstr "am neamhbhailí"
+
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/alarm-notify/util.c:70 ../calendar/gui/e-alarm-list.c:370
+#: ../calendar/gui/misc.c:96
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d uair"
+msgstr[1] "%d uair"
+msgstr[2] "%d uaire"
+msgstr[3] "%d n-uaire"
+msgstr[4] "%d uair"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:376
+#: ../calendar/gui/misc.c:102
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d nóiméad"
+msgstr[1] "%d nóiméad"
+msgstr[2] "%d nóiméad"
+msgstr[3] "%d nóiméad"
+msgstr[4] "%d nóiméad"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/alarm-notify/util.c:80 ../calendar/gui/e-alarm-list.c:382
+#: ../calendar/gui/misc.c:106
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d soicind"
+msgstr[1] "%d shoicind"
+msgstr[2] "%d shoicind"
+msgstr[3] "%d soicind"
+msgstr[4] "%d soicind"
+
+#: ../calendar/calendar.error.xml.h:1
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr ""
 
-#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' does not support assigned tasks, please select a different task list."
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
 msgstr ""
 
-#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:3
+msgid "Do _not Send"
+msgstr "_Ná Seol"
+
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
+msgid "_Send Notice"
+msgstr "_Seol Fógra"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:6
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
-msgstr ""
+#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/gui/dialogs/delete-comp.c:193
+#, c-format
+msgid "Are you sure you want to delete this meeting?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an cruinniú seo a scriosadh?"
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful summary to your appointment will give you an idea of "
-"what your appointment is about."
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:8
 msgid ""
-"Adding a meaningful summary to your task will give you an idea of what your "
-"task is about."
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information in these memos will be deleted and can not be restored."
-msgstr ""
+#: ../calendar/gui/dialogs/delete-comp.c:196
+#, c-format
+msgid "Are you sure you want to delete this task?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
 
 #: ../calendar/calendar.error.xml.h:10
-msgid "All information in this memo will be deleted and can not be restored."
+msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+msgid "Would you like to send a cancelation notice for this memo?"
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:12
-msgid "All information on these tasks will be deleted and can not be restored."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:13
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr ""
+#: ../calendar/gui/dialogs/delete-comp.c:199
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an meamram seo a scriosadh?"
 
 #: ../calendar/calendar.error.xml.h:14
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:15
-msgid "All information on this memo will be deleted and can not be restored."
+#, fuzzy
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
 msgstr ""
+"An bhfuil tú cinnte gur mhaith leat an choinne dar teideal '{0}' a scriosadh?"
 
 #: ../calendar/calendar.error.xml.h:16
-msgid "All information on this task will be deleted and can not be restored."
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr ""
+"An bhfuil tú cinnte gur mhaith leat an choinne dar teideal '{0}' a scriosadh?"
 
 #: ../calendar/calendar.error.xml.h:17
-msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "An bhfuil tú cinnte gur mhaith leat an tasc '{0}' a scriosadh?"
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:18
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr ""
-"An bhfuil tú cinnte gur mhaith leat an choinne dar teideal '{0}' a scriosadh?"
+msgid "Are you sure you want to delete this appointment?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an choinne seo a scriosadh?"
 
 #: ../calendar/calendar.error.xml.h:19
-#, fuzzy
-msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr ""
-"An bhfuil tú cinnte gur mhaith leat an choinne dar teideal '{0}' a scriosadh?"
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an tasc '{0}' a scriosadh?"
 
 #: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "An bhfuil tú cinnte gur mhaith leat an meamram '{0}' a scriosadh?"
 
 #: ../calendar/calendar.error.xml.h:21
-msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "An bhfuil tú cinnte gur mhaith leat an {0} coinne seo a scriosadh?"
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:22
-msgid "Are you sure you want to delete these {0} memos?"
-msgstr "An bhfuil tú cinnte gur mhaith leat an {0} meamram seo a scriosadh?"
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an {0} coinne seo a scriosadh?"
 
 #: ../calendar/calendar.error.xml.h:23
-msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "An bhfuil tú cinnte gur mhaith leat an {0} tasc seo a scriosadh?"
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:24
-msgid "Are you sure you want to delete this appointment?"
-msgstr "An bhfuil tú cinnte gur mhaith leat an choinne seo a scriosadh?"
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an {0} tasc seo a scriosadh?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:191
-#, c-format
-msgid "Are you sure you want to delete this meeting?"
-msgstr "An bhfuil tú cinnte gur mhaith leat an cruinniú seo a scriosadh?"
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:26
-#: ../calendar/gui/dialogs/delete-comp.c:197
-#, c-format
-msgid "Are you sure you want to delete this memo?"
-msgstr "An bhfuil tú cinnte gur mhaith leat an meamram seo a scriosadh?"
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an {0} meamram seo a scriosadh?"
 
 #: ../calendar/calendar.error.xml.h:27
-#: ../calendar/gui/dialogs/delete-comp.c:194
-#, c-format
-msgid "Are you sure you want to delete this task?"
-msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:28
 #, fuzzy
-msgid "Are you sure you want to save the appointment without a summary?"
-msgstr ""
-"An bhfuil tú cinnte gur mhaith leat an choinne dar teideal '{0}' a scriosadh?"
+msgid "Would you like to save your changes to this meeting?"
+msgstr "Ar mhaith leat do chuid athruithe a shábháil?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Are you sure you want to save the memo without a summary?"
+msgid "You have changed this meeting, but not yet saved it."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:30
-#, fuzzy
-msgid "Are you sure you want to save the task without a summary?"
-msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
+msgid "_Save Changes"
+msgstr "_Sábháil Athruithe"
 
 #: ../calendar/calendar.error.xml.h:31
-msgid "Cannot create a new event"
-msgstr "Ní féidir teagmhas nua a chruthú"
+#: ../composer/mail-composer.error.xml.h:16
+msgid "_Discard Changes"
+msgstr "Cuir Athruithe i _Leataobh"
 
 #: ../calendar/calendar.error.xml.h:32
-msgid "Cannot save event"
-msgstr "Ní féidir teagmhas a shábháil"
+msgid "Would you like to save your changes to this appointment?"
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:33
-#, fuzzy
-msgid "Cannot save task"
-msgstr "Ní féidir teagmhas a shábháil"
+msgid "You have changed this appointment, but not yet saved it."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:34
-msgid "Delete calendar '{0}'?"
-msgstr "Scrios féilire '{0}'?"
+msgid "Would you like to save your changes to this task?"
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:35
-msgid "Delete memo list '{0}'?"
-msgstr "Scrios liosta meamram '{0}'?"
+msgid "You have changed this task, but not yet saved it."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:36
-msgid "Delete task list '{0}'?"
-msgstr "Scrios liosta tascanna '{0}'?"
+msgid "Would you like to save your changes to this memo?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:37
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:38
-msgid "Do _not Send"
-msgstr "_Ná Seol"
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:39
-msgid "Download in progress. Do you want to save the appointment?"
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:40
-msgid "Download in progress. Do you want to save the task?"
-msgstr ""
+#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Send"
+msgstr "_Seol"
 
 #: ../calendar/calendar.error.xml.h:41
-msgid "Editor could not be loaded."
-msgstr "Ní féidir eagarthóir a luchtú."
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:42
 msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:43
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Would you like to send this task to participants?"
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:44
-msgid "Error loading calendar"
-msgstr "Earráid agus féilire á luchtú"
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:45
-msgid "Error loading memo list"
-msgstr "Earráid agus liosta meamram á luchtú"
+msgid "Download in progress. Do you want to save the task?"
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:46
-msgid "Error loading task list"
-msgstr "Earráid agus liosta tascanna á luchtú"
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:297
+msgid "_Save"
+msgstr "_Sábháil"
+
+#: ../calendar/calendar.error.xml.h:48
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr ""
 
-#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
-#. {1} is replaced with a calendar/task/memo list name, where the error happened
 #: ../calendar/calendar.error.xml.h:49
-#, fuzzy
-msgid "Error on {0}: {1}"
-msgstr "Earráid ar '{0}'"
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:50
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+msgid "Would you like to send updated task information to participants?"
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:51
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:52
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
-msgstr ""
+msgid "Editor could not be loaded."
+msgstr "Ní féidir eagarthóir a luchtú."
 
 #: ../calendar/calendar.error.xml.h:53
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr ""
+msgid "Delete calendar '{0}'?"
+msgstr "Scrios féilire '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:54
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
-msgstr ""
+msgid "This calendar will be removed permanently."
+msgstr "Bainfear an féilire seo go buan."
 
 #: ../calendar/calendar.error.xml.h:55
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
-msgstr ""
+msgid "Delete task list '{0}'?"
+msgstr "Scrios liosta tascanna '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:56
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
-msgstr ""
+msgid "This task list will be removed permanently."
+msgstr "Bainfear an liosta tascanna seo go buan."
 
 #: ../calendar/calendar.error.xml.h:57
-msgid "Some features may not work properly with your current server."
-msgstr ""
+msgid "Delete memo list '{0}'?"
+msgstr "Scrios liosta meamram '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:58
-msgid "The Evolution calendar has quit unexpectedly."
-msgstr ""
+msgid "This memo list will be removed permanently."
+msgstr "Bainfear an liosta meamram seo go buan."
 
 #: ../calendar/calendar.error.xml.h:59
-msgid "The Evolution calendars have quit unexpectedly."
-msgstr ""
+msgid "Delete remote calendar '{0}'?"
+msgstr "Scrios cianfhéilire '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:60
-msgid "The Evolution memo has quit unexpectedly."
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:61
-msgid "The Evolution tasks have quit unexpectedly."
+msgid ""
+"This will permanently remove the calendar '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:62
-msgid "The calendar is not marked for offline usage."
-msgstr ""
+#, fuzzy
+msgid "Delete remote task list '{0}'?"
+msgstr "Scrios liosta tascanna '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:63
-msgid "The memo list is not marked for offline usage."
+msgid ""
+"This will permanently remove the task list '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:64
-msgid "The task list is not marked for offline usage."
-msgstr ""
+#, fuzzy
+msgid "Delete remote memo list '{0}'?"
+msgstr "Scrios liosta meamram '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:65
-msgid "This calendar will be removed permanently."
-msgstr "Bainfear an féilire seo go buan."
+msgid ""
+"This will permanently remove the memo list '{0}' from the server. Are you "
+"sure you want to proceed?"
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:66
-msgid "This memo list will be removed permanently."
-msgstr "Bainfear an liosta meamram seo go buan."
+#, fuzzy
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr ""
+"An bhfuil tú cinnte gur mhaith leat an choinne dar teideal '{0}' a scriosadh?"
 
 #: ../calendar/calendar.error.xml.h:67
-msgid "This task list will be removed permanently."
-msgstr "Bainfear an liosta tascanna seo go buan."
-
-#: ../calendar/calendar.error.xml.h:68
-msgid "Would you like to save your changes to this appointment?"
+msgid ""
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:68
 #, fuzzy
-msgid "Would you like to save your changes to this meeting?"
-msgstr "Ar mhaith leat do chuid athruithe a shábháil?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
 
-#: ../calendar/calendar.error.xml.h:70
-msgid "Would you like to save your changes to this memo?"
+#: ../calendar/calendar.error.xml.h:69
+msgid ""
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:71
-msgid "Would you like to save your changes to this task?"
+#: ../calendar/calendar.error.xml.h:70
+msgid "Are you sure you want to save the memo without a summary?"
 msgstr ""
 
+#. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:72
-msgid "Would you like to send a cancelation notice for this memo?"
-msgstr ""
+#, fuzzy
+msgid "Error loading calendar '{0}'"
+msgstr "Earráid agus féilire á luchtú"
 
 #: ../calendar/calendar.error.xml.h:73
-msgid "Would you like to send all the participants a cancelation notice?"
+msgid "The calendar is not marked for offline usage."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:74
-msgid "Would you like to send meeting invitations to participants?"
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:75
-msgid "Would you like to send this task to participants?"
-msgstr ""
+msgid "Cannot save event"
+msgstr "Ní féidir teagmhas a shábháil"
 
+#. Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:76
-msgid "Would you like to send updated meeting information to participants?"
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:77
-msgid "Would you like to send updated task information to participants?"
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:78
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
-msgstr ""
+#, fuzzy
+msgid "Cannot save task"
+msgstr "Ní féidir teagmhas a shábháil"
 
+#. Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:79
-msgid "You have changed this appointment, but not yet saved it."
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:80
-msgid "You have changed this meeting, but not yet saved it."
+msgid ""
+"'{0}' does not support assigned tasks, please select a different task list."
 msgstr ""
 
+#. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:81
-msgid "You have changed this task, but not yet saved it."
-msgstr ""
+#, fuzzy
+msgid "Error loading task list '{0}'"
+msgstr "Earráid agus liosta tascanna á luchtú"
 
 #: ../calendar/calendar.error.xml.h:82
-msgid "You have made changes to this memo, but not yet saved them."
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:83
-msgid "Your calendars will not be available until Evolution is restarted."
+msgid "The task list is not marked for offline usage."
 msgstr ""
 
+#. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:84
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr ""
+#, fuzzy
+msgid "Error loading memo list '{0}'"
+msgstr "Earráid agus liosta meamram á luchtú"
 
 #: ../calendar/calendar.error.xml.h:85
-msgid "Your tasks will not be available until Evolution is restarted."
+msgid "The memo list is not marked for offline usage."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "Cuir Athruithe i _Leataobh"
-
-#: ../calendar/calendar.error.xml.h:87 ../composer/e-composer-actions.c:317
-msgid "_Save"
-msgstr "_Sábháil"
-
-#: ../calendar/calendar.error.xml.h:88
-msgid "_Save Changes"
-msgstr "_Sábháil Athruithe"
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:87
+#, fuzzy
+msgid "Failed to copy an event into the calendar '{0}'"
+msgstr "Comhad féilire le luchtú"
 
+#. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:89
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
-msgid "_Send"
-msgstr "_Seol"
-
-#: ../calendar/calendar.error.xml.h:90
-msgid "_Send Notice"
-msgstr "_Seol Fógra"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "nóiméad"
-msgstr[1] "nóiméad"
-msgstr[2] "nóiméad"
-msgstr[3] "nóiméad"
-msgstr[4] "nóiméad"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "uair"
-msgstr[1] "uair"
-msgstr[2] "uaire"
-msgstr[3] "n-uaire"
-msgstr[4] "uair"
-
-#. 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/alarm-notify/alarm-notify-dialog.c:133
-#: ../calendar/gui/dialogs/recurrence-page.c:1190
-msgid "day"
-msgid_plural "days"
-msgstr[0] "lá"
-msgstr[1] "lá"
-msgstr[2] "lá"
-msgstr[3] "lá"
-msgstr[4] "lá"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
-msgid "Start time"
-msgstr "Am tosaigh"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-msgid "Appointments"
-msgstr "Coinní"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
-msgid "Dismiss _All"
+msgid "Failed to copy a task into the task list '{0}'"
 msgstr ""
 
-#. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1739
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
-#: ../plugins/itip-formatter/itip-view.c:1052
-msgid "Location:"
-msgstr "Suíomh:"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
-msgid "Snooze _time:"
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:91
+msgid "Failed to copy a memo into the memo list '{0}'"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:919
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
-msgid "_Dismiss"
-msgstr ""
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:93
+#, fuzzy
+msgid "Failed to move an event into the calendar '{0}'"
+msgstr "Taispeáin &Tascanna san Fhéilire"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-msgid "_Snooze"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:95
+msgid "Failed to move a task into the task list '{0}'"
 msgstr ""
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:454
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
-#: ../plugins/google-account-setup/google-contacts-source.c:387
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
-msgstr "lá"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:453
-#: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:386
-msgid "hours"
-msgstr "uair"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
-msgid "location of appointment"
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:97
+msgid "Failed to move a memo into the memo list '{0}'"
 msgstr ""
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:452
-#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:385
-msgid "minutes"
-msgstr "nóiméad"
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:99
+#, fuzzy
+msgid "Copying an event into the calendar '{0}'"
+msgstr "Taispeáin &Tascanna san Fhéilire"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
-msgid "No summary available."
-msgstr "Gan achoimre le fáil."
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:101
+#, fuzzy
+msgid "Copying a task into the task list '{0}'"
+msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-msgid "No description available."
-msgstr "Gan chur síos le fáil."
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:103
+#, fuzzy
+msgid "Copying a memo into the memo list '{0}'"
+msgstr "Scrios liosta meamram '{0}'?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
-msgid "No location information available."
-msgstr "Gan eolas suímh le fáil."
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:105
+#, fuzzy
+msgid "Moving an event into the calendar '{0}'"
+msgstr "Taispeáin &Tascanna san Fhéilire"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
-#, fuzzy, c-format
-msgid "You have %d reminder"
-msgid_plural "You have %d reminders"
-msgstr[0] "Tá %d aláram agat"
-msgstr[1] "Tá %d aláram agat"
-msgstr[2] "Tá %d aláram agat"
-msgstr[3] "Tá %d n-aláram agat"
-msgstr[4] "Tá %d aláram agat"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
-msgid "Warning"
-msgstr "Rabhadh"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:107
+#, fuzzy
+msgid "Moving a task into the task list '{0}'"
+msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
-msgid ""
-"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
-msgstr ""
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:109
+#, fuzzy
+msgid "Moving a memo into the memo list '{0}'"
+msgstr "Scrios liosta meamram '{0}'?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
-#, c-format
-msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
-"\n"
-"        %s\n"
-"\n"
-"Are you sure you want to run this program?"
-msgstr ""
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:376
+msgid "Summary"
+msgstr "Achoimre"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
-msgid "Do not ask me about this program again."
-msgstr ""
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:11
+msgid "contains"
+msgstr "ina bhfuil"
 
-#: ../calendar/gui/alarm-notify/util.c:45
-msgid "invalid time"
-msgstr "am neamhbhailí"
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:17
+msgid "does not contain"
+msgstr "nach ina bhfuil"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
-#: ../calendar/gui/misc.c:118
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d uair"
-msgstr[1] "%d uair"
-msgstr[2] "%d uaire"
-msgstr[3] "%d n-uaire"
-msgstr[4] "%d uair"
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
+#: ../e-util/e-table-config.ui.h:4 ../e-util/e-attachment-tree-view.c:528
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+msgid "Description"
+msgstr "Tuarascail"
 
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
-#: ../calendar/gui/misc.c:124
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d nóiméad"
-msgstr[1] "%d nóiméad"
-msgstr[2] "%d nóiméad"
-msgstr[3] "%d nóiméad"
-msgstr[4] "%d nóiméad"
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Any Field"
+msgstr "Aon Réimse"
 
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
-#: ../calendar/gui/misc.c:128
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d soicind"
-msgstr[1] "%d shoicind"
-msgstr[2] "%d shoicind"
-msgstr[3] "%d soicind"
-msgstr[4] "%d soicind"
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:7
+msgid "Classification"
+msgstr "Aicmiúchán"
 
-#: ../calendar/gui/calendar-view-factory.c:116
-msgid "Day View"
-msgstr "Amharc Lae"
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:34
+msgid "is"
+msgstr "is"
 
-#: ../calendar/gui/calendar-view-factory.c:119
-msgid "Work Week View"
-msgstr "Amharc Seachtaine Oibre"
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:40
+msgid "is not"
+msgstr "nach bhfuil"
 
-#: ../calendar/gui/calendar-view-factory.c:122
-msgid "Week View"
-msgstr "Amharc Seachtaine"
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:454
+#: ../calendar/gui/e-cal-model.c:461 ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Public"
+msgstr "Poiblí"
 
-#: ../calendar/gui/calendar-view-factory.c:125
-msgid "Month View"
-msgstr "Amharc Míosa"
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:463
+#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:11
+msgid "Private"
+msgstr "Príobháideach"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:3
-msgid "Any Field"
-msgstr "Aon Réimse"
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
+#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:465
+#: ../calendar/gui/e-task-table.c:549 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-send-options.ui.h:7
+msgid "Confidential"
+msgstr ""
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Iatáin"
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:5
+msgid "Organizer"
+msgstr "Eagraí"
 
-#: ../calendar/gui/caltypes.xml.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/caltypes.xml.h:13
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 #: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
 msgstr "Rannpháirtí"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
+#: ../plugins/publish-calendar/publish-calendar.c:882
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+#: ../plugins/save-calendar/csv-format.c:390
+msgid "Location"
+msgstr "Suíomh"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:328
 msgid "Category"
 msgstr "Catagóir"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-msgid "Classification"
-msgstr ""
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:54
+#: ../em-format/e-mail-formatter-print-headers.c:204
+#: ../mail/em-filter-i18n.h:6
+msgid "Attachments"
+msgstr "Iatáin"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:779 ../calendar/gui/e-task-table.c:504
-#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
-msgid "Confidential"
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:27
+msgid "Exist"
 msgstr ""
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
-#: ../widgets/misc/e-attachment-tree-view.c:526
-#: ../widgets/table/e-table-config.ui.h:6
-msgid "Description"
-msgstr "Tuarascail"
-
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:11
-msgid "Description Contains"
-msgstr "Cur Síos ina bhfuil"
-
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:24
 msgid "Do Not Exist"
 msgstr ""
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
-msgid "Exist"
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/dialogs/event-editor.c:310
+#: ../calendar/gui/dialogs/event-editor.c:331
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
+msgid "Recurrence"
 msgstr ""
 
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:863
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:397
-msgid "Location"
-msgstr "Suíomh"
-
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Organizer"
-msgstr "Eagraí"
-
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:777 ../calendar/gui/e-task-table.c:503
-#: ../calendar/gui/memotypes.xml.h:12
-msgid "Private"
-msgstr "Príobháideach"
+#: ../calendar/gui/caltypes.xml.h:20
+msgid "Occurs"
+msgstr ""
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:768 ../calendar/gui/e-cal-model.c:775
-#: ../calendar/gui/e-task-table.c:502 ../calendar/gui/memotypes.xml.h:13
-msgid "Public"
-msgstr "Poiblí"
+#: ../calendar/gui/caltypes.xml.h:21
+#, fuzzy
+msgid "Less Than"
+msgstr "atá níos lú ná"
 
-#: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:317
-#: ../calendar/gui/dialogs/event-editor.c:338
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
-msgid "Recurrence"
+#: ../calendar/gui/caltypes.xml.h:22
+msgid "Exactly"
 msgstr ""
 
-#: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:383
-msgid "Summary"
-msgstr "Achoimre"
+#: ../calendar/gui/caltypes.xml.h:23
+msgid "More Than"
+msgstr ""
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:23
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:28
 msgid "Summary Contains"
 msgstr "Achoimre ina bhfuil"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "ina bhfuil"
-
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "nach ina bhfuil"
-
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
-msgid "is"
-msgstr "is"
-
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
-msgid "is not"
-msgstr "nach bhfuil"
+#: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:29
+msgid "Description Contains"
+msgstr "Cur Síos ina bhfuil"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:636
+#: ../calendar/gui/dialogs/alarm-dialog.c:669
 #, fuzzy
 msgid "Edit Reminder"
 msgstr "Meabhrúchán!"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:827
-#: ../calendar/gui/e-alarm-list.c:447
+#: ../calendar/gui/dialogs/alarm-dialog.c:897
+#: ../calendar/gui/e-alarm-list.c:412
 msgid "Pop up an alert"
 msgstr ""
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:828
-#: ../calendar/gui/e-alarm-list.c:443
+#: ../calendar/gui/dialogs/alarm-dialog.c:898
+#: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "Seinn fuaim"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:829
-#: ../calendar/gui/e-alarm-list.c:455
+#: ../calendar/gui/dialogs/alarm-dialog.c:899
+#: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "Rith roghchlár"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:830
-#: ../calendar/gui/e-alarm-list.c:451
+#: ../calendar/gui/dialogs/alarm-dialog.c:900
+#: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "Seol ríomhphost"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
+#: ../calendar/gui/dialogs/alarm-dialog.c:909
+msgid "before"
+msgstr "roimh"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:910
+msgid "after"
+msgstr "i ndiaidh"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:919
 #, fuzzy
-msgid "Add Reminder"
-msgstr "Meabhrúchán!"
+msgid "start of appointment"
+msgstr "Coinne nua"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:920
+#, fuzzy
+msgid "end of appointment"
+msgstr "Coinne nua"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
+msgid "minute(s)"
+msgstr "nóiméad"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "Custom _message"
-msgstr "_Teachtaireacht saincheaptha"
+msgid "hour(s)"
+msgstr "uair"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-#, fuzzy
-msgid "Custom reminder sound"
-msgstr "Ceanntásca Saincheaptha"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Mes_sage:"
-msgstr "_Teachtaireacht:"
+msgid "day(s)"
+msgstr "lá"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
-msgid "Options"
-msgstr "Roghanna"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+#, fuzzy
+msgid "Add Reminder"
+msgstr "Meabhrúchán!"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-#: ../calendar/gui/dialogs/event-editor.c:360
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/event-editor.c:353
 #, fuzzy
 msgid "Reminder"
 msgstr "Meabhrúchán!"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 #, fuzzy
 msgid "Repeat"
 msgstr "<b>Athdhéan</b>"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-msgid "Select A File"
-msgstr "Roghnaigh Comhad"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-msgid "Send To:"
-msgstr "Seol Chuig:"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-msgid "_Arguments:"
-msgstr "_Argóintí:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "_Program:"
-msgstr "_Clár:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 #, fuzzy
 msgid "_Repeat the reminder"
 msgstr "_Freagra don Seoltóir"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
-msgid "_Sound:"
-msgstr "_Fuaim:"
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
+msgid "extra times every"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13 ../mail/mail-config.ui.h:30
+msgid "Options"
+msgstr "Roghanna"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "after"
-msgstr "i ndiaidh"
+msgid "Custom _message"
+msgstr "_Teachtaireacht saincheaptha"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
-msgid "before"
-msgstr "roimh"
+msgid "Mes_sage:"
+msgstr "_Teachtaireacht:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "day(s)"
-msgstr "lá"
+#, fuzzy
+msgid "Custom reminder sound"
+msgstr "Ceanntásca Saincheaptha"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
+msgid "_Sound:"
+msgstr "_Fuaim:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-#, fuzzy
-msgid "end of appointment"
-msgstr "Coinne nua"
+msgid "Select A File"
+msgstr "Roghnaigh Comhad"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+msgid "_Program:"
+msgstr "_Clár:"
 
-#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "extra times every"
-msgstr ""
+msgid "_Arguments:"
+msgstr "_Argóintí:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "hour(s)"
-msgstr "uair"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "minute(s)"
-msgstr "nóiméad"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
-#, fuzzy
-msgid "start of appointment"
-msgstr "Coinne nua"
+msgid "Send To:"
+msgstr "Seol Chuig:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
 msgid "Action/Trigger"
 msgstr ""
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-msgid "A_dd"
-msgstr "Cuir _Leis"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
 #, fuzzy
 msgid "Reminders"
 msgstr "Meabhrúchán!"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "Type:"
-msgstr "Cineál:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:185
-#: ../modules/addressbook/addressbook-config.c:530
-msgid "_Type:"
-msgstr "C_ineál:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
-#: ../modules/addressbook/ldap-config.ui.h:26
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:284
-msgid "_Name:"
-msgstr "_Ainm:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:300
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr ""
-
-#: ../calendar/gui/dialogs/calendar-setup.c:302
-msgid "Cop_y task list contents locally for offline operation"
-msgstr ""
-
-#: ../calendar/gui/dialogs/calendar-setup.c:304
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr ""
-
-#: ../calendar/gui/dialogs/calendar-setup.c:350
-#, fuzzy
-msgid "Sh_ow reminder notifications"
-msgstr "Taispeáin deilbhín sa limistéar fógartha"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:425
-msgid "Colo_r:"
-msgstr "_Dath:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:448
-#: ../calendar/gui/dialogs/calendar-setup.c:460
-#: ../calendar/gui/dialogs/calendar-setup.c:471
-#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:52
-#: ../modules/addressbook/addressbook-config.c:1080
-#: ../modules/addressbook/autocompletion-config.c:228
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
-#: ../plugins/itip-formatter/itip-formatter.c:3045
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:21
-msgid "General"
-msgstr "Ginearálta"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:461
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
-msgid "Task List"
-msgstr "Liosta Tascanna"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:472
-msgid "Memo List"
-msgstr "Liosta Meamram"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:564
-msgid "Calendar Properties"
-msgstr "Roghnachais na Fheilire"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:564
-msgid "New Calendar"
-msgstr "Féilire Nua"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:624
-msgid "Task List Properties"
-msgstr "Airíonna Liosta Tascanna"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:624
-msgid "New Task List"
-msgstr "Liosta Tascanna Nua"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:684
-msgid "Memo List Properties"
-msgstr "Airíonna Liosta Meamram"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:684
-msgid "New Memo List"
-msgstr "Liosta Meamram Nua"
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+msgid "A_dd"
+msgstr "Cuir _Leis"
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Scriosadh an teagmhas seo."
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Scriosadh an tasc seo."
 
-#: ../calendar/gui/dialogs/changed-comp.c:70
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This memo has been deleted."
 msgstr "Scriosadh an meamram seo."
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/changed-comp.c:81
+#: ../calendar/gui/dialogs/changed-comp.c:80
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:85
 msgid "This event has been changed."
 msgstr "Athraíodh an teagmhas seo."
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:89
 msgid "This task has been changed."
 msgstr "Athraíodh an tasc seo."
 
-#: ../calendar/gui/dialogs/changed-comp.c:94
+#: ../calendar/gui/dialogs/changed-comp.c:93
 msgid "This memo has been changed."
 msgstr "Athraíodh an meamram seo."
 
@@ -2476,506 +2408,490 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:461
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:274
+#: ../calendar/gui/dialogs/comp-editor.c:266
 msgid "Could not save attachments"
 msgstr "Níorbh fhéidir iatáin a shábháil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:618
 msgid "Could not update object"
 msgstr "Níorbh fhéidir réad a nuashonrú"
 
-#: ../calendar/gui/dialogs/comp-editor.c:748
+#: ../calendar/gui/dialogs/comp-editor.c:752
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: ../calendar/gui/dialogs/comp-editor.c:755
+#: ../calendar/gui/dialogs/comp-editor.c:759
 #, c-format
 msgid "Meeting - %s"
 msgstr "Cruinniú - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:757
+#: ../calendar/gui/dialogs/comp-editor.c:761
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:763
+#: ../calendar/gui/dialogs/comp-editor.c:767
 #, c-format
 msgid "Assigned Task - %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:765
+#: ../calendar/gui/dialogs/comp-editor.c:769
 #, c-format
 msgid "Task - %s"
 msgstr "Tasc - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:774
 #, c-format
 msgid "Memo - %s"
 msgstr "Meamram - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:786
+#: ../calendar/gui/dialogs/comp-editor.c:790
 msgid "No Summary"
 msgstr "Gan Achoimre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:907
+#: ../calendar/gui/dialogs/comp-editor.c:911
 msgid "Keep original item?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1120
+#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1118
+#, fuzzy
+msgid "Unable to synchronize with the server"
+msgstr "Ní féidir nasc leis an bhfreastalaí GroupWise."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1232
 #, fuzzy
 msgid "Close the current window"
 msgstr "Dún an comhad reatha"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1455
-#: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
+#: ../calendar/gui/dialogs/comp-editor.c:1239 ../e-util/e-focus-tracker.c:121
+#: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
+#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:341
+#: ../e-util/e-web-view.c:1249 ../mail/e-mail-browser.c:136
+#: ../shell/e-shell-window-actions.c:888
 msgid "Copy the selection"
 msgstr "Cóipeáil an roghnú"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1462
-#: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1246 ../e-util/e-focus-tracker.c:114
+#: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
+#: ../e-util/e-web-view.c:1243 ../mail/e-mail-browser.c:143
+#: ../shell/e-shell-window-actions.c:895
 msgid "Cut the selection"
 msgstr "Gearr an roghnú"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
-#: ../shell/e-shell-window-actions.c:1469
-#: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1253 ../e-util/e-focus-tracker.c:135
+#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:902
 #, fuzzy
 msgid "Delete the selection"
 msgstr "Gearr an roghnú"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1260
 msgid "View help"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1497
-#: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:1267 ../e-util/e-focus-tracker.c:128
+#: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
+#: ../e-util/e-web-view.c:1255 ../mail/e-mail-browser.c:150
+#: ../shell/e-shell-window-actions.c:923
 msgid "Paste the clipboard"
 msgstr "Greamaigh an ghearrthaisce"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:1288
 msgid "Save current changes"
-msgstr "Sábháil Amharc Reatha"
+msgstr "Sábháil athruithe reatha"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1293
+#: ../e-util/e-mail-signature-editor.c:312
+msgid "Save and Close"
+msgstr "Sábháil agus Dún"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1295
+msgid "Save current changes and close editor"
+msgstr "Sábháil athruithe reatha agus dún an t-eagarthóir"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1574
-#: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
+#: ../calendar/gui/dialogs/comp-editor.c:1302 ../e-util/e-focus-tracker.c:142
+#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:157
+#: ../shell/e-shell-window-actions.c:1000
 msgid "Select all text"
 msgstr "Roghnaigh an téacs ar fad"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../calendar/gui/dialogs/comp-editor.c:1309
 msgid "_Classification"
-msgstr ""
+msgstr "_Aicmiúchán"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1197
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:176
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1602
-#: ../widgets/menus/gal-define-views.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1316
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
+#: ../mail/e-mail-browser.c:171
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../shell/e-shell-window-actions.c:1028
 msgid "_Edit"
 msgstr "_Eagar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204 ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1609
-#: ../widgets/misc/e-signature-editor.c:221
+#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../e-util/e-mail-signature-editor.c:317 ../mail/e-mail-browser.c:164
+#: ../shell/e-shell-window-actions.c:1035
 msgid "_File"
 msgstr "_Comhad"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1211
-#: ../shell/e-shell-window-actions.c:1616
+#: ../calendar/gui/dialogs/comp-editor.c:1330
+#: ../shell/e-shell-window-actions.c:1042
 msgid "_Help"
 msgstr "Cab_hair"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1218
+#: ../calendar/gui/dialogs/comp-editor.c:1337
 msgid "_Insert"
 msgstr "_Ionsáigh"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1225
-#: ../composer/e-composer-actions.c:340
+#: ../calendar/gui/dialogs/comp-editor.c:1344
+#: ../composer/e-composer-actions.c:320
 msgid "_Options"
 msgstr "_Roghanna"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1232 ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1351 ../mail/e-mail-browser.c:178
+#: ../shell/e-shell-window-actions.c:1077 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Amharc"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1242
-#: ../composer/e-composer-actions.c:289
+#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../composer/e-composer-actions.c:269
 msgid "_Attachment..."
 msgstr "_Iatán..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244
-#: ../composer/e-composer-actions.c:291
-#: ../widgets/misc/e-attachment-view.c:439
+#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../composer/e-composer-actions.c:271 ../e-util/e-attachment-view.c:413
 msgid "Attach a file"
 msgstr "Ceangail comhad"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1371
 msgid "_Categories"
 msgstr "_Catagóirí"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1254
+#: ../calendar/gui/dialogs/comp-editor.c:1373
 msgid "Toggles whether to display categories"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1260
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Time _Zone"
 msgstr "_Crios Ama"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1381
 msgid "Toggles whether the time zone is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1271
+#: ../calendar/gui/dialogs/comp-editor.c:1390
 msgid "Pu_blic"
 msgstr "Poi_blí"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1273
+#: ../calendar/gui/dialogs/comp-editor.c:1392
 msgid "Classify as public"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "_Private"
 msgstr "_Príobháideach"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1399
 msgid "Classify as private"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "_Confidential"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Classify as confidential"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1295
+#: ../calendar/gui/dialogs/comp-editor.c:1414
 msgid "R_ole Field"
 msgstr "Réimse _Róil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1297
+#: ../calendar/gui/dialogs/comp-editor.c:1416
 msgid "Toggles whether the Role field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1303
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../calendar/gui/dialogs/comp-editor.c:1424
 msgid "Toggles whether the RSVP field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "_Status Field"
 msgstr "Réimse _Stádais"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1313
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Toggles whether the Status field is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "_Type Field"
 msgstr "Réimse _Cineáil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1321
+#: ../calendar/gui/dialogs/comp-editor.c:1440
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1345
-#: ../composer/e-composer-private.c:77
-msgid "Recent _Documents"
-msgstr "_Cáipéisí le Déanaí"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2078
-#: ../composer/e-composer-actions.c:508
+#: ../calendar/gui/dialogs/comp-editor.c:2221
+#: ../composer/e-composer-actions.c:488
 msgid "Attach"
 msgstr "Ceangail"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2428
-#: ../calendar/gui/dialogs/comp-editor.c:2591
-#: ../calendar/gui/dialogs/comp-editor.c:3580
+#: ../calendar/gui/dialogs/comp-editor.c:2551
+#: ../calendar/gui/dialogs/comp-editor.c:2761
+#: ../calendar/gui/dialogs/comp-editor.c:3772
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:3544
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:3734
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "iatán"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3612
+#: ../calendar/gui/dialogs/comp-editor.c:3804
 msgid "Unable to use current version!"
 msgstr "Ní féidir an leagan reatha a úsáid!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:114
+#: ../calendar/gui/dialogs/comp-editor-page.c:441
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:118
 msgid "Could not open destination"
 msgstr "Níorbh fhéidir sprioc a oscailt"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:128
 msgid "Destination is read only"
 msgstr "Tá an sprioc inléite amháin"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+#: ../calendar/gui/dialogs/copy-source-dialog.c:162
 #, fuzzy
 msgid "Cannot create object"
 msgstr "Ní féidir teagmhas nua a chruthú"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+#: ../calendar/gui/dialogs/copy-source-dialog.c:194
 msgid "Could not open source"
 msgstr "Níorbh fhéidir foinse a oscailt"
 
-#: ../calendar/gui/dialogs/delete-comp.c:214
+#: ../calendar/gui/dialogs/delete-comp.c:216
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-comp.c:217
+#: ../calendar/gui/dialogs/delete-comp.c:219
 #, fuzzy
 msgid "_Retract comment"
 msgstr "_Cáipéisí le Déanaí"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 #, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
 msgstr ""
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:59
 #, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
 msgstr ""
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:65
+#: ../calendar/gui/dialogs/delete-error.c:63
 #, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
 msgstr ""
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:67
 #, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:82
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The memo could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:83
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:91
 #, c-format
 msgid "The event could not be deleted due to an error: %s"
 msgstr ""
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:97
+#: ../calendar/gui/dialogs/delete-error.c:95
 #, c-format
 msgid "The task could not be deleted due to an error: %s"
 msgstr ""
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:101
+#: ../calendar/gui/dialogs/delete-error.c:99
 #, c-format
 msgid "The memo could not be deleted due to an error: %s"
 msgstr ""
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:105
+#: ../calendar/gui/dialogs/delete-error.c:103
 #, fuzzy, c-format
 msgid "The item could not be deleted due to an error: %s"
 msgstr "Níorbh fhéidir an mhír a sheoladh!\n"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Contacts..."
-msgstr "Teagmhálacha..."
+msgid "Enter Delegate"
+msgstr "Iontráil Toscaire"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
-msgstr ""
+msgstr "Tarmlig Chuig:"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-msgid "Enter Delegate"
-msgstr ""
+msgid "Contacts..."
+msgstr "Teagmhálacha..."
 
-#: ../calendar/gui/dialogs/event-editor.c:212
-#, fuzzy
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Reminders"
-msgstr "Meabhrúchán!"
+msgstr "_Meabhrúcháin"
 
-#: ../calendar/gui/dialogs/event-editor.c:214
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Set or unset reminders for this event"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:215
 msgid "Show Time as _Busy"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:224
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "Toggles whether to show time as busy"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "_Recurrence"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Make this a recurring event"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:240
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../calendar/gui/dialogs/event-editor.c:233 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
-msgstr ""
+msgstr "Roghanna Seolta"
 
-#: ../calendar/gui/dialogs/event-editor.c:242
-#: ../calendar/gui/dialogs/task-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/task-editor.c:96
 msgid "Insert advanced send options"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:250
+#: ../calendar/gui/dialogs/event-editor.c:243
 msgid "All _Day Event"
 msgstr "Teagmhas an _Lae ar Fad"
 
-#: ../calendar/gui/dialogs/event-editor.c:252
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "Toggles whether to have All Day Event"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:261
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "_Free/Busy"
 msgstr "_Saor/Gnóthach"
 
-#: ../calendar/gui/dialogs/event-editor.c:263
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Query free / busy information for the attendees"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
+#: ../calendar/gui/dialogs/event-editor.c:307 ../calendar/gui/print.c:3505
 msgid "Appointment"
 msgstr "Coinne"
 
-#: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/dialogs/event-editor.c:377
+#: ../calendar/gui/dialogs/event-page.ui.h:24
+#: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "Rannpháirtithe"
 
-#: ../calendar/gui/dialogs/event-editor.c:582
-#, fuzzy
+#: ../calendar/gui/dialogs/event-editor.c:574
 msgid "Print this event"
-msgstr "Priontáil an teachtaireacht seo"
+msgstr "Priontáil an t-imeacht seo"
 
-#: ../calendar/gui/dialogs/event-page.c:558
+#: ../calendar/gui/dialogs/event-page.c:557
 msgid "Event's start time is in the past"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:635
+#: ../calendar/gui/dialogs/event-page.c:634
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:639
+#: ../calendar/gui/dialogs/event-page.c:638
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:651
-#: ../calendar/gui/dialogs/event-page.c:3080
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.c:650
+#: ../calendar/gui/dialogs/event-page.c:3165
 msgid "This event has reminders"
-msgstr "Scriosadh an teagmhas seo."
+msgstr "Tá meabhrúcháin ag an imeacht seo"
 
-#: ../calendar/gui/dialogs/event-page.c:718
-#: ../calendar/gui/dialogs/event-page.ui.h:7
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.c:717
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "_Eagraí:"
 
-#: ../calendar/gui/dialogs/event-page.c:1263
+#: ../calendar/gui/dialogs/event-page.c:1299
 msgid "Event with no start date"
 msgstr "Teagmhas gan dáta tosaithe"
 
-#: ../calendar/gui/dialogs/event-page.c:1266
+#: ../calendar/gui/dialogs/event-page.c:1302
 msgid "Event with no end date"
 msgstr "Teagmhas gan dáta deiridh"
 
-#: ../calendar/gui/dialogs/event-page.c:1439
-#: ../calendar/gui/dialogs/memo-page.c:708
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/event-page.c:1475
+#: ../calendar/gui/dialogs/memo-page.c:726
+#: ../calendar/gui/dialogs/task-page.c:1024
 msgid "Start date is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1449
+#: ../calendar/gui/dialogs/event-page.c:1486
 msgid "End date is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1472
+#: ../calendar/gui/dialogs/event-page.c:1510
 msgid "Start time is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1479
+#: ../calendar/gui/dialogs/event-page.c:1518
 msgid "End time is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1644
-#: ../calendar/gui/dialogs/memo-page.c:749
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1682
+#: ../calendar/gui/dialogs/memo-page.c:765
+#: ../calendar/gui/dialogs/task-page.c:1078
 msgid "An organizer is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1678
-#: ../calendar/gui/dialogs/task-page.c:913
+#: ../calendar/gui/dialogs/event-page.c:1717
+#: ../calendar/gui/dialogs/task-page.c:1113
 msgid "At least one attendee is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1885
+#: ../calendar/gui/dialogs/event-page.c:1923
 msgid "_Delegatees"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1887
+#: ../calendar/gui/dialogs/event-page.c:1925
 msgid "Atte_ndees"
 msgstr "_Rannpháirtithe"
 
-#: ../calendar/gui/dialogs/event-page.c:2921
-#, fuzzy, c-format
-msgid "Unable to open the calendar '%s': %s"
-msgstr "Ní féidir an féilire '%s' a oscailt."
-
-#. 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:2998
-#: ../calendar/gui/dialogs/memo-page.c:1012
-#: ../calendar/gui/dialogs/task-page.c:1844
-#, c-format
-msgid "You are acting on behalf of %s"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.c:3325
+#: ../calendar/gui/dialogs/event-page.c:3445
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -2985,177 +2901,160 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../calendar/gui/dialogs/event-page.c:3331
+#: ../calendar/gui/dialogs/event-page.c:3451
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/dialogs/event-page.c:3337
+#: ../calendar/gui/dialogs/event-page.c:3457
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/dialogs/event-page.c:3356
+#: ../calendar/gui/dialogs/event-page.c:3478
 msgid "Customize"
 msgstr "Saincheap"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3362
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.c:3485
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Neamhní"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:564
-msgid "Atte_ndees..."
-msgstr "_Rannpháirtithe..."
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+msgctxt "eventpage"
+msgid "for"
+msgstr "go ceann"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-#, fuzzy
-msgid "Custom Reminder:"
-msgstr "Ceanntásc Saincheaptha"
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#: ../calendar/gui/dialogs/event-page.ui.h:4
+msgctxt "eventpage"
+msgid "until"
+msgstr "go dtí"
 
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Event Description"
-msgstr "Cur Síos Teagmhais"
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "15 nóiméad roimh an gcoinne"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Time _zone:"
-msgstr "Cri_os ama:"
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "uair roimh an gcoinne"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:347
-msgid "_Description:"
-msgstr "_Cur síos:"
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "lá roimh an gcoinne"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../plugins/calendar-weather/calendar-weather.c:381
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 msgid "_Location:"
 msgstr "_Suíomh:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-#, fuzzy
-msgid "_Reminder"
-msgstr "Meabhrúchán!"
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:29
+#: ../e-util/e-attachment-dialog.c:357
+msgid "_Description:"
+msgstr "_Cur síos:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:14
-#, fuzzy
-msgid "_Summary:"
-msgstr "Achoimre:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "_Am:"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#, fuzzy
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "roimh gach coinne"
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Time _zone:"
+msgstr "Cri_os ama:"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#, fuzzy
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "roimh gach coinne"
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "_Achoimre:"
 
-#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
-#, fuzzy
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "roimh gach coinne"
+msgid "Event Description"
+msgstr "Cur Síos Teagmhais"
 
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#, fuzzy
-msgctxt "eventpage"
-msgid "for"
-msgstr "ceathrú"
+#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/e-meeting-time-sel.c:547
+msgid "Atte_ndees..."
+msgstr "_Rannpháirtithe..."
 
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#: ../calendar/gui/dialogs/event-page.ui.h:25
-#, fuzzy
-msgctxt "eventpage"
-msgid "until"
-msgstr ""
-"go ceann\n"
-"go dtí"
+#: ../calendar/gui/dialogs/event-page.ui.h:26
+msgid "_Reminder"
+msgstr "_Meabhrúchán"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+msgid "Custom Reminder:"
+msgstr "Meabhrúchán Saincheaptha"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "April"
-msgstr ""
+msgid "January"
+msgstr "Eanáir"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "August"
-msgstr ""
+msgid "February"
+msgstr "Feabhra"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-#, fuzzy
-msgid "December"
-msgstr "Ball"
+msgid "March"
+msgstr "Márta"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "February"
-msgstr ""
+msgid "April"
+msgstr "Aibreán"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "January"
-msgstr ""
+msgid "May"
+msgstr "Bealtaine"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "July"
-msgstr ""
+msgid "June"
+msgstr "Meitheamh"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:7
-msgid "June"
-msgstr ""
+msgid "July"
+msgstr "Iúil"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-#, fuzzy
-msgid "March"
-msgstr "Cuardaigh"
+msgid "August"
+msgstr "Lúnasa"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-#, fuzzy
-msgid "May"
-msgstr "lá"
+msgid "September"
+msgstr "Meán Fómhair"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-#, fuzzy
-msgid "November"
-msgstr "Ball"
+msgid "October"
+msgstr "Deireadh Fómhair"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:11
-msgid "October"
-msgstr ""
+msgid "November"
+msgstr "Samhain"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "December"
+msgstr "Nollaig"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
 msgid "Select Date"
 msgstr "Roghnaigh Dáta"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "Select _Today"
 msgstr "Roghnaigh an Lá _Inniu"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#, fuzzy
-msgid "September"
-msgstr "Ball"
-
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
+#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3509
 msgid "Memo"
 msgstr "Meamram"
 
@@ -3164,102 +3063,103 @@ msgstr "Meamram"
 msgid "Print this memo"
 msgstr "Priontáil liosta meamram"
 
-#: ../calendar/gui/dialogs/memo-page.c:405
+#: ../calendar/gui/dialogs/memo-page.c:421
 msgid "Memo's start date is in the past"
 msgstr ""
 
-#: ../calendar/gui/dialogs/memo-page.c:442
+#: ../calendar/gui/dialogs/memo-page.c:457
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/memo-page.c:446
+#: ../calendar/gui/dialogs/memo-page.c:461
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr ""
 
-#: ../calendar/gui/dialogs/memo-page.c:936
-#, fuzzy, c-format
-msgid "Unable to open memos in '%s': %s"
-msgstr "Ní féidir meamraim i '%s' a oscailt."
-
-#: ../calendar/gui/dialogs/memo-page.c:1144 ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1062 ../mail/em-format-html.c:2626
-#: ../mail/em-format-html.c:2691 ../mail/em-format-html.c:2715
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
+#: ../calendar/gui/dialogs/memo-page.c:1161
+#: ../em-format/e-mail-formatter-utils.c:205
+#: ../em-format/e-mail-formatter-utils.c:229
+#: ../em-format/e-mail-part-headers.c:49 ../mail/em-filter-i18n.h:78
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:66
 msgid "To"
 msgstr "Chuig"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.ui.h:5
-msgid "Sta_rt date:"
-msgstr "Dáta to_saigh:"
+#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.ui.h:31
+msgid "_List:"
+msgstr "_Liosta:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "_Achoimre:"
+#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.ui.h:24
+msgid "Organi_zer:"
+msgstr "Ea_graí:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_Chuig:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:26
+msgid "Sta_rt date:"
+msgstr "Dáta to_saigh:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:339
-#: ../calendar/gui/dialogs/task-page.ui.h:9
-#, fuzzy
-msgid "_List:"
-msgstr "Liosta"
+#: ../calendar/gui/dialogs/task-page.ui.h:23
+msgid "Su_mmary:"
+msgstr "_Achoimre:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:57
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:61
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:65
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:101
+#: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:106
+#: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
 msgstr "Gach Ásc"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:575
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:964
+#: ../calendar/gui/dialogs/recurrence-page.c:1000
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1073
 msgid "on"
 msgstr "ar"
 
@@ -3267,7 +3167,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:1097
+#: ../calendar/gui/dialogs/recurrence-page.c:1154
 msgid "first"
 msgstr "céad"
 
@@ -3276,7 +3176,7 @@ msgstr "céad"
 #. * (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:1103
+#: ../calendar/gui/dialogs/recurrence-page.c:1160
 msgid "second"
 msgstr "dara"
 
@@ -3284,7 +3184,7 @@ msgstr "dara"
 #. * (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:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "third"
 msgstr "tríú"
 
@@ -3292,7 +3192,7 @@ msgstr "tríú"
 #. * (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:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "fourth"
 msgstr "ceathrú"
 
@@ -3300,7 +3200,7 @@ msgstr "ceathrú"
 #. * (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:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1175
 msgid "fifth"
 msgstr "cúigiú"
 
@@ -3308,13 +3208,13 @@ msgstr "cúigiú"
 #. * (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:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "last"
 msgstr "deireadh"
 
 #. 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:1147
+#: ../calendar/gui/dialogs/recurrence-page.c:1204
 msgid "Other Date"
 msgstr "Dáta Eile"
 
@@ -3322,7 +3222,7 @@ msgstr "Dáta Eile"
 #. * 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:1153
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 msgid "1st to 10th"
 msgstr "1ú go 10ú"
 
@@ -3330,7 +3230,7 @@ msgstr "1ú go 10ú"
 #. * 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:1159
+#: ../calendar/gui/dialogs/recurrence-page.c:1216
 msgid "11th to 20th"
 msgstr "11ú go 20ú"
 
@@ -3338,343 +3238,455 @@ msgstr "11ú go 20ú"
 #. * 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:1165
+#: ../calendar/gui/dialogs/recurrence-page.c:1222
 msgid "21st to 31st"
 msgstr "21ú go 31ú"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1191
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "Luan"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1192
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "Máirt"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1193
-#: ../modules/calendar/e-calendar-preferences.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "Céadaoin"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1194
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "Déardaoin"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "Aoine"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
-#: ../modules/calendar/e-calendar-preferences.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "Sathain"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "Domhnach"
 
 #. 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:1321
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
 msgid "on the"
 msgstr "ar an"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1496
+#: ../calendar/gui/dialogs/recurrence-page.c:1571
 msgid "occurrences"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2214
+#: ../calendar/gui/dialogs/recurrence-page.c:2341
 msgid "Add exception"
 msgstr "Cuir eisceacht leis"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2255
+#: ../calendar/gui/dialogs/recurrence-page.c:2383
 msgid "Could not get a selection to modify."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2261
+#: ../calendar/gui/dialogs/recurrence-page.c:2389
 msgid "Modify exception"
 msgstr "Athraigh eisceacht"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2305
+#: ../calendar/gui/dialogs/recurrence-page.c:2435
 msgid "Could not get a selection to delete."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2439
+#: ../calendar/gui/dialogs/recurrence-page.c:2576
 msgid "Date/Time"
 msgstr "Dáta/Am"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
-msgid "Every"
-msgstr "Gach"
-
+#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-#, fuzzy
-msgid "Exceptions"
-msgstr "<b>Eisceachtaí</b>"
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "lá"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
-msgid "Preview"
-msgstr "Réamhamharc"
+#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
+msgctxt "recurrpage"
+msgid "week(s)"
+msgstr "s(h)eachtain"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
-msgid "This appointment rec_urs"
-msgstr ""
+#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
+msgctxt "recurrpage"
+msgid "month(s)"
+msgstr "m(h)í"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgctxt "recurrpage"
-msgid "day(s)"
-msgstr "lá"
+msgid "year(s)"
+msgstr "blia(in/na)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-#, fuzzy
 msgctxt "recurrpage"
 msgid "for"
-msgstr "ceathrú"
+msgstr "go ceann"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-#, fuzzy
 msgctxt "recurrpage"
-msgid "forever"
-msgstr "Riamh"
+msgid "until"
+msgstr "go dtí"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgctxt "recurrpage"
-msgid "month(s)"
-msgstr "m(h)í"
+msgid "forever"
+msgstr "go deo"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-#, fuzzy
-msgctxt "recurrpage"
-msgid "until"
+msgid "This appointment rec_urs"
 msgstr ""
-"go ceann\n"
-"go dtí"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
+msgid "Every"
+msgstr "Gach"
+
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-msgctxt "recurrpage"
-msgid "week(s)"
-msgstr "s(h)eachtain"
+#, fuzzy
+msgid "Exceptions"
+msgstr "<b>Eisceachtaí</b>"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-msgctxt "recurrpage"
-msgid "year(s)"
-msgstr "blia(in/na)"
+msgid "Preview"
+msgstr "Réamhamharc"
 
-#: ../calendar/gui/dialogs/send-comp.c:198
+#: ../calendar/gui/dialogs/send-comp.c:170
+#: ../calendar/gui/dialogs/send-comp.c:248
 #, fuzzy
 msgid "Send my reminders with this event"
 msgstr "Priontáil an teachtaireacht seo"
 
-#: ../calendar/gui/dialogs/send-comp.c:200
+#: ../calendar/gui/dialogs/send-comp.c:172
+#: ../calendar/gui/dialogs/send-comp.c:250
 msgid "Notify new attendees _only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.c:351
-#: ../calendar/gui/dialogs/task-details-page.c:373
-msgid "Completed date is wrong"
+#: ../calendar/gui/dialogs/task-editor.c:94
+msgid "_Send Options"
+msgstr "_Seol Roghanna"
+
+#: ../calendar/gui/dialogs/task-editor.c:149 ../calendar/gui/print.c:3507
+#: ../e-util/e-send-options.c:553
+msgid "Task"
+msgstr "Tasc"
+
+#: ../calendar/gui/dialogs/task-editor.c:286
+msgid "Print this task"
+msgstr "Priontáil an tasc seo"
+
+#: ../calendar/gui/dialogs/task-page.c:330
+msgid "Task's start date is in the past"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.c:488
-msgid "Web Page"
-msgstr "Leathanach Gréasáin"
+#: ../calendar/gui/dialogs/task-page.c:331
+msgid "Task's due date is in the past"
+msgstr ""
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:300
-#: ../calendar/gui/e-cal-model-tasks.c:440
-#: ../calendar/gui/e-cal-model-tasks.c:725 ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:606
-#: ../calendar/gui/print.c:3400 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
-#, c-format
-msgid "Canceled"
-msgstr "Cealaithe"
+#: ../calendar/gui/dialogs/task-page.c:364
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr ""
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:297
-#: ../calendar/gui/e-cal-model-tasks.c:438
-#: ../calendar/gui/e-cal-model-tasks.c:723
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
-msgid "Completed"
-msgstr "Críochnaithe"
+#: ../calendar/gui/dialogs/task-page.c:368
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:372
+msgid ""
+"Task cannot be edited, because the selected task list does not support "
+"assigned tasks"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:1005
+msgid "Due date is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:1173
+#: ../calendar/gui/dialogs/task-page.c:1198
+msgid "Completed date is wrong"
+msgstr ""
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1274 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:348
+#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:320
 msgid "High"
 msgstr "Ard"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:294
-#: ../calendar/gui/e-cal-model-tasks.c:436
-#: ../calendar/gui/e-cal-model-tasks.c:721
-#: ../calendar/gui/e-cal-model-tasks.c:799 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:604
-#: ../calendar/gui/print.c:3394
-msgid "In Progress"
-msgstr "Ar Siúl"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:350
+#: ../calendar/gui/e-cal-model.c:1666 ../calendar/gui/e-task-table.c:574
+#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
+#: ../mail/message-list.c:319
+msgid "Normal"
+msgstr "Gnáth"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-task-table.c:528 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1272 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/task-page.ui.h:12
+#: ../calendar/gui/e-cal-component-preview.c:352
+#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:318
 msgid "Low"
 msgstr "Íseal"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model.c:1583 ../calendar/gui/e-task-table.c:527
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1273
-#: ../widgets/misc/e-send-options.ui.h:16
-msgid "Normal"
-msgstr "Gnáth"
+#: ../calendar/gui/dialogs/task-page.ui.h:14
+#: ../calendar/gui/e-task-table.c:576 ../calendar/gui/tasktypes.xml.h:22
+#: ../e-util/e-send-options.ui.h:1
+msgid "Undefined"
+msgstr "Gan sainmhiniú"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:304
-#: ../calendar/gui/e-cal-model-tasks.c:434
-#: ../calendar/gui/e-cal-model-tasks.c:719 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:603
-#: ../calendar/gui/print.c:3391 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/dialogs/task-page.ui.h:16
+#: ../calendar/gui/e-cal-component-preview.c:333
+#: ../calendar/gui/e-cal-model-tasks.c:311
+#: ../calendar/gui/e-cal-model-tasks.c:551 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:656
+#: ../calendar/gui/print.c:3591 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Gan Tosú"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:16
-msgid "P_ercent complete:"
-msgstr ""
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-page.ui.h:18
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-model-tasks.c:313
+#: ../calendar/gui/e-cal-model-tasks.c:553
+#: ../calendar/gui/e-cal-model-tasks.c:631 ../calendar/gui/e-task-table.c:216
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:657
+#: ../calendar/gui/print.c:3594
+msgid "In Progress"
+msgstr "Ar Siúl"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:17
-msgid "Stat_us:"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-page.ui.h:20
+#: ../calendar/gui/e-cal-component-preview.c:326
+#: ../calendar/gui/e-cal-model-tasks.c:315
+#: ../calendar/gui/e-cal-model-tasks.c:555
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
+#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3597
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:380
+msgid "Completed"
+msgstr "Críochnaithe"
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-page.ui.h:22
+#: ../calendar/gui/e-cal-component-preview.c:329
+#: ../calendar/gui/e-cal-model-tasks.c:317
+#: ../calendar/gui/e-cal-model-tasks.c:557 ../calendar/gui/e-task-table.c:220
+#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:659
+#: ../calendar/gui/print.c:3600 ../mail/mail-send-recv.c:878
+msgid "Canceled"
+msgstr "Cealaithe"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:25
+msgid "D_ue date:"
+msgstr "_Spriocdháta:"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:28
+msgid "Time zone:"
+msgstr "Crios ama:"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+msgid "_Status:"
 msgstr "_Stádas:"
 
-#. 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/dialogs/task-details-page.ui.h:18
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1854
-#: ../calendar/gui/e-meeting-list-view.c:635
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Stádas"
+#: ../calendar/gui/dialogs/task-page.ui.h:33
+#, fuzzy
+msgid "Date _completed:"
+msgstr "Scrios tascanna críochnaithe"
 
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:529 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:27
-msgid "Undefined"
-msgstr "Gan sainmhiniú"
+#: ../calendar/gui/dialogs/task-page.ui.h:34
+#, fuzzy
+msgid "_Percent complete:"
+msgstr "_Cáipéisí le Déanaí"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:21
-msgid "_Date completed:"
-msgstr ""
+#: ../calendar/gui/dialogs/task-page.ui.h:35
+msgid "Priorit_y:"
+msgstr "T_osaíocht:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:35
-msgid "_Priority:"
-msgstr "_Tosaíocht:"
+#: ../calendar/gui/dialogs/task-page.ui.h:36
+msgid "C_lassification:"
+msgstr "A_icmiúchán"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:23
+#: ../calendar/gui/dialogs/task-page.ui.h:37
 msgid "_Web Page:"
 msgstr "Leathanach _Gréasáin:"
 
-#: ../calendar/gui/dialogs/task-editor.c:116
-msgid "_Status Details"
-msgstr "Sonraí _Stádais"
+#: ../calendar/gui/ea-cal-view.c:324
+msgid "New Appointment"
+msgstr "Coinne Nua"
 
-#: ../calendar/gui/dialogs/task-editor.c:118
-msgid "Click to change or view the status details of the task"
-msgstr ""
+#: ../calendar/gui/ea-cal-view.c:325
+msgid "New All Day Event"
+msgstr "Teagmhas an Lae ar Fad Nua"
 
-#: ../calendar/gui/dialogs/task-editor.c:126
-msgid "_Send Options"
-msgstr "_Seol Roghanna"
+#: ../calendar/gui/ea-cal-view.c:326
+msgid "New Meeting"
+msgstr "Cruinniú Nua"
 
-#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
-#: ../widgets/misc/e-send-options.c:535
-msgid "Task"
-msgstr "Tasc"
+#: ../calendar/gui/ea-cal-view.c:327
+msgid "Go to Today"
+msgstr "Téigh go Inniu"
 
-#: ../calendar/gui/dialogs/task-editor.c:324
-msgid "Task Details"
-msgstr "Sonraí Taisc"
+#: ../calendar/gui/ea-cal-view.c:328
+msgid "Go to Date"
+msgstr "Téigh go Dáta"
 
-#: ../calendar/gui/dialogs/task-editor.c:366
-msgid "Print this task"
-msgstr "Priontáil an tasc seo"
+#: ../calendar/gui/ea-cal-view-event.c:298
+#, fuzzy
+msgid "It has reminders."
+msgstr "Tá aláraim aige."
 
-#: ../calendar/gui/dialogs/task-page.c:251
-msgid "Task's start date is in the past"
+#: ../calendar/gui/ea-cal-view-event.c:301
+msgid "It has recurrences."
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:252
-msgid "Task's due date is in the past"
+#: ../calendar/gui/ea-cal-view-event.c:304
+msgid "It is a meeting."
+msgstr "Is cruinniú é."
+
+#: ../calendar/gui/ea-cal-view-event.c:311
+#, c-format
+msgid "Calendar Event: Summary is %s."
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:286
-msgid "Task cannot be edited, because the selected task list is read only"
+#: ../calendar/gui/ea-cal-view-event.c:314
+msgid "Calendar Event: It has no summary."
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:290
-msgid "Task cannot be fully edited, because you are not the organizer"
+#: ../calendar/gui/ea-cal-view-event.c:337
+msgid "calendar view event"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:294
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
+#: ../calendar/gui/ea-cal-view-event.c:569
+msgid "Grab Focus"
+msgstr "Gabh Fócas"
+
+#: ../calendar/gui/ea-day-view.c:154 ../calendar/gui/ea-week-view.c:154
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Tá %d teagmhas aige."
+msgstr[1] "Tá %d teagmhas aige."
+msgstr[2] "Tá %d theagmhas aige."
+msgstr[3] "Tá %d dteagmhas aige."
+msgstr[4] "Tá %d teagmhas aige."
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:161 ../calendar/gui/ea-week-view.c:157
+msgid "It has no events."
+msgstr "Níl aon teagmhas aige."
+
+#: ../calendar/gui/ea-day-view.c:169
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Amharc Seachtaine Oibre; %s. %s"
+
+#: ../calendar/gui/ea-day-view.c:176
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "Amharc Lae: %s. %s"
+
+#: ../calendar/gui/ea-day-view.c:210
+msgid "calendar view for a work week"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:347
-#: ../calendar/gui/dialogs/task-page.ui.h:4
-msgid "Organi_zer:"
-msgstr "Ea_graí:"
+#: ../calendar/gui/ea-day-view.c:212
+msgid "calendar view for one or more days"
+msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:807
-msgid "Due date is wrong"
+#: ../calendar/gui/ea-day-view-main-item.c:327
+#: ../calendar/gui/ea-week-view-main-item.c:354
+msgid "a table to view and select the current time range"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:1763
-#, fuzzy, c-format
-msgid "Unable to open tasks in '%s': %s"
-msgstr "Ní féidir tascanna i '%s' a oscailt."
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:1114
+msgid "Gnome Calendar"
+msgstr "Féilire Gnome"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:2
-msgid "Categor_ies..."
-msgstr "Catagó_irí..."
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1222
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:3
-msgid "D_ue date:"
-msgstr "_Spriocdháta:"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:2793
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:219
+#: ../modules/calendar/e-cal-shell-view-private.c:1226
+msgid "%a %d %b"
+msgstr "%a %d %b"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:7
-msgid "Time zone:"
-msgstr "Crios ama:"
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:217
+#: ../calendar/gui/ea-gnome-calendar.c:220
+#: ../modules/calendar/e-cal-shell-view-private.c:1229
+#: ../modules/calendar/e-cal-shell-view-private.c:1235
+#: ../modules/calendar/e-cal-shell-view-private.c:1238
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:239
+#: ../calendar/gui/ea-gnome-calendar.c:247
+#: ../calendar/gui/ea-gnome-calendar.c:254
+#: ../calendar/gui/ea-gnome-calendar.c:257
+#: ../modules/calendar/e-cal-shell-view-private.c:1255
+#: ../modules/calendar/e-cal-shell-view-private.c:1266
+#: ../modules/calendar/e-cal-shell-view-private.c:1273
+#: ../modules/calendar/e-cal-shell-view-private.c:1276
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:2809
+#: ../calendar/gui/e-day-view-top-item.c:863
+#: ../calendar/gui/e-week-view-main-item.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1262
+msgid "%d %b"
+msgstr "%d %b"
+
+#: ../calendar/gui/ea-jump-button.c:151
+msgid "Jump button"
+msgstr ""
+
+#: ../calendar/gui/ea-jump-button.c:160
+msgid "Click here, you can find more events."
+msgstr ""
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:393
+#: ../calendar/gui/e-alarm-list.c:358
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3685,7 +3697,7 @@ msgstr[3] "%d lá"
 msgstr[4] "%d lá"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:399
+#: ../calendar/gui/e-alarm-list.c:364
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -3695,293 +3707,220 @@ msgstr[2] "%d sheachtain"
 msgstr[3] "%d seachtain"
 msgstr[4] "%d seachtain"
 
-#: ../calendar/gui/e-alarm-list.c:461
+#: ../calendar/gui/e-alarm-list.c:426
 msgid "Unknown action to be performed"
 msgstr ""
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:441
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr ""
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:480
+#: ../calendar/gui/e-alarm-list.c:447
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr ""
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:487
+#: ../calendar/gui/e-alarm-list.c:454
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr ""
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:498
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr ""
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:503
+#: ../calendar/gui/e-alarm-list.c:472
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr ""
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:510
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr ""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:534
+#: ../calendar/gui/e-alarm-list.c:503
 #, c-format
 msgid "%s at %s"
 msgstr "%s ag %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:542
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
+#: ../calendar/gui/ea-week-view.c:163
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "Amharc Míosa: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:168
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Amharc Seachtaine: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:202
+msgid "calendar view for a month"
+msgstr ""
+
+#: ../calendar/gui/ea-week-view.c:204
+msgid "calendar view for one or more weeks"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-preview.c:234 ../e-util/e-filter-rule.c:750
+#: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Gan Teideal"
 
-#: ../calendar/gui/e-cal-component-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:242
 msgid "Categories:"
 msgstr "Catagóirí:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:274
 msgid "Summary:"
 msgstr "Achoimre:"
 
-#: ../calendar/gui/e-cal-component-preview.c:249
-#: ../calendar/gui/e-cal-component-preview.c:263
+#: ../calendar/gui/e-cal-component-preview.c:283
 msgid "Start Date:"
 msgstr "Dáta Tosaigh:"
 
-#: ../calendar/gui/e-cal-component-preview.c:277
+#: ../calendar/gui/e-cal-component-preview.c:295
+#, fuzzy
+msgid "End Date:"
+msgstr "Dáta Deiridh"
+
+#: ../calendar/gui/e-cal-component-preview.c:307
 msgid "Due Date:"
 msgstr "Spriocdháta:"
 
-#. Status
-#: ../calendar/gui/e-cal-component-preview.c:290
-#: ../plugins/itip-formatter/itip-view.c:1083
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../modules/itip-formatter/itip-view.c:1492
+#: ../modules/itip-formatter/itip-view.c:1609
 msgid "Status:"
 msgstr "Stádas:"
 
-#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-component-preview.c:346
 msgid "Priority:"
 msgstr "Tosaíocht:"
 
-#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:371
+#: ../mail/e-mail-config-service-page.c:672
 msgid "Description:"
 msgstr "Cur Síos:"
 
-#: ../calendar/gui/e-cal-component-preview.c:373
+#: ../calendar/gui/e-cal-component-preview.c:402
 msgid "Web Page:"
 msgstr "Leathanach Gréasáin:"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:388
-msgid "Created"
-msgstr "Cruthaithe"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
-msgid "End Date"
-msgstr "Dáta Deiridh"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:9
-#: ../calendar/gui/e-memo-table.etspec.h:4
-msgid "Last modified"
-msgstr "Athraithe"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:5
-msgid "Start Date"
-msgstr "Dáta Tosaigh"
-
-#: ../calendar/gui/e-cal-model-calendar.c:188
-#: ../calendar/gui/e-task-table.c:580
-msgid "Free"
-msgstr "Saor"
-
-#: ../calendar/gui/e-cal-model-calendar.c:191
-#: ../calendar/gui/e-meeting-time-sel.c:547 ../calendar/gui/e-task-table.c:581
-msgid "Busy"
-msgstr "Gnóthach"
-
-#: ../calendar/gui/e-cal-model-tasks.c:665
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:717
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "Neamhní"
-
-#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1589
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:1053
-msgid "Yes"
-msgstr "Déan"
-
-#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1589
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:190
-msgid "No"
-msgstr "Ná Déan"
-
-#: ../calendar/gui/e-cal-model.c:781 ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1151
-#: ../calendar/gui/print.c:1168 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:101
-#: ../plugins/itip-formatter/itip-formatter.c:469
-#: ../plugins/itip-formatter/itip-formatter.c:2697
-msgid "Unknown"
-msgstr "Anaithnid"
-
-#: ../calendar/gui/e-cal-model.c:1585
-msgid "Recurring"
-msgstr ""
-
-#: ../calendar/gui/e-cal-model.c:1587
-msgid "Assigned"
-msgstr "Sannta"
-
-#: ../calendar/gui/e-cal-model.c:2963
-#, c-format
-msgid "Opening %s"
-msgstr "%s á Oscailt"
+#: ../calendar/gui/e-calendar-table.etspec.h:1
+msgid "Click to add a task"
+msgstr "Cliceáil chun tasc a chur leis"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% Críochnaithe"
+msgid "Start date"
+msgstr "Dáta tosaigh"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "Cliceáil chun tasc a chur leis"
+#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-meeting-list-view.c:652
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../e-util/e-attachment-tree-view.c:586
+#: ../mail/e-mail-account-tree-view.c:159
+msgid "Type"
+msgstr "Cineál"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Complete"
-msgstr "Críochnaithe"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Le críochnú"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:880
+msgid "Complete"
+msgstr "Críochnaithe"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Spriocdháta"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#, no-c-format
+msgid "% Complete"
+msgstr "% Críochnaithe"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../calendar/gui/tasktypes.xml.h:18
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Priority"
 msgstr "Tosaíocht"
 
+#. 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:11
-msgid "Start date"
-msgstr "Dáta tosaigh"
+#: ../calendar/gui/e-cal-model.c:4017
+#: ../calendar/gui/e-meeting-list-view.c:695
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
+#: ../mail/message-list.etspec.h:1
+msgid "Status"
+msgstr "Stádas"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../plugins/save-calendar/csv-format.c:381
+msgid "Created"
+msgstr "Cruthaithe"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:598
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:584
-msgid "Type"
-msgstr "Cineál"
+msgid "Last modified"
+msgstr "Athraithe"
 
-#: ../calendar/gui/e-calendar-view.c:420
+#: ../calendar/gui/e-calendar-view.c:445
 #, fuzzy
 msgid "Cut selected events to the clipboard"
 msgstr "Gearr téacs roghnaithe go dtí an gearrthaisce"
 
-#: ../calendar/gui/e-calendar-view.c:426
+#: ../calendar/gui/e-calendar-view.c:451
 #, fuzzy
 msgid "Copy selected events to the clipboard"
 msgstr "Cóipeáil téacs roghnaithe go dtí an gearrthaisce"
 
-#: ../calendar/gui/e-calendar-view.c:432
+#: ../calendar/gui/e-calendar-view.c:457
 #, fuzzy
 msgid "Paste events from the clipboard"
 msgstr "Greamaigh téacs ón ngearrthaisce"
 
-#: ../calendar/gui/e-calendar-view.c:438
+#: ../calendar/gui/e-calendar-view.c:463
 #, fuzzy
 msgid "Delete selected events"
 msgstr "Scrios meamraim roghnaithe"
 
-#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:269
+#: ../calendar/gui/e-calendar-view.c:483 ../calendar/gui/e-memo-table.c:183
+#: ../calendar/gui/e-task-table.c:270
 msgid "Deleting selected objects"
 msgstr "Réada roghnaithe á scriosadh"
 
-#: ../calendar/gui/e-calendar-view.c:650 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/e-task-table.c:1104
+#: ../calendar/gui/e-calendar-view.c:642 ../calendar/gui/e-memo-table.c:878
+#: ../calendar/gui/e-task-table.c:1176
 msgid "Updating objects"
 msgstr "Réada á nuashonrú"
 
-#: ../calendar/gui/e-calendar-view.c:1801
-#: ../calendar/gui/e-meeting-list-view.c:214
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2685
-msgid "Accepted"
-msgstr "Glactha"
-
-#: ../calendar/gui/e-calendar-view.c:1802
-#: ../calendar/gui/e-meeting-list-view.c:215
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2691
-msgid "Declined"
-msgstr "Diúltaithe"
-
-#: ../calendar/gui/e-calendar-view.c:1803
-#: ../calendar/gui/e-meeting-list-view.c:216
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../calendar/gui/e-meeting-time-sel.c:546
-msgid "Tentative"
-msgstr ""
-
-#: ../calendar/gui/e-calendar-view.c:1804
-#: ../calendar/gui/e-meeting-list-view.c:217
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2694
-msgid "Delegated"
-msgstr ""
-
-#: ../calendar/gui/e-calendar-view.c:1805
-msgid "Needs action"
-msgstr "Gníomh de dhíth"
-
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1949 ../calendar/gui/e-memo-table.c:539
-#: ../calendar/gui/e-task-table.c:770
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/e-memo-table.c:553
+#: ../calendar/gui/e-task-table.c:840
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Eagraí: %s <%s>"
@@ -3989,68 +3928,151 @@ msgstr "Eagraí: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1953 ../calendar/gui/e-memo-table.c:544
-#: ../calendar/gui/e-task-table.c:774
+#: ../calendar/gui/e-calendar-view.c:2054 ../calendar/gui/e-memo-table.c:558
+#: ../calendar/gui/e-task-table.c:844
 #, c-format
 msgid "Organizer: %s"
 msgstr "Eagraí: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1969 ../calendar/gui/print.c:3346
+#: ../calendar/gui/e-calendar-view.c:2070
+#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3545
 #, c-format
 msgid "Location: %s"
 msgstr "Suíomh: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2000
+#: ../calendar/gui/e-calendar-view.c:2101
 #, c-format
 msgid "Time: %s %s"
 msgstr "Am: %s %s"
 
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
+#: ../calendar/gui/e-memo-table.etspec.h:5
+msgid "Start Date"
+msgstr "Dáta Tosaigh"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Dáta Deiridh"
+
+#: ../calendar/gui/e-cal-model.c:467 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1251
+#: ../calendar/gui/print.c:1268 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3496
+#: ../modules/itip-formatter/itip-view.c:6085
+#: ../modules/plugin-manager/evolution-plugin-manager.c:100
+msgid "Unknown"
+msgstr "Anaithnid"
+
+#: ../calendar/gui/e-cal-model.c:1668
+msgid "Recurring"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model.c:1670
+msgid "Assigned"
+msgstr "Sannta"
+
+#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1161
+#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:1024
+msgid "Yes"
+msgstr "Déan"
+
+#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1161
+#: ../calendar/gui/e-meeting-list-view.c:210
+#: ../calendar/gui/e-meeting-store.c:189
+msgid "No"
+msgstr "Ná Déan"
+
+#: ../calendar/gui/e-cal-model.c:3958
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../modules/itip-formatter/itip-view.c:6073
+msgid "Accepted"
+msgstr "Glactha"
+
+#: ../calendar/gui/e-cal-model.c:3959
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../modules/itip-formatter/itip-view.c:6079
+msgid "Declined"
+msgstr "Diúltaithe"
+
+#: ../calendar/gui/e-cal-model.c:3960
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-time-sel.c:526
+msgid "Tentative"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model.c:3961
+#: ../calendar/gui/e-meeting-list-view.c:224
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../modules/itip-formatter/itip-view.c:6082
+msgid "Delegated"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model.c:3962
+msgid "Needs action"
+msgstr "Gníomh de dhíth"
+
+#: ../calendar/gui/e-cal-model-calendar.c:125
+#: ../calendar/gui/e-task-table.c:631
+msgid "Free"
+msgstr "Saor"
+
+#: ../calendar/gui/e-cal-model-calendar.c:128
+#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:632
+msgid "Busy"
+msgstr "Gnóthach"
+
+#: ../calendar/gui/e-cal-model-tasks.c:497
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:549
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "Neamhní"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:156
+#: ../calendar/gui/e-cell-date-edit-text.c:159
 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:159
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 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:167
+#: ../calendar/gui/e-cell-date-edit-text.c:170
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
 "%s"
 msgstr ""
 
-#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
-#. * to change the length of the time division in the calendar day view, e.g.
-#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
-#.
-#: ../calendar/gui/e-day-view-time-item.c:809
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#: ../calendar/gui/e-day-view-time-item.c:830
-msgid "Show the second time zone"
-msgstr ""
-
-#. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:847
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
-#: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:231
-msgctxt "cal-second-zone"
-msgid "None"
-msgstr "Neamhní"
+#. String to use in 12-hour time format for times in the morning.
+#: ../calendar/gui/e-day-view.c:1983 ../calendar/gui/e-week-view.c:1554
+#: ../calendar/gui/print.c:1074 ../calendar/gui/print.c:1093
+#: ../calendar/gui/print.c:2637 ../calendar/gui/print.c:2657
+msgid "am"
+msgstr "am"
 
-#: ../calendar/gui/e-day-view-time-item.c:879
-#: ../calendar/gui/e-timezone-entry.c:319
-#: ../modules/calendar/e-calendar-preferences.c:258
-msgid "Select..."
-msgstr "Roghnaigh..."
+#. String to use in 12-hour time format for times in the afternoon.
+#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1557
+#: ../calendar/gui/print.c:1079 ../calendar/gui/print.c:1095
+#: ../calendar/gui/print.c:2642 ../calendar/gui/print.c:2659
+msgid "pm"
+msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. * %B = full month name. Don't use any other specifiers.
@@ -4058,56 +4080,47 @@ msgstr "Roghnaigh..."
 #. * 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:848 ../calendar/gui/e-day-view.c:1819
-#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
+#: ../calendar/gui/e-day-view.c:2776 ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:210 ../calendar/gui/print.c:2093
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1836
-#: ../calendar/gui/e-week-view-main-item.c:224
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. * month name. You can change the order but don't
-#. * change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1852
-#: ../calendar/gui/e-week-view-main-item.c:238
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../modules/calendar/e-cal-shell-view-private.c:1090
-msgid "%d %b"
-msgstr "%d %b"
-
-#. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1019 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:977 ../calendar/gui/print.c:996
-#: ../calendar/gui/print.c:2484 ../calendar/gui/print.c:2504
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:982 ../calendar/gui/print.c:998
-#: ../calendar/gui/print.c:2489 ../calendar/gui/print.c:2506
-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:2636
+#: ../calendar/gui/e-day-view.c:3433
 #, c-format
 msgid "Week %d"
 msgstr "Seachtain %d"
 
+#. Translators: %02i is the number of minutes;
+#. * this is a context menu entry to change the
+#. * length of the time division in the calendar
+#. * day view, e.g. a day is displayed in
+#. * 24 "60 minute divisions" or
+#. * 48 "30 minute divisions".
+#: ../calendar/gui/e-day-view-time-item.c:801
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
+
+#: ../calendar/gui/e-day-view-time-item.c:826
+msgid "Show the second time zone"
+msgstr ""
+
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../calendar/gui/e-day-view-time-item.c:843
+#: ../modules/calendar/e-calendar-preferences.c:306
+#: ../modules/calendar/e-calendar-preferences.c:358
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgctxt "cal-second-zone"
+msgid "None"
+msgstr "Neamhní"
+
+#: ../calendar/gui/e-day-view-time-item.c:877
+#: ../calendar/gui/e-timezone-entry.c:324
+#: ../modules/calendar/e-calendar-preferences.c:389
+msgid "Select..."
+msgstr "Roghnaigh..."
+
 #: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Cathaoirligh"
@@ -4124,150 +4137,124 @@ msgstr "Rannpháirtithe Roghnacha"
 msgid "Resources"
 msgstr "Acmhainní"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1147
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1247
 msgid "Individual"
 msgstr "Aonar"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1148 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/print.c:1248 ../e-util/e-table-config.ui.h:5
 msgid "Group"
 msgstr "Grúpa"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1149
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/print.c:1249
 msgid "Resource"
 msgstr "Acmhainn"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1150
+#: ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1250
 msgid "Room"
 msgstr "Seomra"
 
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/print.c:1164
+#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/print.c:1264
 msgid "Chair"
 msgstr "Cathaoirleach"
 
-#: ../calendar/gui/e-meeting-list-view.c:189
-#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1165
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1265
 msgid "Required Participant"
 msgstr "Rannpháirtí Riachtanach"
 
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1166
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1266
 msgid "Optional Participant"
 msgstr "Rannpháirtí Roghnach"
 
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1167
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/print.c:1267
 msgid "Non-Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:213
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/e-meeting-store.c:1060
+#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:1031
 msgid "Needs Action"
 msgstr "Gníomh de Dhíth"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:626
 msgid "Attendee                          "
 msgstr "Rannpháirtí"
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:623
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../calendar/gui/e-meeting-list-view.c:681
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-store.c:1876
+#: ../calendar/gui/e-meeting-store.c:1910
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-store.c:1886
+#: ../calendar/gui/e-meeting-store.c:1920
 #, fuzzy, c-format
 msgid "Failure reason: %s"
 msgstr ""
 "Teip ag cruthaigh eolaire '%s':\n"
 "%s"
 
-#: ../calendar/gui/e-meeting-store.c:1891
-#: ../plugins/caldav/caldav-browse-server.c:957
-#: ../plugins/google-account-setup/google-source.c:460
-#: ../plugins/publish-calendar/publish-calendar.c:345
-#: ../smime/gui/component.c:53
+#: ../calendar/gui/e-meeting-store.c:1925
+#: ../plugins/publish-calendar/publish-calendar.c:340
+#: ../smime/gui/component.c:64
 msgid "Enter password"
 msgstr "Iontráil focal faire"
 
-#. This is a strftime() format string %A = full weekday name,
-#. * %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:445
-#: ../calendar/gui/e-meeting-time-sel.c:2379
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. * name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. * %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:449
-#: ../calendar/gui/e-meeting-time-sel.c:2410
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. * %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:453
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-meeting-time-sel.c:528
 msgid "Out of Office"
 msgstr "As Láthair ón Oifig"
 
-#: ../calendar/gui/e-meeting-time-sel.c:549
+#: ../calendar/gui/e-meeting-time-sel.c:530
 msgid "No Information"
 msgstr "Gan Eolas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "O_ptions"
 msgstr "_Roghanna"
 
-#: ../calendar/gui/e-meeting-time-sel.c:603
+#: ../calendar/gui/e-meeting-time-sel.c:590
 msgid "Show _only working hours"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:614
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _zoomed out"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Update free/busy"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:645
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:663
+#: ../calendar/gui/e-meeting-time-sel.c:658
 msgid "_Autopick"
 msgstr "_Uathpioc"
 
-#: ../calendar/gui/e-meeting-time-sel.c:678
+#: ../calendar/gui/e-meeting-time-sel.c:675
 msgid ">_>"
 msgstr ">_>"
 
@@ -4275,99 +4262,110 @@ msgstr ">_>"
 msgid "_All people and resources"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "All _people and one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:725
+#: ../calendar/gui/e-meeting-time-sel.c:728
 msgid "Required people and _one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:774
+#: ../calendar/gui/e-meeting-time-sel.c:767
 msgid "_Start time:"
 msgstr "Am _tosaithe:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:814
+#: ../calendar/gui/e-meeting-time-sel.c:796
 msgid "_End time:"
 msgstr "Am _deiridh:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.c:2660
+#, fuzzy, c-format
+msgid ""
+"Summary: %s\n"
+"Location: %s"
+msgstr "Suíomh: %s"
+
+#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3534
+#, c-format
+msgid "Summary: %s"
+msgstr "Achoimre: %s"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr ""
 
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
+msgid "Member"
+msgstr "Ball"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Delegated To"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Delegated From"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+msgid "Common Name"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Language"
 msgstr "Teanga"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Ball"
-
-#: ../calendar/gui/e-memo-table.c:420
-#: ../modules/calendar/e-cal-shell-content.c:473
-#: ../modules/calendar/e-memo-shell-view-actions.c:231
-#: ../modules/calendar/e-memo-shell-view-actions.c:246
-#: ../modules/calendar/e-memo-shell-view.c:293
-#: ../plugins/caldav/caldav-browse-server.c:458
+#: ../calendar/gui/e-memo-table.c:434
+#: ../modules/calendar/e-cal-shell-content.c:482
+#: ../modules/calendar/e-memo-shell-view-actions.c:212
+#: ../modules/calendar/e-memo-shell-view-actions.c:227
+#: ../modules/calendar/e-memo-shell-view.c:307
 msgid "Memos"
 msgstr "Meamraim"
 
-#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:733
+#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:803
 msgid "* No Summary *"
 msgstr "* Gan Achoimre *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:817
+#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:887
 msgid "Start: "
 msgstr "Tosaigh:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:835
+#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:905
 msgid "Due: "
 msgstr "Spriocdháta:"
 
-#: ../calendar/gui/e-memo-table.c:726
+#: ../calendar/gui/e-memo-table.c:742
 #, fuzzy
 msgid "Cut selected memos to the clipboard"
 msgstr "Déan cóip den téacs roghnaithe sa ghearrthaisce."
 
-#: ../calendar/gui/e-memo-table.c:732
+#: ../calendar/gui/e-memo-table.c:748
 #, fuzzy
 msgid "Copy selected memos to the clipboard"
 msgstr "Déan cóip den téacs nó mír(eanna) roghnaithe sa ghearrthaisce"
 
-#: ../calendar/gui/e-memo-table.c:738
+#: ../calendar/gui/e-memo-table.c:754
 #, fuzzy
 msgid "Paste memos from the clipboard"
 msgstr "Greamaigh meamram ón ngearrthaisce"
 
-#: ../calendar/gui/e-memo-table.c:744
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../calendar/gui/e-memo-table.c:760
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
 msgid "Delete selected memos"
 msgstr "Scrios meamraim roghnaithe"
 
-#: ../calendar/gui/e-memo-table.c:750
+#: ../calendar/gui/e-memo-table.c:766
 #, fuzzy
 msgid "Select all visible memos"
 msgstr "Taispeáin gach rabhadh"
 
-#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.etspec.h:1
 msgid "Click to add a memo"
 msgstr "Cliceáil chun meamram a chur leis"
 
@@ -4375,240 +4373,87 @@ msgstr "Cliceáil chun meamram a chur leis"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:555
+#: ../calendar/gui/e-task-table.c:604
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
-#: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:1043
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
-#: ../modules/calendar/e-cal-shell-content.c:434
-#: ../modules/calendar/e-task-shell-view-actions.c:254
-#: ../modules/calendar/e-task-shell-view-actions.c:269
-#: ../modules/calendar/e-task-shell-view.c:448
-#: ../plugins/caldav/caldav-browse-server.c:456
+#: ../calendar/gui/e-task-table.c:721 ../calendar/gui/print.c:2418
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:1078
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
+#: ../modules/calendar/e-cal-shell-content.c:439
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view-actions.c:250
+#: ../modules/calendar/e-task-shell-view.c:462
 msgid "Tasks"
 msgstr "Tascanna"
 
-#: ../calendar/gui/e-task-table.c:968
+#: ../calendar/gui/e-task-table.c:1040
 #, fuzzy
 msgid "Cut selected tasks to the clipboard"
 msgstr "Gearr téacs roghnaithe go dtí an gearrthaisce"
 
-#: ../calendar/gui/e-task-table.c:974
+#: ../calendar/gui/e-task-table.c:1046
 #, fuzzy
 msgid "Copy selected tasks to the clipboard"
 msgstr "Cóipeáil téacs roghnaithe go dtí an gearrthaisce"
 
-#: ../calendar/gui/e-task-table.c:980
+#: ../calendar/gui/e-task-table.c:1052
 msgid "Paste tasks from the clipboard"
 msgstr "Greamaigh tascanna ón ngearrthaisce"
 
-#: ../calendar/gui/e-task-table.c:986
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../calendar/gui/e-task-table.c:1058
+#: ../modules/calendar/e-task-shell-view-actions.c:713
 msgid "Delete selected tasks"
 msgstr "Scrios tascanna roghnaithe"
 
-#: ../calendar/gui/e-task-table.c:992
+#: ../calendar/gui/e-task-table.c:1064
 #, fuzzy
 msgid "Select all visible tasks"
 msgstr "Taispeáin gach rabhadh"
 
-#: ../calendar/gui/e-timezone-entry.c:330
+#: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "Roghnaigh Crios Ama"
 
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1949
+#: ../calendar/gui/e-week-view-main-item.c:227 ../calendar/gui/print.c:2072
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:290
-#, fuzzy
-msgid "It has reminders."
-msgstr "Tá aláraim aige."
-
-#: ../calendar/gui/ea-cal-view-event.c:293
-msgid "It has recurrences."
-msgstr ""
-
-#: ../calendar/gui/ea-cal-view-event.c:296
-msgid "It is a meeting."
-msgstr "Is cruinniú é."
-
-#: ../calendar/gui/ea-cal-view-event.c:303
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr ""
-
-#: ../calendar/gui/ea-cal-view-event.c:306
-msgid "Calendar Event: It has no summary."
-msgstr ""
-
-#: ../calendar/gui/ea-cal-view-event.c:328
-msgid "calendar view event"
-msgstr ""
-
-#: ../calendar/gui/ea-cal-view-event.c:557
-msgid "Grab Focus"
-msgstr "Gabh Fócas"
-
-#: ../calendar/gui/ea-cal-view.c:315
-msgid "New Appointment"
-msgstr "Coinne Nua"
-
-#: ../calendar/gui/ea-cal-view.c:316
-msgid "New All Day Event"
-msgstr "Teagmhas an Lae ar Fad Nua"
-
-#: ../calendar/gui/ea-cal-view.c:317
-msgid "New Meeting"
-msgstr "Cruinniú Nua"
-
-#: ../calendar/gui/ea-cal-view.c:318
-msgid "Go to Today"
-msgstr "Téigh go Inniu"
-
-#: ../calendar/gui/ea-cal-view.c:319
-msgid "Go to Date"
-msgstr "Téigh go Dáta"
-
-#: ../calendar/gui/ea-day-view-main-item.c:318
-#: ../calendar/gui/ea-week-view-main-item.c:344
-msgid "a table to view and select the current time range"
-msgstr ""
-
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "Tá %d teagmhas aige."
-msgstr[1] "Tá %d teagmhas aige."
-msgstr[2] "Tá %d theagmhas aige."
-msgstr[3] "Tá %d dteagmhas aige."
-msgstr[4] "Tá %d teagmhas aige."
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
-msgid "It has no events."
-msgstr "Níl aon teagmhas aige."
-
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:163
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "Amharc Seachtaine Oibre; %s. %s"
-
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:169
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "Amharc Lae: %s. %s"
-
-#: ../calendar/gui/ea-day-view.c:203
-msgid "calendar view for a work week"
-msgstr ""
-
-#: ../calendar/gui/ea-day-view.c:205
-msgid "calendar view for one or more days"
-msgstr ""
-
-#: ../calendar/gui/ea-gnome-calendar.c:50
-#: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1077
-msgid "Gnome Calendar"
-msgstr "Féilire Gnome"
-
-#: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
-
-#: ../calendar/gui/ea-gnome-calendar.c:206
-#: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1057
-#: ../modules/calendar/e-cal-shell-view-private.c:1063
-#: ../modules/calendar/e-cal-shell-view-private.c:1066
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../calendar/gui/ea-gnome-calendar.c:236
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1083
-#: ../modules/calendar/e-cal-shell-view-private.c:1094
-#: ../modules/calendar/e-cal-shell-view-private.c:1101
-#: ../modules/calendar/e-cal-shell-view-private.c:1104
-msgid "%d %b %Y"
-msgstr "%d %b %Y"
-
-#: ../calendar/gui/ea-jump-button.c:150
-msgid "Jump button"
-msgstr ""
-
-#: ../calendar/gui/ea-jump-button.c:159
-msgid "Click here, you can find more events."
-msgstr ""
-
-#: ../calendar/gui/ea-week-view.c:159
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "Amharc Míosa: %s. %s"
-
-#: ../calendar/gui/ea-week-view.c:163
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "Amharc Seachtaine: %s. %s"
-
-#: ../calendar/gui/ea-week-view.c:197
-msgid "calendar view for a month"
-msgstr ""
-
-#: ../calendar/gui/ea-week-view.c:199
-msgid "calendar view for one or more weeks"
-msgstr ""
-
-#: ../calendar/gui/gnome-cal.c:2262
+#: ../calendar/gui/gnome-cal.c:2369
 msgid "Purging"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:511 ../calendar/gui/itip-utils.c:566
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:646 ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/itip-utils.c:838
 msgid "An organizer must be set."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:558
+#: ../calendar/gui/itip-utils.c:695
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:755 ../calendar/gui/itip-utils.c:916
+#: ../calendar/gui/itip-utils.c:926 ../calendar/gui/itip-utils.c:1087
 msgid "Event information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:758 ../calendar/gui/itip-utils.c:919
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Task information"
 msgstr "Eolas Tasc"
 
-#: ../calendar/gui/itip-utils.c:761 ../calendar/gui/itip-utils.c:922
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Memo information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:940
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1111
 msgid "Free/Busy information"
 msgstr "Eolas Saor/Gnóthach"
 
-#: ../calendar/gui/itip-utils.c:767
+#: ../calendar/gui/itip-utils.c:938
 msgid "Calendar information"
 msgstr "Eolas féilire"
 
@@ -4616,7 +4461,7 @@ msgstr "Eolas féilire"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:975
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Glactha"
@@ -4625,7 +4470,7 @@ msgstr "Glactha"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:982
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr ""
@@ -4637,7 +4482,7 @@ msgstr ""
 #. 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:818 ../calendar/gui/itip-utils.c:866
+#: ../calendar/gui/itip-utils.c:989 ../calendar/gui/itip-utils.c:1037
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Diúltaithe"
@@ -4646,7 +4491,7 @@ msgstr "Diúltaithe"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:825
+#: ../calendar/gui/itip-utils.c:996
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr ""
@@ -4654,7 +4499,7 @@ msgstr ""
 #. 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:838
+#: ../calendar/gui/itip-utils.c:1009
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Nuashonraithe"
@@ -4662,7 +4507,7 @@ msgstr "Nuashonraithe"
 #. 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:845
+#: ../calendar/gui/itip-utils.c:1016
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cealaigh"
@@ -4670,7 +4515,7 @@ msgstr "Cealaigh"
 #. 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:852
+#: ../calendar/gui/itip-utils.c:1023
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Athnuaigh"
@@ -4678,470 +4523,460 @@ msgstr "Athnuaigh"
 #. 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:859
+#: ../calendar/gui/itip-utils.c:1030
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:1108
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:945
+#: ../calendar/gui/itip-utils.c:1116
 msgid "iCalendar information"
 msgstr "Eolas iCalendar"
 
-#: ../calendar/gui/itip-utils.c:970
+#: ../calendar/gui/itip-utils.c:1143
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:974
-msgid "Unable to book a resource, error: "
+#: ../calendar/gui/itip-utils.c:1148
+#, c-format
+msgid "Unable to book a resource, error: %s"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:1137
+#: ../calendar/gui/itip-utils.c:1325
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:661
 msgid "1st"
 msgstr "1ú"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:661
 msgid "2nd"
 msgstr "2ú"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:661
 msgid "3rd"
 msgstr "3ú"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:661
 msgid "4th"
 msgstr "4ú"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:661
 msgid "5th"
 msgstr "5ú"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:662
 msgid "6th"
 msgstr "6ú"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:662
 msgid "7th"
 msgstr "7ú"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:662
 msgid "8th"
 msgstr "8ú"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:662
 msgid "9th"
 msgstr "9ú"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:662
 msgid "10th"
 msgstr "10ú"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:663
 msgid "11th"
 msgstr "11ú"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:663
 msgid "12th"
 msgstr "12ú"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:663
 msgid "13th"
 msgstr "13ú"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:663
 msgid "14th"
 msgstr "14ú"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:663
 msgid "15th"
 msgstr "15ú"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:664
 msgid "16th"
 msgstr "16ú"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:664
 msgid "17th"
 msgstr "17ú"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:664
 msgid "18th"
 msgstr "18ú"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:664
 msgid "19th"
 msgstr "19ú"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:664
 msgid "20th"
 msgstr "20ú"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:665
 msgid "21st"
 msgstr "21ú"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:665
 msgid "22nd"
 msgstr "22ú"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:665
 msgid "23rd"
 msgstr "23ú"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:665
 msgid "24th"
 msgstr "24ú"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:665
 msgid "25th"
 msgstr "25ú"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:666
 msgid "26th"
 msgstr "26ú"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:666
 msgid "27th"
 msgstr "27ú"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:666
 msgid "28th"
 msgstr "28ú"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:666
 msgid "29th"
 msgstr "29ú"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:666
 msgid "30th"
 msgstr "30ú"
 
-#: ../calendar/gui/print.c:587
+#: ../calendar/gui/print.c:667
 msgid "31st"
 msgstr "31ú"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:644
-msgid "Su"
-msgstr "Do"
-
-#: ../calendar/gui/print.c:644
+#. Translators: These are workday abbreviations,
+#. * e.g. Su=Sunday and Th=thursday
+#. G_DATE_BAD_WEEKDAY
+#. G_DATE_MONDAY
+#: ../calendar/gui/print.c:727
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:644
+#. G_DATE_TUESDAY
+#: ../calendar/gui/print.c:728
 msgid "Tu"
 msgstr "Má"
 
-#: ../calendar/gui/print.c:644
+#. G_DATE_WEDNESDAY
+#: ../calendar/gui/print.c:729
 msgid "We"
 msgstr "Cé"
 
-#: ../calendar/gui/print.c:645
+#. G_DATE_THURSDAY
+#: ../calendar/gui/print.c:730
 msgid "Th"
 msgstr "Dé"
 
-#: ../calendar/gui/print.c:645
+#. G_DATE_FRIDAY
+#: ../calendar/gui/print.c:731
 msgid "Fr"
 msgstr "Ao"
 
-#: ../calendar/gui/print.c:645
+#. G_DATE_SATURDAY
+#: ../calendar/gui/print.c:732
 msgid "Sa"
 msgstr "Sa"
 
+#. G_DATE_SUNDAY
+#: ../calendar/gui/print.c:733
+msgid "Su"
+msgstr "Do"
+
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3139
+#: ../calendar/gui/print.c:3328
 msgid " to "
 msgstr " go "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3149
+#: ../calendar/gui/print.c:3338
 msgid " (Completed "
 msgstr " (Críochnaithe "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3155
+#: ../calendar/gui/print.c:3344
 msgid "Completed "
 msgstr "Críochnaithe "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3165
+#: ../calendar/gui/print.c:3354
 msgid " (Due "
 msgstr " (Spriocdháta "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3172
+#: ../calendar/gui/print.c:3361
 msgid "Due "
 msgstr "Spriocdháta"
 
-#: ../calendar/gui/print.c:3337
-#, c-format
-msgid "Summary: %s"
-msgstr "Achoimre: %s"
-
-#: ../calendar/gui/print.c:3364
+#: ../calendar/gui/print.c:3564
 msgid "Attendees: "
 msgstr "Rannpháirtithe:"
 
-#: ../calendar/gui/print.c:3407
+#: ../calendar/gui/print.c:3608
 #, c-format
 msgid "Status: %s"
 msgstr "Stádas: %s"
 
-#: ../calendar/gui/print.c:3422
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Priority: %s"
 msgstr "Tosaíocht: %s"
 
-#: ../calendar/gui/print.c:3440
+#: ../calendar/gui/print.c:3642
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: ../calendar/gui/print.c:3451
+#: ../calendar/gui/print.c:3656
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3464
+#: ../calendar/gui/print.c:3670
 #, c-format
 msgid "Categories: %s"
 msgstr "Catagóirí: %s"
 
-#: ../calendar/gui/print.c:3475
+#: ../calendar/gui/print.c:3681
 msgid "Contacts: "
 msgstr "Teagmhálacha:"
 
-#: ../calendar/gui/tasktypes.xml.h:2
-#, no-c-format
-msgid "% Completed"
-msgstr "% Críochnaithe"
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "In progress"
+msgstr "Ar siúl"
 
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "Cealaithe"
 
-#: ../calendar/gui/tasktypes.xml.h:15
-msgid "In progress"
-msgstr "Ar siúl"
+#: ../calendar/gui/tasktypes.xml.h:25
+#, no-c-format
+msgid "% Completed"
+msgstr "% Críochnaithe"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:38
 msgid "is greater than"
 msgstr "atá níos mó ná"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:39
 msgid "is less than"
 msgstr "atá níos lú ná"
 
-#: ../calendar/importers/icalendar-importer.c:84
+#: ../calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr "Coinní agus Cruinnithe"
 
-#: ../calendar/importers/icalendar-importer.c:435
-#: ../calendar/importers/icalendar-importer.c:868
-#: ../plugins/itip-formatter/itip-formatter.c:2170
+#: ../calendar/importers/icalendar-importer.c:462
+#: ../calendar/importers/icalendar-importer.c:901
 msgid "Opening calendar"
 msgstr "Féilire á oscailt"
 
-#: ../calendar/importers/icalendar-importer.c:583
+#: ../calendar/importers/icalendar-importer.c:610
 msgid "iCalendar files (.ics)"
 msgstr "Comhaid iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:611
 msgid "Evolution iCalendar importer"
 msgstr "Iompórtálaí iCalendar Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:674
+#: ../calendar/importers/icalendar-importer.c:703
 msgid "Reminder!"
 msgstr "Meabhrúchán!"
 
-#: ../calendar/importers/icalendar-importer.c:758
+#: ../calendar/importers/icalendar-importer.c:787
 msgid "vCalendar files (.vcs)"
 msgstr "Comhaid vCalendar (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:759
+#: ../calendar/importers/icalendar-importer.c:788
 msgid "Evolution vCalendar importer"
 msgstr "Iompórtálaí vCalendar Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:1038
+#: ../calendar/importers/icalendar-importer.c:1071
 msgid "Calendar Events"
 msgstr "Teagmhais Féilire"
 
-#: ../calendar/importers/icalendar-importer.c:1078
+#: ../calendar/importers/icalendar-importer.c:1115
 msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:1146
-#: ../calendar/importers/icalendar-importer.c:1464
+#: ../calendar/importers/icalendar-importer.c:1186
+#: ../calendar/importers/icalendar-importer.c:1500
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Cruinniú"
 
-#: ../calendar/importers/icalendar-importer.c:1146
-#: ../calendar/importers/icalendar-importer.c:1464
+#: ../calendar/importers/icalendar-importer.c:1186
+#: ../calendar/importers/icalendar-importer.c:1500
 msgctxt "iCalImp"
 msgid "Event"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:1149
-#: ../calendar/importers/icalendar-importer.c:1465
+#: ../calendar/importers/icalendar-importer.c:1189
+#: ../calendar/importers/icalendar-importer.c:1501
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tasc"
 
-#: ../calendar/importers/icalendar-importer.c:1152
-#: ../calendar/importers/icalendar-importer.c:1466
+#: ../calendar/importers/icalendar-importer.c:1192
+#: ../calendar/importers/icalendar-importer.c:1502
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Meamram"
 
-#: ../calendar/importers/icalendar-importer.c:1161
+#: ../calendar/importers/icalendar-importer.c:1201
 #, fuzzy
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "Sainroghanna Poist"
 
-#: ../calendar/importers/icalendar-importer.c:1166
+#: ../calendar/importers/icalendar-importer.c:1206
 #, fuzzy
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "Ásc"
 
-#: ../calendar/importers/icalendar-importer.c:1171
+#: ../calendar/importers/icalendar-importer.c:1211
 #, fuzzy
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "&Scoránaigh Meabhrúchán"
 
-#: ../calendar/importers/icalendar-importer.c:1176
+#: ../calendar/importers/icalendar-importer.c:1216
 #, fuzzy
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "iatán %s"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1189
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1229
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Poiblí"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1192
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1232
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Príobháideach"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1195
+#: ../calendar/importers/icalendar-importer.c:1235
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr ""
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1199
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1239
 msgctxt "iCalImp"
 msgid "Classification"
-msgstr "&Fógairt an Chórais"
+msgstr "Aicmiúchán"
 
 #. Translators: Appointment's summary
-#. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1204
-#: ../calendar/importers/icalendar-importer.c:1505
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1544
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Achoimre"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1210
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1250
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Suíomh"
 
 #. Translators: Appointment's start time
-#. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1218
-#: ../calendar/importers/icalendar-importer.c:1501
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1258
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Start"
-msgstr "Tús"
+msgstr "Tosú"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1269
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Spriocdháta"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1241
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1281
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Deireadh"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1251
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1291
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Catagóirí"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1275
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1315
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Críochnaithe"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1283
+#: ../calendar/importers/icalendar-importer.c:1323
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1294
-#: ../calendar/importers/icalendar-importer.c:1297
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1334
+#: ../calendar/importers/icalendar-importer.c:1337
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Eagraí"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1317
-#: ../calendar/importers/icalendar-importer.c:1320
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1357
+#: ../calendar/importers/icalendar-importer.c:1360
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Rannpháirtithe"
 
-#: ../calendar/importers/icalendar-importer.c:1334
+#: ../calendar/importers/icalendar-importer.c:1374
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Cur Síos"
 
-#. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1497
+#: ../calendar/importers/icalendar-importer.c:1534
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Cineál"
@@ -5695,7 +5530,6 @@ msgid "America/Nassau"
 msgstr "Meiriceá/Nassau"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "Meiriceá/Nua_Eabhrac"
 
@@ -6695,800 +6529,3694 @@ msgstr "An tAigéan Ciúin/Wallis"
 msgid "Pacific/Yap"
 msgstr "An tAigéan Ciúin/Yap"
 
-#: ../composer/e-composer-actions.c:208
+#: ../composer/e-composer-actions.c:203
 msgid "Save as..."
 msgstr "Sábháil mar..."
 
-#: ../composer/e-composer-actions.c:296
-#: ../widgets/misc/e-signature-editor.c:207
+#: ../composer/e-composer-actions.c:276
+#: ../e-util/e-mail-signature-editor.c:303
 msgid "_Close"
 msgstr "_Dún"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:278
 msgid "Close the current file"
 msgstr "Dún an comhad reatha"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:283
 msgid "New _Message"
 msgstr "_Teachtaireacht Nua"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:285
 msgid "Open New Message window"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
-#, fuzzy
+#: ../composer/e-composer-actions.c:292 ../shell/e-shell-window-actions.c:937
 msgid "Configure Evolution"
-msgstr "Cumraíocht"
+msgstr "Cumraigh Evolution"
 
-#: ../composer/e-composer-actions.c:319
+#: ../composer/e-composer-actions.c:299
 msgid "Save the current file"
 msgstr "Sábháil an comhad reatha"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:304
 msgid "Save _As..."
 msgstr "Sábháil _Mar..."
 
-#: ../composer/e-composer-actions.c:326
+#: ../composer/e-composer-actions.c:306
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:313
 msgid "Character _Encoding"
 msgstr "_Ionchódú Carachtar"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:330
 msgid "_Print..."
 msgstr "_Priontáil..."
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:337
 msgid "Print Pre_view"
 msgstr "_Réamhamharc Priontála"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:344
 msgid "Save as _Draft"
 msgstr "Sábháil mar _Dhréacht"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:346
 msgid "Save as draft"
 msgstr "Sábháil mar dhréacht"
 
-#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
+#: ../composer/e-composer-actions.c:351
 msgid "S_end"
 msgstr "_Seol"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:353
 msgid "Send this message"
 msgstr "Seol an teachtaireacht seo"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "_Criptigh le PGP"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "_Sínigh le PGP"
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:377
 msgid "_Picture Gallery"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:399
+#: ../composer/e-composer-actions.c:379
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:385
 msgid "_Prioritize Message"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:407
+#: ../composer/e-composer-actions.c:387
 msgid "Set the message priority to high"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:393
 msgid "Re_quest Read Receipt"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:415
+#: ../composer/e-composer-actions.c:395
 msgid "Get delivery notification when your message is read"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME En_crypt"
 msgstr "_Criptigh le S/MIME"
 
-#: ../composer/e-composer-actions.c:423
+#: ../composer/e-composer-actions.c:403
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:409
 msgid "S/MIME Sig_n"
 msgstr "_Sínigh le S/MIME"
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:411
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:417
 msgid "_Bcc Field"
 msgstr "Réimse _Bcc"
 
-#: ../composer/e-composer-actions.c:439
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:425
 msgid "_Cc Field"
 msgstr "Réimse _Cc"
 
-#: ../composer/e-composer-actions.c:447
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "Réimse _Freagra-Chuig"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:494
 msgid "Save Draft"
 msgstr "Sábháil Dréacht"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../composer/e-composer-header-table.c:39
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:45
+#: ../composer/e-composer-header-table.c:44
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:1021
+#: ../composer/e-composer-header-table.c:772
 msgid "Fr_om:"
 msgstr "Ó (_O):"
 
-#: ../composer/e-composer-header-table.c:1030
+#: ../composer/e-composer-header-table.c:779
 msgid "_Reply-To:"
 msgstr "_Freagra-Chuig:"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:784
 msgid "_To:"
 msgstr "C_huig:"
 
-#: ../composer/e-composer-header-table.c:1039
+#: ../composer/e-composer-header-table.c:790
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1044
+#: ../composer/e-composer-header-table.c:796
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:1049
+#: ../composer/e-composer-header-table.c:801
 msgid "_Post To:"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:1053
+#: ../composer/e-composer-header-table.c:805
 msgid "S_ubject:"
 msgstr "Á_bhar: "
 
-#: ../composer/e-composer-header-table.c:1062
+#: ../composer/e-composer-header-table.c:813
+#: ../mail/e-mail-config-identity-page.c:488
 msgid "Si_gnature:"
 msgstr "_Síniú:"
 
-#: ../composer/e-composer-name-header.c:141
+#: ../composer/e-composer-name-header.c:235
 msgid "Click here for the address book"
 msgstr ""
 
-#: ../composer/e-composer-post-header.c:131
+#: ../composer/e-composer-post-header.c:184
 msgid "Click here to select folders to post to"
 msgstr ""
 
-#: ../composer/e-composer-private.c:249
-#, fuzzy
-msgid "Undo the last action"
-msgstr "Cóipeáil an roghnú"
-
-#: ../composer/e-composer-private.c:253
-msgid "Redo the last undone action"
-msgstr ""
-
-#: ../composer/e-composer-private.c:257
-#, fuzzy
-msgid "Search for text"
-msgstr "Fillteán foinseach: %1 - Spriocfhillteán: %2"
-
-#: ../composer/e-composer-private.c:261
-#, fuzzy
-msgid "Search for and replace text"
-msgstr ""
-"Theip ar chruthú mionsamhla: \n"
-"%1\n"
-" "
-
-#: ../composer/e-composer-private.c:372
-msgid "Save draft"
-msgstr "Sábháil dréacht"
-
-#: ../composer/e-msg-composer.c:812
+#: ../composer/e-msg-composer.c:869
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:821
+#: ../composer/e-msg-composer.c:878
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1699 ../composer/e-msg-composer.c:2083
+#: ../composer/e-msg-composer.c:1557 ../composer/e-msg-composer.c:1958
 msgid "Compose Message"
 msgstr "Cum Teachtaireacht"
 
-#: ../composer/e-msg-composer.c:4228
+#: ../composer/e-msg-composer.c:4213
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 
-#: ../composer/e-msg-composer.c:4933
+#: ../composer/e-msg-composer.c:4886
 msgid "Untitled Message"
 msgstr "Teachtaireacht Gan Teideal"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
+#, fuzzy
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "Ní féidir an íomhá a shábháil - ní féidir comhad sealadach a chruthú."
 
 #: ../composer/mail-composer.error.xml.h:2
-msgid "All accounts have been removed."
-msgstr "Baineadh gach cuntas."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:3
-#, fuzzy
-msgid "An error occurred while saving to your Drafts folder."
-msgstr "Tharla earráid anaithnid le linn priontála."
+msgid "Could not retrieve messages to attach from {0}."
+msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:4
-#, fuzzy
-msgid "An error occurred while saving to your Outbox folder."
-msgstr "Tharla earráid agus á phriontáil"
+msgid "Because &quot;{1}&quot;."
+msgstr "Mar &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:5
-#, fuzzy
-msgid "An error occurred while sending. How do you want to proceed?"
-msgstr "Tharla earráid agus á phriontáil"
+msgid "Do you want to recover unfinished messages?"
+msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:7
-msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgid "_Do not Recover"
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:8
-msgid "Because &quot;{1}&quot;."
-msgstr "Mar &quot;{1}&quot;."
+msgid "_Recover"
+msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:9
-msgid ""
-"Because you are working offline, the message will be saved to your local "
-"Outbox folder. When you are back online you can send the message by clicking "
-"the Send/Receive button in Evolution's toolbar."
+msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:10
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Download in progress. Do you want to send the mail?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:12
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:14
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:15
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:11
+#. Response codes were chosen somewhat arbitrarily.
+#: ../composer/mail-composer.error.xml.h:18
+msgid "_Continue Editing"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:19
+msgid "_Save Draft"
+msgstr "_Sábháil Dréacht"
+
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Could not create message."
 msgstr "Níorbh fhéidir teachtaireacht a chruthú."
 
-#: ../composer/mail-composer.error.xml.h:12
+#: ../composer/mail-composer.error.xml.h:21
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:13
-msgid "Could not retrieve messages to attach from {0}."
+#: ../composer/mail-composer.error.xml.h:23
+msgid "All accounts have been removed."
+msgstr "Baineadh gach cuntas."
+
+#: ../composer/mail-composer.error.xml.h:24
+msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:14
-msgid "Could not save to autosave file &quot;{0}&quot;."
+#: ../composer/mail-composer.error.xml.h:25
+#, fuzzy
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "Tharla earráid agus á phriontáil"
+
+#: ../composer/mail-composer.error.xml.h:26
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:15
-msgid "Do you want to recover unfinished messages?"
+#: ../composer/mail-composer.error.xml.h:27
+#, fuzzy
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "Tharla earráid anaithnid le linn priontála."
+
+#: ../composer/mail-composer.error.xml.h:28
+msgid ""
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:16
-msgid "Download in progress. Do you want to send the mail?"
+#: ../composer/mail-composer.error.xml.h:29
+#, fuzzy
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "Tharla earráid agus á phriontáil"
+
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
+#, fuzzy
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "GenericName=Eagarthóir Sloinn Ionadaíochta"
+
+#: ../composer/mail-composer.error.xml.h:31
+#, fuzzy
+msgid "_Save to Outbox"
+msgstr "_Sábháil chuig Diosca"
+
+#: ../composer/mail-composer.error.xml.h:32
+msgid "_Try Again"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:17
-msgid "Error saving to autosave because &quot;{1}&quot;."
+#: ../composer/mail-composer.error.xml.h:33
+#, fuzzy
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr "Tharla earráid anaithnid le linn priontála."
+
+#: ../composer/mail-composer.error.xml.h:34
+#, fuzzy
+msgid "Saving message to Outbox."
+msgstr "Teachtaireacht á sábháil go fillteán"
+
+#: ../composer/mail-composer.error.xml.h:35
+msgid ""
+"The message will be saved to your local Outbox folder, because the "
+"destination service is currently unavailable. You can send the message by "
+"clicking the Send/Receive button in Evolution's toolbar."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:18
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+#, fuzzy
+msgid "Evolution Alarm Notify"
+msgstr "&GNOME-PIM (Evolution)"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+#, fuzzy
+msgid "Calendar event notifications"
+msgstr "Eolas féilire"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1033
+#: ../modules/mailto-handler/evolution-mailto-handler.c:212
+#: ../shell/e-shell-window-private.c:243
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:83
+msgid "Groupware Suite"
+msgstr "Sraith Feidhmchlár Grúpa-Earraí"
+
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Post agus Féilire Evolution"
+
+#: ../data/evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "Bainstigh do chuid ríomhphoist, do chuid teagmhálacha agus do sceideal"
+
+#: ../data/evolution.desktop.in.in.h:5
+msgid "mail;calendar;contact;addressbook;task;"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
+#, fuzzy
+msgid "Enable address formatting"
+msgstr "Eolas féilire"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"Whether addresses should be formatted according to standard in their "
+"destination country"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:19
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
+msgid "Autocomplete length"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
+msgid "URI for the folder last used in the select names dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
+msgid "URI for the folder last used in the select names dialog."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
 #, fuzzy
-msgid "Saving message to Outbox."
-msgstr "Teachtaireacht á sábháil go fillteán"
+msgid "Contact layout style"
+msgstr "Liosta Teagmhálacha"
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
+msgid "Contact preview pane position (horizontal)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
+msgid "Contact preview pane position (vertical)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
 #, fuzzy
-msgid "The reported error was &quot;{0}&quot;."
-msgstr "GenericName=Eagarthóir Sloinn Ionadaíochta"
+msgid "Show maps"
+msgstr "Taispeán Beocháin"
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
+#, fuzzy
+msgid "Whether to show maps in preview pane"
+msgstr "Taispeáin an pána \"Réamhamharc\""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
+#, fuzzy
+msgid "Primary address book"
+msgstr "leabhar seoltaí evolution"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
 msgid ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:23
-msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
+msgid "Show preview pane"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
+msgid "Whether to show the preview pane."
+msgstr ""
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Tiontaigh teachtaireachtaí poist go Unicode"
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
+msgid "Save directory for reminder audio"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
 #, fuzzy
-msgid "You cannot attach the file &quot;{0}&quot; to this message."
-msgstr "Ní féidir an íomhá a shábháil - ní féidir comhad sealadach a chruthú."
+msgid "Directory for saving reminder audio files"
+msgstr "Comhadlann a sábhálfar comhaid uathúla chúltaca inti"
 
-#: ../composer/mail-composer.error.xml.h:25
-msgid "You need to configure an account before you can compose mail."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
+#, fuzzy
+msgid "Birthday and anniversary reminder value"
+msgstr "Breithlaethanta & Cothroim Lae"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
 #, fuzzy
-msgid "Your message was sent, but an error occurred during post-processing."
-msgstr "Tharla earráid anaithnid le linn priontála."
+msgid "Birthday and anniversary reminder units"
+msgstr "Breithlaethanta & Cothroim Lae"
 
-#. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:28
-msgid "_Continue Editing"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:30
-msgid "_Do not Recover"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
+msgid "Compress weekends in month view"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:31
-msgid "_Recover"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Draft"
-msgstr "_Sábháil Dréacht"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
+msgid "Ask for confirmation when deleting items"
+msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
+msgid "Whether to ask for confirmation when deleting an appointment or task"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
+msgid "Confirm expunge"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
+msgid "Whether to ask for confirmation when expunging appointments and tasks"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
+msgid "Month view vertical pane position"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
+msgid "Workday end hour"
+msgstr "Uair deiridh an lae oibre"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
+msgid "Workday end minute"
+msgstr "Nóiméad deiridh an lae oibre"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
+msgid "Minute the workday ends on, 0 to 59."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
+msgid "Workday start hour"
+msgstr "Uair tosaigh an lae oibre"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
+msgid "Workday start minute"
+msgstr "Nóiméad tosaigh an lae oibre"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
+msgid "Minute the workday starts on, 0 to 59."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+msgid "List of recently used second time zones in a Day View"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+msgid "Maximum number of recently used timezones to remember"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+msgid ""
+"Maximum number of recently used timezones to remember in a 'day-second-"
+"zones' list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+msgid "Default reminder value"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+msgid "Number of units for determining a default reminder"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+msgid "Default reminder units"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+msgid "Show Role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+msgid "Show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
+msgid "Show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
+msgid "Hide completed tasks"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
+msgid "Whether to hide completed tasks in the tasks view"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
+msgid "Hide task units"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+msgid "Hide task value"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+msgid "Horizontal pane position"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
 #, fuzzy
-msgid "_Save to Outbox"
-msgstr "_Sábháil chuig Diosca"
+msgid "Last reminder time"
+msgstr "Am aláraim is déanaí"
 
-#: ../composer/mail-composer.error.xml.h:35
-msgid "_Try Again"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+#, fuzzy
+msgid "Time the last reminder ran, in time_t"
+msgstr "Am aláraim is déanaí"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+msgid "Marcus Bains Line Color - Day View"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+msgid "Color to draw the Marcus Bains line in the Day View"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+msgid "Marcus Bains Line Color - Time bar"
 msgstr ""
 
-#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:154
-msgid "ID of the socket to embed in"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
 msgstr ""
 
-#: ../capplet/anjal-settings-main.c:155
-msgid "socket"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+msgid "Marcus Bains Line"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+msgid "Memo preview pane position (horizontal)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+msgid "Position of the task preview pane when oriented horizontally"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
 #, fuzzy
-msgid "Please enter your full name."
-msgstr "Roghnaigh ainm eile ar an riail"
+msgid "Memo layout style"
+msgstr "Stíl na hImlíne"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+msgid "Memo preview pane position (vertical)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+msgid "Position of the memo preview pane when oriented vertically"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+msgid "Month view horizontal pane position"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:78
-msgid "Please enter your email address."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+msgid "Scroll Month View by a week, not by a month"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:79
-msgid "The email address you have entered is invalid."
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:80
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
 #, fuzzy
-msgid "Please enter your password."
-msgstr "Iontráil focal faire."
+msgid "Reminder programs"
+msgstr "Rith roghchlár"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+msgid "Programs that are allowed to be run by reminders"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#, fuzzy
+msgid "Show display reminders in notification tray"
+msgstr "Taispeáin deilbhín sa limistéar fógartha"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+msgid "Whether or not to use the notification tray for display reminders"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+msgid "Preferred New button item"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+msgid "Name of the preferred New toolbar button item"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+msgid "Primary calendar"
+msgstr "Príomhfhéilire"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+msgid "Primary memo list"
+msgstr "Príomhliosta meamram"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+msgid "Primary task list"
+msgstr "Príomhliosta tascanna"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+msgid "Free/busy template URL"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#, 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 ""
 
-#: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:67
-msgid "CalDAV"
-msgstr "CalDAV"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+msgid "Recurrent Events in Italic"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+msgid "Show days with recurrent events in italic font in bottom left calendar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+msgid "Search range for time-based searching in years"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+msgid ""
+"How many years can the time-based search go forward or backward from "
+"currently selected day when searching for another occurrence; default is ten "
+"years"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:361
-#: ../capplet/settings/mail-account-view.c:413
-#: ../modules/online-accounts/e-online-accounts-google.c:287
-#: ../modules/online-accounts/e-online-accounts-google.c:359
-#: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:87
-msgid "Google"
-msgstr "Google"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+msgid "Show appointment end times in week and month views"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:480
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+msgid "Whether to display the end time of events in the week and month views"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 #, fuzzy
-msgid "Personal details:"
-msgstr "Pearsanta"
+msgid "Show the memo preview pane"
+msgstr "Taispeáin an pána \"Réamhamharc\""
 
-#: ../capplet/settings/mail-account-view.c:487
-msgid "Name:"
-msgstr "Ainm:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#, fuzzy
+msgid "If \"true\", show the memo preview pane in the main window"
+msgstr "Taispeáin an pána \"Réamhamharc\""
 
-#: ../capplet/settings/mail-account-view.c:496
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 #, fuzzy
-msgid "Email address:"
-msgstr "_Seoladh Ríomhphoist:"
+msgid "Show the task preview pane"
+msgstr "Taispeáin an pána \"Réamhamharc\""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#, fuzzy
+msgid "If \"true\", show the task preview pane in the main window"
+msgstr "Taispeáin an pána \"Réamhamharc\""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+msgid "Whether to show week numbers in various places in the Calendar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+msgid "Vertical position for the tag pane"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+msgid "Highlight tasks due today"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+msgid ""
+"Whether highlight tasks due today with a special color (task-due-today-color)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+msgid "Tasks due today color"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+msgid ""
+"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
+"together with task-due-today-highlight"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+msgid "Task preview pane position (horizontal)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+msgid "Task layout style"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:506
-msgid "Details:"
-msgstr "Mionsonraí:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+msgid "Task preview pane position (vertical)"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:514
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+msgid "Position of the task preview pane when oriented vertically"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 #, fuzzy
-msgid "Receiving"
-msgstr "Fáil Ríomhphoist"
+msgid "Highlight overdue tasks"
+msgstr "Tascanna Déanacha"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+msgid ""
+"Whether highlight overdue tasks with a special color (task-overdue-color)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+msgid "Overdue tasks color"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:521
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+msgid ""
+"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
+"together with task-overdue-highlight."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+msgid "Time divisions"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+msgid "Intervals shown in Day and Work Week views, in minutes"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+msgid "Timezone"
+msgstr "Crios Ama"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olson timezone database location like \"America/New York\""
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+msgid "Twenty four hour time format"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+msgid "Whether to show times in twenty four hour format instead of using am/pm"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 #, fuzzy
-msgid "Server type:"
-msgstr "C_ineál Freastalaí:"
+msgid "Birthday and anniversary reminder"
+msgstr "Breithlaethanta & Cothroim Lae"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+msgid "Default appointment reminder"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+msgid "Whether to set a default reminder for appointments"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+msgid "Use system timezone"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+msgid "Use the system timezone instead of the timezone selected in Evolution"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+msgid "First day of the week"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+msgid "Monday is a work day"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+msgid "Tuesday is a work day"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:530
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+msgid "Wednesday is a work day"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+msgid "Thursday is a work day"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+msgid "Friday is a work day"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+msgid "Saturday is a work day"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+msgid "Sunday is a work day"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"week-start-day-name\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+msgid "(Deprecated) Work days"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+msgid ""
+"Days on which the start and end of work hours should be indicated. (This key "
+"was deprecated in version 3.10 and should no longer be used. Use the \"work-"
+"day-monday\", \"work-day-tuesday\", etc. keys instead.)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:1
 #, fuzzy
-msgid "Server address:"
-msgstr "Teachtaireacht Freastalaí:"
+msgid "Previous Evolution version"
+msgstr "Athchóiriú Evolution"
 
-#: ../capplet/settings/mail-account-view.c:539
+#: ../data/org.gnome.evolution.gschema.xml.in.h:2
+msgid ""
+"The most recently used version of Evolution, expressed as \"major.minor.micro"
+"\". This is used for data and settings migration from older to newer "
+"versions."
+msgstr ""
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:3
 #, fuzzy
-msgid "Username:"
-msgstr "_Ainm úsáideora:"
+msgid "List of disabled plugins"
+msgstr "Cumasaigh agus díchumasaigh breiseáin"
 
-#: ../capplet/settings/mail-account-view.c:548
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
+msgid "The list of disabled plugins in Evolution"
+msgstr ""
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:5
 #, fuzzy
-msgid "Use encryption:"
-msgstr "Gan chriptiú"
+msgid "The window's X coordinate"
+msgstr "Staid fhuinneog réamhshocraithe"
 
-#: ../capplet/settings/mail-account-view.c:553
-#: ../capplet/settings/mail-account-view.c:588
+#: ../data/org.gnome.evolution.gschema.xml.in.h:6
 #, fuzzy
-msgid "never"
-msgstr "Riamh"
+msgid "The window's Y coordinate"
+msgstr "Staid fhuinneog réamhshocraithe"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:7
+msgid "The window's width in pixels"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:565
+#: ../data/org.gnome.evolution.gschema.xml.in.h:8
 #, fuzzy
-msgid "Sending"
-msgstr "Ag dul suas"
+msgid "The window's height in pixels"
+msgstr "Airde fhuinneog réamhshocraithe"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:9
+#, fuzzy
+msgid "Whether the window is maximized"
+msgstr "Cé acu atá an phríomhfhuinneog uasmhéadaithe nó nach bhfuil."
 
-#: ../capplet/settings/mail-account-view.c:607
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
+msgid "Gnome Calendar's calendar import done"
+msgstr ""
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
+msgid "Whether calendar from Gnome Calendar has been imported or not"
+msgstr ""
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
+msgid "Gnome Calendar's tasks import done"
+msgstr ""
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
+msgid "Whether tasks from Gnome Calendar have been imported or not"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
 msgid ""
-"To use the email application you'll need to setup an account. Put your email "
-"address and password in below and we'll try and work out all the settings. "
-"If we can't do it automatically you'll need your server details as well."
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
+msgid "Default charset in which to compose messages"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
+msgid "Default charset in which to compose messages."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
+msgid "Path where picture gallery should search for its content"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+msgid ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Seiceáil an litrithe go huathoibríoch"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "Aithint uathoibríoch cineálacha"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
+#, fuzzy
+msgid "Automatic emoticon recognition"
+msgstr "Aithint uathoibríoch cineálacha"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
+msgid "Recognize emoticons in text and replace them with images."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#, fuzzy
+msgid "Attribute message"
+msgstr "Teachtaireacht Gan Teideal"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
 msgid ""
-"Sorry, we can't work out the settings to get your mail automatically. Please "
-"enter them below. We've tried to make a start with the details you just "
-"entered but you may need to change them."
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:611
-msgid "You can specify more options to configure the account."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+#, fuzzy
+msgid "Forward message"
+msgstr "Teachtaireacht Curtha Ar Aghaidh"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#, fuzzy
+msgid "Original message"
+msgstr "-----Bunteachtaireacht-----"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
 msgid ""
-"Now we need your settings for sending mail. We've tried to make some guesses "
-"but you should check them over to make sure."
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:614
-msgid "You can specify your default settings for your account."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+msgid "Group Reply replies to list"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
 msgid ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:630
-#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
-msgid "Identity"
-msgstr "Aitheantas"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+msgid "Put the cursor at the bottom of replies"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+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 ""
 
-#: ../capplet/settings/mail-account-view.c:630
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
 #, fuzzy
-msgid "Next - Receiving mail"
-msgstr "Fáil Ríomhphoist"
+msgid "Always request read receipt"
+msgstr "Nuair a thagann admháil léite:"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:631
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+msgid "Send HTML mail by default"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+msgid "Send HTML mail by default."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
 #, fuzzy
-msgid "Receiving mail"
-msgstr "Fáil Ríomhphoist"
+msgid "Spell checking color"
+msgstr "Seiceáil Litrithe"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:631
-#: ../capplet/settings/mail-account-view.c:632
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 #, fuzzy
-msgid "Next - Sending mail"
-msgstr "Seoladh Poist"
+msgid "Spell checking languages"
+msgstr "Seiceáil an litrithe go huathoibríoch"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:631
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+msgid "Digitally sign replies when the original message is signed"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+msgid ""
+"Automatically enable PGP or S/MIME signatures when replying to a message "
+"which is also PGP or S/MIME signed."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+msgid "Encode filenames in an Outlook/GMail way"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+msgid ""
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
 #, fuzzy
-msgid "Back - Identity"
-msgstr "Aitheantas"
+msgid "Do not add signature delimiter"
+msgstr "Níorbh fhéidir comhad cumraíochta X a shábháil"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+msgid "Ignore list Reply-To:"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+msgid "List of localized 'Re'"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+msgid ""
+"Comma-separated list of localized 'Re' abbreviations to skip in a subject "
+"text when replying to a message, as an addition to the standard \"Re\" "
+"prefix. An example is 'SV,AV'."
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:631
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+msgid "Save file format for drag-and-drop operation"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+msgid "Can be either 'mbox' or 'pdf'."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 #, fuzzy
-msgid "Next - Receiving options"
-msgstr "Roghanna Fála"
+msgid "Show image animations"
+msgstr "Taispeáin cineál na híomhá"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+msgid "Ellipsize mode for folder names in side bar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+msgid "Enable or disable type ahead search feature"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:632
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 #, fuzzy
-msgid "Receiving options"
-msgstr "Roghanna Fála"
+msgid "Enable or disable magic space bar"
+msgstr "Bainistigh Gléasanna agus Breiseáin"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:632
-#: ../capplet/settings/mail-account-view.c:634
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 #, fuzzy
-msgid "Back - Receiving mail"
-msgstr "Fáil Ríomhphoist"
+msgid "Citation highlight color"
+msgstr "Athraigh Dath an Aibhsiú"
 
-#: ../capplet/settings/mail-account-view.c:634
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 #, fuzzy
-msgid "Sending mail"
-msgstr "Seoladh Poist"
+msgid "Citation highlight color."
+msgstr "Athraigh Dath an Aibhsiú"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+msgid "Enable/disable caret mode"
+msgstr "Cumasaigh/díchumasaigh mód carait"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+msgid "Default charset in which to display messages"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:634
-#: ../capplet/settings/mail-account-view.c:635
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+msgid "Default charset in which to display messages."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 #, fuzzy
-msgid "Next - Review account"
-msgstr "Scrios cuntas?"
+msgid "Automatically load images for HTML messages over HTTP"
+msgstr "Luchtaigh íomhánna do theachtaireachtaí HTML trí HTTP"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+msgid "Show Animations"
+msgstr "Taispeán Beocháin"
 
-#: ../capplet/settings/mail-account-view.c:634
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+msgid "Show animated images as animations."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 #, fuzzy
-msgid "Next - Defaults"
-msgstr "Réamhshocruithe"
+msgid "Show all message headers"
+msgstr "Laghdaigh gach snáithe teachtaireachtaí"
 
-#: ../capplet/settings/mail-account-view.c:634
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 #, fuzzy
-msgid "Back - Receiving options"
-msgstr "Roghanna Fála"
+msgid "Show all the headers when viewing a messages."
+msgstr "Comment=Taispeáin Teachtaireacht Téacs i bPreabfhuinneog"
 
-#: ../capplet/settings/mail-account-view.c:635
-#: ../mail/em-account-editor.c:3377
-msgid "Defaults"
-msgstr "Réamhshocruithe"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#, fuzzy
+msgid "List of headers to show when viewing a message."
+msgstr "Comment=Taispeáin Teachtaireacht Téacs i bPreabfhuinneog"
 
-#: ../capplet/settings/mail-account-view.c:635
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+msgid ""
+"Each header is represented as a pair: the header name, and a boolean "
+"indicating whether the header is enabled. Disabled headers are not shown "
+"when viewing a message, but are still listed in Preferences."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 #, fuzzy
-msgid "Back - Sending mail"
-msgstr "Seoladh Poist"
+msgid "Show photo of the sender"
+msgstr "&Seoladh nua an tseoltóra:"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+msgid "Show the photo of the sender in the message reading pane."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+msgid "Timeout for marking messages as seen"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+msgid "Timeout in milliseconds for marking messages as seen."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+msgid "Sender email-address column in the message list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+msgid "Show deleted messages in the message-list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 #, fuzzy
-msgid "Review account"
-msgstr "Scrios cuntas?"
+msgid "Enable Unmatched search folder"
+msgstr "Cumasaigh fillteáin cuardaigh"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+msgid ""
+"Enable Unmatched search folder within Search Folders. It does nothing if "
+"Search Folders are disabled."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+msgid "Hides the per-folder preview and removes the selection"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+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 ""
 
-#: ../capplet/settings/mail-account-view.c:637
-msgid "Finish"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+msgid "Height of the message-list pane"
+msgstr "Airde pána an liosta teachtaireachtaí"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+msgid "Height of the message-list pane."
+msgstr "Airde pána an liosta teachtaireachtaí."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 #, fuzzy
-msgid "Back - Sending"
-msgstr "Ag dul suas"
+msgid "Width of the message-list pane"
+msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
 
-#: ../capplet/settings/mail-account-view.c:760
-msgid "Setup Google contacts with Evolution"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#, fuzzy
+msgid "Width of the message-list pane."
+msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+msgid "Layout style"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:761
-msgid "Setup Google calendar with Evolution"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:766
-msgid "You may need to enable IMAP access."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#, fuzzy
+msgid "Variable width font"
+msgstr "Cló &il-leithid"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#, fuzzy
+msgid "The variable width font for mail display."
+msgstr "Úsáid &dath uathoibríoch cló don taispeántas scáileáin"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+msgid "Terminal font"
+msgstr "Cló teirminéil"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#, fuzzy
+msgid "The terminal font for mail display."
+msgstr "Úsáid &dath uathoibríoch cló don taispeántas scáileáin"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+msgid "Use custom fonts"
+msgstr "Úsáid clónna saincheaptha"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#, fuzzy
+msgid "Use custom fonts for displaying mail."
+msgstr "Úsáid clónna saincheaptha"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+msgid "Compress display of addresses in TO/CC/BCC"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:774
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+msgid "Default value for thread expand state"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+msgid "Whether sort threads based on latest message in that thread"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+msgid ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+msgid "Log filter actions"
+msgstr "Logáil gníomhartha scagaire"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+msgid "Log filter actions to the specified log file."
+msgstr "Logáil gníomhartha scagaire go dtí an comhad loga sonraithe."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+msgid "Flush Outbox after filtering"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 #, fuzzy
-msgid "Google account settings:"
-msgstr "Socruithe Evolution á luchtú"
+msgid "Default forward style"
+msgstr "Stíl Réamhshocraithe KDE"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#, fuzzy
+msgid "Default reply style"
+msgstr "Stíl Réamhshocraithe KDE"
 
-#: ../capplet/settings/mail-account-view.c:800
-msgid "Setup Yahoo calendar with Evolution"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#, fuzzy
+msgid "Prompt on empty subject"
+msgstr "Folmhaigh an Bruscar ag an &Scor"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:804
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#, fuzzy
+msgid "Prompt when emptying the trash"
+msgstr "Tabhair &leid nuair a dhéanann feidhmchlár rochtain ar sparán oscailte"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+msgid "Prompt the user when he or she tries to empty the trash."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#, fuzzy
+msgid "Prompt when user expunges"
+msgstr "Tabhair &leid nuair a dhéanann feidhmchlár rochtain ar sparán oscailte"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid ""
-"Yahoo calendars are named as firstname_lastname. We have tried to form the "
-"calendar name. So please confirm and re-enter the calendar name if it is not "
-"correct."
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+msgid "Prompt while marking multiple messages"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:813
-msgid "Yahoo account settings:"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:827
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 #, fuzzy
-msgid "Yahoo Calendar name:"
-msgstr "Roghnaigh comhad féilire"
+msgid "Prompt when deleting messages in search folder"
+msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+msgid ""
+"Possible values are: 'never' - do not allow copy with drag &amp; drop of "
+"folders in folder tree, 'always' - allow copy with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+msgid ""
+"Possible values are: 'never' - do not allow move with drag &amp; drop of "
+"folders in folder tree, 'always' - allow move with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+msgid "Prompt when replying privately to list messages"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+msgid "Prompt when mailing list hijacks private replies"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+msgid "Prompt when replying to many recipients"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+msgid ""
+"Policy for automatically closing the message browser window when forwarding "
+"or replying to the displayed message."
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:1098
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 #, fuzzy
-msgid "Password:"
-msgstr "_Focal faire:"
+msgid "Empty Trash folders on exit"
+msgstr "Folmhaigh taisce na mionsamhlacha go huathoibríoch ag am scortha"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+msgid "Last time Empty Trash was run"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+msgid "Level beyond which the message should be logged."
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:1150
-#: ../capplet/settings/mail-settings-view.c:254
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+msgid "Show original \"Date\" header value."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+msgid "List of Labels and their associated colors"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+msgid "Run junk test on incoming mail."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 #, fuzzy
-msgid "Close Tab"
-msgstr "Dún"
+msgid "Empty Junk folders on exit"
+msgstr "Folmhaigh taisce na mionsamhlacha go huathoibríoch ag am scortha"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+msgid "Minimum days between emptying the junk on exit"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+msgid "Last time Empty Junk was run"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+msgid "The default plugin for Junk hook"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+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 ""
 
-#: ../capplet/settings/mail-account-view.c:1160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+msgid "Determines whether to lookup in address book for sender email"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+msgid "Custom headers to use while checking for junk."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 #, fuzzy
-msgid "Account Wizard"
-msgstr "Eagarthóir Cuntas"
+msgid "UID string of the default account."
+msgstr "Úsáid an réamhshocrú ó shocruithe an chuntais"
 
-#: ../capplet/settings/mail-capplet-shell.c:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+msgid "Save directory"
+msgstr "Sábháil comhadlann"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 #, fuzzy
-msgid "Evolution account assistant"
-msgstr "Cúntóir Cuntais Evolution"
+msgid "Directory for saving mail component files."
+msgstr "Comhadlann a sábhálfar comhaid uathúla chúltaca inti"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+msgid "Composer load/attach directory"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#, fuzzy
+msgid "Directory for loading/attaching files to composer."
+msgstr "Comhadlann a sábhálfar comhaid uathúla chúltaca inti"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+msgid "Check for new messages on start"
+msgstr "Lorg teachtaireachtaí nua ag tosú"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+msgid ""
+"Whether to check for new messages when Evolution is started. This includes "
+"also sending messages from Outbox."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#, fuzzy
+msgid "Check for new messages in all active accounts"
+msgstr "Lorg teachtaireachtaí _nua gach"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+msgid ""
+"Whether to check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#, fuzzy
+msgid "Server synchronization interval"
+msgstr "Roghanna Beochana"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#, fuzzy
+msgid "(Deprecated) Default forward style"
+msgstr "Stíl Réamhshocraithe KDE"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"forward-style-name\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#, fuzzy
+msgid "(Deprecated) Default reply style"
+msgstr "Stíl Réamhshocraithe KDE"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"reply-style-name\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+msgid "(Deprecated) List of custom headers and whether they are enabled."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"show-headers\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#, fuzzy
+msgid "(Deprecated) Load images for HTML messages over HTTP"
+msgstr "Luchtaigh íomhánna do theachtaireachtaí HTML trí HTTP"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"image-loading-policy\" instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+msgid ""
+"(Deprecated) Asks whether to close the message window when the user forwards "
+"or replies to the message shown in the window"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"browser-close-on-reply-policy\" instead."
+msgstr ""
+
+#. Translators: This is the a list of words for the attach reminder plugin to look
+#. for in a message body. Please use any number of words here in your language that might
+#. indicate that an attachment should have been attached to the message.
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
+msgid "['attachment','attaching','attached','enclosed']"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
+#, fuzzy
+msgid "Address book source"
+msgstr "Airíonna an Leabhar Seoltaí"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
+#, fuzzy
+msgid "Address book to use for storing automatically synced contacts."
+msgstr "Tadhallaí Phoiblí"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
+#, fuzzy
+msgid "Auto sync Pidgin contacts"
+msgstr "Teagmhálacha Uathoibríoch"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
+msgid "Whether Pidgin contacts should be automatically synced."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
+#, fuzzy
+msgid "Enable autocontacts"
+msgstr "Teagmháil neamhbhailí."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+msgid ""
+"Whether contacts should be automatically added to the user's address book."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
+#, fuzzy
+msgid "Pidgin address book source"
+msgstr "leabhar seoltaí evolution"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+msgid ""
+"Address book to use for storing automatically synced contacts from Pidgin."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
+msgid "Pidgin check interval"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
+msgid "Check interval for Pidgin syncing of contacts."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
+msgid "Pidgin last sync MD5"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
+msgid "Pidgin last sync MD5."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+msgid "Pidgin last sync time"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+msgid "Pidgin last sync time."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
+msgid "List of Custom Headers"
+msgstr "Liosta Cheanntásc Saincheaptha"
+
+#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
 
-#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:377 ../mail/e-mail-local.c:81
-#: ../mail/e-mail-migrate.c:750 ../mail/em-folder-tree-model.c:167
-#: ../modules/addressbook/e-book-shell-backend.c:100
-#: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:113
-#: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:102
-#: ../modules/calendar/e-memo-shell-migrate.c:109
-#: ../modules/calendar/e-task-shell-backend.c:102
-#: ../modules/calendar/e-task-shell-migrate.c:121
-#: ../widgets/misc/e-account-tree-view.c:99
-#: ../widgets/misc/e-account-tree-view.c:291
-#: ../widgets/misc/e-account-tree-view.c:922
-#: ../widgets/misc/e-account-tree-view.c:979
-#: ../widgets/misc/e-account-tree-view.c:1050
-#: ../widgets/misc/e-account-tree-view.c:1125
-#: ../widgets/misc/e-account-tree-view.c:1348
-msgid "On This Computer"
-msgstr "Ar an Ríomhaire Seo"
-
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
+msgid "Default External Editor"
+msgstr "Eagarthóir Seachtrach Réamhshocraithe"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
+msgid "Automatically launch when a new mail is edited"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
+msgid "Automatically launch editor when key is pressed in the mail composer."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
+msgid "Insert Face picture by default"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
+#, fuzzy
+msgid "Delete processed"
+msgstr "_Scrios Teachtaireacht"
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:2
+msgid "Whether to delete processed iTip objects"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
+#, fuzzy
+msgid "Notify new messages for Inbox only."
+msgstr "Bog Teachtaireachtaí go Fillteán"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
+#, fuzzy
+msgid "Enable D-Bus messages."
+msgstr "-----Bunteachtaireacht-----"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
+#, fuzzy
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "Ar theacht teachtaireachtaí nua i"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
+msgid "Enable icon in notification area."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
+msgid "Popup message together with the icon."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
+#, fuzzy
+msgid "Whether show message over the icon when new messages arrive."
+msgstr "Ar theacht teachtaireachtaí nua i"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
+#, fuzzy
+msgid "Enable audible notifications when new messages arrive."
+msgstr "Ar theacht teachtaireachtaí nua i"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
+msgid ""
+"Whether to make a sound of any kind when new messages arrive. If \"false\", "
+"the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\" "
+"and \"notify-sound-use-theme\" keys are disregarded."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
+#, fuzzy
+msgid "Whether to emit a beep."
+msgstr "Taispeáin an pána \"Réamhamharc\""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
+#, fuzzy
+msgid "Whether to emit a beep when new messages arrive."
+msgstr "Ar theacht teachtaireachtaí nua i"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
+msgid "Sound filename to be played."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
+msgid ""
+"Sound file to be played when new messages arrive, if \"notify-sound-play-file"
+"\" is \"true\"."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
+#, fuzzy
+msgid "Whether to play a sound file."
+msgstr "Roghnaigh Comhad Fuaime"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
+msgid ""
+"Whether to play a sound file when new messages arrive. The name of the sound "
+"file is given by the 'notify-sound-file' key."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
+msgid "Use sound theme"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
+#, fuzzy
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr "Ar theacht teachtaireachtaí nua i"
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
+#, fuzzy
+msgid "Mode to use when displaying mails"
+msgstr "Úsáid clónna saincheaptha"
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
+msgid ""
+"The mode to use for displaying mails. \"normal\" makes Evolution choose the "
+"best part to show, \"prefer_plain\" makes it use the text part, if present, "
+"and \"only_plain\" forces Evolution to only show plain text"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
+#, fuzzy
+msgid "Whether to show suppressed HTML output"
+msgstr "Taispeáin an pána \"Réamhamharc\""
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
+msgid "List of Destinations for publishing"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
+msgid ""
+"The key specifies the list of destinations to where publish calendars. Each "
+"values specifies an XML with setup for publishing to one destination."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
+#, fuzzy
+msgid "Skip development warning dialog"
+msgstr "Tabhair foláireamh dom agus mé ar tí:"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
+#, fuzzy
+msgid "Initial attachment view"
+msgstr "&Oscail Iatán"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
+#, fuzzy
+msgid "Initial file chooser folder"
+msgstr "Cuir comhfhillteáin leis"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
+msgid "Start in offline mode"
+msgstr "Tosaigh i mód as líne"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+#, fuzzy
+msgid "Offline folder paths"
+msgstr "Fillteán %s á bhogadh"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
+#, fuzzy
+msgid "Enable express mode"
+msgstr "Cumasaigh fillteáin cuardaigh"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+#, fuzzy
+msgid "Window buttons are visible"
+msgstr "Níl aon teachtaireacht chlibeáilte le feiceáil!"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+msgid "Whether the window buttons should be visible."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+#, fuzzy
+msgid "Window button style"
+msgstr "Roghnaigh stíl chnaipe"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+#, fuzzy
+msgid "Toolbar is visible"
+msgstr "($Arg1) dofheicthe"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+#, fuzzy
+msgid "Sidebar is visible"
+msgstr "Tá an barra taoibh suiteáilte."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+msgid "Whether the sidebar should be visible."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+msgid "Statusbar is visible"
+msgstr "Tá an barra stádais infheicthe"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+msgid "Whether the status bar should be visible."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+msgid "Default sidebar width"
+msgstr "Leithead barra taoibh réamhshocraithe"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+msgid "The default width for the sidebar, in pixels."
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
+msgid "Use only local spam tests."
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
+msgid "Use only the local spam tests (no DNS)."
+msgstr ""
+
+#: ../em-format/e-mail-formatter-attachment.c:397
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
+#: ../mail/message-list.etspec.h:4
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Iatán"
+msgstr[1] "Iatáin"
+msgstr[2] "Iatáin"
+msgstr[3] "Iatáin"
+msgstr[4] "Iatáin"
+
+#: ../em-format/e-mail-formatter-attachment.c:398
+#, fuzzy
+msgid "Display as attachment"
+msgstr "iatán %s"
+
+#: ../em-format/e-mail-formatter-headers.c:107
+#: ../em-format/e-mail-part-headers.c:47 ../mail/e-mail-tag-editor.c:272
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:64
+msgid "From"
+msgstr "Ó"
+
+#: ../em-format/e-mail-formatter-headers.c:133
+#, fuzzy
+msgid "(no subject)"
+msgstr "Ábhar"
+
+#: ../em-format/e-mail-formatter-headers.c:333
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-image.c:152
+#, fuzzy
+msgid "Regular Image"
+msgstr "Sábháil Teachtaireacht..."
+
+#: ../em-format/e-mail-formatter-image.c:153
+#, fuzzy
+msgid "Display part as an image"
+msgstr "An Chéad Teachtaireacht &Neamhléite Eile"
+
+#: ../em-format/e-mail-formatter-message-rfc822.c:252
+#, fuzzy
+msgid "RFC822 message"
+msgstr "_Teachtaireacht saincheaptha"
+
+#: ../em-format/e-mail-formatter-message-rfc822.c:253
+#, fuzzy
+msgid "Format part as an RFC822 message"
+msgstr "Teachtaireacht á formáidiú"
+
+#: ../em-format/e-mail-formatter-print.c:54
+#: ../e-util/gal-view-instance-save-as-dialog.c:95
+#: ../mail/e-mail-label-tree-view.c:99
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1328
+#: ../modules/cal-config-google/e-google-chooser.c:237
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+msgid "Name"
+msgstr "Ainm"
+
+#: ../em-format/e-mail-formatter-print.c:54
+#: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
+msgid "Size"
+msgstr "Méid"
+
+#: ../em-format/e-mail-formatter-print-headers.c:144
+#, fuzzy
+msgid "GPG signed"
+msgstr "Sannta"
+
+#: ../em-format/e-mail-formatter-print-headers.c:150
+#, fuzzy
+msgid "GPG encrpyted"
+msgstr "Gan chriptiú"
+
+#: ../em-format/e-mail-formatter-print-headers.c:156
+#, fuzzy
+msgid "S/MIME signed"
+msgstr "_Sínigh le S/MIME"
+
+#: ../em-format/e-mail-formatter-print-headers.c:162
+#, fuzzy
+msgid "S/MIME encrpyted"
+msgstr "_Criptigh le S/MIME"
+
+#: ../em-format/e-mail-formatter-print-headers.c:171
+#: ../mail/e-mail-config-security-page.c:642
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
+msgid "Security"
+msgstr "Slándáil"
+
+#: ../em-format/e-mail-formatter-quote-headers.c:168
+#: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
+#: ../modules/mail/em-mailer-prefs.c:69 ../smime/lib/e-asn1-object.c:712
+msgid "Subject"
+msgstr "Ábhar"
+
+#. pseudo-header
+#: ../em-format/e-mail-formatter-quote-headers.c:187
+#: ../em-format/e-mail-formatter-utils.c:359
+#: ../modules/mail/em-mailer-prefs.c:1145
+msgid "Mailer"
+msgstr "Seoltóir Ríomhphoist"
+
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:91
+#: ../em-format/e-mail-formatter-text-enriched.c:104
+msgid "Richtext"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../em-format/e-mail-formatter-text-enriched.c:105
+msgid "Display part as enriched text"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-quote-text-html.c:90
+#: ../em-format/e-mail-formatter-text-html.c:353
+msgid "HTML"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-quote-text-html.c:91
+#: ../em-format/e-mail-formatter-text-html.c:354
+#, fuzzy
+msgid "Format part as HTML"
+msgstr "Seol mar HTML amháin"
+
+#: ../em-format/e-mail-formatter-quote-text-plain.c:115
+#: ../em-format/e-mail-formatter-text-plain.c:194
+#, fuzzy
+msgid "Plain Text"
+msgstr "Mód Gnáth-Théacs"
+
+#: ../em-format/e-mail-formatter-quote-text-plain.c:116
+#: ../em-format/e-mail-formatter-text-plain.c:195
+#, fuzzy
+msgid "Format part as plain text"
+msgstr "Ná taispeáin ach PLAIN"
+
+#: ../em-format/e-mail-formatter-secure-button.c:52
+msgid "Unsigned"
+msgstr "Gan síniú"
+
+#: ../em-format/e-mail-formatter-secure-button.c:52
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:53
+msgid "Valid signature"
+msgstr "Síniú bailí"
+
+#: ../em-format/e-mail-formatter-secure-button.c:53
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:54
+msgid "Invalid signature"
+msgstr "Síniú neamhbhailí"
+
+#: ../em-format/e-mail-formatter-secure-button.c:54
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:55
+msgid "Valid signature, but cannot verify sender"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:55
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:56
+msgid "Signature exists, but need public key"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:56
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:63
+msgid "Unencrypted"
+msgstr "Gan chriptiú"
+
+#: ../em-format/e-mail-formatter-secure-button.c:63
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:64
+msgid "Encrypted, weak"
+msgstr "Criptithe, lag"
+
+#: ../em-format/e-mail-formatter-secure-button.c:64
+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 ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:65
+msgid "Encrypted"
+msgstr "Criptithe"
+
+#: ../em-format/e-mail-formatter-secure-button.c:65
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:66
+msgid "Encrypted, strong"
+msgstr "Criptithe, láidir"
+
+#: ../em-format/e-mail-formatter-secure-button.c:66
+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 ""
+
+#: ../em-format/e-mail-formatter-secure-button.c:182
+#: ../smime/gui/smime-ui.ui.h:20
+msgid "_View Certificate"
+msgstr "_Amharc ar Theastas"
+
+#: ../em-format/e-mail-formatter-secure-button.c:197
+msgid "This certificate is not viewable"
+msgstr "Níl an teastas inamharctha"
+
+#: ../em-format/e-mail-formatter-source.c:130
+#, fuzzy
+msgid "Source"
+msgstr "Foinse"
+
+#: ../em-format/e-mail-formatter-source.c:131
+msgid "Display source of a MIME part"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-utils.c:207
+#: ../em-format/e-mail-formatter-utils.c:231
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+msgid "Cc"
+msgstr "Cc"
+
+#: ../em-format/e-mail-formatter-utils.c:209
+#: ../em-format/e-mail-formatter-utils.c:233
+#: ../em-format/e-mail-part-headers.c:51 ../modules/mail/em-mailer-prefs.c:68
+msgid "Bcc"
+msgstr "Bcc"
+
+#: ../em-format/e-mail-parser-application-mbox.c:88
+#, c-format
+msgid "Error parsing MBOX part: %s"
+msgstr ""
+
+#: ../em-format/e-mail-parser-application-smime.c:84
 #, fuzzy, c-format
-msgid "Modify %s..."
-msgstr "Athraigh"
+msgid "Could not parse S/MIME message: %s"
+msgstr "Níorbh fhéidir teachtaireacht PGP/MIME a pharsáil"
 
-#: ../capplet/settings/mail-settings-view.c:152
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:80
+#, fuzzy, c-format
+msgid "Could not parse PGP message: %s"
+msgstr "Níorbh fhéidir teachtaireacht PGP a pharsáil"
+
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:83
+#: ../em-format/e-mail-parser-multipart-signed.c:128
+#, fuzzy, c-format
+msgid "Error verifying signature: %s"
+msgstr "Earráid agus an síniú á sheiceáil"
+
+#: ../em-format/e-mail-parser-message-external.c:69
 #, fuzzy
-msgid "Add a new account"
-msgstr "Cuir colún leis..."
+msgid "Malformed external-body part"
+msgstr "Ceanntásc míchumtha"
+
+#: ../em-format/e-mail-parser-message-external.c:102
+#, fuzzy, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Uasluchtaigh go suíomh saincheaptha FTP"
+
+#: ../em-format/e-mail-parser-message-external.c:113
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: ../em-format/e-mail-parser-message-external.c:115
+#, fuzzy, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Easpórtáil: Easpórtáil imeachtaí go comhad logánta."
+
+#: ../em-format/e-mail-parser-message-external.c:134
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Ag iarraidh sonraí le seoladh"
+
+#: ../em-format/e-mail-parser-message-external.c:152
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
 
-#: ../capplet/settings/mail-settings-view.c:188
+#: ../em-format/e-mail-parser-multipart-encrypted.c:67
+#: ../em-format/e-mail-parser-multipart-signed.c:81
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:83
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:102
+#, fuzzy, c-format
+msgid "Could not parse PGP/MIME message: %s"
+msgstr "Níorbh fhéidir teachtaireacht PGP/MIME a pharsáil"
+
+#: ../em-format/e-mail-parser-multipart-signed.c:114
 #, fuzzy
-msgid "Account management"
-msgstr "Bainistíocht Cuntas"
+msgid "Unsupported signature format"
+msgstr "Leasú na formáide comhaid gan tacaíocht."
+
+#: ../em-format/e-mail-part-headers.c:48 ../modules/mail/em-mailer-prefs.c:65
+msgid "Reply-To"
+msgstr "Freagra-Chuig"
+
+#: ../em-format/e-mail-part-headers.c:53 ../e-util/e-dateedit.c:550
+#: ../e-util/e-dateedit.c:573 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:70
+msgid "Date"
+msgstr "Dáta"
+
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+msgid "Newsgroups"
+msgstr "Grúpaí Nuachta"
 
-#: ../capplet/settings/mail-settings-view.c:264
+#: ../em-format/e-mail-part-headers.c:55 ../modules/mail/em-mailer-prefs.c:72
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Face"
+msgstr "Aghaidh"
+
+#: ../em-format/e-mail-part-utils.c:500
+#, c-format
+msgid "%s attachment"
+msgstr "iatán %s"
+
+#: ../e-util/e-send-options.ui.h:3
 #, fuzzy
-msgid "Settings"
-msgstr "Socruithe Dramhphoist"
+msgid "Standard"
+msgstr "Cló Comhrá"
 
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+#: ../e-util/e-send-options.ui.h:6
 #, fuzzy
-msgid "Calendar event notifications"
-msgstr "Eolas féilire"
+msgid "Proprietary"
+msgstr "_Airíonna"
 
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+#: ../e-util/e-send-options.ui.h:8
 #, fuzzy
-msgid "Evolution Alarm Notify"
-msgstr "&GNOME-PIM (Evolution)"
+msgid "Secret"
+msgstr "Scór"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
-#: ../shell/e-shell-window-private.c:257
-msgid "Evolution"
-msgstr "Evolution"
+#: ../e-util/e-send-options.ui.h:9
+#, fuzzy
+msgid "Top Secret"
+msgstr "Scór"
 
-#: ../data/evolution.desktop.in.in.h:2
-msgid "Evolution Mail and Calendar"
-msgstr "Post agus Féilire Evolution"
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr ""
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
-msgid "Groupware Suite"
-msgstr "Sraith Feidhmchlár Grúpa-Earraí"
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+#, fuzzy
+msgctxt "send-options"
+msgid "None"
+msgstr "Neamhní"
 
-#: ../data/evolution.desktop.in.in.h:4
-msgid "Manage your email, contacts and schedule"
-msgstr "Bainstigh do chuid ríomhphoist, do chuid teagmhálacha agus do sceideal"
+#: ../e-util/e-send-options.ui.h:13
+#, fuzzy
+msgid "Mail Receipt"
+msgstr "&Ná seol admháil léite riamh"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr ""
 
-#: ../data/evolution-settings.desktop.in.in.h:1
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "lá"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:840
+msgid "Replies"
+msgstr "Freagraí"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:21
 #, fuzzy
-msgid "Configure email accounts"
-msgstr "Cumraigh do chuid chuntais poist anseo"
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Tar Éis:"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "lá"
 
-#: ../data/evolution-settings.desktop.in.in.h:2
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:24
 #, fuzzy
-msgid "Email Settings"
-msgstr "Socruithe Dramhphoist"
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Go Dtí:"
+
+#: ../e-util/e-send-options.ui.h:25
+#, fuzzy
+msgid "Delivery Options"
+msgstr "Roghanna _Ginearálta"
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Tosaíocht:"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_Aicmiúchán:"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "Roghanna _Ginearálta"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:34
+#, fuzzy
+msgid "Status Tracking"
+msgstr "Sonraí _Stádais"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr ""
+
+#: ../e-util/e-send-options.ui.h:39
+#, fuzzy
+msgid "Return Notification"
+msgstr "&Fógairt an Chórais"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr ""
+
+#: ../e-util/e-table-config.ui.h:1
+msgid "_Sort..."
+msgstr "_Sórtáil..."
+
+#: ../e-util/e-table-config.ui.h:2
+msgid "_Group By..."
+msgstr "_Grúpáil de Réir..."
+
+#: ../e-util/e-table-config.ui.h:3
+msgid "_Fields Shown..."
+msgstr "_Réimsí Taispeánta..."
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "Clear _All"
+msgstr "Glan _Gach Rud"
+
+#: ../e-util/e-table-config.ui.h:7
+msgid "_Show field in View"
+msgstr ""
+
+#: ../e-util/e-table-config.ui.h:8 ../e-util/e-table-header-item.c:1753
+msgid "Ascending"
+msgstr "Ag dul suas"
+
+#: ../e-util/e-table-config.ui.h:9 ../e-util/e-table-header-item.c:1753
+msgid "Descending"
+msgstr "Ag dul síos"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "Group Items By"
+msgstr "Grúpáil Míreanna de Réir"
+
+#: ../e-util/e-table-config.ui.h:11
+msgid "Show _field in View"
+msgstr ""
+
+#: ../e-util/e-table-config.ui.h:12
+msgid "Then By"
+msgstr "Ansin de Réir"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Show field i_n View"
+msgstr ""
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show field in _View"
+msgstr ""
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Sort"
+msgstr "Sórtáil"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Clear All"
+msgstr "Glan Gach Rud"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Sort Items By"
+msgstr "Sórtáil Míreanna de Réir"
+
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "Roghnaigh Crios Ama"
+
+#: ../e-util/e-timezone-dialog.ui.h:2
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+#, fuzzy
+msgid "Time Zones"
+msgstr "_Crios Ama"
+
+#: ../e-util/e-timezone-dialog.ui.h:5
+#, fuzzy
+msgid "_Selection"
+msgstr "Mód Roghnaithe"
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Timezone drop-down combination box"
+msgstr ""
+
+#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
+#: ../mail/em-utils.c:240
+msgid "Incoming"
+msgstr "Isteach"
+
+#: ../e-util/filter.ui.h:2
+#, fuzzy
+msgid "the current time"
+msgstr "Sábháil an comhad reatha"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr ""
+
+#: ../e-util/filter.ui.h:4
+#, fuzzy
+msgid "a time relative to the current time"
+msgstr ""
+"an t-am reatha\n"
+"an t-am a shonraíonn tú\n"
+"am coibhneasta leis an am reatha"
+
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:78
+msgid "seconds"
+msgstr "soicind"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "seachtain"
+
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#, fuzzy
+msgid "months"
+msgstr "Mí"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr ""
+
+#: ../e-util/filter.ui.h:12
+#, fuzzy
+msgid "ago"
+msgstr "Clib"
+
+#: ../e-util/filter.ui.h:13
+#, fuzzy
+msgid "in the future"
+msgstr ""
+"ó shin\n"
+"sa todhchaí"
+
+#: ../e-util/filter.ui.h:14
+#, fuzzy
+msgid "Show filters for mail:"
+msgstr "Seoladán Poist le haghaidh KPilot"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:166
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Rialacha Scagtha"
+
+#: ../e-util/filter.ui.h:17
+#, fuzzy
+msgid "Compare against"
+msgstr "Bailíochtaigh i ndiaidh:"
+
+#: ../e-util/filter.ui.h:18
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: ../e-util/filter.ui.h:20
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: ../e-util/filter.ui.h:22
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "_Cruthaigh amharc nua"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../e-util/e-mail-signature-script-dialog.c:417
+#: ../mail/e-mail-config-identity-page.c:311
+#: ../mail/e-mail-config-summary-page.c:341
+msgid "_Name:"
+msgstr "_Ainm:"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr ""
+
+#: ../e-util/e-activity-proxy.c:311
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
+msgid "Cancel"
+msgstr "Cealaigh"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:259
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (cealaithe)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:230
+#: ../e-util/e-activity.c:262
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (críochnaithe)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:233
+#: ../e-util/e-activity.c:265
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (ag fanacht)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:237
+#: ../e-util/e-activity.c:269
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (á chealú)"
 
-#: ../e-util/e-activity.c:239
+#: ../e-util/e-activity.c:271
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:244
+#: ../e-util/e-activity.c:276
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% críochnaithe)"
 
+#. Translators: Escape is a keyboard binding.
+#: ../e-util/e-alert-bar.c:121
+#, fuzzy
+msgid "Close this message (Escape)"
+msgstr "Seol an teachtaireacht seo"
+
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
+msgid "Icon View"
+msgstr "Amharc Deilbhín"
+
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
+msgid "List View"
+msgstr "Amharc Liosta"
+
+#: ../e-util/e-attachment-dialog.c:318
+msgid "Attachment Properties"
+msgstr "Airíonna Iatáin"
+
+#: ../e-util/e-attachment-dialog.c:340 ../e-util/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "A_inm Comhaid:"
+
+#: ../e-util/e-attachment-dialog.c:375
+msgid "MIME Type:"
+msgstr "Cineál MIME:"
+
+#: ../e-util/e-attachment-dialog.c:383 ../e-util/e-attachment-store.c:483
+msgid "_Suggest automatic display of attachment"
+msgstr ""
+
+#: ../e-util/e-attachment-handler-image.c:97
+msgid "Could not set as background"
+msgstr ""
+
+#: ../e-util/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Socraigh mar _Chúlra"
+
+#: ../e-util/e-attachment-icon-view.c:166
+#: ../e-util/e-attachment-tree-view.c:549
+msgid "Loading"
+msgstr "Á Luchtú"
+
+#: ../e-util/e-attachment-icon-view.c:178
+#: ../e-util/e-attachment-tree-view.c:561
+msgid "Saving"
+msgstr "Á Shábháil"
+
+#: ../e-util/e-attachment-paned.c:104
+msgid "Hide Attachment _Bar"
+msgstr "Folaigh _Barra Iatán"
+
+#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+msgid "Show Attachment _Bar"
+msgstr "Taispeáin _Barra Iatán"
+
+#: ../e-util/e-attachment-store.c:463
+msgid "Add Attachment"
+msgstr "Cuir Iatán Leis"
+
+#: ../e-util/e-attachment-store.c:466
+msgid "A_ttach"
+msgstr "_Ceangail"
+
+#: ../e-util/e-attachment-store.c:537
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Sábháil Iatáin"
+msgstr[1] "Sábháil Iatán"
+msgstr[2] "Sábháil Iatáin"
+msgstr[3] "Sábháil Iatáin"
+msgstr[4] "Sábháil Iatáin"
+
+#. Translators: Default attachment filename.
+#: ../e-util/e-attachment-store.c:568 ../e-util/e-attachment.c:2055
+#: ../e-util/e-attachment.c:2711
+msgid "attachment.dat"
+msgstr "iatán.dat"
+
+#: ../e-util/e-attachment-view.c:378
+msgid "Open With Other Application..."
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:385
+msgid "S_ave All"
+msgstr "Sábháil G_ach Rud"
+
+#: ../e-util/e-attachment-view.c:411
+msgid "A_dd Attachment..."
+msgstr "Cuir _Iatán Leis..."
+
+#: ../e-util/e-attachment-view.c:435
+msgid "_Hide"
+msgstr "_Folaigh"
+
+#: ../e-util/e-attachment-view.c:442
+#, fuzzy
+msgid "Hid_e All"
+msgstr "Sábháil G_ach Rud"
+
+#: ../e-util/e-attachment-view.c:449
+#, fuzzy
+msgid "_View Inline"
+msgstr "&Inlíne"
+
+#: ../e-util/e-attachment-view.c:456
+#, fuzzy
+msgid "Vie_w All Inline"
+msgstr "&Inlíne"
+
+#: ../e-util/e-attachment-view.c:803
+#, fuzzy, c-format
+msgid "Open With \"%s\""
+msgstr "Oscail le \"%s\""
+
+#: ../e-util/e-attachment-view.c:806
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "Oscail an t-iatán seo i %s"
+
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../e-util/e-attachment.c:1110
+msgid "Attached message"
+msgstr ""
+
+#: ../e-util/e-attachment.c:2135 ../e-util/e-attachment.c:3017
+msgid "A load operation is already in progress"
+msgstr ""
+
+#: ../e-util/e-attachment.c:2143 ../e-util/e-attachment.c:3025
+msgid "A save operation is already in progress"
+msgstr ""
+
+#: ../e-util/e-attachment.c:2260
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Níorbh fhéidir '%s' a luchtú"
+
+#: ../e-util/e-attachment.c:2263
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Níorbh fhéidir an t-iatán a luchtú"
+
+#: ../e-util/e-attachment.c:2566
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Níorbh fhéidir '%s' a oscailt"
+
+#: ../e-util/e-attachment.c:2569
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Níorbh fhéidir an t-iatán a oscailt"
+
+#: ../e-util/e-attachment.c:3034
+msgid "Attachment contents not loaded"
+msgstr ""
+
+#: ../e-util/e-attachment.c:3110
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Níorbh fhéidir '%s' a shábháil"
+
+#: ../e-util/e-attachment.c:3113
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Níorbh fhéidir an t-iatán a shábháil"
+
+#: ../e-util/e-book-source-config.c:98
+#, fuzzy
+msgid "Mark as default address book"
+msgstr "Marcáil mar leabhar seoltaí _réamhshocraithe"
+
+#: ../e-util/e-book-source-config.c:103
+#, fuzzy
+msgid "Autocomplete with this address book"
+msgstr "Comhlánaigh go h_uathoibríoch leis an leabhar seoltaí seo"
+
+#: ../e-util/e-book-source-config.c:277
+#, fuzzy
+msgid "Copy book content locally for offline operation"
+msgstr "Cóipeáil ábhar an _leabhair go logánta chun oibríochta as líne"
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../e-util/e-buffer-tagger.c:410
+#, fuzzy
+msgid "Ctrl-click to open a link"
+msgstr "Cliceáil chun %s a oscailt"
+
+#: ../e-util/e-cal-source-config.c:170
+#, fuzzy
+msgid "Mark as default calendar"
+msgstr "Marcáil mar féilire _réamhshocraithe"
+
+#: ../e-util/e-cal-source-config.c:173
+#, fuzzy
+msgid "Mark as default task list"
+msgstr "Marcáil mar liosta tascanna _réamhshocraithe"
+
+#: ../e-util/e-cal-source-config.c:176
+#, fuzzy
+msgid "Mark as default memo list"
+msgstr "Marcáil mar liosta meamram _réamhshocraithe"
+
+#: ../e-util/e-cal-source-config.c:201
+#, fuzzy
+msgid "Color:"
+msgstr "_Dath:"
+
+#: ../e-util/e-cal-source-config.c:406
+#, fuzzy
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Cóipeáil ábhar an _leabhair go logánta chun oibríochta as líne"
+
+#: ../e-util/e-cal-source-config.c:410
+#, fuzzy
+msgid "Copy task list contents locally for offline operation"
+msgstr "Cóipeáil ábhar an _leabhair go logánta chun oibríochta as líne"
+
+#: ../e-util/e-cal-source-config.c:414
+#, fuzzy
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Cóipeáil ábhar an _leabhair go logánta chun oibríochta as líne"
+
+#. This is a strftime() format. %B = Month name.
+#: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2195
+msgctxt "CalItem"
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %Y = Year.
+#: ../e-util/e-calendar-item.c:1329
+msgctxt "CalItem"
+msgid "%Y"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../e-util/e-calendar-item.c:1366
+#, fuzzy
+msgctxt "CalItem"
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../e-util/e-calendar.c:190
+#, fuzzy
+msgid "Previous month"
+msgstr "Siar"
+
+#: ../e-util/e-calendar.c:215
+#, fuzzy
+msgid "Next month"
+msgstr "Samhail Téacs"
+
+#: ../e-util/e-calendar.c:241
+#, fuzzy
+msgid "Previous year"
+msgstr "Siar"
+
+#: ../e-util/e-calendar.c:266
+#, fuzzy
+msgid "Next year"
+msgstr "An Chéad _Snáithe Eile"
+
+#: ../e-util/e-calendar.c:290
+msgid "Month Calendar"
+msgstr "Féilire Míosa"
+
+#: ../e-util/e-categories-editor.c:224
+msgid "Currently _used categories:"
+msgstr ""
+
+#: ../e-util/e-categories-editor.c:235
+#, fuzzy
+msgid "_Available Categories:"
+msgstr "Réimsí ar Fáil"
+
+#: ../e-util/e-categories-selector.c:323
+#, fuzzy
+msgid "Icon"
+msgstr "Amharc Deilbhín"
+
+#: ../e-util/e-category-completion.c:300
+#, c-format
+msgid "Create category \"%s\""
+msgstr ""
+
+#: ../e-util/e-category-editor.c:137
+#, fuzzy
+msgid "Category Icon"
+msgstr "Catagóir"
+
+#: ../e-util/e-category-editor.c:141
+#, fuzzy
+msgid "_No Image"
+msgstr "_Gan íomhá"
+
+#: ../e-util/e-category-editor.c:178
+#, fuzzy
+msgid "Category _Name"
+msgstr "Catagóir"
+
+#: ../e-util/e-category-editor.c:190
+#, fuzzy
+msgid "Category _Icon"
+msgstr "Catagóir"
+
+#: ../e-util/e-category-editor.c:216
+#, fuzzy
+msgid "Category Properties"
+msgstr "Roghnachais na Fheilire"
+
+#: ../e-util/e-category-editor.c:277
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr ""
+
+#: ../e-util/e-cell-combo.c:186
+msgid "popup list"
+msgstr "preabliosta"
+
+#: ../e-util/e-cell-date-edit.c:299
+msgid "Now"
+msgstr "Anois"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1901
+#: ../modules/itip-formatter/itip-view.c:230
+msgid "Today"
+msgstr "Inniu"
+
+#. Translators: "None" as a label of a button to unset date in a
+#. * date table cell.
+#: ../e-util/e-cell-date-edit.c:317
+msgctxt "table-date"
+msgid "None"
+msgstr "Neamhní"
+
+#: ../e-util/e-cell-date-edit.c:325
+msgid "OK"
+msgstr "Ceart go Leor"
+
+#: ../e-util/e-cell-date-edit.c:873
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr ""
+
+#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1851
+msgid "?"
+msgstr "?"
+
+#: ../e-util/e-cell-percent.c:80
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: ../e-util/e-charset-combo-box.c:100
+msgid "Character Encoding"
+msgstr "Ionchódú Carachtar"
+
+#: ../e-util/e-charset-combo-box.c:123
+msgid "Enter the character set to use"
+msgstr "Iontráil an tacar carachtar le húsáid"
+
+#: ../e-util/e-charset-combo-box.c:342
+msgid "Other..."
+msgstr "Eile..."
+
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
 msgstr "Arabach"
@@ -7566,27 +10294,75 @@ msgstr "Úcránach"
 msgid "Visual"
 msgstr "Infheicthe"
 
-#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1856
-#: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:307
-msgid "Today"
-msgstr "Inniu"
+#: ../e-util/e-client-cache.c:1162
+#, c-format
+msgid "Cannot create a client object from extension name '%s'"
+msgstr ""
+
+#: ../e-util/e-dateedit.c:524
+msgid "Date and Time"
+msgstr "Dáta agus Am"
+
+#: ../e-util/e-dateedit.c:549
+msgid "Text entry to input date"
+msgstr ""
+
+#: ../e-util/e-dateedit.c:572
+msgid "Click this button to show a calendar"
+msgstr "Cliceáil an cnaipe seo chun féilire a thaispeáint"
+
+#: ../e-util/e-dateedit.c:626
+msgid "Drop-down combination box to select time"
+msgstr ""
+
+#: ../e-util/e-dateedit.c:627
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Time"
+msgstr "Am"
+
+#: ../e-util/e-dateedit.c:701
+msgid "No_w"
+msgstr "_Anois"
+
+#: ../e-util/e-dateedit.c:708
+msgid "_Today"
+msgstr "_Inniu"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. * is not permitted.
+#: ../e-util/e-dateedit.c:717
+msgid "_None"
+msgstr "_Neamhní"
+
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../e-util/e-dateedit.c:1813 ../e-util/e-dateedit.c:2061
+#, fuzzy
+msgctxt "date"
+msgid "None"
+msgstr "Neamhní"
+
+#: ../e-util/e-dateedit.c:1953
+msgid "Invalid Date Value"
+msgstr "Luach Dáta Neamhbhailí"
+
+#: ../e-util/e-dateedit.c:1998
+msgid "Invalid Time Value"
+msgstr "Luach Ama Neamhbhailí"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:258
 msgid "Tomorrow"
 msgstr "Amárach"
 
-#: ../e-util/e-datetime-format.c:219
+#: ../e-util/e-datetime-format.c:222
 msgid "Yesterday"
 msgstr "Inné"
 
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:227
+#: ../e-util/e-datetime-format.c:230
 #, fuzzy
 msgctxt "DateFmt"
 msgid "Next Mon"
@@ -7595,7 +10371,7 @@ msgstr "Samhail Téacs"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:233
+#: ../e-util/e-datetime-format.c:236
 #, fuzzy
 msgctxt "DateFmt"
 msgid "Next Tue"
@@ -7604,7 +10380,7 @@ msgstr "An Chéad _Snáithe Eile"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:239
+#: ../e-util/e-datetime-format.c:242
 #, fuzzy
 msgctxt "DateFmt"
 msgid "Next Wed"
@@ -7613,7 +10389,7 @@ msgstr "An Chéad _Snáithe Eile"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:245
+#: ../e-util/e-datetime-format.c:248
 #, fuzzy
 msgctxt "DateFmt"
 msgid "Next Thu"
@@ -7622,7 +10398,7 @@ msgstr "An Chéad _Snáithe Eile"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:251
+#: ../e-util/e-datetime-format.c:254
 #, fuzzy
 msgctxt "DateFmt"
 msgid "Next Fri"
@@ -7631,7 +10407,7 @@ msgstr "Ar Aghaidh"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:257
+#: ../e-util/e-datetime-format.c:260
 #, fuzzy
 msgctxt "DateFmt"
 msgid "Next Sat"
@@ -7640,206 +10416,41 @@ msgstr "Ar Aghaidh"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:263
+#: ../e-util/e-datetime-format.c:266
 #, fuzzy
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Ar Aghaidh"
 
-#: ../e-util/e-datetime-format.c:350 ../e-util/e-datetime-format.c:360
-#: ../e-util/e-datetime-format.c:369
+#: ../e-util/e-datetime-format.c:353 ../e-util/e-datetime-format.c:363
+#: ../e-util/e-datetime-format.c:372
 msgid "Use locale default"
 msgstr "Úsáid réamhshocrú an logchaighdeáin"
 
-#: ../e-util/e-datetime-format.c:574
+#: ../e-util/e-datetime-format.c:577
 msgid "Format:"
 msgstr "Formáid:"
 
-#: ../e-util/e-file-utils.c:151
+#: ../e-util/e-file-utils.c:121
 msgid "(Unknown Filename)"
 msgstr "(Ainm Comhaid Anaithnid)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:155
+#: ../e-util/e-file-utils.c:125
 #, fuzzy, c-format
 msgid "Writing \"%s\""
 msgstr "%s á phingiú"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:160
+#: ../e-util/e-file-utils.c:130
 #, fuzzy, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "`%s' á chóipeáil go `%s'"
 
-#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:388
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-msgid "weeks"
-msgstr "seachtain"
-
-#: ../e-util/e-print.c:161
-msgid "An error occurred while printing"
-msgstr "Tharla earráid agus á phriontáil"
-
-#: ../e-util/e-print.c:168
-msgid "The printing system reported the following details about the error:"
-msgstr ""
-
-#: ../e-util/e-print.c:174
-msgid ""
-"The printing system did not report any additional details about the error."
-msgstr ""
-
-#: ../e-util/e-signature.c:708
-msgid "Autogenerated"
-msgstr "Ginte go huathoibríoch"
-
-#: ../e-util/e-system.error.xml.h:1
-msgid "Because \"{1}\"."
-msgstr "Mar \"{1}\"."
-
-#: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file \"{0}\"."
-msgstr "Ní féidir comhad \"{0}\" a oscailt."
-
-#: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file \"{0}\"."
-msgstr "Ní féidir comhad \"{0}\" a shábháil."
-
-#: ../e-util/e-system.error.xml.h:4
-msgid "Do you wish to overwrite it?"
-msgstr "Ar mhaith leat é a fhorscríobh?"
-
-#: ../e-util/e-system.error.xml.h:5
-msgid "File exists \"{0}\"."
-msgstr "Tá an comhad \"{0}\" ann."
-
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
-msgid "_Overwrite"
-msgstr "_Forscríobh"
-
-#: ../e-util/e-util.c:117
-msgid "Could not open the link."
-msgstr "Níorbh fhéidir an nasc a oscailt."
-
-#: ../e-util/e-util.c:164
-msgid "Could not display help for Evolution."
-msgstr "Níorbh fhéidir cabhair d'Evolution a thaispeáint."
-
-#: ../e-util/gconf-bridge.c:1332
-#, c-format
-msgid "GConf error: %s"
-msgstr "Earráid GConf: %s"
-
-#: ../e-util/gconf-bridge.c:1343
-msgid "All further errors shown only on terminal."
-msgstr ""
-
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1060
-#: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:72
-msgid "From"
-msgstr "Ó"
-
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1061
-#: ../modules/mail/em-mailer-prefs.c:73
-msgid "Reply-To"
-msgstr "Freagra-Chuig"
-
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1063
-#: ../mail/em-format-html.c:2627 ../mail/em-format-html.c:2695
-#: ../mail/em-format-html.c:2718 ../modules/mail/em-mailer-prefs.c:75
-msgid "Cc"
-msgstr "Cc"
-
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1064
-#: ../mail/em-format-html.c:2628 ../mail/em-format-html.c:2699
-#: ../mail/em-format-html.c:2721 ../modules/mail/em-mailer-prefs.c:76
-msgid "Bcc"
-msgstr "Bcc"
-
-#: ../em-format/em-format-quote.c:464 ../em-format/em-format.c:1065
-#: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
-#: ../smime/lib/e-cert.c:1151
-msgid "Subject"
-msgstr "Ábhar"
-
-#. pseudo-header
-#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2820
-#: ../modules/mail/em-mailer-prefs.c:1028
-msgid "Mailer"
-msgstr "Seoltóir Ríomhphoist"
-
-#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1203
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Teachtaireacht Curtha ar Aghaidh --------"
-
-#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
-#: ../widgets/misc/e-dateedit.c:545
-msgid "Date"
-msgstr "Dáta"
-
-#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:79
-msgid "Newsgroups"
-msgstr "Grúpaí Nuachta"
-
-#: ../em-format/em-format.c:1068 ../modules/mail/em-mailer-prefs.c:80
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Aghaidh"
-
-#: ../em-format/em-format.c:1472
-#, c-format
-msgid "%s attachment"
-msgstr "iatán %s"
-
-#: ../em-format/em-format.c:1583
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr ""
-
-#: ../em-format/em-format.c:1777 ../em-format/em-format.c:2005
-msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
-
-#: ../em-format/em-format.c:1788
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: ../em-format/em-format.c:1808
-msgid "Could not parse PGP/MIME message"
-msgstr "Níorbh fhéidir teachtaireacht PGP/MIME a pharsáil"
-
-#: ../em-format/em-format.c:1809
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr ""
-
-#: ../em-format/em-format.c:2030
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Leasú na formáide comhaid gan tacaíocht."
-
-#: ../em-format/em-format.c:2043 ../em-format/em-format.c:2225
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Earráid agus an síniú á sheiceáil"
-
-#: ../em-format/em-format.c:2044 ../em-format/em-format.c:2210
-#: ../em-format/em-format.c:2226
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Earráid: Síniú gan deimhniú"
-
-#: ../em-format/em-format.c:2318
-#, fuzzy
-msgid "Could not parse PGP message: "
-msgstr "Níorbh fhéidir teachtaireacht PGP a pharsáil"
-
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../filter/e-filter-datespec.c:66
+#: ../e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -7849,7 +10460,7 @@ msgstr[2] "%d soicind ó shin"
 msgstr[3] "%d soicind ó shin"
 msgstr[4] "%d soicind ó shin"
 
-#: ../filter/e-filter-datespec.c:67
+#: ../e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -7859,7 +10470,7 @@ msgstr[2] "%d shoicind sa todhchaí"
 msgstr[3] "%d soicind sa todhchaí"
 msgstr[4] "%d soicind sa todhchaí"
 
-#: ../filter/e-filter-datespec.c:68
+#: ../e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -7869,7 +10480,7 @@ msgstr[2] "%d nóiméad ó shin"
 msgstr[3] "%d nóiméad ó shin"
 msgstr[4] "%d nóiméad ó shin"
 
-#: ../filter/e-filter-datespec.c:69
+#: ../e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -7879,7 +10490,7 @@ msgstr[2] "%d nóiméad sa todhchaí"
 msgstr[3] "%d nóiméad sa todhchaí"
 msgstr[4] "%d nóiméad sa todhchaí"
 
-#: ../filter/e-filter-datespec.c:70
+#: ../e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -7889,7 +10500,7 @@ msgstr[2] "%d uaire ó shin"
 msgstr[3] "%d n-uaire ó shin"
 msgstr[4] "%d uair ó shin"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -7899,7 +10510,7 @@ msgstr[2] "%d uaire sa todhchaí"
 msgstr[3] "%d n-uaire sa todhchaí"
 msgstr[4] "%d uair sa todhchaí"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -7909,7 +10520,7 @@ msgstr[2] "%d lá ó shin"
 msgstr[3] "%d lá ó shin"
 msgstr[4] "%d lá ó shin"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -7919,7 +10530,7 @@ msgstr[2] "%d lá sa todhchaí"
 msgstr[3] "%d lá sa todhchaí"
 msgstr[4] "%d lá sa todhchaí"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -7929,7 +10540,7 @@ msgstr[2] "%d sheachtain ó shin"
 msgstr[3] "%d seachtain ó shin"
 msgstr[4] "%d seachtain ó shin"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -7939,7 +10550,7 @@ msgstr[2] "%d sheachtain sa todhchaí"
 msgstr[3] "%d seachtain sa todhchaí"
 msgstr[4] "%d seachtain sa todhchaí"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -7949,7 +10560,7 @@ msgstr[2] "%d mhí ó shin"
 msgstr[3] "%d mí ó shin"
 msgstr[4] "%d mí ó shin"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../e-util/e-filter-datespec.c:78
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -7959,7 +10570,7 @@ msgstr[2] "%d mhí sa todhchaí"
 msgstr[3] "%d mí sa todhchaí"
 msgstr[4] "%d mí sa todhchaí"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../e-util/e-filter-datespec.c:79
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -7969,7 +10580,7 @@ msgstr[2] "%d bliana ó shin"
 msgstr[3] "%d mbliana ó shin"
 msgstr[4] "%d bliain ó shin"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../e-util/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -7979,441 +10590,1093 @@ msgstr[2] "%d bliana sa todhchaí"
 msgstr[3] "%d mbliana sa todhchaí"
 msgstr[4] "%d bliain sa todhchaí"
 
-#: ../filter/e-filter-datespec.c:129
+#: ../e-util/e-filter-datespec.c:130
 msgid "<click here to select a date>"
 msgstr "<cliceáil anseo chun dáta a roghnú>"
 
-#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
-#: ../filter/e-filter-datespec.c:154
+#: ../e-util/e-filter-datespec.c:133 ../e-util/e-filter-datespec.c:144
+#: ../e-util/e-filter-datespec.c:155
 msgid "now"
 msgstr "anois"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:139
+#: ../e-util/e-filter-datespec.c:140
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:286
+#: ../e-util/e-filter-datespec.c:289
 msgid "Select a time to compare against"
 msgstr ""
 
-#: ../filter/e-filter-file.c:190
+#: ../e-util/e-filter-file.c:187
 msgid "Choose a File"
 msgstr "Roghnaigh Comhad"
 
-#: ../filter/e-filter-rule.c:666
+#: ../e-util/e-filter-rule.c:743
 msgid "R_ule name:"
 msgstr "Ainm _rialach:"
 
-#: ../filter/e-filter-rule.c:696
-msgid "Find items that meet the following conditions"
-msgstr ""
-
-#: ../filter/e-filter-rule.c:721
+#: ../e-util/e-filter-rule.c:793
 #, fuzzy
-msgid "If all conditions are met"
-msgstr "Aisfhilleann sé TRUE más TRUE iad na hargóintí go léir."
+msgid "all the following conditions"
+msgstr "Cealaíodh an cruinniú seo"
 
-#: ../filter/e-filter-rule.c:722
+#: ../e-util/e-filter-rule.c:794
 #, fuzzy
-msgid "If any conditions are met"
-msgstr "Aisfhilleann sé TRUE más TRUE iad na hargóintí go léir."
+msgid "any of the following conditions"
+msgstr "Cumraigh na socruithe cuntais a leanas, le do thoil."
 
-#: ../filter/e-filter-rule.c:725
+#: ../e-util/e-filter-rule.c:800
 #, fuzzy
-msgid "_Find items:"
+msgid "_Find items which match:"
 msgstr "Míreanna Speisialta"
 
+#: ../e-util/e-filter-rule.c:823
+msgid "Find items that meet the following conditions"
+msgstr ""
+
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:754
+#. protocol:
+#. name:
+#: ../e-util/e-filter-rule.c:838 ../e-util/e-mail-signature-combo-box.c:369
+#: ../libemail-engine/camel-null-store.c:28
+#: ../mail/e-mail-config-summary-page.c:139
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
 msgid "None"
 msgstr "Neamhní"
 
-#: ../filter/e-filter-rule.c:755
+#: ../e-util/e-filter-rule.c:839
 #, fuzzy
 msgid "All related"
 msgstr "Gníomhartha gaolmhara:"
 
-#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
-msgid "Replies"
-msgstr "Freagraí"
-
-#: ../filter/e-filter-rule.c:757
+#: ../e-util/e-filter-rule.c:841
 #, fuzzy
 msgid "Replies and parents"
 msgstr "Ceadaítear plé agus freagraí"
 
-#: ../filter/e-filter-rule.c:758
+#: ../e-util/e-filter-rule.c:842
 #, fuzzy
 msgid "No reply or parent"
 msgstr "Níl;Tá;Máthairfhoirm"
 
-#: ../filter/e-filter-rule.c:761
+#: ../e-util/e-filter-rule.c:845
 #, fuzzy
 msgid "I_nclude threads:"
 msgstr "Sná&itheanna ar a dtugtar neamhaird"
 
-#: ../filter/e-filter-rule.c:786
+#: ../e-util/e-filter-rule.c:922
 #, fuzzy
 msgid "A_dd Condition"
 msgstr "Cuir _Gníomh Leis"
 
-#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:323
-msgid "Incoming"
-msgstr "Isteach"
-
-#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:324
+#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:241
 msgid "Outgoing"
 msgstr "Amach"
 
-#: ../filter/e-rule-editor.c:270
-msgid "Add Rule"
-msgstr "Cuir Riail Leis"
+#: ../e-util/e-import-assistant.c:256
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
 
-#: ../filter/e-rule-editor.c:359
-msgid "Edit Rule"
-msgstr "Cuir Riail in Eagar"
+#: ../e-util/e-import-assistant.c:283
+msgid "Select a file"
+msgstr "Roghnaigh comhad"
 
-#: ../filter/filter.error.xml.h:1
+#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+msgid "File _type:"
+msgstr "_Cineál comhaid:"
+
+#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:921
 #, fuzzy
-msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "GenericName=Eagarthóir Sloinn Ionadaíochta"
+msgid "Choose the destination for this import"
+msgstr "Roghnaigh am críochnaithe don imeacht seo"
 
-#: ../filter/filter.error.xml.h:2
-msgid "Could not compile regular expression &quot;{1}&quot;."
+#: ../e-util/e-import-assistant.c:365
+#, fuzzy
+msgid "Choose the type of importer to run:"
+msgstr "Roghnaigh cineál an mhéarchlár le cumrú."
+
+#: ../e-util/e-import-assistant.c:373
+msgid "Import data and settings from _older programs"
+msgstr "Iompórtáil sonraí agus socruithe ó fheidhmchláir níos _sine"
+
+#: ../e-util/e-import-assistant.c:381
+msgid "Import a _single file"
+msgstr "Iompórtáil comhad _aonair"
+
+#: ../e-util/e-import-assistant.c:403
+#: ../modules/startup-wizard/e-mail-config-import-page.c:202
+#, fuzzy
+msgid "Please select the information that you would like to import:"
+msgstr "Roghnaigh cineál an chomhaid a theastaíonn uait a iompórtáil:"
+
+#: ../e-util/e-import-assistant.c:533
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
 msgstr ""
 
-#: ../filter/filter.error.xml.h:3
+#: ../e-util/e-import-assistant.c:559
+#: ../modules/startup-wizard/e-mail-config-import-page.c:231
+#, c-format
+msgid "From %s:"
+msgstr "Ó %s:"
+
+#. Install a custom "Cancel Import" button.
+#: ../e-util/e-import-assistant.c:775
 #, fuzzy
-msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "<p>Níl an comhad <nobr>\"%1\"</nobr> ann, nó ní féidir é a léamh.</p>"
+msgid "_Cancel Import"
+msgstr "_Iompórtáil"
 
-#: ../filter/filter.error.xml.h:4
+#: ../e-util/e-import-assistant.c:920
 #, fuzzy
-msgid "Missing date."
-msgstr "Breithlá"
+msgid "Preview data to be imported"
+msgstr "Roghnaigh na míreanna atá le priontáil"
 
-#: ../filter/filter.error.xml.h:5
+#: ../e-util/e-import-assistant.c:926 ../e-util/e-import-assistant.c:939
+#: ../e-util/e-import-assistant.c:1292 ../e-util/e-import-assistant.c:1368
+#: ../e-util/e-import-assistant.c:1377
 #, fuzzy
-msgid "Missing file name."
-msgstr "Ainm comhaid ar iarraidh.\n"
+msgid "Import Data"
+msgstr "Tábhachtach"
+
+#: ../e-util/e-import-assistant.c:934
+msgid "Select what type of file you want to import from the list."
+msgstr ""
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
+#: ../e-util/e-import-assistant.c:1282 ../e-util/e-import-assistant.c:1317
 #, fuzzy
-msgid "Missing name."
-msgstr "Ainm ar lár"
+msgid "Evolution Import Assistant"
+msgstr "Iompórtáil Comhaid mbox (UNIX, Evolution)"
+
+#: ../e-util/e-import-assistant.c:1299 ../e-util/e-import-assistant.c:1355
+msgid "Import Location"
+msgstr "Iompórtáil Suíomh"
+
+#: ../e-util/e-import-assistant.c:1310
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+
+#: ../e-util/e-import-assistant.c:1327
+msgid "Importer Type"
+msgstr "Cineál Iompórtálaí"
 
-#: ../filter/filter.error.xml.h:7
+#: ../e-util/e-import-assistant.c:1337
+msgid "Select Information to Import"
+msgstr "Roghnaigh Eolas le hIompórtáil"
+
+#: ../e-util/e-import-assistant.c:1346
+msgid "Select a File"
+msgstr "Roghnaigh Comhad"
+
+#: ../e-util/e-import-assistant.c:1363
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr ""
+
+#: ../e-util/e-mail-signature-combo-box.c:378
+msgid "Autogenerated"
+msgstr "Ginte go huathoibríoch"
+
+#: ../e-util/e-mail-signature-editor.c:305
 #, fuzzy
-msgid "Name &quot;{0}&quot; already used."
-msgstr "Tá an t-ainm seo ann cheana."
+msgid "Close"
+msgstr "_Dún"
+
+#: ../e-util/e-mail-signature-editor.c:310
+msgid "_Save and Close"
+msgstr "_Sábháil agus Dún"
+
+#: ../e-util/e-mail-signature-editor.c:524
+msgid "Edit Signature"
+msgstr "Cuir Síniú in Eagar"
+
+#: ../e-util/e-mail-signature-editor.c:544
+msgid "_Signature Name:"
+msgstr "Ainm _Sínithe:"
+
+#: ../e-util/e-mail-signature-editor.c:590
+msgid "Unnamed"
+msgstr "Gan Ainm"
 
-#: ../filter/filter.error.xml.h:8
+#: ../e-util/e-mail-signature-manager.c:337
+msgid "Add _Script"
+msgstr "Cuir _Script Leis"
+
+#: ../e-util/e-mail-signature-manager.c:422
 #, fuzzy
-msgid "Please choose another name."
-msgstr "Roghnaigh ainm eile ar an riail"
+msgid "Add Signature Script"
+msgstr "Cuir script sínithe leis"
 
-#: ../filter/filter.error.xml.h:9
+#: ../e-util/e-mail-signature-manager.c:492
 #, fuzzy
-msgid "You must choose a date."
-msgstr "Roghnaigh dáta le hoscailt"
+msgid "Edit Signature Script"
+msgstr "Cuir Síniú in Eagar"
 
-#: ../filter/filter.error.xml.h:10
+#: ../e-util/e-mail-signature-script-dialog.c:395
 #, fuzzy
-msgid "You must name this filter."
-msgstr "Caithfidh tú ainm a chur ar an scagaire seo."
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"Iontráil ainm tuairisciúil don chuntas seo sa spás thíos, le do thoil. "
+"Úsáidfear an t-ainm seo le haghaidh taispeána amháin."
 
-#: ../filter/filter.error.xml.h:11
+#: ../e-util/e-mail-signature-script-dialog.c:446
 #, fuzzy
-msgid "You must specify a file name."
-msgstr "Is gá ainm comhaid ar a laghad a thabhairt."
+msgid "S_cript:"
+msgstr "_Script:"
+
+#: ../e-util/e-mail-signature-script-dialog.c:477
+msgid "Script file must be executable."
+msgstr ""
+
+#: ../e-util/e-map.c:886
+msgid "World Map"
+msgstr "Léarscáil an Domhain"
+
+#: ../e-util/e-map.c:889
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+
+#: ../e-util/e-misc-utils.c:242
+msgid "Could not open the link."
+msgstr "Níorbh fhéidir an nasc a oscailt."
+
+#: ../e-util/e-misc-utils.c:289
+msgid "Could not display help for Evolution."
+msgstr "Níorbh fhéidir cabhair d'Evolution a thaispeáint."
 
-#: ../filter/filter.ui.h:1
+#: ../e-util/e-name-selector-dialog.c:290
 #, fuzzy
-msgid "Compare against"
-msgstr "Bailíochtaigh i ndiaidh:"
+msgid "Show Contacts"
+msgstr "Teagmhálacha"
 
-#: ../filter/filter.ui.h:3
+#: ../e-util/e-name-selector-dialog.c:322
 #, fuzzy
-msgid "Show filters for mail:"
-msgstr "Seoladán Poist le haghaidh KPilot"
+msgid "Address B_ook:"
+msgstr "Leabhar Seoltaí"
 
-#: ../filter/filter.ui.h:4
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
+#: ../e-util/e-name-selector-dialog.c:329
+#, fuzzy
+msgid "Cat_egory:"
+msgstr "Catagóir"
+
+#: ../e-util/e-name-selector-dialog.c:353
+#, fuzzy
+msgid "_Search:"
+msgstr "Cuar_daigh"
+
+#: ../e-util/e-name-selector-dialog.c:379
+#: ../e-util/e-name-selector-dialog.c:1267
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:938
+msgid "Any Category"
+msgstr "Catagóir ar Bith"
+
+#: ../e-util/e-name-selector-dialog.c:381
+#, fuzzy
+msgid "Co_ntacts"
+msgstr "Teagmhálacha"
+
+#: ../e-util/e-name-selector-dialog.c:458
+#, fuzzy
+msgid "Search"
+msgstr "Cuar_daigh"
+
+#: ../e-util/e-name-selector-dialog.c:461
+#: ../mail/importers/pine-importer.c:426
+msgid "Address Book"
+msgstr "Leabhar Seoltaí"
+
+#: ../e-util/e-name-selector-dialog.c:464
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view.c:372
+msgid "Contacts"
+msgstr "Teagmhálacha"
+
+#: ../e-util/e-name-selector-dialog.c:589
+#, fuzzy
+msgid "Select Contacts from Address Book"
+msgstr "Roghnaigh Leabhar Seoltaí"
+
+#: ../e-util/e-name-selector-dialog.c:992
+msgid "_Remove"
+msgstr "B_ain"
+
+#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
+#: ../e-util/e-name-selector-entry.c:3028
+#, fuzzy, c-format
+msgid "E_xpand %s Inline"
+msgstr "Lea_thnaigh Gach Snáithe"
+
+#. Copy Contact Item
+#: ../e-util/e-name-selector-entry.c:3044
+#, c-format
+msgid "Cop_y %s"
 msgstr ""
 
-#: ../filter/filter.ui.h:6
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
+#. Cut Contact Item
+#: ../e-util/e-name-selector-entry.c:3055
+#, c-format
+msgid "C_ut %s"
 msgstr ""
 
-#: ../filter/filter.ui.h:8
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
+#. Edit Contact item
+#: ../e-util/e-name-selector-entry.c:3073
+#, fuzzy, c-format
+msgid "_Edit %s"
+msgstr "_Eagar"
+
+#: ../e-util/e-name-selector-list.c:583
+#, fuzzy, c-format
+msgid "_Delete %s"
+msgstr "Scr_ios"
+
+#: ../e-util/e-online-button.c:31
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"Tá Evolution ar líne faoi láthair.  Cliceáil ar an gcnaipe seo chun oibriú "
+"as líne."
+
+#: ../e-util/e-online-button.c:34
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"Tá Evolution as líne faoi láthair.  Cliceáil ar an gcnaipe seo chun oibriú "
+"ar líne."
+
+#: ../e-util/e-online-button.c:37
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr "Tá Evolution as líne faoi láthair mar níl an líonra ar fáil."
+
+#: ../e-util/e-passwords.c:127
+msgid "Keyring key is unusable: no user or host name"
 msgstr ""
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:194
+#: ../e-util/e-passwords.c:447
+msgid "You have the Caps Lock key on."
+msgstr ""
+
+#: ../e-util/e-passwords.c:578
 #, fuzzy
-msgid "_Filter Rules"
-msgstr "Rialacha Scagtha"
+msgid "_Remember this passphrase"
+msgstr "_Meabhraigh focal faire"
+
+#: ../e-util/e-passwords.c:579
+msgid "_Remember this passphrase for the remainder of this session"
+msgstr ""
 
-#: ../filter/filter.ui.h:12
+#: ../e-util/e-passwords.c:584
 #, fuzzy
-msgid "a time relative to the current time"
+msgid "_Remember this password"
+msgstr "_Meabhraigh focal faire"
+
+#: ../e-util/e-passwords.c:585
+msgid "_Remember this password for the remainder of this session"
 msgstr ""
-"an t-am reatha\n"
-"an t-am a shonraíonn tú\n"
-"am coibhneasta leis an am reatha"
 
-#: ../filter/filter.ui.h:13
+#: ../e-util/e-preferences-window.c:318
+msgid "Evolution Preferences"
+msgstr "Sainroghanna Evolution"
+
+#: ../e-util/e-print.c:161
+msgid "An error occurred while printing"
+msgstr "Tharla earráid agus á phriontáil"
+
+#: ../e-util/e-print.c:168
+msgid "The printing system reported the following details about the error:"
+msgstr ""
+
+#: ../e-util/e-print.c:174
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr ""
+
+#: ../e-util/e-rule-editor.c:185
+msgid "Add Rule"
+msgstr "Cuir Riail Leis"
+
+#: ../e-util/e-rule-editor.c:287
+msgid "Edit Rule"
+msgstr "Cuir Riail in Eagar"
+
+#: ../e-util/e-search-bar.c:81
+#, fuzzy, c-format
+msgid "Matches: %u"
+msgstr "Comhoiriúnaigh Gach Rud"
+
+#: ../e-util/e-search-bar.c:565
 #, fuzzy
-msgid "ago"
-msgstr "Clib"
+msgid "Close the find bar"
+msgstr "Dún an fhuinneog seo"
+
+#: ../e-util/e-search-bar.c:573
+msgid "Fin_d:"
+msgstr "Ai_msigh:"
 
-#: ../filter/filter.ui.h:16
+#: ../e-util/e-search-bar.c:585
 #, fuzzy
-msgid "in the future"
+msgid "Clear the search"
+msgstr "Cuardaigh i gcónaí"
+
+#: ../e-util/e-search-bar.c:609
+msgid "_Previous"
+msgstr "_Roimhe Seo"
+
+#: ../e-util/e-search-bar.c:615
+msgid "Find the previous occurrence of the phrase"
 msgstr ""
-"ó shin\n"
-"sa todhchaí"
 
-#: ../filter/filter.ui.h:18
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../e-util/e-search-bar.c:624
+msgid "_Next"
+msgstr "_Ar Aghaidh"
+
+#: ../e-util/e-search-bar.c:630
+msgid "Find the next occurrence of the phrase"
+msgstr ""
+
+#: ../e-util/e-search-bar.c:639
+msgid "Mat_ch case"
+msgstr "_Comhoiriúnaigh an cás"
+
+#: ../e-util/e-search-bar.c:667
+msgid "Reached bottom of page, continued from top"
+msgstr ""
+
+#: ../e-util/e-search-bar.c:689
+msgid "Reached top of page, continued from bottom"
+msgstr ""
+
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
+#: ../mail/importers/pine-importer.c:419
+#: ../modules/mail/e-mail-shell-view.c:1075
+msgid "Mail"
+msgstr "Post"
+
+#: ../e-util/e-send-options.c:570
+msgid "When de_leted:"
+msgstr ""
+
+#: ../e-util/e-source-config.c:679 ../e-util/e-source-config.c:683
+msgid "Type:"
+msgstr "Cineál:"
+
+#: ../e-util/e-source-config.c:691 ../e-util/e-source-config.c:695
+msgid "Name:"
+msgstr "Ainm:"
+
+#. Translators: This is the first of a sequence of widgets:
+#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
+#: ../e-util/e-source-config.c:1300
 #, fuzzy
-msgid "months"
-msgstr "Mí"
+msgid "Refresh every"
+msgstr "Athnuaigh an fillteán"
 
-#: ../filter/filter.ui.h:19
-msgid "seconds"
-msgstr "soicind"
+#: ../e-util/e-source-config.c:1330 ../e-util/e-source-config.c:1401
+#, fuzzy
+msgid "Use a secure connection"
+msgstr "Úsáid nasc daingean:"
 
-#: ../filter/filter.ui.h:20
+#: ../e-util/e-source-config.c:1425
 #, fuzzy
-msgid "the current time"
-msgstr "Sábháil an comhad reatha"
+msgid "Unset _trust for SSL certificate"
+msgstr "Iompórtáladh Teastas"
 
-#: ../filter/filter.ui.h:21
-msgid "the time you specify"
+#: ../e-util/e-source-config.c:1459
+#, fuzzy
+msgid "User"
+msgstr "_Ainm úsáideora:"
+
+#: ../e-util/e-source-selector-dialog.c:229
+#, fuzzy
+msgid "_Destination"
+msgstr "Sprioc-fhillteán:"
+
+#: ../e-util/e-source-selector-dialog.c:342
+#, fuzzy
+msgid "Select destination"
+msgstr "Roghnaigh sprioc-chomhad"
+
+#. no suggestions. Put something in the menu anyway...
+#: ../e-util/e-spell-entry.c:384
+#, fuzzy
+msgid "(no suggestions)"
+msgstr "Ábhar"
+
+#: ../e-util/e-spell-entry.c:408
+msgid "More..."
 msgstr ""
 
-#: ../filter/filter.ui.h:23
-msgid "years"
+#. + Add to Dictionary
+#: ../e-util/e-spell-entry.c:479
+#, c-format
+msgid "Add \"%s\" to Dictionary"
 msgstr ""
 
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
-msgctxt "mail-signature"
-msgid "None"
-msgstr "Neamhní"
+#. - Ignore All
+#: ../e-util/e-spell-entry.c:530
+#, fuzzy
+msgid "Ignore All"
+msgstr "Tabhair Neamhaird Air"
 
-#: ../mail/em-account-editor.c:946
-msgid "Never"
-msgstr "Riamh"
+#: ../e-util/e-spell-entry.c:558
+msgid "Spelling Suggestions"
+msgstr ""
 
-#: ../mail/em-account-editor.c:947
-msgid "Always"
-msgstr "I gCónaí"
+#: ../e-util/e-system.error.xml.h:1
+msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+msgstr ""
 
-#: ../mail/em-account-editor.c:948
-msgid "Ask for each message"
-msgstr "Fiafraigh díom do gach teachtaireacht"
+#: ../e-util/e-system.error.xml.h:2
+msgid ""
+"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+msgstr ""
 
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1833 ../widgets/misc/e-account-tree-view.c:265
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "Neamhní"
+#: ../e-util/e-system.error.xml.h:3
+#, fuzzy
+msgid "_Replace"
+msgstr "_Freagair"
 
-#: ../mail/em-account-editor.c:2237
-msgid "Fil_e:"
-msgstr ""
+#: ../e-util/e-system.error.xml.h:4
+msgid "Cannot save file \"{0}\"."
+msgstr "Ní féidir comhad \"{0}\" a shábháil."
 
-#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
-msgid "_Path:"
-msgstr "_Cosán:"
+#: ../e-util/e-system.error.xml.h:5
+msgid "Because \"{1}\"."
+msgstr "Mar \"{1}\"."
 
-#: ../mail/em-account-editor.c:2286
-msgid "Mail Configuration"
-msgstr "Socrú Post"
+#: ../e-util/e-system.error.xml.h:6
+msgid "Cannot open file \"{0}\"."
+msgstr "Ní féidir comhad \"{0}\" a oscailt."
+
+#: ../e-util/e-system.error.xml.h:7
+#, fuzzy
+msgid "Failed to remove data source &quot;{0}&quot;."
+msgstr "GenericName=Eagarthóir Sloinn Ionadaíochta"
+
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+#, fuzzy
+msgid "The reported error was &quot;{1}&quot;."
+msgstr "GenericName=Eagarthóir Sloinn Ionadaíochta"
+
+#: ../e-util/e-system.error.xml.h:9
+#, fuzzy
+msgid "Failed to update data source &quot;{0}&quot;."
+msgstr "GenericName=Eagarthóir Sloinn Ionadaíochta"
 
-#: ../mail/em-account-editor.c:2287
+#: ../e-util/e-system.error.xml.h:10
+#, fuzzy
+msgid "Failed to delete resource &quot;{0}&quot;."
+msgstr "GenericName=Eagarthóir Sloinn Ionadaíochta"
+
+#: ../e-util/e-system.error.xml.h:11
 msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Continue\" to begin."
+"The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
 msgstr ""
 
-#: ../mail/em-account-editor.c:2290
+#: ../e-util/e-system.error.xml.h:12
 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."
+"Some of your contacts may not be available until Evolution is restarted."
 msgstr ""
-"Iontráil d'ainm agus do sheoladh ríomhphoist thíos, le do thoil. Ní gá na "
-"réimsí \"roghnach\" thíos a chomhlánú, murar mhaith leat an t-eolas seo a "
-"chur i ríomhphoist a sheolann tú."
 
-#: ../mail/em-account-editor.c:2292 ../mail/em-account-editor.c:2484
-msgid "Receiving Email"
-msgstr "Fáil Ríomhphoist"
+#: ../e-util/e-system.error.xml.h:13
+msgid "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr ""
 
-#: ../mail/em-account-editor.c:2293
-msgid "Please configure the following account settings."
-msgstr "Cumraigh na socruithe cuntais a leanas, le do thoil."
+#: ../e-util/e-system.error.xml.h:14
+msgid ""
+"Some of your appointments may not be available until Evolution is restarted."
+msgstr ""
 
-#: ../mail/em-account-editor.c:2295 ../mail/em-account-editor.c:3081
-msgid "Sending Email"
-msgstr "Seoladh Ríomhphoist"
+#: ../e-util/e-system.error.xml.h:15
+msgid "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:16
+msgid "Some of your memos may not be available until Evolution is restarted."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:17
+msgid "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:18
+msgid "Some of your tasks may not be available until Evolution is restarted."
+msgstr ""
 
-#: ../mail/em-account-editor.c:2296
+#: ../e-util/e-system.error.xml.h:19
 msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
+"The address book backend servicing &quot;{0}&quot; encountered an error."
 msgstr ""
-"Iontráil eolas faoin slí ina sheolfaidh tú post, le do thoil. Mura bhfuil tú "
-"cinnte, fiafraigh do do riarthóir córais nó do do Sholáthraí Seirbhísí "
-"Idirlín."
 
-#: ../mail/em-account-editor.c:2298 ../mail/mail-config.ui.h:1
+#: ../e-util/e-system.error.xml.h:20
+msgid "The calendar backend servicing &quot;{0}&quot; encountered an error."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:21
+msgid "The memo list backend servicing &quot;{0}&quot; encountered an error."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:22
+msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
+msgstr ""
+
+#: ../e-util/e-table-click-to-add.c:680
+#: ../e-util/gal-a11y-e-table-click-to-add.c:62
+#: ../e-util/gal-a11y-e-table-click-to-add.c:143
+msgid "click to add"
+msgstr "cliceáil chun cur leis"
+
+#: ../e-util/e-table-column-selector.c:266
 #, fuzzy
-msgid "Account Information"
-msgstr "Gan Eolas"
+msgid "Move selected column names to top"
+msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
+
+#: ../e-util/e-table-column-selector.c:271
+#, fuzzy
+msgid "Move selected column names up one row"
+msgstr "Bog teagmhálacha roghnaithe go leabhar seoltaí eile"
+
+#: ../e-util/e-table-column-selector.c:276
+#, fuzzy
+msgid "Move selected column names down one row"
+msgstr "Bog teagmhálacha roghnaithe go leabhar seoltaí eile"
+
+#: ../e-util/e-table-column-selector.c:281
+#, fuzzy
+msgid "Move selected column names to bottom"
+msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
+
+#: ../e-util/e-table-column-selector.c:286
+#, fuzzy
+msgid "Select all column names"
+msgstr "Taispeáin gach rabhadh"
+
+#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+msgid "(Ascending)"
+msgstr "(Ag dul suas)"
 
-#: ../mail/em-account-editor.c:2299
+#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+msgid "(Descending)"
+msgstr "(Ag dul síos)"
+
+#: ../e-util/e-table-config.c:396
+msgid "Not sorted"
+msgstr "Gan sórtáil"
+
+#: ../e-util/e-table-config.c:441
+msgid "No grouping"
+msgstr "Gan grúpáil"
+
+#: ../e-util/e-table-config.c:546
+msgid "Show Fields"
+msgstr "Taispeáin Réimsí"
+
+#: ../e-util/e-table-config.c:562
 #, fuzzy
+msgid "Choose the order of information to appear in the message list."
+msgstr "Roghnaigh am críochnaithe don imeacht seo"
+
+#: ../e-util/e-table-field-chooser-dialog.c:227
+msgid "Add a Column"
+msgstr "Cuir Colún Leis"
+
+#: ../e-util/e-table-field-chooser.c:167
 msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
 msgstr ""
-"Iontráil ainm tuairisciúil don chuntas seo sa spás thíos, le do thoil. "
-"Úsáidfear an t-ainm seo le haghaidh taispeána amháin."
 
-#: ../mail/em-account-editor.c:2303
-msgid "Done"
-msgstr "Críochnaithe"
+#: ../e-util/e-table-group-container.c:369
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s: %s (%d mhír)"
+msgstr[1] "%s: %s (%d mhír)"
+msgstr[2] "%s: %s (%d mhír)"
+msgstr[3] "%s: %s (%d mír)"
+msgstr[4] "%s: %s (%d mír)"
+
+#: ../e-util/e-table-group-container.c:383
+#, c-format
+msgid "%s (%d item)"
+msgid_plural "%s (%d items)"
+msgstr[0] "%s (%d mhír)"
+msgstr[1] "%s (%d mhír)"
+msgstr[2] "%s (%d mhír)"
+msgstr[3] "%s (%d mír)"
+msgstr[4] "%s (%d mír)"
 
-#: ../mail/em-account-editor.c:2304
+#: ../e-util/e-table-header-item.c:1576
 #, fuzzy
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
+msgid "Customize Current View"
+msgstr "Féach ar an gcomhad reatha"
+
+#: ../e-util/e-table-header-item.c:1599
+#, fuzzy
+msgid "Sort _Ascending"
+msgstr "Sórtáil in ord Ardaitheach"
+
+#: ../e-util/e-table-header-item.c:1602
+#, fuzzy
+msgid "Sort _Descending"
+msgstr "Sórtáil in ord Íslitheach"
+
+#: ../e-util/e-table-header-item.c:1605
+msgid "_Unsort"
+msgstr "_Díshórtáil"
+
+#: ../e-util/e-table-header-item.c:1608
+#, fuzzy
+msgid "Group By This _Field"
+msgstr "&Seiceáil litriú an réimse seo"
+
+#: ../e-util/e-table-header-item.c:1611
+#, fuzzy
+msgid "Group By _Box"
+msgstr "Grúpáil de réir &Suímh"
+
+#: ../e-util/e-table-header-item.c:1615
+msgid "Remove This _Column"
+msgstr "Bain an Co_lún Seo"
+
+#: ../e-util/e-table-header-item.c:1618
+msgid "Add a C_olumn..."
+msgstr "Cuir C_olún Leis..."
+
+#: ../e-util/e-table-header-item.c:1622
+#, fuzzy
+msgid "A_lignment"
+msgstr "Ai&líniú..."
+
+#: ../e-util/e-table-header-item.c:1625
+#, fuzzy
+msgid "B_est Fit"
+msgstr "Laghdaigh go leithead leathanaigh"
+
+#: ../e-util/e-table-header-item.c:1628
+msgid "Format Column_s..."
+msgstr "Formáidigh Colúi_n..."
+
+#: ../e-util/e-table-header-item.c:1632
+#, fuzzy
+msgid "Custo_mize Current View..."
+msgstr "Dún an t-amharc reatha cáipéise"
+
+#: ../e-util/e-table-header-item.c:1703
+msgid "_Sort By"
+msgstr "_Sórtáil De Réir"
+
+#. Custom
+#: ../e-util/e-table-header-item.c:1726
+msgid "_Custom"
+msgstr "_Saincheaptha"
+
+#: ../e-util/e-text.c:2098
+msgid "Select All"
+msgstr "Roghnaigh Gach Rud"
+
+#: ../e-util/e-text.c:2111
+msgid "Input Methods"
+msgstr "Modhanna Ionchurtha"
+
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../e-util/e-timezone-dialog.c:207 ../e-util/e-timezone-dialog.c:429
+#: ../e-util/e-timezone-dialog.c:433 ../e-util/e-timezone-dialog.c:437
+#: ../e-util/e-timezone-dialog.c:803
+msgid "UTC"
+msgstr "AUL"
+
+#: ../e-util/e-url-entry.c:109
+#, fuzzy
+msgid "Click here to open the URL"
+msgstr "Cliceáil chun %s a oscailt"
+
+#: ../e-util/e-url-entry.c:111
+#, fuzzy
+msgid "Enter a URL here"
+msgstr "Iontráil Frása Faire:"
+
+#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:285
+msgid "_Copy Link Location"
+msgstr "_Cóipeáil Suíomh an Naisc"
+
+#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:287
+#, fuzzy
+msgid "Copy the link to the clipboard"
+msgstr "Cóipeáil rudaí go dtí an gearrthaisce."
+
+#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:295
+msgid "_Open Link in Browser"
+msgstr "_Oscail Nasc i mBrabhsálaí"
+
+#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:297
+#, fuzzy
+msgid "Open the link in a web browser"
+msgstr "_Oscail Nasc i mBrabhsálaí"
+
+#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:305
+#, fuzzy
+msgid "_Copy Email Address"
+msgstr "Cóipeáil _Seoladh Ríomhphoist"
+
+#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:322
+#, fuzzy
+msgid "_Copy Image"
+msgstr "_Gan íomhá"
+
+#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:324
+#, fuzzy
+msgid "Copy the image to the clipboard"
+msgstr "Cóipeáil rudaí go dtí an gearrthaisce."
+
+#: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1308
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1261
+#, fuzzy
+msgid "Select all text and images"
+msgstr "Comment=Taispeáin Teachtaireacht Téacs i bPreabfhuinneog"
+
+#: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
+#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:936
+#: ../e-util/e-web-view.c:938 ../e-util/e-web-view.c:940
+#, fuzzy, c-format
+msgid "Click to call %s"
+msgstr "Theip ar ghlao '%s': %s\n"
+
+#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:942
+#, fuzzy
+msgid "Click to hide/unhide addresses"
+msgstr "Cliceáil chun féilire an mhíosa a fholú"
+
+#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:944
+#, c-format
+msgid "Click to open %s"
+msgstr "Cliceáil chun %s a oscailt"
+
+#: ../e-util/e-web-view.c:329
+#, fuzzy
+msgid "Save _Image..."
+msgstr "Sábháil mar..."
+
+#: ../e-util/e-web-view.c:331
+#, fuzzy
+msgid "Save the image to a file"
+msgstr "Sábháil an comhad reatha"
+
+#: ../e-util/e-web-view.c:2832
+#, fuzzy
+msgid "Copying image to clipboard"
+msgstr "Cóipeáil rudaí go dtí an gearrthaisce."
+
+#: ../e-util/e-web-view.c:3020
+#, fuzzy
+msgid "Save Image"
+msgstr "Sábháil Teachtaireacht..."
+
+#: ../e-util/e-web-view.c:3056
+#, fuzzy, c-format
+msgid "Saving image to '%s'"
+msgstr "Teachtaireachtaí á mbogadh go %s"
+
+#: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../e-util/ea-calendar-item.c:327
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Féilire: ó %s go %s"
+
+#: ../e-util/ea-calendar-item.c:364
+msgid "evolution calendar item"
 msgstr ""
-"Comhghairdeas, tá do chumraíocht phoist críochnaithe.\n"
-"\n"
-"Anois tá tú réidh le ríomhphost a sheoladh agus a fháil \n"
-"le Evolution.\n"
-"\n"
-"Cliceáil \"Cuir i bhFeidhm\" chun do chuid socruithe a shábháil."
 
-#: ../mail/em-account-editor.c:2843
-msgid "Check for _new messages every"
-msgstr "Lorg teachtaireachtaí _nua gach"
+#: ../e-util/evolution-source-viewer.c:635
+#, fuzzy
+msgid "Evolution Source Viewer"
+msgstr "Iompórtálaí Pine Evolution"
 
-#: ../mail/em-account-editor.c:2851
-msgid "minu_tes"
-msgstr "nói_méad"
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:665
+#, fuzzy
+msgid "Display Name"
+msgstr "Taispeáin"
 
-#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
-msgid "Security"
-msgstr "Slándáil"
+#: ../e-util/evolution-source-viewer.c:674
+#, fuzzy
+msgid "Flags"
+msgstr "_Bratach:"
 
-#. 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:3575 ../mail/em-account-editor.c:3658
-msgid "Receiving Options"
-msgstr "Roghanna Fála"
+#: ../e-util/evolution-source-viewer.c:726
+#: ../mail/e-mail-config-identity-page.c:677
+msgid "Identity"
+msgstr "Aitheantas"
 
-#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
-msgid "Checking for New Messages"
-msgstr "Lorg Teachtaireachtaí Nua"
+#: ../e-util/filter.error.xml.h:1
+#, fuzzy
+msgid "Missing date."
+msgstr "Breithlá"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1416 ../mail/mail-config.ui.h:14
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
-#: ../widgets/misc/e-attachment-paned.c:133
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Iatán"
-msgstr[1] "Iatáin"
-msgstr[2] "Iatáin"
-msgstr[3] "Iatáin"
-msgstr[4] "Iatáin"
+#: ../e-util/filter.error.xml.h:2
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Roghnaigh dáta le hoscailt"
 
-#: ../mail/e-mail-attachment-bar.c:608
-#: ../widgets/misc/e-attachment-paned.c:623
-msgid "Icon View"
-msgstr "Amharc Deilbhín"
+#: ../e-util/filter.error.xml.h:3
+#, fuzzy
+msgid "Missing filename."
+msgstr "Ainm comhaid ar iarraidh.\n"
 
-#: ../mail/e-mail-attachment-bar.c:610
-#: ../widgets/misc/e-attachment-paned.c:625
-msgid "List View"
-msgstr "Amharc Liosta"
+#: ../e-util/filter.error.xml.h:4
+#, fuzzy
+msgid "You must specify a filename."
+msgstr "Is gá ainm comhaid ar a laghad a thabhairt."
 
-#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
-#: ../shell/e-shell-window-actions.c:1434
-#: ../shell/e-shell-window-actions.c:1441
-msgid "Close this window"
-msgstr "Dún an fhuinneog seo"
+#: ../e-util/filter.error.xml.h:5
+#, fuzzy
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "<p>Níl an comhad <nobr>\"%1\"</nobr> ann, nó ní féidir é a léamh.</p>"
 
-#: ../mail/e-mail-browser.c:293
+#: ../e-util/filter.error.xml.h:6
 #, fuzzy
-msgid "(No Subject)"
-msgstr "Ábhar"
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "GenericName=Eagarthóir Sloinn Ionadaíochta"
+
+#: ../e-util/filter.error.xml.h:7
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr ""
 
-#: ../mail/e-mail-display.c:66
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
 #, fuzzy
-msgid "_Add to Address Book..."
-msgstr "_Cuir leis an Leabhar Seoltaí"
+msgid "Missing name."
+msgstr "Ainm ar lár"
 
-#: ../mail/e-mail-display.c:73
+#: ../e-util/filter.error.xml.h:9
 #, fuzzy
-msgid "_To This Address"
-msgstr "Chuig an S_eoladh Seo"
+msgid "You must name this filter."
+msgstr "Caithfidh tú ainm a chur ar an scagaire seo."
 
-#: ../mail/e-mail-display.c:80
+#: ../e-util/filter.error.xml.h:10
 #, fuzzy
-msgid "_From This Address"
-msgstr "Ón _Seoladh Seo"
+msgid "Name &quot;{0}&quot; already used."
+msgstr "Tá an t-ainm seo ann cheana."
 
-#: ../mail/e-mail-display.c:87
+#: ../e-util/filter.error.xml.h:11
 #, fuzzy
-msgid "Send _Reply To..."
-msgstr "_Seol Chuig..."
+msgid "Please choose another name."
+msgstr "Roghnaigh ainm eile ar an riail"
+
+#. Translators: description of a "popup" action
+#: ../e-util/gal-a11y-e-cell-popup.c:128
+msgid "popup a child"
+msgstr ""
 
-#: ../mail/e-mail-display.c:89
+#. Translators: description of a "toggle" action
+#: ../e-util/gal-a11y-e-cell-toggle.c:180
+msgid "toggle the cell"
+msgstr ""
+
+#. Translators: description of an "expand" action
+#: ../e-util/gal-a11y-e-cell-tree.c:215
+msgid "expands the row in the ETree containing this cell"
+msgstr ""
+
+#. Translators: description of a "collapse" action
+#: ../e-util/gal-a11y-e-cell-tree.c:223
+msgid "collapses the row in the ETree containing this cell"
+msgstr ""
+
+#: ../e-util/gal-a11y-e-cell.c:123
+msgid "Table Cell"
+msgstr ""
+
+#: ../e-util/gal-a11y-e-table-click-to-add.c:72
+msgid "click"
+msgstr "cliceáil"
+
+#: ../e-util/gal-a11y-e-table-column-header.c:163
+msgid "sort"
+msgstr "sórtáil"
+
+#: ../e-util/gal-view-instance-save-as-dialog.c:296
+msgid "Save Current View"
+msgstr "Sábháil Amharc Reatha"
+
+#: ../e-util/widgets.error.xml.h:1
+msgid "Do you wish to save your changes?"
+msgstr "Ar mhaith leat do chuid athruithe a shábháil?"
+
+#: ../e-util/widgets.error.xml.h:2
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+
+#: ../e-util/widgets.error.xml.h:3
+msgid "_Discard changes"
+msgstr "Cuir athruithe i _leataobh"
+
+#: ../e-util/widgets.error.xml.h:4
+msgid "Blank Signature"
+msgstr "Bánaigh Síniú"
+
+#: ../e-util/widgets.error.xml.h:5
+msgid "Please provide an unique name to identify this signature."
+msgstr ""
+
+#: ../e-util/widgets.error.xml.h:6
 #, fuzzy
-msgid "Send a reply message to this address"
-msgstr "Post an sceál seo"
+msgid "Unable to copy image to clipboard."
+msgstr "Cóipeáil rudaí go dtí an gearrthaisce."
 
-#: ../mail/e-mail-display.c:96
+#: ../e-util/widgets.error.xml.h:7
 #, fuzzy
-msgid "Create Search _Folder"
-msgstr "Ní féidir an fillteán %1 a chruthú."
+msgid "Unable to save image."
+msgstr "Ní féidir {0} a shábháil."
 
-#: ../mail/e-mail-folder-utils.c:111
+#: ../e-util/widgets.error.xml.h:8
+#, fuzzy
+msgid "Could not load signature."
+msgstr "Níorbh fhéidir comhad cumraíochta X a shábháil"
+
+#: ../e-util/widgets.error.xml.h:9
+#, fuzzy
+msgid "Could not save signature."
+msgstr "Níorbh fhéidir comhad cumraíochta X a shábháil"
+
+#: ../libemail-engine/camel-sasl-xoauth2.c:27
+msgid "OAuth2"
+msgstr ""
+
+#: ../libemail-engine/camel-sasl-xoauth2.c:28
+msgid "This option will use an OAuth 2.0 access token to connect to the server"
+msgstr ""
+
+#: ../libemail-engine/e-mail-authenticator.c:182
+#, fuzzy, c-format
+msgid "Invalid authentication result code (%d)"
+msgstr "Name=Fíordheimhniú"
+
+#: ../libemail-engine/e-mail-folder-utils.c:114
 #, fuzzy, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Teachtaireacht á sábháil go fillteán"
 
-#: ../mail/e-mail-folder-utils.c:274
+#: ../libemail-engine/e-mail-folder-utils.c:572
 msgid "Forwarded messages"
 msgstr "Teachtaireachtaí curtha ar aghaidh"
 
-#: ../mail/e-mail-folder-utils.c:391
-#, fuzzy
-msgid "Scanning messages for duplicates"
-msgstr "Teachtaireacht á sábháil go fillteán"
-
-#: ../mail/e-mail-folder-utils.c:584
+#: ../libemail-engine/e-mail-folder-utils.c:682
+#: ../libemail-engine/e-mail-folder-utils.c:933
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -8423,27 +11686,32 @@ msgstr[2] "%d theachtaireacht á bhfáil"
 msgstr[3] "%d dteachtaireacht á bhfáil"
 msgstr[4] "%d teachtaireacht á bhfáil"
 
-#: ../mail/e-mail-folder-utils.c:834
+#: ../libemail-engine/e-mail-folder-utils.c:776
+#, fuzzy
+msgid "Scanning messages for duplicates"
+msgstr "Teachtaireacht á sábháil go fillteán"
+
+#: ../libemail-engine/e-mail-folder-utils.c:1184
 #, fuzzy, c-format
 msgid "Removing folder '%s'"
 msgstr "Fillteán %s á bhaint"
 
-#: ../mail/e-mail-folder-utils.c:968
+#: ../libemail-engine/e-mail-folder-utils.c:1321
 #, fuzzy, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Baineadh gach cuntas."
 
-#: ../mail/e-mail-folder-utils.c:972
+#: ../libemail-engine/e-mail-folder-utils.c:1325
 #, fuzzy
 msgid "File has been removed."
 msgstr "Baineadh gach cuntas."
 
-#: ../mail/e-mail-folder-utils.c:1031
+#: ../libemail-engine/e-mail-folder-utils.c:1384
 #, fuzzy
 msgid "Removing attachments"
 msgstr "Iatán á shábháil"
 
-#: ../mail/e-mail-folder-utils.c:1195
+#: ../libemail-engine/e-mail-folder-utils.c:1548
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -8453,813 +11721,1452 @@ msgstr[2] "%d theachtaireacht á sábháil"
 msgstr[3] "%d dteachtaireacht á sábháil"
 msgstr[4] "%d teachtaireacht á sábháil"
 
-#: ../mail/e-mail-folder-utils.c:1539 ../mail/em-folder-utils.c:628
+#: ../libemail-engine/e-mail-folder-utils.c:1926 ../mail/em-folder-utils.c:638
 #, fuzzy, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Fillteán neamhbhailí: `%s'"
 
+#: ../libemail-engine/e-mail-session-utils.c:540
+#, fuzzy
+msgid "No mail transport service available"
+msgstr "Gan achoimre le fáil."
+
+#: ../libemail-engine/e-mail-session-utils.c:638
+#: ../libemail-engine/mail-ops.c:730
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr ""
+
+#: ../libemail-engine/e-mail-session-utils.c:685
+#: ../libemail-engine/mail-ops.c:774
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+
+#: ../libemail-engine/e-mail-session-utils.c:711
+#: ../libemail-engine/mail-ops.c:798
+#, fuzzy, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Comhad féilire le luchtú"
+
+#: ../libemail-engine/e-mail-session-utils.c:912
+#: ../libemail-engine/mail-ops.c:929 ../libemail-engine/mail-ops.c:1031
+msgid "Sending message"
+msgstr "Teachtaireacht á seoladh"
+
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:342
+#: ../mail/em-folder-tree-model.c:786
+#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../modules/mail/e-mail-shell-view-private.c:1087
+msgid "Inbox"
+msgstr "Bosca Isteach"
+
+#. E_MAIL_LOCAL_FOLDER_INBOX
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:779
+#: ../modules/mail/e-mail-shell-view-private.c:1074
+msgid "Drafts"
+msgstr "Dréachtaí"
+
+#. E_MAIL_LOCAL_FOLDER_DRAFTS
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:790
+#: ../modules/mail/e-mail-shell-view-private.c:1078
+msgid "Outbox"
+msgstr "Bosca Amach"
+
+#. E_MAIL_LOCAL_FOLDER_OUTBOX
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:794
+#: ../modules/mail/e-mail-shell-view-private.c:1080
+msgid "Sent"
+msgstr "Seolta"
+
+#. E_MAIL_LOCAL_FOLDER_SENT
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:782
+#: ../modules/mail/e-mail-shell-view-private.c:1082
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#: ../plugins/templates/templates.c:1082 ../plugins/templates/templates.c:1381
+#: ../plugins/templates/templates.c:1391
+msgid "Templates"
+msgstr "Teimpléid"
+
+#: ../libemail-engine/e-mail-session.c:1344
+#, fuzzy, c-format
+msgid "User cancelled operation"
+msgstr "Chealaigh an t-úsáideoir an oibríocht."
+
+#: ../libemail-engine/e-mail-session.c:1534
+#, fuzzy, c-format
+msgid "%s authentication failed"
+msgstr "Úsáid Fío_rdheimhniú"
+
+#: ../libemail-engine/e-mail-session.c:1584
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr ""
+
+#: ../libemail-engine/e-mail-session.c:1647
+#, c-format
+msgid ""
+"No destination address provided, forwarding of the message has been "
+"cancelled."
+msgstr ""
+
+#: ../libemail-engine/e-mail-session.c:1660
+#, c-format
+msgid "No identity found to use, forwarding of the message has been cancelled."
+msgstr ""
+
+#: ../libemail-engine/e-mail-store-utils.c:190
+#, fuzzy, c-format
+msgid "Disconnecting from '%s'"
+msgstr "Ag dínasc ó %s"
+
+#: ../libemail-engine/e-mail-store-utils.c:279
+#, fuzzy, c-format
+msgid "Reconnecting to '%s'"
+msgstr "Ag athnasc le %s"
+
+#: ../libemail-engine/e-mail-store-utils.c:370
+#, fuzzy, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Míreanna le húsáid as líne"
+
+#: ../libemail-engine/mail-folder-cache.c:1240
+#, c-format
+msgid "Pinging %s"
+msgstr "%s á phingiú"
+
+#: ../libemail-engine/mail-ops.c:94
+#, fuzzy
+msgid "Filtering Selected Messages"
+msgstr "&Scrios Teachtaireachtaí Roghnaithe"
+
+#: ../libemail-engine/mail-ops.c:152
+#, c-format
+msgid ""
+"Failed to filter selected messages. One reason can be that folder location "
+"set in one or more filters is invalid. Please check your filters in Edit-"
+">Message Filters.\n"
+"Original error was: %s"
+msgstr ""
+
+#: ../libemail-engine/mail-ops.c:233
+#, fuzzy, c-format
+msgid "Fetching mail from '%s'"
+msgstr "&Seol Ríomhphost Go..."
+
+#: ../libemail-engine/mail-ops.c:724
+#, c-format
+msgid ""
+"Failed to apply outgoing filters. One reason can be that folder location set "
+"in one or more filters is invalid. Please check your filters in Edit-"
+">Message Filters.\n"
+"Original error was: %s"
+msgstr ""
+
+#: ../libemail-engine/mail-ops.c:940
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "Teachtaireacht %d as %d á seoladh"
+
+#: ../libemail-engine/mail-ops.c:992
+#, fuzzy, c-format
+msgid "Failed to send a message"
+msgid_plural "Failed to send %d of %d messages"
+msgstr[0] "Theip ar sheoladh %d as %d teachtaireacht"
+msgstr[1] "Theip ar sheoladh %d as %d teachtaireacht"
+msgstr[2] "Theip ar sheoladh %d as %d teachtaireacht"
+msgstr[3] "Theip ar sheoladh %d as %d teachtaireacht"
+msgstr[4] "Theip ar sheoladh %d as %d teachtaireacht"
+
+#: ../libemail-engine/mail-ops.c:998
+msgid "Canceled."
+msgstr "Cealaithe."
+
+#: ../libemail-engine/mail-ops.c:1000
+msgid "Complete."
+msgstr "Críochnaithe."
+
+#: ../libemail-engine/mail-ops.c:1112
+#, fuzzy, c-format
+msgid "Moving messages to '%s'"
+msgstr "Teachtaireachtaí á mbogadh go %s"
+
+#: ../libemail-engine/mail-ops.c:1113
+#, fuzzy, c-format
+msgid "Copying messages to '%s'"
+msgstr "Teachtaireachtaí á gcóipeáil go %s"
+
+#: ../libemail-engine/mail-ops.c:1232
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "Fillteán '%s' á stóráil"
+
+#: ../libemail-engine/mail-ops.c:1360
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr ""
+
+#: ../libemail-engine/mail-ops.c:1361
+#, c-format
+msgid "Storing account '%s'"
+msgstr "Cuntas '%s' á stóráil"
+
+#: ../libemail-engine/mail-ops.c:1435
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr "Bruscar i '%s' á fholmhú"
+
+#: ../libemail-engine/mail-tools.c:71
+#, fuzzy, c-format
+msgid "Could not create spool directory '%s': %s"
+msgstr "Níl an chomhadlann (%1) ann. Cruthaigh?"
+
+#: ../libemail-engine/mail-tools.c:111
+#, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr ""
+
+#: ../libemail-engine/mail-tools.c:229
+#, fuzzy, c-format
+msgid "Forwarded message - %s"
+msgstr "Teachtaireacht Curtha Ar Aghaidh"
+
+#: ../libemail-engine/mail-tools.c:231
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Teachtaireacht Curtha Ar Aghaidh"
+
+#: ../libemail-engine/mail-vfolder.c:153
+#, fuzzy, c-format
+msgid "Setting up Search Folder: %s"
+msgstr "cuardaigh sa bhfillteán sonraithe"
+
+#: ../libemail-engine/mail-vfolder.c:306
+#, fuzzy, c-format
+msgid "Updating Search Folders for '%s' - %s"
+msgstr "_Brabhsáil le fillteáin eile"
+
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * removed folder. For more than one search folder is
+#. * each of them on a separate line, with four spaces
+#. * in front of its name, without quotes.
+#: ../libemail-engine/mail-vfolder.c:670
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../mail/e-mail-account-manager.c:116 ../mail/e-mail-account-manager.c:203
+#, fuzzy
+msgid "Open _Online Accounts"
+msgstr "nGach Cuntas"
+
+#: ../mail/e-mail-account-manager.c:142 ../mail/e-mail-account-manager.c:229
+msgid "This account was created through the Online Accounts service."
+msgstr ""
+
+#: ../mail/e-mail-account-manager.c:690
+#, fuzzy
+msgid "_Restore Default"
+msgstr "Úsáid _Réamhshocrú"
+
+#: ../mail/e-mail-account-manager.c:703
+msgid "You can drag and drop account names to reorder them."
+msgstr ""
+
+#: ../mail/e-mail-account-manager.c:746
+msgid "De_fault"
+msgstr "_Réamhshocrú"
+
+#: ../mail/e-mail-account-tree-view.c:85
+#: ../modules/mail/em-composer-prefs.c:443
+#: ../modules/plugin-manager/evolution-plugin-manager.c:359
+#: ../plugins/publish-calendar/publish-calendar.c:875
+msgid "Enabled"
+msgstr "Cumasaithe"
+
+#: ../mail/e-mail-account-tree-view.c:109
+msgid "Account Name"
+msgstr "Ainm Cuntais"
+
+#: ../mail/e-mail-account-tree-view.c:136
+#: ../mail/e-mail-config-security-page.c:333
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3532
+#: ../mail/mail-config.ui.h:49
+msgid "Default"
+msgstr "Réamhshocrú"
+
+#: ../mail/e-mail-autoconfig.c:578
+#, fuzzy
+msgid "No email address provided"
+msgstr "_Seoladh Ríomhphoist:"
+
+#: ../mail/e-mail-autoconfig.c:587
+#, fuzzy
+msgid "Missing domain in email address"
+msgstr "_Seoladh Ríomhphoist:"
+
+#: ../mail/e-mail-backend.c:737
+msgid "Unknown background operation"
+msgstr ""
+
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:860
+#: ../shell/e-shell-window-actions.c:867 ../shell/e-shell-window-actions.c:874
+msgid "Close this window"
+msgstr "Dún an fhuinneog seo"
+
+#: ../mail/e-mail-browser.c:286
+#, fuzzy
+msgid "(No Subject)"
+msgstr "Ábhar"
+
+#. GtkAssistant sinks the floating button reference.
+#: ../mail/e-mail-config-assistant.c:102
+msgid "_Skip Lookup"
+msgstr ""
+
+#: ../mail/e-mail-config-assistant.c:562
+msgid "Evolution Account Assistant"
+msgstr "Cúntóir Cuntais Evolution"
+
+#: ../mail/e-mail-config-auth-check.c:352
+#, fuzzy
+msgid "Check for Supported Types"
+msgstr "_Lorg Cineáil Tacaithe"
+
+#: ../mail/e-mail-config-confirm-page.c:157
+#, fuzzy
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Comhghairdeas, tá do chumraíocht phoist críochnaithe.\n"
+"\n"
+"Anois tá tú réidh le ríomhphost a sheoladh agus a fháil \n"
+"le Evolution.\n"
+"\n"
+"Cliceáil \"Cuir i bhFeidhm\" chun do chuid socruithe a shábháil."
+
+#: ../mail/e-mail-config-confirm-page.c:169
+msgid "Done"
+msgstr "Críochnaithe"
+
+#: ../mail/e-mail-config-defaults-page.c:552
+msgid "Special Folders"
+msgstr "Fillteáin Speisialta"
+
+#: ../mail/e-mail-config-defaults-page.c:561
+#, fuzzy
+msgid "Draft Messages _Folder:"
+msgstr "Fillteán _Teachtaireachtaí Seolta:"
+
+#: ../mail/e-mail-config-defaults-page.c:571
+msgid "Choose a folder for saving draft messages."
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:585
+msgid "Sent _Messages Folder:"
+msgstr "Fillteán _Teachtaireachtaí Seolta:"
+
+#: ../mail/e-mail-config-defaults-page.c:595
+msgid "Choose a folder for saving sent messages."
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:614
+msgid "S_ave replies in the folder of the message being replied to"
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:631
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Ú_sáid réamhshocruithe an chórais"
+
+#: ../mail/e-mail-config-defaults-page.c:645
+msgid "Use a Real Folder for _Trash:"
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:646
+#, fuzzy
+msgid "Choose a folder for deleted messages."
+msgstr "Níorbh fhéidir teachtaireacht a chruthú."
+
+#: ../mail/e-mail-config-defaults-page.c:655
+msgid "Use a Real Folder for _Junk:"
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:656
+#, fuzzy
+msgid "Choose a folder for junk messages."
+msgstr "Roghnaigh comhad le hathchóiriú"
+
+#: ../mail/e-mail-config-defaults-page.c:673
+msgid "Composing Messages"
+msgstr "Cumadh Teachtaireachtaí"
+
+#: ../mail/e-mail-config-defaults-page.c:682
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Déan cóip charbóin (_cc) i gcónaí go:"
+
+#: ../mail/e-mail-config-defaults-page.c:707
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Déan cóip charbóin folaithe (_bcc) i gcónaí go:"
+
+#: ../mail/e-mail-config-defaults-page.c:742
+msgid "Message Receipts"
+msgstr "Admhálacha Teachtaireachta"
+
+#: ../mail/e-mail-config-defaults-page.c:751
+msgid "S_end message receipts:"
+msgstr "_Seol admhálacha teachtaireachta:"
+
+#: ../mail/e-mail-config-defaults-page.c:776
+msgid "Never"
+msgstr "Riamh"
+
+#: ../mail/e-mail-config-defaults-page.c:782
+msgid "Always"
+msgstr "I gCónaí"
+
+#: ../mail/e-mail-config-defaults-page.c:788
+msgid "Ask for each message"
+msgstr "Fiafraigh díom do gach teachtaireacht"
+
+#: ../mail/e-mail-config-defaults-page.c:859
+msgid "Defaults"
+msgstr "Réamhshocruithe"
+
+#: ../mail/e-mail-config-identity-page.c:266
+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 ""
+"Iontráil d'ainm agus do sheoladh ríomhphoist thíos, le do thoil. Ní gá na "
+"réimsí \"roghnach\" thíos a chomhlánú, murar mhaith leat an t-eolas seo a "
+"chur i ríomhphoist a sheolann tú."
+
+#: ../mail/e-mail-config-identity-page.c:294
+#: ../mail/e-mail-config-summary-page.c:324
+#, fuzzy
+msgid "Account Information"
+msgstr "Gan Eolas"
+
+#: ../mail/e-mail-config-identity-page.c:303
+#: ../mail/e-mail-config-summary-page.c:333
+#, fuzzy
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example, \"Work\" or \"Personal\"."
+msgstr ""
+"Clóscríobh an t-ainm lenar mhaith leat an cuntas seo a chur i leith.\n"
+"Mar shampla: \"Obair\" nó \"Pearsanta\""
+
+#: ../mail/e-mail-config-identity-page.c:348
+#, fuzzy
+msgid "Required Information"
+msgstr "Eolas faoin bhFreastalaí"
+
+#: ../mail/e-mail-config-identity-page.c:357
+msgid "Full Nam_e:"
+msgstr "_Ainm Iomlán:"
+
+#: ../mail/e-mail-config-identity-page.c:384
+msgid "Email _Address:"
+msgstr "_Seoladh Ríomhphoist:"
+
+#: ../mail/e-mail-config-identity-page.c:431
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+#, fuzzy
+msgid "Optional Information"
+msgstr "Eolas Pearsanta"
+
+#: ../mail/e-mail-config-identity-page.c:439
+msgid "Re_ply-To:"
+msgstr "_Freagra-Chuig:"
+
+#: ../mail/e-mail-config-identity-page.c:466
+msgid "Or_ganization:"
+msgstr "_Eagras:"
+
+#: ../mail/e-mail-config-identity-page.c:521
+msgid "Add Ne_w Signature..."
+msgstr "Cuir Síniú _Nua Leis..."
+
+#: ../mail/e-mail-config-lookup-page.c:68
+#, fuzzy
+msgid "Looking up account details..."
+msgstr "Á Luchtú..."
+
+#: ../mail/e-mail-config-provider-page.c:485
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "Lorg poist nua"
+
+#: ../mail/e-mail-config-provider-page.c:501
+msgid "Check for _new messages every"
+msgstr "Lorg teachtaireachtaí _nua gach"
+
+#: ../mail/e-mail-config-provider-page.c:700
+msgid "Receiving Options"
+msgstr "Roghanna Fála"
+
+#: ../mail/e-mail-config-receiving-page.c:50
+msgid "Receiving Email"
+msgstr "Fáil Ríomhphoist"
+
+#: ../mail/e-mail-config-security-page.c:260
+#: ../mail/em-folder-properties.c:266 ../mail/mail-config.ui.h:24
+#: ../modules/addressbook/autocompletion-config.c:114
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/itip-formatter/plugin/config-ui.c:91
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../smime/gui/certificate-viewer.c:653
+msgid "General"
+msgstr "Ginearálta"
+
+#: ../mail/e-mail-config-security-page.c:268
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "_Ná sínigh iarratais cruinnithe (le haghaidh comhoiriúnachta Outlook)"
+
+#: ../mail/e-mail-config-security-page.c:290
+#, fuzzy
+msgid "Pretty Good Privacy (OpenPGP)"
+msgstr "Pretty Good Privacy (PGP/GPG)"
+
+#: ../mail/e-mail-config-security-page.c:298
+#, fuzzy
+msgid "OpenPGP _Key ID:"
+msgstr "CA _Eochracha PGP/GPG:"
+
+#: ../mail/e-mail-config-security-page.c:320
+msgid "Si_gning algorithm:"
+msgstr "Al_gartam sínithe:"
+
+#: ../mail/e-mail-config-security-page.c:336
+#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:50
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/e-mail-config-security-page.c:339
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:51
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/e-mail-config-security-page.c:342
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:52
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/e-mail-config-security-page.c:345
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:53
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/e-mail-config-security-page.c:361
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:373
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:385
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:409
+msgid "Secure MIME (S/MIME)"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:417
+msgid "Sig_ning certificate:"
+msgstr "_Teastas sínithe:"
+
+#: ../mail/e-mail-config-security-page.c:441
+#: ../mail/e-mail-config-security-page.c:547
+#, fuzzy
+msgid "Select"
+msgstr "Roghnaigh..."
+
+#: ../mail/e-mail-config-security-page.c:459
+msgid "Signing _algorithm:"
+msgstr "_Algartam sínithe:"
+
+#: ../mail/e-mail-config-security-page.c:500
+#, fuzzy
+msgid "Always sign outgoing messages when using this account"
+msgstr "Ag bogadh scéaltaí"
+
+#: ../mail/e-mail-config-security-page.c:523
+#, fuzzy
+msgid "Encryption certificate:"
+msgstr "Gan Teastas Freastalaí"
+
+#: ../mail/e-mail-config-security-page.c:565
+#, fuzzy
+msgid "Always encrypt outgoing messages when using this account"
+msgstr "Ag bogadh scéaltaí"
+
+#: ../mail/e-mail-config-security-page.c:585
+msgid "Always encrypt to myself when sending encrypted messages"
+msgstr ""
+
+#: ../mail/e-mail-config-sending-page.c:50
+msgid "Sending Email"
+msgstr "Seoladh Ríomhphoist"
+
+#: ../mail/e-mail-config-service-page.c:640
+msgid "Server _Type:"
+msgstr "C_ineál Freastalaí:"
+
+#: ../mail/e-mail-config-summary-page.c:142
+msgid "SSL"
+msgstr ""
+
+#: ../mail/e-mail-config-summary-page.c:145
+msgid "TLS"
+msgstr ""
+
+#: ../mail/e-mail-config-summary-page.c:307
+msgid ""
+"This is a summary of the settings which will be used to access your mail."
+msgstr ""
+
+#: ../mail/e-mail-config-summary-page.c:372
+#, fuzzy
+msgid "Personal Details"
+msgstr "Pearsanta"
+
+#: ../mail/e-mail-config-summary-page.c:381
+#, fuzzy
+msgid "Full Name:"
+msgstr "_Ainm Iomlán:"
+
+#: ../mail/e-mail-config-summary-page.c:395
+#, fuzzy
+msgid "Email Address:"
+msgstr "_Seoladh Ríomhphoist:"
+
+#: ../mail/e-mail-config-summary-page.c:409
+#, fuzzy
+msgid "Receiving"
+msgstr "Fáil Ríomhphoist"
+
+#: ../mail/e-mail-config-summary-page.c:421
+#, fuzzy
+msgid "Sending"
+msgstr "Ag dul suas"
+
+#: ../mail/e-mail-config-summary-page.c:433
+#, fuzzy
+msgid "Server Type:"
+msgstr "C_ineál Freastalaí:"
+
+#: ../mail/e-mail-config-summary-page.c:454
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#, fuzzy
+msgid "Server:"
+msgstr "_Freastalaí:"
+
+#: ../mail/e-mail-config-summary-page.c:475
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:697
+#, fuzzy
+msgid "Username:"
+msgstr "_Ainm úsáideora:"
+
+#: ../mail/e-mail-config-summary-page.c:496
+#, fuzzy
+msgid "Security:"
+msgstr "Slándáil:"
+
+#: ../mail/e-mail-config-summary-page.c:787
+#, fuzzy
+msgid "Account Summary"
+msgstr "Cuardach Cuntas"
+
+#: ../mail/e-mail-config-welcome-page.c:157
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+
+#: ../mail/e-mail-config-welcome-page.c:167
+#: ../modules/startup-wizard/e-startup-assistant.c:152
+msgid "Welcome"
+msgstr "Fáilte"
+
+#: ../mail/e-mail-config-window.c:327
+msgid "Account Editor"
+msgstr "Eagarthóir Cuntas"
+
+#: ../mail/e-mail-display.c:96
+#, fuzzy
+msgid "_Add to Address Book..."
+msgstr "_Cuir leis an Leabhar Seoltaí"
+
+#: ../mail/e-mail-display.c:103
+#, fuzzy
+msgid "_To This Address"
+msgstr "Chuig an S_eoladh Seo"
+
+#: ../mail/e-mail-display.c:110
+#, fuzzy
+msgid "_From This Address"
+msgstr "Ón _Seoladh Seo"
+
+#: ../mail/e-mail-display.c:117
+#, fuzzy
+msgid "Send _Reply To..."
+msgstr "_Seol Chuig..."
+
+#: ../mail/e-mail-display.c:119
+#, fuzzy
+msgid "Send a reply message to this address"
+msgstr "Post an sceál seo"
+
+#: ../mail/e-mail-display.c:126
+#, fuzzy
+msgid "Create Search _Folder"
+msgstr "Ní féidir an fillteán %1 a chruthú."
+
 #. Label + combo box has a 12px left margin so it's
 #. * aligned with the junk mail options above it.
 #: ../mail/e-mail-junk-options.c:252
 msgid "Junk filtering software:"
 msgstr ""
 
-#: ../mail/e-mail-label-dialog.c:223
+#: ../mail/e-mail-label-dialog.c:225
 #, fuzzy
 msgid "_Label name:"
 msgstr "_Ainm Lipéid:"
 
-#: ../mail/e-mail-label-list-store.c:41
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "_Tábhachtach"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:42
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "_Obair"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:43
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "_Pearsanta"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:44
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "Le _Déanamh"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:45
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "Ar _Ball"
 
-#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:684
+#: ../mail/e-mail-label-manager.c:170
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "Add Label"
 msgstr "Cuir Lipéad Leis"
 
-#: ../mail/e-mail-label-manager.c:216
+#: ../mail/e-mail-label-manager.c:221
 msgid "Edit Label"
 msgstr "Cuir Lipéad in Eagar"
 
-#: ../mail/e-mail-label-manager.c:350
+#: ../mail/e-mail-label-manager.c:353
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 msgstr ""
 
-#: ../mail/e-mail-label-tree-view.c:88
+#: ../mail/e-mail-label-tree-view.c:89
 msgid "Color"
 msgstr "Dath"
 
-#: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../plugins/caldav/caldav-browse-server.c:1358
-#: ../widgets/menus/gal-define-views-dialog.c:347
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
-msgid "Name"
-msgstr "Ainm"
-
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
-#: ../mail/em-folder-tree-model.c:919
-#: ../modules/mail/e-mail-shell-view-private.c:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1077
-msgid "Inbox"
-msgstr "Bosca Isteach"
-
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:912
-#: ../modules/mail/e-mail-shell-view-private.c:1064
-msgid "Drafts"
-msgstr "Dréachtaí"
-
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:923
-#: ../modules/mail/e-mail-shell-view-private.c:1068
-msgid "Outbox"
-msgstr "Bosca Amach"
-
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:927
-#: ../modules/mail/e-mail-shell-view-private.c:1070
-msgid "Sent"
-msgstr "Seolta"
+#: ../mail/e-mail-print-config-headers.c:167
+#, fuzzy
+msgid "Move selected headers to top"
+msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 
-#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:915
-#: ../modules/mail/e-mail-shell-view-private.c:1072
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:1034 ../plugins/templates/templates.c:1312
-#: ../plugins/templates/templates.c:1322
-msgid "Templates"
-msgstr "Teimpléid"
+#: ../mail/e-mail-print-config-headers.c:172
+#, fuzzy
+msgid "Move selected headers up one row"
+msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 
-#: ../mail/e-mail-migrate.c:134
-msgid "Migrating..."
-msgstr ""
+#: ../mail/e-mail-print-config-headers.c:177
+#, fuzzy
+msgid "Move selected headers down one row"
+msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 
-#: ../mail/e-mail-migrate.c:169
+#: ../mail/e-mail-print-config-headers.c:182
 #, fuzzy
-msgid "Migration"
-msgstr "Cumraíocht"
+msgid "Move selected headers to bottom"
+msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 
-#: ../mail/e-mail-migrate.c:210
-#, c-format
-msgid "Migrating '%s':"
-msgstr ""
+#: ../mail/e-mail-print-config-headers.c:187
+#, fuzzy
+msgid "Select all headers"
+msgstr "Roghnaigh an téacs ar fad"
 
-#: ../mail/e-mail-migrate.c:728
+#: ../mail/e-mail-print-config-headers.c:206
 #, fuzzy
-msgid "Migrating Folders"
-msgstr "Ag cruthú na comhadlainne %1"
+msgid "Header Name"
+msgstr "Ainm Ceanntáisc:"
 
-#: ../mail/e-mail-migrate.c:729
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
+#: ../mail/e-mail-print-config-headers.c:215
+#, fuzzy
+msgid "Header Value"
+msgstr "Ainm Ceanntáisc:"
 
-#: ../mail/e-mail-migrate.c:1527
-#, fuzzy, c-format
-msgid "Unable to create local mail folders at '%s': %s"
-msgstr "Ní féidir fillteáin poist logánta a chruthú ag `%s': %s"
+#: ../mail/e-mail-printer.c:125 ../mail/mail-config.ui.h:101
+msgid "Headers"
+msgstr "Ceanntásca"
 
-#: ../mail/e-mail-notebook-view.c:621
-#, fuzzy
-msgid "Please select a folder"
-msgstr "Roghnaigh úsáideoir le do thoil."
+#: ../mail/e-mail-printer.c:167
+#, c-format
+msgid "Page %d of %d"
+msgstr "Leathanach %d as %d"
 
-#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:346 ../mail/em-filter-i18n.h:12
 msgid "Copy to Folder"
 msgstr "Cóipeáil go Fillteán"
 
-#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:517
 msgid "C_opy"
 msgstr "_Cóipeáil"
 
-#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:846 ../mail/em-filter-i18n.h:54
 msgid "Move to Folder"
 msgstr "Bog go Fillteán"
 
-#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:846 ../mail/em-folder-utils.c:517
 msgid "_Move"
 msgstr "_Bog"
 
-#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
-#: ../mail/e-mail-reader.c:1403
+#: ../mail/e-mail-reader.c:1172 ../mail/e-mail-reader.c:1384
+#: ../mail/e-mail-reader.c:1424
 #, fuzzy
 msgid "_Do not ask me again."
 msgstr "Ná fiafraigh díom arís."
 
-#: ../mail/e-mail-reader.c:1409
+#: ../mail/e-mail-reader.c:1430
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1775
+#: ../mail/e-mail-reader.c:1632
+#, fuzzy
+msgid "Failed to retrieve message:"
+msgstr "Ní féidir an teachtaireacht a rá"
+
+#: ../mail/e-mail-reader.c:1672 ../mail/e-mail-reader.c:2774
+#, fuzzy, c-format
+msgid "Retrieving message '%s'"
+msgstr "Teachtaireacht %s á fáil"
+
+#: ../mail/e-mail-reader.c:1860
 msgid "A_dd Sender to Address Book"
 msgstr "Cuir Seoltóir _Leis an Leabhar Seoltaí"
 
-#: ../mail/e-mail-reader.c:1777
+#: ../mail/e-mail-reader.c:1862
 #, fuzzy
 msgid "Add sender to address book"
 msgstr "Cuir Seoltóir Leis an Leabhar Seoltaí"
 
-#: ../mail/e-mail-reader.c:1782
+#: ../mail/e-mail-reader.c:1867
 msgid "Check for _Junk"
 msgstr "Lorg _Dramhphost"
 
-#: ../mail/e-mail-reader.c:1784
+#: ../mail/e-mail-reader.c:1869
 #, fuzzy
 msgid "Filter the selected messages for junk status"
 msgstr "Post sceál do tadhall"
 
-#: ../mail/e-mail-reader.c:1789
+#: ../mail/e-mail-reader.c:1874
 msgid "_Copy to Folder..."
 msgstr "_Cóipeáil go Fillteán..."
 
-#: ../mail/e-mail-reader.c:1791
+#: ../mail/e-mail-reader.c:1876
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 
-#: ../mail/e-mail-reader.c:1796
+#: ../mail/e-mail-reader.c:1881
 msgid "_Delete Message"
 msgstr "_Scrios Teachtaireacht"
 
-#: ../mail/e-mail-reader.c:1798
+#: ../mail/e-mail-reader.c:1883
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Marcáil na teachtaireachtaí roghnaithe mar dhramhphost"
 
-#: ../mail/e-mail-reader.c:1803
-msgid "Filter on Mailing _List..."
-msgstr "Scag ar L_iosta Postála..."
+#: ../mail/e-mail-reader.c:1888
+msgid "Create a Filter Rule for Mailing _List..."
+msgstr "Cruthaigh Riail Scagtha do L_iosta Postála..."
 
-#: ../mail/e-mail-reader.c:1805
+#: ../mail/e-mail-reader.c:1890
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1810
-msgid "Filter on _Recipients..."
-msgstr "Scag ar Fh_aighteoirí..."
+#: ../mail/e-mail-reader.c:1895
+msgid "Create a Filter Rule for _Recipients..."
+msgstr "Cruthaigh Riail Scagtha d'Fh_aighteoirí..."
 
-#: ../mail/e-mail-reader.c:1812
+#: ../mail/e-mail-reader.c:1897
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1817
-msgid "Filter on Se_nder..."
-msgstr "Scag ar Sh_eoltóir..."
+#: ../mail/e-mail-reader.c:1902
+msgid "Create a Filter Rule for Se_nder..."
+msgstr "Cruthaigh Riail Scagtha do Sh_eoltóir..."
 
-#: ../mail/e-mail-reader.c:1819
+#: ../mail/e-mail-reader.c:1904
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1824
-msgid "Filter on _Subject..."
-msgstr "Scag ar Áb_har..."
+#: ../mail/e-mail-reader.c:1909
+msgid "Create a Filter Rule for _Subject..."
+msgstr "Cruthaigh Riail Scagtha d'Áb_har..."
 
-#: ../mail/e-mail-reader.c:1826
+#: ../mail/e-mail-reader.c:1911
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1831
+#: ../mail/e-mail-reader.c:1916
 msgid "A_pply Filters"
 msgstr "Cuir Scagairí i b_hFeidhm"
 
-#: ../mail/e-mail-reader.c:1833
+#: ../mail/e-mail-reader.c:1918
 msgid "Apply filter rules to the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1838
+#: ../mail/e-mail-reader.c:1923
 msgid "_Find in Message..."
 msgstr "_Aimsigh i dTeachtaireacht..."
 
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:1925
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1845
+#: ../mail/e-mail-reader.c:1930
 msgid "_Clear Flag"
 msgstr "_Glan Bratach"
 
-#: ../mail/e-mail-reader.c:1847
+#: ../mail/e-mail-reader.c:1932
 #, fuzzy
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Cruthaigh tasc nua ón dteachtaireacht roghnaithe"
 
-#: ../mail/e-mail-reader.c:1852
+#: ../mail/e-mail-reader.c:1937
 msgid "_Flag Completed"
 msgstr "Cuir _Bratach \"Críochnaithe\" Leis"
 
-#: ../mail/e-mail-reader.c:1854
+#: ../mail/e-mail-reader.c:1939
 #, fuzzy
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Cruthaigh cruinniú nua ón dteachtaireacht roghnaithe"
 
-#: ../mail/e-mail-reader.c:1859
+#: ../mail/e-mail-reader.c:1944
 msgid "Follow _Up..."
 msgstr "_Leantach..."
 
-#: ../mail/e-mail-reader.c:1861
+#: ../mail/e-mail-reader.c:1946
 #, fuzzy
 msgid "Flag the selected messages for follow-up"
 msgstr "Post sceál do tadhall"
 
-#: ../mail/e-mail-reader.c:1866
+#: ../mail/e-mail-reader.c:1951
 msgid "_Attached"
 msgstr "_Ceangailte"
 
-#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
+#: ../mail/e-mail-reader.c:1953 ../mail/e-mail-reader.c:1960
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1873
+#: ../mail/e-mail-reader.c:1958
 msgid "Forward As _Attached"
 msgstr "Cuir ar Aghaidh mar _Iatán"
 
-#: ../mail/e-mail-reader.c:1880
+#: ../mail/e-mail-reader.c:1965
 msgid "_Inline"
 msgstr "_Inlíne"
 
-#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
+#: ../mail/e-mail-reader.c:1967 ../mail/e-mail-reader.c:1974
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1887
+#: ../mail/e-mail-reader.c:1972
 msgid "Forward As _Inline"
 msgstr "Cuir ar Aghaidh mar I_nlíne"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1979
 msgid "_Quoted"
 msgstr "_Athfhriotail"
 
-#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
+#: ../mail/e-mail-reader.c:1981 ../mail/e-mail-reader.c:1988
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1901
+#: ../mail/e-mail-reader.c:1986
 msgid "Forward As _Quoted"
 msgstr "Cuir ar Aghaidh mar _Luachan"
 
-#: ../mail/e-mail-reader.c:1908
+#: ../mail/e-mail-reader.c:1993
 msgid "_Load Images"
 msgstr "_Luchtaigh Íomhánna"
 
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:1995
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1915
+#: ../mail/e-mail-reader.c:2000
 msgid "_Important"
 msgstr "_Tábhachtach"
 
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:2002
 #, fuzzy
 msgid "Mark the selected messages as important"
 msgstr "Marcáil na teachtaireachtaí roghnaithe mar dhramhphost"
 
-#: ../mail/e-mail-reader.c:1922
+#: ../mail/e-mail-reader.c:2007
 msgid "_Junk"
 msgstr "_Dramhphost"
 
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:2009
 #, fuzzy
 msgid "Mark the selected messages as junk"
 msgstr "Marcáil na teachtaireachtaí roghnaithe mar dhramhphost"
 
-#: ../mail/e-mail-reader.c:1929
+#: ../mail/e-mail-reader.c:2014
 msgid "_Not Junk"
 msgstr "_Post Ceart"
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:2016
 #, fuzzy
 msgid "Mark the selected messages as not being junk"
 msgstr "Post sceál do tadhall"
 
-#: ../mail/e-mail-reader.c:1936
+#: ../mail/e-mail-reader.c:2021
 msgid "_Read"
 msgstr "_Léite"
 
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:2023
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "Post an sceál seo"
 
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:2028
 msgid "Uni_mportant"
 msgstr "Gan Tá_bhacht"
 
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:2030
 #, fuzzy
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcáil na teachtaireachtaí roghnaithe mar dhramhphost"
 
-#: ../mail/e-mail-reader.c:1950
+#: ../mail/e-mail-reader.c:2035
 msgid "_Unread"
 msgstr "Gan _Léamh"
 
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:2037
 #, fuzzy
 msgid "Mark the selected messages as not having been read"
 msgstr "Post an sceál seo"
 
-#: ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:2042
 msgid "_Edit as New Message..."
 msgstr "Cuir in _Eagar mar Theachtaireacht Nua..."
 
-#: ../mail/e-mail-reader.c:1959
+#: ../mail/e-mail-reader.c:2044
 #, fuzzy
 msgid "Open the selected messages in the composer for editing"
 msgstr "Post an sceál seo"
 
-#: ../mail/e-mail-reader.c:1964
+#: ../mail/e-mail-reader.c:2049
 msgid "Compose _New Message"
 msgstr "Cum Teachtaireacht _Nua"
 
-#: ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:2051
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:2056
 msgid "_Open in New Window"
 msgstr "_Oscail i bhFuinneog Nua"
 
-#: ../mail/e-mail-reader.c:1973
+#: ../mail/e-mail-reader.c:2058
 #, fuzzy
 msgid "Open the selected messages in a new window"
 msgstr "Oscail Gach Teachtaireacht i bhFuinneog Nua Chomhrá"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:2063
 msgid "_Move to Folder..."
 msgstr "_Bog go Fillteán..."
 
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:2065
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 
-#: ../mail/e-mail-reader.c:1985
-#, fuzzy
-msgid "_Switch to Folder"
-msgstr "Athraigh go %s"
-
-#: ../mail/e-mail-reader.c:1987
-#, fuzzy
-msgid "Display the parent folder"
-msgstr "Cuir comhfhillteáin leis"
-
-#: ../mail/e-mail-reader.c:1992
-#, fuzzy
-msgid "Switch to _next tab"
-msgstr "Athraigh go %s"
-
-#: ../mail/e-mail-reader.c:1994
-msgid "Switch to the next tab"
-msgstr ""
-
-#: ../mail/e-mail-reader.c:1999
-#, fuzzy
-msgid "Switch to _previous tab"
-msgstr "Athraigh go %s"
-
-#: ../mail/e-mail-reader.c:2001
-msgid "Switch to the previous tab"
-msgstr ""
-
-#: ../mail/e-mail-reader.c:2006
-#, fuzzy
-msgid "Cl_ose current tab"
-msgstr "Dún an comhad reatha"
-
-#: ../mail/e-mail-reader.c:2008
-#, fuzzy
-msgid "Close current tab"
-msgstr "Dún an comhad reatha"
-
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:2070
 msgid "_Next Message"
 msgstr "An Chéad Teachtaireacht _Eile"
 
-#: ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2072
 #, fuzzy
 msgid "Display the next message"
 msgstr "An Chéad Teachtaireacht &Neamhléite Eile"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2077
 msgid "Next _Important Message"
 msgstr "An Chéad Teachtaireacht _Tábhachtach Eile"
 
-#: ../mail/e-mail-reader.c:2022
+#: ../mail/e-mail-reader.c:2079
 #, fuzzy
 msgid "Display the next important message"
 msgstr "Liosta Teachtaireachtaí - Teachtaireachtaí Tábhachtacha"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2084
 msgid "Next _Thread"
 msgstr "An Chéad _Snáithe Eile"
 
-#: ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2086
 #, fuzzy
 msgid "Display the next thread"
 msgstr "téigh go dtí an chéad snáithe eile"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2091
 msgid "Next _Unread Message"
 msgstr "An Chéad Teachtaireacht Gan _Léamh Eile"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2093
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "An Chéad Teachtaireacht Neamhléite Eile"
 
-#: ../mail/e-mail-reader.c:2041
+#: ../mail/e-mail-reader.c:2098
 msgid "_Previous Message"
 msgstr "An Teachtaireacht _Roimhe Seo"
 
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2100
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Luaigh an teachtaireacht roimhe seo"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2105
 msgid "Pr_evious Important Message"
 msgstr "An Teachtaireacht Gan _Tábhacht Roimhe Seo"
 
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2107
 #, fuzzy
 msgid "Display the previous important message"
 msgstr "Liosta Teachtaireachtaí - Teachtaireachtaí Tábhachtacha"
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2112
 msgid "Previous T_hread"
 msgstr "An S_náithe Roimhe Seo"
 
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2114
 #, fuzzy
 msgid "Display the previous thread"
 msgstr "Luaigh an teachtaireacht roimhe seo"
 
-#: ../mail/e-mail-reader.c:2062
+#: ../mail/e-mail-reader.c:2119
 msgid "P_revious Unread Message"
 msgstr "An Teachtaireacht Gan _Léamh Roimhe Seo"
 
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2121
 #, fuzzy
 msgid "Display the previous unread message"
 msgstr "Téigh go dtí an teachtaireacht gan léamh roimhe"
 
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2128
 msgid "Print this message"
 msgstr "Priontáil an teachtaireacht seo"
 
-#: ../mail/e-mail-reader.c:2078
+#: ../mail/e-mail-reader.c:2135
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Roghnaigh na míreanna atá le priontáil"
 
-#: ../mail/e-mail-reader.c:2083
+#: ../mail/e-mail-reader.c:2140
 msgid "Re_direct"
 msgstr "A_treoraigh"
 
-#: ../mail/e-mail-reader.c:2085
+#: ../mail/e-mail-reader.c:2142
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2090
+#: ../mail/e-mail-reader.c:2147
 msgid "Remo_ve Attachments"
 msgstr "Bain _Iatáin"
 
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2149
 #, fuzzy
 msgid "Remove attachments"
 msgstr "Sábháil Iatáin"
 
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2154
 msgid "Remove Du_plicate Messages"
 msgstr "Bain Teachtaireachtaí _Dúblacha"
 
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2156
 #, fuzzy
 msgid "Checks selected messages for duplicates"
 msgstr "Marcáil na teachtaireachtaí roghnaithe mar dhramhphost"
 
-#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
-#: ../modules/mail/e-mail-attachment-handler.c:177
+#: ../mail/e-mail-reader.c:2161 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1548
+#: ../modules/mail/e-mail-attachment-handler.c:214
 msgid "Reply to _All"
 msgstr "F_reagair Cách"
 
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2163
 #, fuzzy
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Cruthaigh teagmhas nua ón dteachtaireacht roghnaithe"
 
-#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
+#: ../mail/e-mail-reader.c:2168 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Freagair do _Liosta"
 
-#: ../mail/e-mail-reader.c:2113
+#: ../mail/e-mail-reader.c:2170
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2118
-#: ../modules/mail/e-mail-attachment-handler.c:184
+#: ../mail/e-mail-reader.c:2175
+#: ../modules/mail/e-mail-attachment-handler.c:221
 msgid "_Reply to Sender"
 msgstr "_Freagra don Seoltóir"
 
-#: ../mail/e-mail-reader.c:2120
+#: ../mail/e-mail-reader.c:2177
 msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2182
 msgid "_Save as mbox..."
 msgstr "Sábháil mar _mbox..."
 
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2184
 msgid "Save selected messages as an mbox file"
 msgstr "Sábháil teachtaireachtaí roghnaithe mar chomhad mbox"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2189
 msgid "_Message Source"
 msgstr "Foinse _Theachtaireachta"
 
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2191
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2203
 msgid "_Undelete Message"
 msgstr "_Díscrios Teachtaireacht"
 
-#: ../mail/e-mail-reader.c:2148
+#: ../mail/e-mail-reader.c:2205
 msgid "Undelete the selected messages"
 msgstr "Díscrios na teachtaireachtaí roghnaithe"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2210
 msgid "_Normal Size"
 msgstr "G_náthmhéid"
 
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2212
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2217
 msgid "_Zoom In"
 msgstr "_Súmáil Isteach"
 
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2219
 msgid "Increase the text size"
 msgstr "Méadaigh an téacs"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2224
 msgid "Zoom _Out"
 msgstr "Súmáil _Amach"
 
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2226
 msgid "Decrease the text size"
 msgstr "Laghdaigh méid an téacs"
 
-#: ../mail/e-mail-reader.c:2176
-msgid "Create R_ule"
-msgstr "Cruthaigh R_iail"
+#: ../mail/e-mail-reader.c:2233
+msgid "Cre_ate"
+msgstr "Cr_uthaigh"
 
-#: ../mail/e-mail-reader.c:2183
+#: ../mail/e-mail-reader.c:2240
 msgid "Ch_aracter Encoding"
 msgstr "Ionchódú C_arachtar"
 
-#: ../mail/e-mail-reader.c:2190
+#: ../mail/e-mail-reader.c:2247
 msgid "F_orward As"
 msgstr "C_uir ar Aghaidh Mar..."
 
-#: ../mail/e-mail-reader.c:2197
+#: ../mail/e-mail-reader.c:2254
 msgid "_Group Reply"
 msgstr "_Grúpfhreagairt"
 
-#: ../mail/e-mail-reader.c:2204
+#: ../mail/e-mail-reader.c:2261
 msgid "_Go To"
 msgstr "_Téigh go dTí"
 
-#: ../mail/e-mail-reader.c:2211
+#: ../mail/e-mail-reader.c:2268
 msgid "Mar_k As"
 msgstr "_Marcáil Mar"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2275
 msgid "_Message"
 msgstr "_Teachtaireacht"
 
-#: ../mail/e-mail-reader.c:2225
+#: ../mail/e-mail-reader.c:2282
 msgid "_Zoom"
 msgstr "_Súmáil"
 
-#: ../mail/e-mail-reader.c:2235
-msgid "Search Folder from Mailing _List..."
-msgstr "Fillteán Cuardaigh ó _Liosta Postála..."
+#: ../mail/e-mail-reader.c:2292
+msgid "Create a Search Folder from Mailing _List..."
+msgstr "Cruthaigh Fillteán Cuardaigh ó _Liosta Postála..."
 
-#: ../mail/e-mail-reader.c:2237
-#, fuzzy
+#: ../mail/e-mail-reader.c:2294
 msgid "Create a search folder for this mailing list"
-msgstr "Cruthaigh liosta tadhaill nua"
+msgstr "Cruthaigh fillteán cuardaigh don liosta postála seo"
 
-#: ../mail/e-mail-reader.c:2242
-msgid "Search Folder from Recipien_ts..."
-msgstr "Fillteán Cuardaigh ó _Fhaighteoirí..."
+#: ../mail/e-mail-reader.c:2299
+msgid "Create a Search Folder from Recipien_ts..."
+msgstr "Cruthaigh Fillteán Cuardaigh ó _Fhaighteoirí..."
 
-#: ../mail/e-mail-reader.c:2244
-#, fuzzy
+#: ../mail/e-mail-reader.c:2301
 msgid "Create a search folder for these recipients"
-msgstr "Cruthaigh liosta tadhaill nua"
+msgstr "Cruthaigh fillteán cuardaigh do na faighteoirí seo"
 
-#: ../mail/e-mail-reader.c:2249
-msgid "Search Folder from Sen_der..."
-msgstr "Fillteán Cuardaigh ó _Sheoltóir..."
+#: ../mail/e-mail-reader.c:2306
+msgid "Create a Search Folder from Sen_der..."
+msgstr "Cruthaigh Fillteán Cuardaigh ó _Sheoltóir..."
 
-#: ../mail/e-mail-reader.c:2251
-#, fuzzy
+#: ../mail/e-mail-reader.c:2308
 msgid "Create a search folder for this sender"
-msgstr ""
-"Cumraigh na critéir chuardaigh le húsáid don fhillteán cuardaigh shábháilte "
-"seo:"
+msgstr "Cruthaigh fillteán cuardaigh don seoltóir seo"
 
-#: ../mail/e-mail-reader.c:2256
-msgid "Search Folder from S_ubject..."
-msgstr "Fillteán Cuardaigh ó Á_bhar..."
+#: ../mail/e-mail-reader.c:2313
+msgid "Create a Search Folder from S_ubject..."
+msgstr "Cruthaigh Fillteán Cuardaigh ó Á_bhar..."
 
-#: ../mail/e-mail-reader.c:2258
-#, fuzzy
+#: ../mail/e-mail-reader.c:2315
 msgid "Create a search folder for this subject"
-msgstr ""
-"Cumraigh na critéir chuardaigh le húsáid don fhillteán cuardaigh shábháilte "
-"seo:"
+msgstr "Cruthaigh fillteán cuardaigh don ábhar seo"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2338
 msgid "Mark for Follo_w Up..."
 msgstr "Marcáil le hAghaidh _Leanúna..."
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2346
 msgid "Mark as _Important"
 msgstr "Marcáil mar _Tábhachtach"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2350
 msgid "Mark as _Junk"
 msgstr "Marcáil mar _Dramhphost"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2354
 msgid "Mark as _Not Junk"
 msgstr "Marcáil mar _Phost Ceart"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2358
 msgid "Mar_k as Read"
 msgstr "Marcá_il mar Léite"
 
-#: ../mail/e-mail-reader.c:2305
-#, fuzzy
+#: ../mail/e-mail-reader.c:2362
 msgid "Mark as Uni_mportant"
 msgstr "Marcáil mar Gan _Tábhacht"
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2366
 msgid "Mark as _Unread"
 msgstr "Marcáil mar _Gan Léamh"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2410
 msgid "_Caret Mode"
 msgstr "Mód _Carait"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2412
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2418
 msgid "All Message _Headers"
 msgstr "Gach _Ceanntásc Teachtaireachta"
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2420
 msgid "Show messages with all email headers"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2659
-#, fuzzy, c-format
-msgid "Retrieving message '%s'"
-msgstr "Teachtaireacht %s á fáil"
-
-#. we changed user, thus reset the chosen calendar combo too, because
-#. * other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3246 ../mail/mail-config.ui.h:32
-#: ../plugins/google-account-setup/google-source.c:316
-#: ../plugins/google-account-setup/google-source.c:565
-#: ../plugins/google-account-setup/google-source.c:704
-#: ../widgets/misc/e-account-tree-view.c:414
-msgid "Default"
-msgstr "Réamhshocrú"
+#: ../mail/e-mail-reader.c:2780
+#, fuzzy
+msgid "Retrieving message"
+msgstr "%d teachtaireacht á bhfáil"
 
-#: ../mail/e-mail-reader.c:3415
-#: ../modules/mail/e-mail-attachment-handler.c:170
+#: ../mail/e-mail-reader.c:3702
+#: ../modules/mail/e-mail-attachment-handler.c:207
 msgid "_Forward"
 msgstr "_Cuir ar Aghaidh"
 
-#: ../mail/e-mail-reader.c:3416
+#: ../mail/e-mail-reader.c:3703
 msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:3435
+#: ../mail/e-mail-reader.c:3722
 msgid "Group Reply"
 msgstr "Grúpfhreagairt"
 
-#: ../mail/e-mail-reader.c:3436
+#: ../mail/e-mail-reader.c:3723
 msgid "Reply to the mailing list, or to all recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3789 ../mail/em-filter-i18n.h:15
 msgid "Delete"
 msgstr "Scrios"
 
-#: ../mail/e-mail-reader.c:3522
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../widgets/misc/e-calendar.c:202
+#: ../mail/e-mail-reader.c:3801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "Next"
 msgstr "Ar Aghaidh"
 
-#: ../mail/e-mail-reader.c:3526
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
-#: ../widgets/misc/e-calendar.c:178
+#: ../mail/e-mail-reader.c:3805
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Previous"
 msgstr "Siar"
 
-#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3814 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "Freagair"
 
-#: ../mail/e-mail-reader.c:4205
-#, fuzzy, c-format
-msgid "Folder '%s'"
-msgstr "Fillteán"
-
-#: ../mail/e-mail-reader-utils.c:145
+#: ../mail/e-mail-reader-utils.c:151
 #, fuzzy
 msgid "Do not warn me again"
 msgstr "Ná fiafraigh díom arís."
 
+#: ../mail/e-mail-reader-utils.c:976
+msgid "Printing"
+msgstr "Á phriontáil"
+
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:670
+#: ../mail/e-mail-reader-utils.c:1211
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -9273,114 +13180,39 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../mail/e-mail-reader-utils.c:1047
-#, fuzzy
+#: ../mail/e-mail-reader-utils.c:2026
 msgid "Save Message"
 msgid_plural "Save Messages"
-msgstr[0] "Sábháil Teachtaireacht..."
-msgstr[1] "Sábháil Teachtaireacht..."
-msgstr[2] "Sábháil Teachtaireacht..."
-msgstr[3] "Sábháil Teachtaireacht..."
-msgstr[4] "Sábháil Teachtaireacht..."
+msgstr[0] "Sábháil Teachtaireacht"
+msgstr[1] "Sábháil Teachtaireachtaí"
+msgstr[2] "Sábháil Teachtaireachtaí"
+msgstr[3] "Sábháil Teachtaireachtaí"
+msgstr[4] "Sábháil Teachtaireachtaí"
 
 #. Translators: This is part of a suggested file name
 #. * used when saving a message or multiple messages to
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1068
-#, fuzzy
+#: ../mail/e-mail-reader-utils.c:2047
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Teachtaireacht"
-msgstr[1] "Teachtaireacht"
-msgstr[2] "Teachtaireacht"
-msgstr[3] "Teachtaireacht"
-msgstr[4] "Teachtaireacht"
-
-#: ../mail/e-mail-session.c:871
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Iontráil Frása Faire do %s"
-
-#: ../mail/e-mail-session.c:875
-msgid "Enter Passphrase"
-msgstr "Iontráil Frása Faire:"
-
-#: ../mail/e-mail-session.c:879
-#, c-format
-msgid "Enter Password for %s"
-msgstr "Iontráil Focal Faire do %s"
-
-#: ../mail/e-mail-session.c:883
-msgid "Enter Password"
-msgstr "Iontráil Focal Faire"
-
-#: ../mail/e-mail-session.c:934
-#, c-format
-msgid "User canceled operation."
-msgstr "Chealaigh an t-úsáideoir an oibríocht."
-
-#: ../mail/e-mail-session.c:1047
-#, c-format
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr ""
-
-#: ../mail/e-mail-session.c:1056
-#, c-format
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr ""
-
-#: ../mail/e-mail-session-utils.c:419
-#, fuzzy, c-format
-msgid "Cannot get transport for account '%s'"
-msgstr "Sábháil \"%title%\" %reason%?"
-
-#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:635
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr ""
-
-#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
-#: ../mail/mail-ops.c:654 ../mail/mail-ops.c:688
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
+msgstr[1] "Teachtaireachtaí"
+msgstr[2] "Teachtaireachtaí"
+msgstr[3] "Teachtaireachtaí"
+msgstr[4] "Teachtaireachtaí"
 
-#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:708
-#, fuzzy, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "Comhad féilire le luchtú"
-
-#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:831
-#: ../mail/mail-ops.c:927
-msgid "Sending message"
-msgstr "Teachtaireacht á seoladh"
-
-#: ../mail/e-mail-session-utils.c:873
-#, fuzzy, c-format
-msgid "Unsubscribing from folder '%s'"
-msgstr "Ag díliostáil ón bhfillteán %S..."
-
-#: ../mail/e-mail-store-utils.c:168
-#, fuzzy, c-format
-msgid "Disconnecting from '%s'"
-msgstr "Ag dínasc ó %s"
-
-#: ../mail/e-mail-store-utils.c:259
-#, fuzzy, c-format
-msgid "Reconnecting to '%s'"
-msgstr "Ag athnasc le %s"
+#: ../mail/e-mail-reader-utils.c:2416
+msgid "Parsing message"
+msgstr "Teachtaireacht á parsáil"
 
-#: ../mail/e-mail-store-utils.c:334
-#, fuzzy, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "Míreanna le húsáid as líne"
+#: ../mail/e-mail-request.c:182
+#, fuzzy
+msgid "The message has no text content."
+msgstr "Teachtaireacht mar Ghnáth-théacs"
 
-#: ../mail/e-mail-tag-editor.c:291
+#: ../mail/e-mail-tag-editor.c:238
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "Clóigh leanúint anseo"
@@ -9389,41 +13221,35 @@ msgstr "Clóigh leanúint anseo"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1197
+#: ../mail/em-composer-utils.c:1368
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
+"Ar ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} ag ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} scríobh:"
+
+#: ../mail/em-composer-utils.c:1374
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Teachtaireacht Curtha ar Aghaidh --------"
 
-#: ../mail/em-composer-utils.c:1208
+#: ../mail/em-composer-utils.c:1379
 msgid "-----Original Message-----"
 msgstr "-----Bunteachtaireacht-----"
 
-#. Translators: First %s is an email address, second %s
-#. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1992
-#, c-format
-msgid "Your message to %s about \"%s\" on %s has been read."
-msgstr ""
-
-#: ../mail/em-composer-utils.c:2052
-#, fuzzy, c-format
-msgid "Delivery Notification for: \"%s\""
-msgstr "&Fógairt an Chórais"
-
-#: ../mail/em-composer-utils.c:2592
+#: ../mail/em-composer-utils.c:2524
 msgid "an unknown sender"
 msgstr "seoltóir anaithnid"
 
-#: ../mail/em-composer-utils.c:2998
+#: ../mail/em-composer-utils.c:2945
 msgid "Posting destination"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:2999
+#: ../mail/em-composer-utils.c:2946
 msgid "Choose folders to post the message to."
 msgstr ""
 
-#: ../mail/em-filter-folder-element.c:241
+#: ../mail/em-filter-editor-folder-element.c:157
 msgid "Select Folder"
 msgstr "Roghnaigh Fillteán"
 
@@ -9434,262 +13260,281 @@ msgid "Adjust Score"
 msgstr "GAN SCÓR"
 
 #: ../mail/em-filter-i18n.h:3
+msgid "Any header"
+msgstr "Ceanntásc ar bith"
+
+#: ../mail/em-filter-i18n.h:4
 #, fuzzy
 msgid "Assign Color"
 msgstr "Dath téacs"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:5
 #, fuzzy
 msgid "Assign Score"
 msgstr "GAN SCÓR"
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:7
 msgid "BCC"
 msgstr "BCC"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:8
 msgid "Beep"
 msgstr "Bíp"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:9
 msgid "CC"
 msgstr "CC"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:10
 msgid "Completed On"
 msgstr "Críochnaithe Ar"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:13
 msgid "Date received"
 msgstr "Dáta faighte"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:14
 msgid "Date sent"
 msgstr "Dáta seolta"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:16
 msgid "Deleted"
 msgstr "Scriosta"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:18
 msgid "does not end with"
 msgstr "nach gcríochnaíonn le"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:19
 msgid "does not exist"
 msgstr "nach bhfuil ann"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:20
+#, fuzzy
+msgid "does not have words"
+msgstr "nach gcríochnaíonn le"
+
+#: ../mail/em-filter-i18n.h:21
 msgid "does not return"
 msgstr "nach bhfilleann"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:22
 msgid "does not sound like"
 msgstr "nach bhfuaimnítear cosúil le"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:23
 msgid "does not start with"
 msgstr "nach dtosaíonn le"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:25
 msgid "Draft"
 msgstr "Dréacht"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:26
 msgid "ends with"
 msgstr "a chríochnaíonn le"
 
-#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-filter-i18n.h:28
 msgid "exists"
 msgstr "atá ann"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:29
 #, fuzzy
 msgid "Expression"
 msgstr "Slonn"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:30
 #, fuzzy
 msgid "Follow Up"
 msgstr "Teachtaireacht leantach go %s%s?"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:31
 #, fuzzy
 msgid "Forward to"
 msgstr "Cuir Ar Aghaidh"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:32
+#, fuzzy
+msgid "has words"
+msgstr "_Focal faire:"
+
+#: ../mail/em-filter-i18n.h:33
 msgid "Important"
 msgstr "Tábhachtach"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:35
 msgid "is after"
 msgstr "atá i ndiaidh"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:36
 msgid "is before"
 msgstr "atá roimh"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:37
 #, fuzzy
 msgid "is Flagged"
 msgstr "réidh"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:41
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Is neamhbhailí é '%1'."
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:42
 msgid "is not set"
 msgstr "nach bhfuil socruithe"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:43
 msgid "is set"
 msgstr "atá socruithe"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
+#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:108
 msgid "Junk"
 msgstr "Dramhphost"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:45
 msgid "Junk Test"
 msgstr "Tástáil Dramhphoist"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:46
 msgid "Label"
 msgstr "Lipéad"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:47
 msgid "Mailing list"
 msgstr "Liosta postála"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:48
 msgid "Match All"
 msgstr "Comhoiriúnaigh Gach Rud"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:49
 msgid "Message Body"
 msgstr "Corp Teachtaireachta"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:50
 #, fuzzy
 msgid "Message Header"
 msgstr "Ceanntásc &nua teachtaireachta:"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:51
 #, fuzzy
 msgid "Message is Junk"
 msgstr "Is nialasach í an teachtaireacht."
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:52
 #, fuzzy
 msgid "Message is not Junk"
 msgstr "Ní Dramhphost é seo"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:53
 #, fuzzy
 msgid "Message Location"
 msgstr "Teachtaireacht ina bhfuil"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:55
 #, fuzzy
 msgid "Pipe to Program"
 msgstr "Píopáil go dtí an Consól?"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:56
 msgid "Play Sound"
 msgstr "Seinn Fuaim"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
+#: ../mail/em-filter-i18n.h:57 ../mail/mail-dialogs.ui.h:14
 msgid "Read"
 msgstr "Léigh"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:58 ../mail/message-list.etspec.h:16
 msgid "Recipients"
 msgstr "Faighteoirí"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:59
 msgid "Regex Match"
 msgstr "Comhoiriúnú Slonn Ionadaíochta"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:60
 #, fuzzy
 msgid "Replied to"
 msgstr "Marcáil \"Freagartha\""
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:61
 msgid "returns"
 msgstr "a fhilleann"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:62
 msgid "returns greater than"
 msgstr "a fhilleann níos mó ná"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:63
 msgid "returns less than"
 msgstr "a fhilleann níos lú ná"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:64
 msgid "Run Program"
 msgstr "Rith Ríomhchlár"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:3
 msgid "Score"
 msgstr "Scór"
 
-#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:66 ../mail/message-list.etspec.h:15
 msgid "Sender"
 msgstr "Seoltóir"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:67
 msgid "Sender or Recipients"
 msgstr "Seoltóir nó Faighteoirí"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:68
 msgid "Set Label"
 msgstr "Socraigh Lipéad"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:69
 msgid "Set Status"
 msgstr "Socraigh Stádas"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:70
 msgid "Size (kB)"
 msgstr "Méid (kB)"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:71
 msgid "sounds like"
 msgstr "a fhuaimnítear cosúil le"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:72
 msgid "Source Account"
 msgstr "Cuntáis foinse"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:73
 msgid "Specific header"
 msgstr "Ceanntásc áirithe"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:74
 msgid "starts with"
 msgstr "a thosaíonn le"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:76
 #, fuzzy
 msgid "Stop Processing"
 msgstr "Earráid: \"%1\" agus %2 á phróiseáil"
 
-#: ../mail/em-filter-i18n.h:75
+#: ../mail/em-filter-i18n.h:79
+#, fuzzy
+msgid "Unset Color"
+msgstr "Dath"
+
+#: ../mail/em-filter-i18n.h:80
 msgid "Unset Status"
 msgstr "Díshocraigh Stádas"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:583
 msgid "Then"
 msgstr "Ansin"
 
-#: ../mail/em-filter-rule.c:592
+#: ../mail/em-filter-rule.c:648
 msgid "Add Ac_tion"
 msgstr "Cuir _Gníomh Leis"
 
@@ -9721,387 +13566,175 @@ msgstr "Úsáid cuóta (%s):"
 msgid "Quota usage"
 msgstr "Úsáid cuóta"
 
-#: ../mail/em-folder-properties.c:317
+#: ../mail/em-folder-properties.c:347
 msgid "Folder Properties"
 msgstr "Airíonna Fillteáin"
 
-#: ../mail/em-folder-selection-button.c:79
+#: ../mail/em-folder-selection-button.c:80
 msgid "<click here to select a folder>"
 msgstr "<cliceáil anseo chun fillteán a roghnú>"
 
-#: ../mail/em-folder-selector.c:436
+#: ../mail/em-folder-selector.c:390
 msgid "C_reate"
 msgstr "C_ruthaigh"
 
-#: ../mail/em-folder-selector.c:442
+#: ../mail/em-folder-selector.c:396
 msgid "Folder _name:"
 msgstr "Ai_nm Fillteán:"
 
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:637
 msgid "Folder names cannot contain '/'"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:768
+#: ../mail/em-folder-tree.c:774
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1590
+#: ../mail/em-folder-tree.c:1599
 msgid "Mail Folder Tree"
 msgstr "Crann Fillteáin Poist"
 
-#: ../mail/em-folder-tree.c:2069 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2168 ../mail/em-folder-utils.c:112
 #, c-format
 msgid "Moving folder %s"
 msgstr "Fillteán %s á bhogadh"
 
-#: ../mail/em-folder-tree.c:2072 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2171 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Copying folder %s"
 msgstr "Fillteán %s á chóipeáil"
 
-#: ../mail/em-folder-tree.c:2079 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2178 ../mail/message-list.c:2280
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Teachtaireachtaí á mbogadh isteach i bhfillteán %s"
 
-#: ../mail/em-folder-tree.c:2083 ../mail/message-list.c:2305
+#: ../mail/em-folder-tree.c:2182 ../mail/message-list.c:2282
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Teachtaireachtaí á gcóipeáil isteach i bhfillteán %s"
 
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2201
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ní féidir teachtaireacht(aí) a chur isteach i stóráil barrleibhéil"
 
-#: ../mail/em-folder-tree-model.c:168 ../mail/mail-vfolder.c:1125
-#: ../mail/mail-vfolder.c:1239 ../widgets/misc/e-account-tree-view.c:100
-#: ../widgets/misc/e-account-tree-view.c:301
-#: ../widgets/misc/e-account-tree-view.c:924
-#: ../widgets/misc/e-account-tree-view.c:982
-#: ../widgets/misc/e-account-tree-view.c:1052
-#: ../widgets/misc/e-account-tree-view.c:1127
-#: ../widgets/misc/e-account-tree-view.c:1375
-msgid "Search Folders"
-msgstr "Fillteáin Cuardaigh"
-
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
 msgid "UNMATCHED"
 msgstr "GAN CHOMHOIRIÚNÚ"
 
-#: ../mail/em-folder-tree-model.c:989 ../mail/em-folder-tree-model.c:1281
+#: ../mail/em-folder-tree-model.c:870 ../mail/em-folder-tree-model.c:1165
 msgid "Loading..."
 msgstr "Á Luchtú..."
 
-#: ../mail/em-folder-utils.c:488
-#, fuzzy
+#: ../mail/em-folder-utils.c:518
 msgid "Move Folder To"
-msgstr "_Bog Fillteán Go..."
+msgstr "Bog Fillteán Go"
 
-#: ../mail/em-folder-utils.c:488
-#, fuzzy
+#: ../mail/em-folder-utils.c:518
 msgid "Copy Folder To"
-msgstr "_Cóipeáil Fillteán Go..."
+msgstr "Cóipeáil Fillteán Go"
 
-#: ../mail/em-folder-utils.c:605
-#, fuzzy
+#: ../mail/em-folder-utils.c:615
 msgid "Create Folder"
-msgstr "Cruthaigh fillteán"
+msgstr "Cruthaigh Fillteán"
 
-#: ../mail/em-folder-utils.c:606
+#: ../mail/em-folder-utils.c:616
 msgid "Specify where to create the folder:"
 msgstr "Sonraigh an áit ina cruthófar an fillteán:"
 
-#: ../mail/em-format-html.c:167
-msgid "Formatting message"
-msgstr "Teachtaireacht á formáidiú"
-
-#: ../mail/em-format-html.c:379
-msgid "Formatting Message..."
-msgstr "Teachtaireacht á Formáidiú..."
-
-#: ../mail/em-format-html.c:1596 ../mail/em-format-html.c:1606
-#, fuzzy, c-format
-msgid "Retrieving '%s'"
-msgstr "`%s' á Fháil"
-
-#: ../mail/em-format-html.c:1757 ../mail/em-format-html-display.c:89
-msgid "Unsigned"
-msgstr "Gan síniú"
-
-#: ../mail/em-format-html.c:1758 ../mail/em-format-html-display.c:90
-msgid "Valid signature"
-msgstr "Síniú bailí"
-
-#: ../mail/em-format-html.c:1759 ../mail/em-format-html-display.c:91
-msgid "Invalid signature"
-msgstr "Síniú neamhbhailí"
-
-#: ../mail/em-format-html.c:1760 ../mail/em-format-html-display.c:92
-msgid "Valid signature, but cannot verify sender"
-msgstr ""
-
-#: ../mail/em-format-html.c:1761 ../mail/em-format-html-display.c:93
-msgid "Signature exists, but need public key"
-msgstr ""
-
-#: ../mail/em-format-html.c:1767 ../mail/em-format-html-display.c:100
-msgid "Unencrypted"
-msgstr "Gan chriptiú"
-
-#: ../mail/em-format-html.c:1768 ../mail/em-format-html-display.c:101
-msgid "Encrypted, weak"
-msgstr "Criptithe, lag"
-
-#: ../mail/em-format-html.c:1769 ../mail/em-format-html-display.c:102
-msgid "Encrypted"
-msgstr "Criptithe"
-
-#: ../mail/em-format-html.c:1770 ../mail/em-format-html-display.c:103
-msgid "Encrypted, strong"
-msgstr "Criptithe, láidir"
-
-#: ../mail/em-format-html.c:2170
-msgid "Unknown external-body part."
-msgstr ""
-
-#: ../mail/em-format-html.c:2180
-msgid "Malformed external-body part."
-msgstr ""
-
-#: ../mail/em-format-html.c:2211
-#, fuzzy, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Uasluchtaigh go suíomh saincheaptha FTP"
-
-#: ../mail/em-format-html.c:2222
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
-
-#: ../mail/em-format-html.c:2224
-#, fuzzy, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Easpórtáil: Easpórtáil imeachtaí go comhad logánta."
-
-#: ../mail/em-format-html.c:2245
-#, fuzzy, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Ag iarraidh sonraí le seoladh"
+#: ../mail/em-subscription-editor.c:867
+msgid "_Subscribe"
+msgstr "_Liostáil"
 
-#: ../mail/em-format-html.c:2260
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:2968
-#: ../plugins/mail-notification/mail-notification.c:402
-#, fuzzy, c-format
-msgid "From: %s"
-msgstr "Ó %s:"
-
-#: ../mail/em-format-html.c:2990
+#: ../mail/em-subscription-editor.c:876
 #, fuzzy
-msgid "(no subject)"
-msgstr "Ábhar"
-
-#: ../mail/em-format-html.c:3066
-#, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr ""
-
-#: ../mail/em-format-html-display.c:89
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:90
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:91
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:92
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:93
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:100
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:101
-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 ""
-
-#: ../mail/em-format-html-display.c:102
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:103
-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 ""
-
-#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
-msgid "_View Certificate"
-msgstr "_Amharc ar Theastas"
-
-#: ../mail/em-format-html-display.c:254
-msgid "This certificate is not viewable"
-msgstr "Níl an teastas inamharctha"
+msgid "Su_bscribe To Shown"
+msgstr "Liostáilte"
 
-#: ../mail/em-format-html-display.c:566
-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 ""
+#: ../mail/em-subscription-editor.c:884
+msgid "Subscribe To _All"
+msgstr "Liostáil le _Gach Rud"
 
-#: ../mail/em-format-html-display.c:756
-#, fuzzy
-msgid "Save Image"
-msgstr "Sábháil Teachtaireacht..."
-
-#: ../mail/em-format-html-display.c:804
-#, fuzzy
-msgid "Save _Image..."
-msgstr "Sábháil mar..."
+#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1836
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
+msgid "_Unsubscribe"
+msgstr "_Díliostáil"
 
-#: ../mail/em-format-html-display.c:806
+#: ../mail/em-subscription-editor.c:990
 #, fuzzy
-msgid "Save the image to a file"
-msgstr "Sábháil an comhad reatha"
-
-#: ../mail/em-format-html-display.c:1034
-msgid "Completed on"
-msgstr "Críochnaithe ar"
+msgid "Unsu_bscribe From Hidden"
+msgstr "_Díliostáil ó Liosta"
 
-#: ../mail/em-format-html-display.c:1046
+#: ../mail/em-subscription-editor.c:998
 #, fuzzy
-msgid "Overdue:"
-msgstr "thar téarma"
-
-#: ../mail/em-format-html-display.c:1054
-msgid "by"
-msgstr "roimh"
-
-#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
-msgid "View _Unformatted"
-msgstr "Amharc ar Cinn gan _Fhormáidiú"
-
-#: ../mail/em-format-html-display.c:1337
-msgid "Hide _Unformatted"
-msgstr "Folaigh Cinn gan _Fhormáidiú"
-
-#: ../mail/em-format-html-display.c:1408
-msgid "O_pen With"
-msgstr "_Oscail Le"
-
-#: ../mail/em-format-html-print.c:176
-#, c-format
-msgid "Page %d of %d"
-msgstr "Leathanach %d as %d"
-
-#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
-#: ../mail/em-html-stream.c:122
-#, fuzzy, c-format
-msgid "No HTML stream available"
-msgstr "Gan achoimre le fáil."
+msgid "Unsubscribe From _All"
+msgstr "_Díliostáil ó Liosta"
 
-#: ../mail/em-subscription-editor.c:1162
+#: ../mail/em-subscription-editor.c:1677
 #, fuzzy
 msgid "Folder Subscriptions"
 msgstr "Bainistiú na Síntiús Fillteán"
 
-#: ../mail/em-subscription-editor.c:1201
+#: ../mail/em-subscription-editor.c:1716
 msgid "_Account:"
 msgstr "_Cuntas:"
 
-#: ../mail/em-subscription-editor.c:1216
+#: ../mail/em-subscription-editor.c:1729
 #, fuzzy
 msgid "Clear Search"
 msgstr "Cuardaigh i gcónaí"
 
-#: ../mail/em-subscription-editor.c:1234
+#: ../mail/em-subscription-editor.c:1746
 #, fuzzy
 msgid "Sho_w items that contain:"
 msgstr "nach ina bhfuil"
 
-#: ../mail/em-subscription-editor.c:1273
+#: ../mail/em-subscription-editor.c:1789
 #, fuzzy
 msgid "Subscribe to the selected folder"
 msgstr "Liostáil le Fillteán Úsáideora Eile"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1790
 #, fuzzy
 msgid "Su_bscribe"
 msgstr "Liostáilte"
 
-#: ../mail/em-subscription-editor.c:1285
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../mail/em-subscription-editor.c:1835
+#: ../modules/mail/e-mail-shell-view-actions.c:1628
 #, fuzzy
 msgid "Unsubscribe from the selected folder"
 msgstr "Athainmnigh an fillteán roghnaithe"
 
-#: ../mail/em-subscription-editor.c:1286
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
-msgid "_Unsubscribe"
-msgstr "_Díliostáil"
-
-#: ../mail/em-subscription-editor.c:1297
+#: ../mail/em-subscription-editor.c:1875
 #, fuzzy
 msgid "Collapse all folders"
 msgstr "Gach fillteán logánta"
 
-#: ../mail/em-subscription-editor.c:1298
+#: ../mail/em-subscription-editor.c:1876
 #, fuzzy
 msgid "C_ollapse All"
 msgstr "Laghdaigh Gach _Snáithe"
 
-#: ../mail/em-subscription-editor.c:1308
+#: ../mail/em-subscription-editor.c:1886
 #, fuzzy
 msgid "Expand all folders"
 msgstr "Lea_thnaigh Gach Snáithe"
 
-#: ../mail/em-subscription-editor.c:1309
+#: ../mail/em-subscription-editor.c:1887
 #, fuzzy
 msgid "E_xpand All"
 msgstr "Lea_thnaigh Gach Snáithe"
 
-#: ../mail/em-subscription-editor.c:1319
+#: ../mail/em-subscription-editor.c:1897
 #, fuzzy
 msgid "Refresh the folder list"
 msgstr "Athnuaigh an fillteán"
 
-#: ../mail/em-subscription-editor.c:1331
+#: ../mail/em-subscription-editor.c:1909
 #, fuzzy
 msgid "Stop the current operation"
 msgstr "Cealaigh an oibríocht phoist reatha"
@@ -10110,7 +13743,7 @@ msgstr "Cealaigh an oibríocht phoist reatha"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:104
+#: ../mail/em-utils.c:86
 #, fuzzy, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
@@ -10120,1332 +13753,162 @@ msgstr[2] "An bhfuil tú cinnte gur main leat an chatagóir seo a bhaint?"
 msgstr[3] "An bhfuil tú cinnte gur main leat an chatagóir seo a bhaint?"
 msgstr[4] "An bhfuil tú cinnte gur main leat an chatagóir seo a bhaint?"
 
-#: ../mail/em-utils.c:160
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+#: ../mail/em-utils.c:142
+#: ../modules/mailto-handler/evolution-mailto-handler.c:150
 #, fuzzy
 msgid "_Do not show this message again"
 msgstr "_Ná taispeáin an teachtaireacht seo arís."
 
-#: ../mail/em-utils.c:335
+#: ../mail/em-utils.c:252
 msgid "Message Filters"
 msgstr "Scagairí Teachtaireachta"
 
-#: ../mail/em-utils.c:920
+#: ../mail/em-utils.c:982
 #, c-format
 msgid "Messages from %s"
 msgstr "Teachtaireachtaí ó %s"
 
-#: ../mail/em-vfolder-editor.c:108
+#: ../mail/em-vfolder-editor.c:105
 msgid "Search _Folders"
 msgstr "Cuardaigh _Fillteáin"
 
-#: ../mail/em-vfolder-rule.c:618
+#: ../mail/em-vfolder-editor-rule.c:397
 msgid "Add Folder"
 msgstr "Cuir Fillteán Leis"
 
-#: ../mail/evolution-mail.schemas.in.h:1
-#, fuzzy
-msgid "\"Filter Editor\" window height"
-msgstr "Airde fhuinneog réamhshocraithe"
-
-#: ../mail/evolution-mail.schemas.in.h:2
-msgid "\"Filter Editor\" window maximize state"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:3
-#, fuzzy
-msgid "\"Filter Editor\" window width"
-msgstr "Leithead fuinneog réamhshocraithe"
-
-#: ../mail/evolution-mail.schemas.in.h:4
-#, fuzzy
-msgid "\"Folder Subscriptions\" window height"
-msgstr "Bainistiú na Síntiús Fillteán"
-
-#: ../mail/evolution-mail.schemas.in.h:5
-#, fuzzy
-msgid "\"Folder Subscriptions\" window maximize state"
-msgstr "Bainistiú na Síntiús Fillteán"
-
-#: ../mail/evolution-mail.schemas.in.h:6
-#, fuzzy
-msgid "\"Folder Subscriptions\" window width"
-msgstr "Bainistiú na Síntiús Fillteán"
-
-#: ../mail/evolution-mail.schemas.in.h:7
-#, fuzzy
-msgid "\"Search Folder Editor\" window height"
-msgstr "Airde fhuinneog réamhshocraithe"
-
-#: ../mail/evolution-mail.schemas.in.h:8
-#, fuzzy
-msgid "\"Search Folder Editor\" window maximize state"
-msgstr "Fillteán Cuardaigh ó _Liosta Postála"
-
-#: ../mail/evolution-mail.schemas.in.h:9
-#, fuzzy
-msgid "\"Search Folder Editor\" window width"
-msgstr "Fillteán Cuardaigh ó _Liosta Postála"
-
-#: ../mail/evolution-mail.schemas.in.h:10
-#, fuzzy
-msgid "\"Send and Receive Mail\" window height"
-msgstr "Seol & Faigh Post"
-
-#: ../mail/evolution-mail.schemas.in.h:11
-msgid "\"Send and Receive Mail\" window maximize state"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:12
-#, fuzzy
-msgid "\"Send and Receive Mail\" window width"
-msgstr "Seol & Faigh Post"
-
-#: ../mail/evolution-mail.schemas.in.h:13
-#, fuzzy
-msgid "Always request read receipt"
-msgstr "Nuair a thagann admháil léite:"
-
-#: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:15
-msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:16
-#, fuzzy
-msgid "Attribute message."
-msgstr "Teachtaireacht Gan Teideal"
-
-#: ../mail/evolution-mail.schemas.in.h:17
-#, fuzzy
-msgid "Automatic emoticon recognition"
-msgstr "Aithint uathoibríoch cineálacha"
-
-#: ../mail/evolution-mail.schemas.in.h:18
-#, fuzzy
-msgid "Automatic link recognition"
-msgstr "Aithint uathoibríoch cineálacha"
-
-#: ../mail/evolution-mail.schemas.in.h:19
-#, fuzzy
-msgid "Check for new messages in all active accounts"
-msgstr "Lorg teachtaireachtaí _nua gach"
-
-#: ../mail/evolution-mail.schemas.in.h:20
-msgid "Check for new messages on start"
-msgstr "Lorg teachtaireachtaí nua ag tosú"
-
-#: ../mail/evolution-mail.schemas.in.h:21
-msgid "Check incoming mail being junk"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:22
-#, fuzzy
-msgid "Citation highlight color"
-msgstr "Athraigh Dath an Aibhsiú"
-
-#: ../mail/evolution-mail.schemas.in.h:23
-#, fuzzy
-msgid "Citation highlight color."
-msgstr "Athraigh Dath an Aibhsiú"
-
-#: ../mail/evolution-mail.schemas.in.h:24
-#, fuzzy
-msgid "Composer Window default height"
-msgstr "Airde fuinneoige réamhshocraithe (i bpicteilíní)"
-
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/em-vfolder-editor-rule.c:523
 #, fuzzy
-msgid "Composer Window default width"
-msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
-
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Composer load/attach directory"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:28
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:29
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:30
-msgid "Custom headers to use while checking for junk."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:31
-msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default charset in which to compose messages"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Default charset in which to compose messages."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:34
-msgid "Default charset in which to display messages"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:35
-msgid "Default charset in which to display messages."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:36
-#, fuzzy
-msgid "Default forward style"
-msgstr "Stíl Réamhshocraithe KDE"
-
-#: ../mail/evolution-mail.schemas.in.h:37
-#, fuzzy
-msgid "Default height of the Composer Window."
-msgstr "Airde fuinneoige réamhshocraithe (i bpicteilíní)"
-
-#: ../mail/evolution-mail.schemas.in.h:38
-#, fuzzy
-msgid "Default height of the mail browser window."
-msgstr "Airde fuinneoige réamhshocraithe (i bpicteilíní)"
-
-#: ../mail/evolution-mail.schemas.in.h:39
-#, fuzzy
-msgid "Default maximized state of the mail browser window."
-msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
-
-#: ../mail/evolution-mail.schemas.in.h:40
-#, fuzzy
-msgid "Default reply style"
-msgstr "Stíl Réamhshocraithe KDE"
-
-#: ../mail/evolution-mail.schemas.in.h:41
-msgid "Default value for thread expand state"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:42
-#, fuzzy
-msgid "Default width of the Composer Window."
-msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
-
-#: ../mail/evolution-mail.schemas.in.h:43
-#, fuzzy
-msgid "Default width of the mail browser window."
-msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
-
-#: ../mail/evolution-mail.schemas.in.h:44
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded \"1\" = collapsed"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:45
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:46
-msgid "Determines whether to lookup in address book for sender email"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:47
-msgid ""
-"Determines whether to lookup the sender email in address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:48
-msgid "Determines whether to use custom headers to check for junk"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:49
-msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:50
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:51
-#, fuzzy
-msgid "Directory for loading/attaching files to composer."
-msgstr "Comhadlann a sábhálfar comhaid uathúla chúltaca inti"
-
-#: ../mail/evolution-mail.schemas.in.h:52
-#, fuzzy
-msgid "Directory for saving mail component files."
-msgstr "Comhadlann a sábhálfar comhaid uathúla chúltaca inti"
-
-#: ../mail/evolution-mail.schemas.in.h:53
-msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:54
-msgid "Display only message texts not exceeding certain size"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:55
-#, fuzzy
-msgid "Do not add signature delimiter"
-msgstr "Níorbh fhéidir comhad cumraíochta X a shábháil"
-
-#: ../mail/evolution-mail.schemas.in.h:56
-msgid "Draw spelling error indicators on words as you type."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:57
-#, fuzzy
-msgid "Empty Junk folders on exit"
-msgstr "Folmhaigh taisce na mionsamhlacha go huathoibríoch ag am scortha"
-
-#: ../mail/evolution-mail.schemas.in.h:58
-#, fuzzy
-msgid "Empty Trash folders on exit"
-msgstr "Folmhaigh taisce na mionsamhlacha go huathoibríoch ag am scortha"
-
-#: ../mail/evolution-mail.schemas.in.h:59
-msgid "Empty all Junk folders when exiting Evolution."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:60
-msgid "Empty all Trash folders when exiting Evolution."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:61
-msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
-msgstr ""
+msgid "Search Folder Sources"
+msgstr "Fillteán foinseach: %1 - Spriocfhillteán: %2"
 
-#: ../mail/evolution-mail.schemas.in.h:62
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
+#: ../mail/em-vfolder-editor-rule.c:555
+msgid "Automatically update on any _source folder change"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:63
-#, fuzzy
-msgid "Enable local folders"
+#: ../mail/em-vfolder-editor-rule.c:567
+msgid "All local folders"
 msgstr "Gach fillteán logánta"
 
-#: ../mail/evolution-mail.schemas.in.h:64
-#, fuzzy
-msgid "Enable or disable magic space bar"
-msgstr "Bainistigh Gléasanna agus Breiseáin"
-
-#: ../mail/evolution-mail.schemas.in.h:65
-msgid "Enable or disable the prompt whilst marking multiple messages."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:66
-msgid "Enable or disable type ahead search feature"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "Enable search folders"
-msgstr "Cumasaigh fillteáin cuardaigh"
-
-#: ../mail/evolution-mail.schemas.in.h:68
-msgid "Enable search folders on startup."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:69
-msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:71
-msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:72
-msgid "Enable to use a similar message list view settings for all folders"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:73
-msgid "Enable to use a similar message list view settings for all folders."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:74
-msgid "Enable/disable caret mode"
-msgstr "Cumasaigh/díchumasaigh mód carait"
-
-#: ../mail/evolution-mail.schemas.in.h:75 ../mail/mail-config.ui.h:45
-msgid "Encode file names in an Outlook/GMail way"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:76
-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:77
-msgid "Flush Outbox after filtering"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:78
-#, fuzzy
-msgid "Forward message."
-msgstr "Teachtaireacht Curtha Ar Aghaidh"
-
-#: ../mail/evolution-mail.schemas.in.h:79
-msgid "Group Reply replies to list"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Height of the message-list pane"
-msgstr "Airde pána an liosta teachtaireachtaí"
-
-#: ../mail/evolution-mail.schemas.in.h:81
-msgid "Height of the message-list pane."
-msgstr "Airde pána an liosta teachtaireachtaí."
-
-#: ../mail/evolution-mail.schemas.in.h:82
-msgid "Hides the per-folder preview and removes the selection"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:83
-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 ""
-
-#: ../mail/evolution-mail.schemas.in.h:84
-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 ""
-
-#: ../mail/evolution-mail.schemas.in.h:85
-msgid "Ignore list Reply-To:"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:86
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:87
-msgid ""
-"Initial height of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:88
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:89
-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:90
-msgid ""
-"Initial maximize state of the \"Filter Editor\" window. The value updates "
-"when the user maximizes or unmaximizes the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximized. This key exists only as an implementation detail."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:91
-msgid ""
-"Initial maximize state of the \"Folder Subscriptions\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Folder Subscriptions\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:93
-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:94
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:95
-msgid ""
-"Initial width of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:96
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:97
-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:98
-msgid ""
-"Instead of the normal \"Reply to All\" behaviour, this option will make the "
-"'Group Reply' toolbar button try to reply only to the mailing list through "
-"which you happened to receive the copy of the message to which you're "
-"replying."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:99
-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:100
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"private reply to a message which arrived via a mailing list."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:101
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying sending "
-"a private reply to a message which arrived via a mailing list, but the list "
-"sets a Reply-To: header which redirects your reply back to the list"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:103
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:104
-msgid "Last time Empty Junk was run"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:105
-msgid "Last time Empty Trash was run"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:106
-msgid "Layout style"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:107
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Level beyond which the message should be logged."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:108
-msgid "List of Labels and their associated colors"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:109
-msgid "List of MIME types to check for Bonobo component viewers"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:110
-msgid "List of accepted licenses"
-msgstr "Liosta ceadúnais glactha leo"
-
-#: ../mail/evolution-mail.schemas.in.h:111
-msgid "List of accounts"
-msgstr "Liosta cuntas"
-
-#: ../mail/evolution-mail.schemas.in.h:112
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid "List of custom headers and whether they are enabled."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid "List of dictionary language codes used for spell checking."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:115
-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 ""
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid "List of protocol names whose license has been accepted."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid "Load images for HTML messages over HTTP"
-msgstr "Luchtaigh íomhánna do theachtaireachtaí HTML trí HTTP"
-
-#: ../mail/evolution-mail.schemas.in.h:118
-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 ""
-"Luchtaigh íomhánna do theachtaireachtaí HTML trí HTTP(S). Is iad na "
-"luachanna a d'fhéadfadh a bheith ann: \"0\" - Ná luchtaigh íomhánna ón "
-"idirlíon riamh. \"1\" - Luchtaigh íomhánna i dteachtaireachtaí ó "
-"theagmhálacha. \"2\" - Luchtaigh íomhánna ón idirlíon i gcónaí."
-
-#: ../mail/evolution-mail.schemas.in.h:119
-msgid "Log filter actions"
-msgstr "Logáil gníomhartha scagaire"
-
-#: ../mail/evolution-mail.schemas.in.h:120
-msgid "Log filter actions to the specified log file."
-msgstr "Logáil gníomhartha scagaire go dtí an comhad loga sonraithe."
-
-#: ../mail/evolution-mail.schemas.in.h:121
-msgid "Logfile to log filter actions"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:122
-msgid "Logfile to log filter actions."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:123
-#, fuzzy
-msgid "Mail browser height"
-msgstr "Airde an ró roghnaithe"
-
-#: ../mail/evolution-mail.schemas.in.h:124
-msgid "Mail browser maximized"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:125
-#, fuzzy
-msgid "Mail browser width"
-msgstr "Tosaíonn ríomhphost le"
-
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Mark as Seen after specified timeout"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "Mark as Seen after specified timeout."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:128
-msgid "Mark citations in the message \"Preview\""
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:129
-msgid "Mark citations in the message \"Preview\"."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Message text limit for display"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:131
-msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Minimum days between emptying the junk on exit"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:133
-msgid "Minimum days between emptying the trash on exit"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:134
-msgid "Minimum time between emptying the junk on exit, in days."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:135
-msgid "Minimum time between emptying the trash on exit, in days."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:136
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:137
-#, fuzzy
-msgid "Original message."
-msgstr "-----Bunteachtaireacht-----"
-
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid "Path where picture gallery should search for its content"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:139
-msgid ""
-"Possible values are: never - to never close browser window always - to "
-"always close browser window ask - (or any other value) will ask user"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Prompt before sending to recipients not entered as mail addresses"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:141
-#, fuzzy
-msgid "Prompt on empty subject"
-msgstr "Folmhaigh an Bruscar ag an &Scor"
-
-#: ../mail/evolution-mail.schemas.in.h:142
-msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:143
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:144
-#, fuzzy
-msgid "Prompt when deleting messages in search folder"
-msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
-
-#: ../mail/evolution-mail.schemas.in.h:145
-msgid "Prompt when mailing list hijacks private replies"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:146
-msgid "Prompt when replying privately to list messages"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:147
-msgid "Prompt when replying to many recipients"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:148
-#, fuzzy
-msgid "Prompt when user expunges"
-msgstr "Tabhair &leid nuair a dhéanann feidhmchlár rochtain ar sparán oscailte"
-
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid "Prompt when user only fills Bcc"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:150
-msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:153
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:154
-msgid "Prompt while marking multiple messages"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:155
-msgid "Put personalized signatures at the top of replies"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid "Put the cursor at the bottom of replies"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:157
-msgid "Recognize emoticons in text and replace them with images."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:158
-msgid "Recognize links in text and replace them."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:159
-msgid "Run junk test on incoming mail."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:160
-msgid "Save directory"
-msgstr "Sábháil comhadlann"
-
-#: ../mail/evolution-mail.schemas.in.h:161
-msgid "Search for the sender photo in local address books"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:162
-msgid "Send HTML mail by default"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:163
-msgid "Send HTML mail by default."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:164
-msgid "Sender email-address column in the message list"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:165
-#, fuzzy
-msgid "Server synchronization interval"
-msgstr "Roghanna Beochana"
-
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "Show \"Bcc\" field when sending a mail message"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Show \"Cc\" field when sending a mail message"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "Show \"From\" field when posting to a newsgroup"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "Show \"Reply To\" field when sending a mail message"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "Show Animations"
-msgstr "Taispeán Beocháin"
-
-#: ../mail/evolution-mail.schemas.in.h:173
-#, fuzzy
-msgid "Show all message headers"
-msgstr "Laghdaigh gach snáithe teachtaireachtaí"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-#, fuzzy
-msgid "Show all the headers when viewing a messages."
-msgstr "Comment=Taispeáin Teachtaireacht Téacs i bPreabfhuinneog"
-
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "Show animated images as animations."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Show deleted messages in the message-list"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:178
-#, fuzzy
-msgid "Show image animations"
-msgstr "Taispeáin cineál na híomhá"
-
-#: ../mail/evolution-mail.schemas.in.h:179
-msgid "Show original \"Date\" header value."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:180
-#, fuzzy
-msgid "Show photo of the sender"
-msgstr "&Seoladh nua an tseoltóra:"
-
-#: ../mail/evolution-mail.schemas.in.h:181
-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:182
-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:183
-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:184
-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:185
-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:186
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:187
-msgid ""
-"Show the original \"Date\" header (with a local time only if the time zone "
-"differs). Otherwise always show \"Date\" header value in a user preferred "
-"format and local time zone."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:188
-msgid "Show the photo of the sender in the message reading pane."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:189
-msgid ""
-"Some mailing lists set a Reply-To: header to trick users into sending "
-"replies to the list, even when they ask Evolution to make a private reply. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:190
-msgid "Sort accounts alphabetically in a folder tree"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:191
-#, fuzzy
-msgid "Spell check inline"
-msgstr "Seiceáil an litrithe go huathoibríoch"
-
-#: ../mail/evolution-mail.schemas.in.h:192
-#, fuzzy
-msgid "Spell checking color"
-msgstr "Seiceáil Litrithe"
-
-#: ../mail/evolution-mail.schemas.in.h:193
-#, fuzzy
-msgid "Spell checking languages"
-msgstr "Seiceáil an litrithe go huathoibríoch"
-
-#: ../mail/evolution-mail.schemas.in.h:194
-msgid "State of message headers in paned view"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:195
-msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:196
-msgid "Terminal font"
-msgstr "Cló teirminéil"
-
-#: ../mail/evolution-mail.schemas.in.h:197
-msgid "The default plugin for Junk hook"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:198
-msgid ""
-"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:199
-msgid ""
-"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:200
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the message list. \"0\" (Classic View) places the preview pane below the "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:201
-#, fuzzy
-msgid "The terminal font for mail display."
-msgstr "Úsáid &dath uathoibríoch cló don taispeántas scáileáin"
-
-#: ../mail/evolution-mail.schemas.in.h:202
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:203
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:204
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:205
-#, fuzzy
-msgid "The variable width font for mail display."
-msgstr "Úsáid &dath uathoibríoch cló don taispeántas scáileáin"
-
-#: ../mail/evolution-mail.schemas.in.h:206
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:207
-msgid ""
-"This decides the max size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when 'force_message_limit' key is activated."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:208
-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 ""
-
-#: ../mail/evolution-mail.schemas.in.h:209
-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:210
-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 ""
-
-#: ../mail/evolution-mail.schemas.in.h:211
-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:212
-msgid "This option would help in improving the speed of fetching."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:213
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:214
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:215
-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:216
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "Thread the message-list based on Subject"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid "Timeout for marking message as seen"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:219
-msgid "Timeout for marking message as seen."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:220
-#, fuzzy
-msgid "UID string of the default account."
-msgstr "Úsáid an réamhshocrú ó shocruithe an chuntais"
-
-#: ../mail/evolution-mail.schemas.in.h:221
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid "Use custom fonts"
-msgstr "Úsáid clónna saincheaptha"
-
-#: ../mail/evolution-mail.schemas.in.h:223
-#, fuzzy
-msgid "Use custom fonts for displaying mail."
-msgstr "Úsáid clónna saincheaptha"
-
-#: ../mail/evolution-mail.schemas.in.h:224
-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:225
-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:226
-#, fuzzy
-msgid "Variable width font"
-msgstr "Cló &il-leithid"
-
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "Whether a read receipt request gets added to every message by default."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:228
-msgid ""
-"Whether check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:229
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:230
-msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:231
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:232
-msgid "Whether sort threads based on latest message in that thread"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:233
-msgid ""
-"Whether to flush Outbox after filtering is done. Outbox flush will happen "
-"only when there was used any 'Forward to' filter action and approximately "
-"one minute after the last action invocation."
-msgstr ""
+#: ../mail/em-vfolder-editor-rule.c:568
+msgid "All active remote folders"
+msgstr "Gach fillteán cianda gníomhach"
 
-#: ../mail/evolution-mail.schemas.in.h:234
-msgid "Whether to show local folders (On This Computer) in a folder tree."
-msgstr ""
+#: ../mail/em-vfolder-editor-rule.c:569
+msgid "All local and active remote folders"
+msgstr "Gach fillteán logánta agus cianda gníomhach"
 
-#: ../mail/evolution-mail.schemas.in.h:235
-#, fuzzy
-msgid "Width of the message-list pane"
-msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
+#: ../mail/em-vfolder-editor-rule.c:570
+msgid "Specific folders"
+msgstr "Fillteáin áirithe"
 
-#: ../mail/evolution-mail.schemas.in.h:236
+#: ../mail/em-vfolder-editor-rule.c:608
 #, fuzzy
-msgid "Width of the message-list pane."
-msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
+msgid "include subfolders"
+msgstr "Cumasaigh fillteáin cuardaigh"
 
-#: ../mail/importers/elm-importer.c:181
+#: ../mail/importers/elm-importer.c:178
 #, fuzzy
 msgid "Importing Elm data"
 msgstr "Earráid agus Sonraí á nIompórtáil"
 
-#: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:458
-#: ../modules/mail/e-mail-shell-view.c:1051
-#: ../widgets/misc/e-send-options.c:520
-msgid "Mail"
-msgstr "Post"
-
-#: ../mail/importers/elm-importer.c:396
+#: ../mail/importers/elm-importer.c:378
 #, fuzzy
 msgid "Evolution Elm importer"
 msgstr "&GNOME-PIM (Evolution)"
 
-#: ../mail/importers/elm-importer.c:397
+#: ../mail/importers/elm-importer.c:379
 #, fuzzy
 msgid "Import mail from Elm."
 msgstr "Iompórtáil Ó Phost OS X"
 
-#: ../mail/importers/evolution-mbox-importer.c:138
+#: ../mail/importers/evolution-mbox-importer.c:140
 #: ../plugins/dbx-import/dbx-importer.c:250
 #, fuzzy
 msgid "_Destination folder:"
 msgstr "Sprioc-fhillteán:"
 
-#: ../mail/importers/evolution-mbox-importer.c:145
-#: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:460
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:256
+#: ../plugins/pst-import/pst-importer.c:545
 msgid "Select folder"
 msgstr "Roghnaigh fillteán"
 
-#: ../mail/importers/evolution-mbox-importer.c:146
-#: ../plugins/dbx-import/dbx-importer.c:261
-#: ../plugins/pst-import/pst-importer.c:461
+#: ../mail/importers/evolution-mbox-importer.c:147
+#: ../plugins/dbx-import/dbx-importer.c:257
+#: ../plugins/pst-import/pst-importer.c:546
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Ní féidir fillteán a chruthú le ríomhphost a iompórtáil isteach ann."
 
-#: ../mail/importers/evolution-mbox-importer.c:433
-#, fuzzy
+#: ../mail/importers/evolution-mbox-importer.c:437
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Ábhar"
 
-#: ../mail/importers/evolution-mbox-importer.c:438
-#, fuzzy
+#: ../mail/importers/evolution-mbox-importer.c:442
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Ó"
 
-#: ../mail/importers/evolution-mbox-importer.c:482
-#: ../shell/e-shell-utils.c:221
+#: ../mail/importers/evolution-mbox-importer.c:486
+#: ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Bosca Poist Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:483
+#: ../mail/importers/evolution-mbox-importer.c:487
 msgid "Importer Berkeley Mailbox format folders"
 msgstr ""
 
-#: ../mail/importers/mail-importer.c:64
+#: ../mail/importers/mail-importer.c:63
 msgid "Importing mailbox"
 msgstr "Bosca poist á iompórtáil"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:610
-#: ../plugins/pst-import/pst-importer.c:648
-#, fuzzy, c-format
+#: ../plugins/dbx-import/dbx-importer.c:612
+#: ../plugins/pst-import/pst-importer.c:767
+#, c-format
 msgid "Importing '%s'"
-msgstr "`%s' á iompórtáil"
+msgstr "'%s' á iompórtáil"
 
 #: ../mail/importers/mail-importer.c:316
 #, c-format
 msgid "Scanning %s"
 msgstr "%s á scanadh"
 
-#: ../mail/importers/pine-importer.c:260
+#: ../mail/importers/pine-importer.c:247
 msgid "Importing Pine data"
 msgstr "Sonraí Pine á n-iompórtáil"
 
-#: ../mail/importers/pine-importer.c:463
-#: ../modules/addressbook/addressbook-config.c:1081
-msgid "Address Book"
-msgstr "Leabhar Seoltaí"
-
-#: ../mail/importers/pine-importer.c:509
+#: ../mail/importers/pine-importer.c:474
 msgid "Evolution Pine importer"
 msgstr "Iompórtálaí Pine Evolution"
 
-#: ../mail/importers/pine-importer.c:510
+#: ../mail/importers/pine-importer.c:475
 msgid "Import mail from Pine."
 msgstr "Iompórtáil post ó Pine."
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Post chuig %s"
 
-#: ../mail/mail-autofilter.c:228 ../mail/mail-autofilter.c:271
+#: ../mail/mail-autofilter.c:226 ../mail/mail-autofilter.c:269
 #, c-format
 msgid "Mail from %s"
 msgstr "Post ó %s"
 
-#: ../mail/mail-autofilter.c:254
+#: ../mail/mail-autofilter.c:252
 #, c-format
 msgid "Subject is %s"
 msgstr "Is %s an t-ábhar"
 
-#: ../mail/mail-autofilter.c:295
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "liosta postála %s"
 
-#: ../mail/mail-autofilter.c:404
+#: ../mail/mail-autofilter.c:403
 msgid "Add Filter Rule"
 msgstr "Cuir Riail Scagaire Leis"
 
@@ -11454,7 +13917,7 @@ msgstr "Cuir Riail Scagaire Leis"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:507
+#: ../mail/mail-autofilter.c:512
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11469,697 +13932,449 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../mail/mail-config.ui.h:2
-msgid "Add Ne_w Signature..."
-msgstr "Cuir Síniú _Nua Leis..."
-
-#: ../mail/mail-config.ui.h:3
-msgid "Al_ways sign outgoing messages when using this account"
-msgstr ""
+#: ../mail/mail-config.ui.h:1
+#, fuzzy
+msgid "Set custom junk header"
+msgstr "Cuir Ceanntásc Dramhphoist Saincheaptha Leis"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:2
 msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
 msgstr ""
 
-#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:3
+#, fuzzy
+msgid "Header name"
+msgstr "Ainm Ceanntáisc:"
+
+#: ../mail/mail-config.ui.h:4
+#, fuzzy
+msgid "Header content"
+msgstr "Seoltóir ina bhfuil"
+
+#: ../mail/mail-config.ui.h:5
+msgid "Default Behavior"
+msgstr "Oibriú Réamhshocraithe"
+
 #: ../mail/mail-config.ui.h:6
-msgid "Allowing a _mailing list to redirect a private reply to the list"
-msgstr ""
+#, fuzzy
+msgid "For_mat messages in HTML"
+msgstr "Seol mar HTML amháin"
 
 #: ../mail/mail-config.ui.h:7
-msgid "Also encrypt to sel_f when sending encrypted messages"
+msgid "Automatically insert _emoticon images"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:8
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Déan cóip charbóin (_cc) i gcónaí go:"
+#, fuzzy
+msgid "Always request rea_d receipt"
+msgstr "Nuair a thagann admháil léite:"
 
 #: ../mail/mail-config.ui.h:9
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Déan cóip charbóin folaithe (_bcc) i gcónaí go:"
+msgid "Encode filenames in an _Outlook/GMail way"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:10
-msgid "Always _trust keys in my keyring when encrypting"
-msgstr ""
+#, fuzzy
+msgid "Ch_aracter encoding:"
+msgstr "Ionchódú C_arachtar"
 
 #: ../mail/mail-config.ui.h:11
-msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr ""
+#, fuzzy
+msgid "Replies and Forwards"
+msgstr "Ceadaítear plé agus freagraí"
 
 #: ../mail/mail-config.ui.h:12
 #, fuzzy
-msgid "Always request rea_d receipt"
-msgstr "Nuair a thagann admháil léite:"
+msgid "_Reply style:"
+msgstr "Stíl na hImlíne"
 
 #: ../mail/mail-config.ui.h:13
-msgid "Apply the same _view settings to all folders"
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Stíl na hImlíne"
+
+#: ../mail/mail-config.ui.h:14
+msgid "Start _typing at the bottom on replying"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1088
-msgid "Authentication"
-msgstr "Fíordheimhniú"
+msgid "_Keep signature above the original message on replying"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:16
-msgid "Automatically insert _emoticon images"
+msgid "Ig_nore Reply-To: for mailing lists"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:17
-msgid "C_haracter set:"
-msgstr "Tacar c_arachtar:"
+msgid "Gro_up Reply goes only to mailing list, if possible"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:18
-msgid "Ch_eck for Supported Types"
-msgstr "_Lorg Cineáil Tacaithe"
+msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:19
 #, fuzzy
-msgid "Check cu_stom headers for junk"
-msgstr "Post ríomhphost"
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "Iatán"
 
 #: ../mail/mail-config.ui.h:20
-msgid "Check for new _messages on start"
-msgstr "Lorg _teachtaireachtaí nua ag tosú"
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:21
-msgid "Check for new messa_ges in all active accounts"
-msgstr "Lorg teachtai_reachtaí nua do gach cuntas gníomhach"
+#, fuzzy
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "_Athfhriotail"
 
 #: ../mail/mail-config.ui.h:22
-msgid "Check incoming _messages for junk"
-msgstr "Seiceáil an dramhphost iad _teachtaireachtaí isteach"
+#, fuzzy
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "Ná scrios"
 
 #: ../mail/mail-config.ui.h:23
-msgid "Check spelling while I _type"
-msgstr "Seiceáil _litriú agus mé á chlóscríobh"
-
-#: ../mail/mail-config.ui.h:24
-msgid "Cle_ar"
-msgstr "_Glan"
+#, fuzzy
+msgctxt "ReplyForward"
+msgid "Inline"
+msgstr "_Inlíne"
 
 #: ../mail/mail-config.ui.h:25
-msgid "Clea_r"
-msgstr "_Glan"
+msgid "Sig_natures"
+msgstr "Sí_nithe"
 
 #: ../mail/mail-config.ui.h:26
-#, fuzzy
-msgid "Color for _misspelled words:"
-msgstr "Uath athchuir focail litrithe mícheart"
+msgid "Signatures"
+msgstr "Sínithe"
 
 #: ../mail/mail-config.ui.h:27
-msgid "Composing Messages"
-msgstr "Cumadh Teachtaireachtaí"
+msgid "_Languages"
+msgstr "_Teangacha"
 
 #: ../mail/mail-config.ui.h:28
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
-msgid "Configuration"
-msgstr "Cumraíocht"
+#, fuzzy
+msgid "Languages Table"
+msgstr "Cuir Tábla Leis"
 
 #: ../mail/mail-config.ui.h:29
-msgid "Confirm _when expunging a folder"
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr ""
 
-#: ../mail/mail-config.ui.h:30
-msgid "Confirmations"
-msgstr "Deimhnithe"
-
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:188
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
-msgid "Date/Time Format"
-msgstr "Formáid Dáta/Ama"
+msgid "Check spelling while I _type"
+msgstr "Seiceáil _litriú agus mé á chlóscríobh"
+
+#: ../mail/mail-config.ui.h:32
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Uath athchuir focail litrithe mícheart"
 
 #: ../mail/mail-config.ui.h:33
-msgid "Default Behavior"
-msgstr "Oibriú Réamhshocraithe"
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
+msgid "Pick a color"
+msgstr "Roghnaigh dath"
 
 #: ../mail/mail-config.ui.h:34
-msgid "Default character e_ncoding:"
-msgstr "_Ionchódú carachtar réamhshocraithe:"
+msgid "Spell Checking"
+msgstr "Litriú"
 
 #: ../mail/mail-config.ui.h:35
-msgid "Delete Mail"
-msgstr "Scriosadh Poist"
-
-#: ../mail/mail-config.ui.h:36
-msgid "Delete junk messages on e_xit"
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:38
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:37
 #, fuzzy
-msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "Ag bogadh scéaltaí"
+msgid "Sending a message with an _empty subject line"
+msgstr "Tá teachtaireachtaí gan léamh sa snáithe seo."
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:39
-#, fuzzy
-msgid "Displayed Message Headers"
-msgstr "Gach _Ceanntásc Teachtaireachta"
-
-#: ../mail/mail-config.ui.h:40
-msgid "Do not mar_k messages as junk if sender is in my address book"
+msgid "Sending a message with only _Bcc recipients defined"
 msgstr ""
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:41
-#, fuzzy
-msgid "Do not quote"
-msgstr "Ná scrios"
-
-#: ../mail/mail-config.ui.h:42
-msgid "Drafts _Folder:"
-msgstr "Fillteán _Dréachtaí:"
+msgid "Sending a _private reply to a mailing list message"
+msgstr ""
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:43
-msgid "Email _Address:"
-msgstr "_Seoladh Ríomhphoist:"
-
-#: ../mail/mail-config.ui.h:44
-msgid "Empty trash folders on e_xit"
+msgid "Sending a reply to a large _number of recipients"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:46
-#, fuzzy
-msgid "Encry_ption certificate:"
-msgstr "Gan Teastas Freastalaí"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:45
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr ""
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:47
-#, fuzzy
-msgid "Encrypt out_going messages (by default)"
-msgstr "Ag bogadh scéaltaí"
-
-#: ../mail/mail-config.ui.h:48
-msgid "F_all back to threading messages by subject"
+msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:49
-msgid "Fix_ed Width Font:"
-msgstr "Cló _Aonleithid:"
-
-#: ../mail/mail-config.ui.h:50
-#, fuzzy
-msgid "Format messages in _HTML"
-msgstr "Seol mar HTML amháin"
-
-#: ../mail/mail-config.ui.h:51
-msgid "Full Nam_e:"
-msgstr "_Ainm Iomlán:"
-
-#: ../mail/mail-config.ui.h:53
-msgid "Group Reply goes only to mailing list, if possible"
-msgstr ""
+#: ../mail/mail-config.ui.h:48
+msgid "Confirmations"
+msgstr "Deimhnithe"
 
-#: ../mail/mail-config.ui.h:54
-msgid "HTML Messages"
-msgstr "Teachtaireachtaí HTML"
+#: ../mail/mail-config.ui.h:54 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "a"
 
-#: ../mail/mail-config.ui.h:55
-#, fuzzy
-msgid "H_TTP Proxy:"
-msgstr "Bosca _Phoist:"
+#: ../mail/mail-config.ui.h:55 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "b"
 
 #: ../mail/mail-config.ui.h:56
-#, fuzzy
-msgid "Header content"
-msgstr "Seoltóir ina bhfuil"
+msgid "Proxy Settings"
+msgstr "Socruithe Seachfhreastalaí"
 
 #: ../mail/mail-config.ui.h:57
-#, fuzzy
-msgid "Header name"
-msgstr "Ainm Ceanntáisc:"
+msgid "_Use system defaults"
+msgstr "Ú_sáid réamhshocruithe an chórais"
 
 #: ../mail/mail-config.ui.h:58
-msgid "Headers"
-msgstr "Ceanntásca"
+msgid "_Direct connection to the Internet"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:59
 #, fuzzy
-msgid "Highlight _quotations with"
-msgstr "RockRidge le díth ainm"
+msgid "_Manual proxy configuration:"
+msgstr "Socrú Post"
 
 #: ../mail/mail-config.ui.h:60
-msgid "Ignore Reply-To: for mailing lists"
-msgstr ""
+msgid "H_TTP Proxy:"
+msgstr "Seachfhreastalaí H_TTP:"
 
 #: ../mail/mail-config.ui.h:61
-#, fuzzy
-msgid "Inline"
-msgstr "_Inlíne"
+msgid "_Secure HTTP Proxy:"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:62
-msgid "Inline (Outlook style)"
+msgid "SOC_KS Proxy:"
+msgstr "Seachfhreastalaí SOC_KS:"
+
+#: ../mail/mail-config.ui.h:63
+msgid "No _Proxy for:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
-msgid "Labels"
-msgstr "Lipéid"
+#: ../mail/mail-config.ui.h:64
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:614
+msgid "Port:"
+msgstr "Port:"
 
 #: ../mail/mail-config.ui.h:65
-#, fuzzy
-msgid "Languages Table"
-msgstr "Cuir Tábla Leis"
+msgid "Use Authe_ntication"
+msgstr "Úsáid Fío_rdheimhniú"
 
 #: ../mail/mail-config.ui.h:66
-msgid "Loading Images"
-msgstr "Luchtú Íomhánna"
+msgid "Us_ername:"
+msgstr "Ainm Ú_sáideora:"
 
 #: ../mail/mail-config.ui.h:67
-#, fuzzy
-msgid "Mail Headers Table"
-msgstr "Tábla gan aimsiú"
+msgid "Pass_word:"
+msgstr "_Focal Faire:"
 
 #: ../mail/mail-config.ui.h:68
-msgid "Mailbox location"
-msgstr "Áit do Bosca Phoist"
+msgid "Start up"
+msgstr "Tosú"
 
 #: ../mail/mail-config.ui.h:69
-msgid "Message Display"
-msgstr "Taispeáint Teachtaireachtaí"
+msgid "Check for new _messages on start"
+msgstr "Lorg _teachtaireachtaí nua ag tosú"
 
 #: ../mail/mail-config.ui.h:70
-msgid "Message Receipts"
-msgstr "Admhálacha Teachtaireachta"
+msgid "Check for new messa_ges in all active accounts"
+msgstr "Lorg teachtai_reachtaí nua do gach cuntas gníomhach"
 
 #: ../mail/mail-config.ui.h:71
-msgid "No _Proxy for:"
-msgstr ""
+msgid "Message Display"
+msgstr "Taispeáint Teachtaireachtaí"
 
-#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "Gan chriptiú"
+#: ../mail/mail-config.ui.h:72
+msgid "_Use the same fonts as other applications"
+msgstr "Ú_sáid na clónna céanna a úsáideann feidhmchláir eile"
 
 #: ../mail/mail-config.ui.h:73
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr ""
+msgid "S_tandard Font:"
+msgstr "Cló _Caighdeánach:"
 
 #: ../mail/mail-config.ui.h:74
-#: ../plugins/publish-calendar/publish-calendar.ui.h:10
 #, fuzzy
-msgid "Optional Information"
-msgstr "Eolas Pearsanta"
+msgid "Select HTML fixed width font"
+msgstr "Ní cló aonleithid é '%s'"
+
+#: ../mail/mail-config.ui.h:75
+msgid "Select HTML variable width font"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:76
-msgid "Or_ganization:"
-msgstr "_Eagras:"
+msgid "Fix_ed Width Font:"
+msgstr "Cló _Aonleithid:"
 
 #: ../mail/mail-config.ui.h:77
-msgid "PGP/GPG _Key ID:"
-msgstr "CA _Eochracha PGP/GPG:"
-
-#: ../mail/mail-config.ui.h:78
-msgid "Pass_word:"
-msgstr "_Focal Faire:"
+#, fuzzy
+msgid "_Mark messages as read after"
+msgstr "Marcáil _Teachtaireachtaí mar Léite"
 
 #: ../mail/mail-config.ui.h:79
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
-msgid "Pick a color"
-msgstr "Roghnaigh dath"
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "RockRidge le díth ainm"
 
 #: ../mail/mail-config.ui.h:80
-msgid "Port:"
-msgstr "Port:"
+msgid "color"
+msgstr "dath"
 
 #: ../mail/mail-config.ui.h:81
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
+msgid "Default character e_ncoding:"
+msgstr "_Ionchódú carachtar réamhshocraithe:"
+
+#: ../mail/mail-config.ui.h:82
+msgid "Apply the same _view settings to all folders"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:83
-msgid "Proxy Settings"
-msgstr "Socruithe Seachfhreastalaí"
+msgid "F_all back to threading messages by subject"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:84
-#, fuzzy
-msgid "Quoted"
-msgstr "_Athfhriotail"
+msgid "Delete Mail"
+msgstr "Scriosadh Poist"
 
 #: ../mail/mail-config.ui.h:85
-msgid "Re_member password"
-msgstr "_Meabhraigh focal faire"
+#, fuzzy
+msgid "Empty _trash folders"
+msgstr "Folmhaigh taisce na mionsamhlacha go huathoibríoch ag am scortha"
 
 #: ../mail/mail-config.ui.h:86
-msgid "Re_ply-To:"
-msgstr "_Freagra-Chuig:"
-
-#: ../mail/mail-config.ui.h:87
-msgid "Remember _password"
-msgstr "Meabhraigh _focal faire"
+msgid "Confirm _when expunging a folder"
+msgstr ""
 
+#. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.ui.h:88
 #, fuzzy
-msgid "Replies and Forwards"
-msgstr "Ceadaítear plé agus freagraí"
+msgid "_Show animated images"
+msgstr "_Taispeáin íomhánna beo"
 
 #: ../mail/mail-config.ui.h:89
-#, fuzzy
-msgid "Required Information"
-msgstr "Eolas faoin bhFreastalaí"
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:90
-msgid "SHA1"
-msgstr "SHA1"
+msgid "Loading Images"
+msgstr "Luchtú Íomhánna"
 
 #: ../mail/mail-config.ui.h:91
-msgid "SHA256"
-msgstr "SHA256"
+msgid "_Never load images from the Internet"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:92
-msgid "SHA384"
-msgstr "SHA384"
+#, fuzzy
+msgid "_Load images only in messages from contacts"
+msgstr "Post sceál do tadhall"
 
 #: ../mail/mail-config.ui.h:93
-msgid "SHA512"
-msgstr "SHA512"
+#, fuzzy
+msgid "_Always load images from the Internet"
+msgstr "Cuirfidh %S cosc ar íomhánna ó %S i gcónaí."
 
-#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "Criptiú SSL"
+#: ../mail/mail-config.ui.h:94
+msgid "HTML Messages"
+msgstr "Teachtaireachtaí HTML"
 
-#: ../mail/mail-config.ui.h:95
-#, fuzzy
-msgid "SSL is not supported in this build of Evolution"
-msgstr "<b>Ní thacaítear le SSL sa tógáil Evolution seo</b>"
+#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
+msgid "Labels"
+msgstr "Lipéid"
 
 #: ../mail/mail-config.ui.h:96
-msgid "S_earch for sender photograph only in local address books"
-msgstr ""
+msgid "Sender Photograph"
+msgstr "Grianghraf Seoltóra"
 
 #: ../mail/mail-config.ui.h:97
-msgid "S_elect..."
-msgstr "_Roghnaigh..."
+msgid "_Show the photograph of sender in the message preview"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:98
-msgid "S_end message receipts:"
-msgstr "_Seol admhálacha teachtaireachta:"
+#, fuzzy
+msgid "Displayed Message Headers"
+msgstr "Gach _Ceanntásc Teachtaireachta"
 
 #: ../mail/mail-config.ui.h:99
-msgid "S_tandard Font:"
-msgstr "Cló _Caighdeánach:"
+#, fuzzy
+msgid "Mail Headers Table"
+msgstr "Tábla gan aimsiú"
 
 #: ../mail/mail-config.ui.h:100
-msgid "Secure MIME (S/MIME)"
-msgstr ""
+#: ../modules/addressbook/autocompletion-config.c:117
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Date/Time Format"
+msgstr "Formáid Dáta/Ama"
 
 #: ../mail/mail-config.ui.h:102
-#, fuzzy
-msgid "Select HTML fixed width font"
-msgstr "Ní cló aonleithid é '%s'"
+msgid "Check incoming _messages for junk"
+msgstr "Seiceáil an dramhphost iad _teachtaireachtaí isteach"
 
 #: ../mail/mail-config.ui.h:103
-msgid "Select HTML variable width font"
-msgstr ""
+#, fuzzy
+msgid "_Delete junk messages"
+msgstr "_Scrios Teachtaireacht"
 
 #: ../mail/mail-config.ui.h:104
-msgid "Sender Photograph"
-msgstr "Grianghraf Seoltóra"
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:106
-msgid "Sending a _private reply to a mailing list message"
-msgstr ""
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:108
-msgid "Sending a message with _recipients not entered as mail addresses"
-msgstr ""
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:110
 #, fuzzy
-msgid "Sending a message with an _empty subject line"
-msgstr "Tá teachtaireachtaí gan léamh sa snáithe seo."
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:112
-msgid "Sending a message with only _Bcc recipients defined"
-msgstr ""
+msgid "Check cu_stom headers for junk"
+msgstr "Post ríomhphost"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:114
-msgid "Sending a reply to a large _number of recipients"
+#: ../mail/mail-config.ui.h:105
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:115
-msgid "Sent _Messages Folder:"
-msgstr "Fillteán _Teachtaireachtaí Seolta:"
-
-#: ../mail/mail-config.ui.h:116
-msgid "Ser_ver requires authentication"
-msgstr "Tá fíordheimhniú de dhíth ar an _bhfreastalaí"
-
-#: ../mail/mail-config.ui.h:117
-#, fuzzy
-msgid "Server Configuration"
-msgstr "Eolas faoin bhFreastalaí"
-
-#: ../mail/mail-config.ui.h:118
-msgid "Server _Type:"
-msgstr "C_ineál Freastalaí:"
-
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:106
 #, fuzzy
-msgid "Set custom junk header"
-msgstr "Cuir Ceanntásc Dramhphoist Saincheaptha Leis"
-
-#: ../mail/mail-config.ui.h:120
-msgid "Si_gning algorithm:"
-msgstr "Al_gartam sínithe:"
-
-#: ../mail/mail-config.ui.h:121
-msgid "Sig_natures"
-msgstr "Sí_nithe"
-
-#: ../mail/mail-config.ui.h:122
-msgid "Sig_ning certificate:"
-msgstr "_Teastas sínithe:"
-
-#: ../mail/mail-config.ui.h:123
-msgid "Signat_ure:"
-msgstr "_Síniú:"
-
-#: ../mail/mail-config.ui.h:124
-msgid "Signatures"
-msgstr "Sínithe"
-
-#: ../mail/mail-config.ui.h:125
-msgid "Signing _algorithm:"
-msgstr "_Algartam sínithe:"
-
-#: ../mail/mail-config.ui.h:126
-msgid "Special Folders"
-msgstr "Fillteáin Speisialta"
-
-#: ../mail/mail-config.ui.h:127
-msgid "Spell Checking"
-msgstr "Litriú"
+msgid "_Lookup in local address book only"
+msgstr "Ná taispeáin ach fillteáin atá oscailte"
 
-#: ../mail/mail-config.ui.h:128
-msgid "Start _typing at the bottom on replying"
+#: ../mail/mail-config.ui.h:107
+msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 
-#: ../mail/mail-config.ui.h:129
-msgid "Start up"
-msgstr "Tosú"
+#: ../mail/mail-config.ui.h:109
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:225
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:159
+msgid "No encryption"
+msgstr "Gan chriptiú"
 
-#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+#: ../mail/mail-config.ui.h:110
 msgid "TLS encryption"
 msgstr "Criptiú TLS"
 
-#: ../mail/mail-config.ui.h:131
-msgid "T_ype:"
-msgstr "_Cineál:"
-
-#: ../mail/mail-config.ui.h:132
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-
-#: ../mail/mail-config.ui.h:133
-#, fuzzy
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
-msgstr ""
-"Iontráil ainm tuairisciúil don chuntas seo sa spás thíos, le do thoil. "
-"Úsáidfear an t-ainm seo le haghaidh taispeána amháin."
-
-#: ../mail/mail-config.ui.h:136
-msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
-msgstr ""
+#: ../mail/mail-config.ui.h:111
+msgid "SSL encryption"
+msgstr "Criptiú SSL"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-dialogs.ui.h:1
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
-msgstr ""
-"Clóscríobh an t-ainm lenar mhaith leat an cuntas seo a chur i leith.\n"
-"Mar shampla: \"Obair\" nó \"Pearsanta\""
-
-#: ../mail/mail-config.ui.h:139
-msgid "Us_ername:"
-msgstr "Ainm Ú_sáideora:"
-
-#: ../mail/mail-config.ui.h:140
-msgid "Use Authe_ntication"
-msgstr "Úsáid Fío_rdheimhniú"
-
-#: ../mail/mail-config.ui.h:141
-msgid "User _Name:"
-msgstr "Ai_nm Úsáideora:"
-
-#: ../mail/mail-config.ui.h:142
-msgid "_Add Signature"
-msgstr "Cuir Síniú _Leis"
-
-#: ../mail/mail-config.ui.h:143
-#, fuzzy
-msgid "_Always load images from the Internet"
-msgstr "Cuirfidh %S cosc ar íomhánna ó %S i gcónaí."
-
-#: ../mail/mail-config.ui.h:144
-msgid "_Authentication Type"
-msgstr "Cineál _Fíordheimhnithe"
-
-#: ../mail/mail-config.ui.h:145
-msgid "_Direct connection to the Internet"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:146
-msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "_Ná sínigh iarratais cruinnithe (le haghaidh comhoiriúnachta Outlook)"
-
-#: ../mail/mail-config.ui.h:147
-#, fuzzy
-msgid "_Forward style:"
-msgstr "Stíl na hImlíne"
-
-#: ../mail/mail-config.ui.h:148
-#, fuzzy
-msgid "_Junk Folder:"
-msgstr "bhFillteán Reatha"
-
-#: ../mail/mail-config.ui.h:149
-msgid "_Keep signature above the original message on replying"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:150
-#, fuzzy
-msgid "_Languages"
-msgstr "Teanga"
-
-#: ../mail/mail-config.ui.h:151
-#, fuzzy
-msgid "_Load images only in messages from contacts"
-msgstr "Post sceál do tadhall"
-
-#: ../mail/mail-config.ui.h:152
-#, fuzzy
-msgid "_Lookup in local address book only"
-msgstr "Ná taispeáin ach fillteáin atá oscailte"
-
-#: ../mail/mail-config.ui.h:153
-msgid "_Make this my default account"
-msgstr "S_ocraigh é seo mar mo chuntas réamhshocraithe"
-
-#: ../mail/mail-config.ui.h:154
-#, fuzzy
-msgid "_Manual proxy configuration:"
-msgstr "Socrú Post"
-
-#: ../mail/mail-config.ui.h:156
-msgid "_Never load images from the Internet"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../mail/mail-config.ui.h:159
-msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:160
-#, fuzzy
-msgid "_Reply style:"
-msgstr "Stíl na hImlíne"
-
-#: ../mail/mail-config.ui.h:161
-msgid "_Script:"
-msgstr "_Script:"
-
-#: ../mail/mail-config.ui.h:162
-msgid "_Secure HTTP Proxy:"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
-#: ../plugins/publish-calendar/publish-calendar.ui.h:28
-msgid "_Server:"
-msgstr "_Freastalaí:"
-
-#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:166
-#, fuzzy
-msgid "_Show animated images"
-msgstr "_Taispeáin íomhánna beo"
-
-#: ../mail/mail-config.ui.h:167
-msgid "_Show the photograph of sender in the message preview"
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 
-#: ../mail/mail-config.ui.h:168
-#, fuzzy
-msgid "_Trash Folder:"
-msgstr "_Fillteán Dréachtaí:"
-
-#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "Úsáid nasc daingean:"
-
-#: ../mail/mail-config.ui.h:170
-msgid "_Use system defaults"
-msgstr "Ú_sáid réamhshocruithe an chórais"
-
-#: ../mail/mail-config.ui.h:171
-msgid "_Use the same fonts as other applications"
-msgstr "Ú_sáid na clónna céanna a úsáideann feidhmchláir eile"
-
-#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
-#, fuzzy
-msgid "a"
-msgstr "am"
-
-#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
-#, fuzzy
-msgid "b"
-msgstr "roimh"
-
-#: ../mail/mail-config.ui.h:174
-msgid "color"
-msgstr "dath"
-
-#: ../mail/mail-config.ui.h:175
-msgid "description"
-msgstr "cur síos"
-
-#: ../mail/mail-dialogs.ui.h:1
-msgid "All active remote folders"
-msgstr "Gach fillteán cianda gníomhach"
-
-#: ../mail/mail-dialogs.ui.h:2
-msgid "All local and active remote folders"
-msgstr "Gach fillteán logánta agus cianda gníomhach"
-
 #: ../mail/mail-dialogs.ui.h:3
-msgid "All local folders"
-msgstr "Gach fillteán logánta"
+msgid "_Flag:"
+msgstr "_Bratach:"
 
 #: ../mail/mail-dialogs.ui.h:4
 #, fuzzy
-msgid "Call"
-msgstr "Glao"
+msgid "_Due By:"
+msgstr "&Grúpáil De Réir"
 
 #. Translators: Flag Completed
 #: ../mail/mail-dialogs.ui.h:6
@@ -12168,8 +14383,8 @@ msgstr "_Críochnaithe"
 
 #: ../mail/mail-dialogs.ui.h:7
 #, fuzzy
-msgid "Digital Signature"
-msgstr "Cuir Síniú in Eagar"
+msgid "Call"
+msgstr "Glao"
 
 #: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
@@ -12177,2693 +14392,2218 @@ msgstr "Ná Cuir Ar Aghaidh"
 
 #: ../mail/mail-dialogs.ui.h:9
 #, fuzzy
-msgid "Encryption"
-msgstr "Criptigh"
-
-#: ../mail/mail-dialogs.ui.h:10
-#, fuzzy
 msgid "Follow-Up"
 msgstr "Teachtaireacht leantach go %s%s?"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "Mar Eolas Duit"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "Cuir ar Aghaidh"
 
-#: ../mail/mail-dialogs.ui.h:13
-#, fuzzy
-msgid "License Agreement"
-msgstr "Comhaontú um Cheadúnas"
-
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:12
 #, fuzzy
 msgid "No Response Necessary"
 msgstr ""
 "Port:\n"
 "(más gá)"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Reply to All"
 msgstr "Freagair Cách"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:17
 #, fuzzy
 msgid "Review"
 msgstr "Athbhreithnigh"
 
-#: ../mail/mail-dialogs.ui.h:20
-#, fuzzy
-msgid "Search Folder Sources"
-msgstr "Fillteán foinseach: %1 - Spriocfhillteán: %2"
-
-#: ../mail/mail-dialogs.ui.h:21
-msgid "Security Information"
-msgstr "Eolas Slándála"
-
-#: ../mail/mail-dialogs.ui.h:22
-msgid "Specific folders"
-msgstr "Fillteáin áirithe"
-
-#: ../mail/mail-dialogs.ui.h:23
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-
-#: ../mail/mail-dialogs.ui.h:25
-msgid "_Accept License"
-msgstr "_Glac le Ceadúnas"
-
-#: ../mail/mail-dialogs.ui.h:26
-#, fuzzy
-msgid "_Due By:"
-msgstr "&Grúpáil De Réir"
-
-#: ../mail/mail-dialogs.ui.h:27
-msgid "_Flag:"
-msgstr "_Bratach:"
+#: ../mail/mail-dialogs.ui.h:18
+msgid "License Agreement"
+msgstr "Comhaontú um Cheadúnas"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:19
 #, fuzzy
 msgid "_Tick this to accept the license agreement"
 msgstr "Líosta do cuntasaí"
 
-#: ../mail/mail-folder-cache.c:779
-#, c-format
-msgid "Pinging %s"
-msgstr "%s á phingiú"
-
-#: ../mail/mail-ops.c:86
-#, fuzzy
-msgid "Filtering Selected Messages"
-msgstr "&Scrios Teachtaireachtaí Roghnaithe"
-
-#: ../mail/mail-ops.c:206
-#, fuzzy
-msgid "Fetching Mail"
-msgstr "&Seol Ríomhphost Go..."
-
-#: ../mail/mail-ops.c:842
-#, c-format
-msgid "Sending message %d of %d"
-msgstr "Teachtaireacht %d as %d á seoladh"
-
-#: ../mail/mail-ops.c:890
-#, c-format
-msgid "Failed to send %d of %d messages"
-msgstr "Theip ar sheoladh %d as %d teachtaireacht"
-
-#: ../mail/mail-ops.c:894 ../mail/mail-send-recv.c:837
-msgid "Canceled."
-msgstr "Cealaithe."
-
-#: ../mail/mail-ops.c:896 ../mail/mail-send-recv.c:839
-msgid "Complete."
-msgstr "Críochnaithe."
-
-#: ../mail/mail-ops.c:1006
-#, fuzzy, c-format
-msgid "Moving messages to '%s'"
-msgstr "Teachtaireachtaí á mbogadh go %s"
-
-#: ../mail/mail-ops.c:1007
-#, fuzzy, c-format
-msgid "Copying messages to '%s'"
-msgstr "Teachtaireachtaí á gcóipeáil go %s"
-
-#: ../mail/mail-ops.c:1125
-#, c-format
-msgid "Storing folder '%s'"
-msgstr "Fillteán '%s' á stóráil"
-
-#: ../mail/mail-ops.c:1200
-#, c-format
-msgid "Expunging and storing account '%s'"
-msgstr ""
-
-#: ../mail/mail-ops.c:1201
-#, c-format
-msgid "Storing account '%s'"
-msgstr "Cuntas '%s' á stóráil"
-
-#: ../mail/mail-ops.c:1263
-#, fuzzy, c-format
-msgid "Refreshing folder '%s'"
-msgstr "Fillteán á athnuachan"
-
-#: ../mail/mail-ops.c:1453
-#, fuzzy, c-format
-msgid "Expunging folder '%s'"
-msgstr "Fillteán á ghlanadh"
-
-#: ../mail/mail-ops.c:1538
-#, c-format
-msgid "Emptying trash in '%s'"
-msgstr "Bruscar i '%s' á fholmhú"
-
-#: ../mail/mail-ops.c:1640
-#, fuzzy, c-format
-msgid "Disconnecting %s"
-msgstr "Ag dínasc ó %s"
-
-#: ../mail/mail-send-recv.c:198
-msgid "Canceling..."
-msgstr "Á Chealú..."
-
-#: ../mail/mail-send-recv.c:454
-msgid "Send & Receive Mail"
-msgstr "Seol & Faigh Post"
-
-#: ../mail/mail-send-recv.c:470
-msgid "Cancel _All"
-msgstr "Cealaigh _Gach Rud"
-
-#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:979
-msgid "Updating..."
-msgstr "Á Nuashonrú..."
-
-#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:691
-msgid "Waiting..."
-msgstr "Ag Feitheamh..."
-
-#: ../mail/mail-send-recv.c:959
-#, c-format
-msgid "Checking for new mail"
-msgstr "Lorg poist nua"
-
-#: ../mail/mail-tools.c:72
-#, fuzzy, c-format
-msgid "Could not create spool directory '%s': %s"
-msgstr "Níl an chomhadlann (%1) ann. Cruthaigh?"
-
-#: ../mail/mail-tools.c:106
-#, c-format
-msgid "Trying to movemail a non-mbox source '%s'"
-msgstr ""
+#: ../mail/mail-dialogs.ui.h:20
+msgid "_Accept License"
+msgstr "_Glac le Ceadúnas"
 
-#: ../mail/mail-tools.c:215
-#, fuzzy, c-format
-msgid "Forwarded message - %s"
-msgstr "Teachtaireacht Curtha Ar Aghaidh"
+#: ../mail/mail-dialogs.ui.h:21
+msgid "Security Information"
+msgstr "Eolas Slándála"
 
-#: ../mail/mail-tools.c:217
+#: ../mail/mail-dialogs.ui.h:22
 #, fuzzy
-msgid "Forwarded message"
-msgstr "Teachtaireacht Curtha Ar Aghaidh"
-
-#: ../mail/mail-vfolder.c:92
-#, fuzzy, c-format
-msgid "Setting up Search Folder: %s"
-msgstr "cuardaigh sa bhfillteán sonraithe"
-
-#: ../mail/mail-vfolder.c:232
-#, fuzzy, c-format
-msgid "Updating Search Folders for '%s' : %s"
-msgstr "_Brabhsáil le fillteáin eile"
-
-#. Translators: The first %s is name of the affected
-#. * search folder(s), the second %s is the URI of the
-#. * removed folder. For more than one search folder is
-#. * each of them on a separate line, with four spaces
-#. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:678
-#, c-format
-msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
-"\"%s\"."
-msgid_plural ""
-"The following Search Folders\n"
-"%s have been modified to account for the deleted folder\n"
-"\"%s\"."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-
-#: ../mail/mail-vfolder.c:1314
-msgid "Edit Search Folder"
-msgstr "Cuir Fillteán Cuardaigh in Eagar"
+msgid "Digital Signature"
+msgstr "Cuir Síniú in Eagar"
 
-#: ../mail/mail-vfolder.c:1423
-msgid "New Search Folder"
-msgstr "Fillteán Cuardaigh Nua"
+#: ../mail/mail-dialogs.ui.h:23
+msgid "Encryption"
+msgstr "Criptiú"
 
 #: ../mail/mail.error.xml.h:1
-#, fuzzy
-msgid "\"Check Junk\" Failed"
-msgstr "Lorg N&uashonruithe..."
+msgid "Invalid authentication"
+msgstr "Fíordheimhniú neamhbhailí"
 
 #: ../mail/mail.error.xml.h:2
-#, fuzzy
-msgid "\"Report Junk\" Failed"
-msgstr "Iompórtáil Comhad"
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:3
-#, fuzzy
-msgid "\"Report Not Junk\" Failed"
-msgstr "Iompórtáil Comhad"
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:4
-msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:5
-msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgid "Are you sure you want to send a message in HTML format?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
-"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:9
-msgid ""
-"A read receipt notification has been requested for \"{1}\". Send the receipt "
-"notification to {0}?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:10
 msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:11
-msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr ""
-
-#: ../mail/mail.error.xml.h:13
-#, fuzzy
-msgid "Are you sure you want to delete this account?"
+#: ../mail/mail.error.xml.h:11
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
-"An bhfuil tú cinnte gur mian leat\n"
-"an cuntas \"%1\" a scriosadh?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:12
 msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 
 #: ../mail/mail.error.xml.h:15
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:16
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
-msgstr ""
-"An bhfuil tú cinnte go dteastaíonn uait an leabharmharc <b>%1</b> a "
-"scriosadh?"
+msgid "Are you sure you want to send a message with invalid address?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
 
 #: ../mail/mail.error.xml.h:17
-msgid "Are you sure you want to send a message in HTML format?"
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:18
-#, fuzzy
-msgid "Are you sure you want to send a message with invalid address?"
-msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
-
 #: ../mail/mail.error.xml.h:19
 #, fuzzy
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
 
 #: ../mail/mail.error.xml.h:20
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
-
-#: ../mail/mail.error.xml.h:21
-msgid "Are you sure you want to send a message without a subject?"
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:22
-msgid "Blank Signature"
-msgstr "Bánaigh Síniú"
+msgid "Send private reply?"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:23
-#, fuzzy
-msgid "Cannot add Search Folder \"{0}\"."
-msgstr "Ní féidir teachtaireacht a chur leis an fhillteán %1 i KMail"
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:24
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Cóipeáil creatlach go dtí an fillteán baile"
-
-#: ../mail/mail.error.xml.h:25
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "<qt>Ní féidir an fillteán <b>%1</b> a chruthú.</qt>"
+msgid "Reply _Privately"
+msgstr "_Príobháideach"
 
 #: ../mail/mail.error.xml.h:26
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "ní féidir comhadlann sealadach a chruthú leis an teimpléad \"%s\""
-
-#: ../mail/mail.error.xml.h:27
-msgid "Cannot create the save directory, because \"{1}\""
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:28
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Ní féidir leat fillteán caighdeánach a scriosadh."
+msgid "Send reply to all recipients?"
+msgstr "Seoltóir nó Faighteoirí"
 
 #: ../mail/mail.error.xml.h:29
-#, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Ní féidir leat fillteán caighdeánach a scriosadh."
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:30
-#, fuzzy
-msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "Teip ag cruthaigh fillteán %s: %s"
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:31
-#, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Bog go dtí &m'fhillteán &quot;Seolta&quot; é"
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:32
-#, fuzzy
-msgid "Cannot open source \"{1}\"."
-msgstr "Ní féidir foinse &quot;{1}&quot; a oscailt."
+msgid "Use default drafts folder?"
+msgstr "Úsáid fillteán dréachtaí réamhshocraithe?"
 
 #: ../mail/mail.error.xml.h:33
-#, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Ní féidir an fhoinse a luchtú."
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:34
-#, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "ní féidir %1 a oscailt chun é a léamh"
+msgid "Use _Default"
+msgstr "Úsáid _Réamhshocrú"
 
 #: ../mail/mail.error.xml.h:35
+#, fuzzy
 msgid ""
-"Cannot read the license file \"{0}\", due to an installation problem. You "
-"will not be able to use this provider until you can accept its license."
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
 msgstr ""
+"An bhfuil tú cinnte go dteastaíonn uait an leabharmharc <b>%1</b> a "
+"scriosadh?"
 
 #: ../mail/mail.error.xml.h:36
-#, fuzzy
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Ní féidir %1 comhad a athainmniú"
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:37
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr ""
-"Teip ag athainmigh fillteán:\n"
-"%s"
+msgid "_Expunge"
+msgstr "_Glan"
 
 #: ../mail/mail.error.xml.h:38
-#, fuzzy
-msgid "Cannot save changes to account."
-msgstr "Sábháil \"%title%\" %reason%?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:39
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "  -P,  --directory-prefix=RÉIMÍR  sábháil comhaid i RÉIMÍR/...\n"
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
+msgid "_Empty Trash"
+msgstr "_Folmhaigh Bruscar"
 
 #: ../mail/mail.error.xml.h:40
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
-msgstr "Dialóg chomhaid chun URL a shábháil"
+msgid "Opening too many messages at once may take a long time."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:41
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Suimigh Siniú"
+msgid "_Open Messages"
+msgstr "_Oscail Teachtaireachtaí"
 
 #: ../mail/mail.error.xml.h:42
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:43
-#, fuzzy
-msgid "Close message window."
-msgstr "Dún an fhuinneog seo"
-
-#: ../mail/mail.error.xml.h:44
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Níorbh fhéidir comhad cumraíochta X a shábháil"
-
-#: ../mail/mail.error.xml.h:46
-#, fuzzy
-msgid "Do _Not Disable"
-msgstr "Ná díchumasaigh"
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
 
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
 #: ../mail/mail.error.xml.h:47
-#, fuzzy
-msgid "Do _Not Send"
-msgstr "_Ná Seol"
+msgid "Error while {0}."
+msgstr "Earráid agus {0}."
 
 #: ../mail/mail.error.xml.h:48
 #, fuzzy
-msgid "Do _Not Synchronize"
-msgstr "_Ná Sioncronaigh"
+msgid "Error while performing operation."
+msgstr "Earráid: theip ar rmdir( %1 )."
 
 #: ../mail/mail.error.xml.h:49
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
-msgstr ""
+msgid "Enter password."
+msgstr "Iontráil focal faire."
 
 #: ../mail/mail.error.xml.h:50
-msgid "Do you want to mark all messages as read?"
-msgstr ""
+#, fuzzy
+msgid "Error loading filter definitions."
+msgstr "EARRÁID: níl a leithéid de scagaire ann."
 
 #: ../mail/mail.error.xml.h:51
-msgid "Do you wish to save your changes?"
-msgstr "Ar mhaith leat do chuid athruithe a shábháil?"
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "  -P,  --directory-prefix=RÉIMÍR  sábháil comhaid i RÉIMÍR/...\n"
 
 #: ../mail/mail.error.xml.h:52
-msgid "Enter password."
-msgstr "Iontráil focal faire."
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
+msgstr "Dialóg chomhaid chun URL a shábháil"
 
 #: ../mail/mail.error.xml.h:53
-#, fuzzy
-msgid "Error loading filter definitions."
-msgstr "EARRÁID: níl a leithéid de scagaire ann."
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
 
 #: ../mail/mail.error.xml.h:54
 #, fuzzy
-msgid "Error while performing operation."
-msgstr "Earráid: theip ar rmdir( %1 )."
+msgid "Cannot create temporary save directory."
+msgstr "ní féidir comhadlann sealadach a chruthú leis an teimpléad \"%s\""
+
+#: ../mail/mail.error.xml.h:55
+#, fuzzy
+msgid "File exists but cannot overwrite it."
+msgstr "Tá comhad ainmnithe \"%1\" ann cheana. Forscríobh?"
+
+#: ../mail/mail.error.xml.h:56
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "Tá %1 ann ach ní gnáthchomhad é."
+
+#: ../mail/mail.error.xml.h:57
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Ní féidir leat fillteán caighdeánach a scriosadh."
 
-#. Translators: the {0} is replaced with an operation name, which failed.
-#. It can be basically anything run asynchronously, like "Fetching Mail",
-#. "Sending message" and others, mostly from mail-ops.c file.
 #: ../mail/mail.error.xml.h:58
-msgid "Error while {0}."
-msgstr "Earráid agus {0}."
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Ní féidir leat fillteán caighdeánach a scriosadh."
 
 #: ../mail/mail.error.xml.h:59
 msgid ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
-"mail must be migrated to the new format before Evolution can proceed. Do you "
-"want to migrate now?\n"
-"\n"
-"An mbox account will be created to preserve the old mbox folders. You can "
-"delete the account after ensuring the data is safely migrated. Please make "
-"sure there is enough disk space if you choose to migrate now."
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 msgstr ""
 
+#: ../mail/mail.error.xml.h:60
+#, fuzzy
+msgid "Failed to expunge folder &quot;{0}&quot;."
+msgstr "GenericName=Eagarthóir Sloinn Ionadaíochta"
+
 #: ../mail/mail.error.xml.h:62
-msgid "Evolution's local mail format has changed."
-msgstr ""
+#, fuzzy
+msgid "Failed to refresh folder &quot;{0}&quot;."
+msgstr "GenericName=Eagarthóir Sloinn Ionadaíochta"
 
 #: ../mail/mail.error.xml.h:63
 #, fuzzy
-msgid "Failed to download messages for offline viewing."
-msgstr "Íosl_uchtaigh Teachtaireachtaí le hAghaidh Úsáide as Líne"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr ""
+"Teip ag athainmigh fillteán:\n"
+"%s"
 
 #: ../mail/mail.error.xml.h:64
-#, fuzzy
-msgid "Failed to find duplicate messages."
-msgstr "Theip ar sheoladh %d as %d teachtaireacht"
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:65
-#, fuzzy
-msgid "Failed to open folder."
-msgstr "theip ar oscailt leabhar"
-
-#: ../mail/mail.error.xml.h:66
-#, fuzzy
 msgid ""
-"Failed to query server for a list of supported authentication mechanisms."
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
 msgstr ""
-"Freastalaí á chuardach le haghaidh liosta mheicníochtaí fíordheimhnithe "
-"tacaithe."
 
 #: ../mail/mail.error.xml.h:67
 #, fuzzy
-msgid "Failed to remove attachments from messages."
-msgstr "Theip ar sheoladh %d as %d teachtaireacht"
+msgid "Really delete folder \"{0}\"?"
+msgstr "Ní féidir leat fillteán caighdeánach a scriosadh."
 
 #: ../mail/mail.error.xml.h:68
-#, fuzzy
-msgid "Failed to retrieve messages."
-msgstr "Ní féidir an teachtaireacht a rá"
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:69
 #, fuzzy
-msgid "Failed to save messages to disk."
-msgstr "Theip ar sheoladh %d as %d teachtaireacht"
+msgid "These messages are not copies."
+msgstr "Teachtaireacht mar Ghnáth-théacs"
 
 #: ../mail/mail.error.xml.h:70
-#, fuzzy
-msgid "Failed to unsubscribe from folder."
-msgstr "Díliostáil ó fhillteán \"%s\" i ndáiríre?"
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:71
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Tá comhad ainmnithe \"%1\" ann cheana. Forscríobh?"
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Ní féidir %1 comhad a athainmniú"
 
 #: ../mail/mail.error.xml.h:72
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:73
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Tá %1 ann ach ní gnáthchomhad é."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Bog go dtí &m'fhillteán &quot;Seolta&quot; é"
 
-#. Translators: {0} is replaced with a folder name
 #: ../mail/mail.error.xml.h:74
-msgid "Folder '{0}' doesn't contain any duplicate message."
-msgstr ""
+#, fuzzy
+msgid "Cannot open source folder. Error: {2}"
+msgstr "Ní féidir an fhoinse a luchtú."
 
 #: ../mail/mail.error.xml.h:75
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#, fuzzy
+msgid "Cannot open target folder. Error: {2}"
+msgstr "ní féidir %1 a oscailt chun é a léamh"
 
 #: ../mail/mail.error.xml.h:76
-msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
-"will be deleted permanently."
-msgstr ""
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Cóipeáil creatlach go dtí an fillteán baile"
 
 #: ../mail/mail.error.xml.h:77
-msgid ""
-"If you delete the folder, all of its contents will be deleted permanently."
-msgstr ""
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "<qt>Ní féidir an fillteán <b>%1</b> a chruthú.</qt>"
 
 #: ../mail/mail.error.xml.h:78
-msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr ""
+#, fuzzy
+msgid "Cannot open folder. Error: {1}"
+msgstr "Cóipeáil creatlach go dtí an fillteán baile"
 
 #: ../mail/mail.error.xml.h:79
-msgid ""
-"If you proceed, the account information and\n"
-"all proxy information will be deleted permanently."
+#, fuzzy
+msgid "Cannot save changes to account."
+msgstr "Sábháil \"%title%\" %reason%?"
+
+#: ../mail/mail.error.xml.h:80
+msgid "You have not filled in all of the required information."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:81
-msgid "If you proceed, the account information will be deleted permanently."
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:82
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#, fuzzy
+msgid "Are you sure you want to delete this account?"
 msgstr ""
+"An bhfuil tú cinnte gur mian leat\n"
+"an cuntas \"%1\" a scriosadh?"
 
 #: ../mail/mail.error.xml.h:83
-msgid "Ignore"
-msgstr "Tabhair Neamhaird Air"
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:84
-#, fuzzy
-msgid "Invalid authentication"
-msgstr "Name=Fíordheimhniú"
+msgid "Are you sure you want to delete this account and all its proxies?"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:85
-msgid "Mail Deletion Failed"
-msgstr "Theip ar Scriosadh Poist"
-
-#: ../mail/mail.error.xml.h:86
-#, fuzzy
-msgid "Mail filters automatically updated."
-msgstr "Ionsáigh pictúir atá ann cheana ó comhad eile"
+msgid ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:87
 msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:88
-msgid ""
-"Messages shown in Search Folders are not copies. Deleting them from a Search "
-"Folder will delete the actual messages from the folder or folders in which "
-"they physically reside. Do you really want to delete these messages?"
+msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:89
-msgid "Missing folder."
-msgstr "Fillteán ar iarraidh."
+msgid "Do _Not Disable"
+msgstr "_Ná Díchumasaigh"
+
+#: ../mail/mail.error.xml.h:90
+#: ../plugins/publish-calendar/publish-calendar.c:634
+msgid "_Disable"
+msgstr "_Díchumasaigh"
 
 #: ../mail/mail.error.xml.h:91
 #, fuzzy
-msgid "N_ever"
-msgstr "Riamh"
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Teip ag cruthaigh fillteán %s: %s"
 
 #: ../mail/mail.error.xml.h:92
-#, fuzzy
-msgid "No duplicate messages found."
-msgstr "Aimsíodh teachtaireachtaí gan chríochnú"
-
-#: ../mail/mail.error.xml.h:93
-msgid "No sources selected."
-msgstr "Níor roghnaíodh aon fhoinse."
+msgid ""
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:94
-msgid "Opening too many messages at once may take a long time."
-msgstr ""
+#, fuzzy
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Ní féidir teachtaireacht a chur leis an fhillteán %1 i KMail"
 
 #: ../mail/mail.error.xml.h:95
-msgid "Please check your account settings and try again."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:96
-msgid "Please enable the account or send using another account."
-msgstr ""
+#, fuzzy
+msgid "Search Folders automatically updated."
+msgstr "Roghnaigh na fillteáin atá le cuardach:"
 
 #: ../mail/mail.error.xml.h:97
-msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
-msgstr ""
+#, fuzzy
+msgid "Mail filters automatically updated."
+msgstr "Ionsáigh pictúir atá ann cheana ó comhad eile"
 
 #: ../mail/mail.error.xml.h:98
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
-"{0}"
-msgstr ""
+msgid "Missing folder."
+msgstr "Fillteán ar iarraidh."
 
-#: ../mail/mail.error.xml.h:100
-msgid "Please provide an unique name to identify this signature."
-msgstr ""
+#: ../mail/mail.error.xml.h:99
+msgid "You must specify a folder."
+msgstr "Ní mór duit fillteán a shonrú."
 
 #: ../mail/mail.error.xml.h:101
-msgid "Please wait."
-msgstr "Fan go fóill, le do thoil."
+msgid "You must name this Search Folder."
+msgstr "Ní mór duit an Fillteán Cuardaigh a ainmniú."
 
 #: ../mail/mail.error.xml.h:102
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr ""
+msgid "No folder selected."
+msgstr "Fillteán gan roghnú."
 
 #: ../mail/mail.error.xml.h:103
-msgid "Querying server for a list of supported authentication mechanisms."
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 msgstr ""
-"Freastalaí á chuardach le haghaidh liosta mheicníochtaí fíordheimhnithe "
-"tacaithe."
-
-#: ../mail/mail.error.xml.h:104
-#, fuzzy
-msgid "Read receipt requested."
-msgstr "cruthaigh an fillteán iarrtha"
 
 #: ../mail/mail.error.xml.h:105
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:106
-#, fuzzy
-msgid "Really delete folder \"{0}\"?"
-msgstr "Ní féidir leat fillteán caighdeánach a scriosadh."
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
+msgstr ""
 
-#: ../mail/mail.error.xml.h:107
-#, fuzzy
-msgid "Remove duplicate messages?"
-msgstr "Bain Gníomh"
+#: ../mail/mail.error.xml.h:109
+msgid "Ignore"
+msgstr "Tabhair Neamhaird Air"
 
-#: ../mail/mail.error.xml.h:108
-#, fuzzy
-msgid "Reply _Privately"
-msgstr "_Príobháideach"
+#: ../mail/mail.error.xml.h:110
+msgid "_Overwrite"
+msgstr "_Forscríobh"
 
 #: ../mail/mail.error.xml.h:111
-#, fuzzy
-msgid "Search Folders automatically updated."
-msgstr "Roghnaigh na fillteáin atá le cuardach:"
+msgid "_Append"
+msgstr "_Iarcheangail"
 
 #: ../mail/mail.error.xml.h:112
-msgid "Send private reply?"
+msgid "Evolution's local mail format has changed."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:113
-#, fuzzy
-msgid "Send reply to all recipients?"
-msgstr "Seoltóir nó Faighteoirí"
-
-#: ../mail/mail.error.xml.h:114
-msgid "Signature Already Exists"
-msgstr "Tá an Síniú Ann Cheana"
-
-#: ../mail/mail.error.xml.h:115
-msgid "Synchronize folders locally for offline usage?"
+msgid ""
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
+"\n"
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:116
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr ""
+msgid "_Exit Evolution"
+msgstr "_Scoir Evolution"
 
 #: ../mail/mail.error.xml.h:117
+#, fuzzy
+msgid "_Migrate Now"
+msgstr "Cumraíocht"
+
+#: ../mail/mail.error.xml.h:118
+msgid "Unable to read license file."
+msgstr "Ní féidir comhad ceadúnais a léamh."
+
+#: ../mail/mail.error.xml.h:119
 msgid ""
-"The contact list you are sending to is configured to hide list recipients.\n"
-"\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:120
-msgid ""
-"The following recipient was not recognized as a valid mail address:\n"
-"{0}"
+msgid "Please wait."
+msgstr "Fan go fóill, le do thoil."
+
+#: ../mail/mail.error.xml.h:121
+msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
+"Freastalaí á chuardach le haghaidh liosta mheicníochtaí fíordheimhnithe "
+"tacaithe."
 
 #: ../mail/mail.error.xml.h:122
+#, fuzzy
 msgid ""
-"The following recipients were not recognized as valid mail addresses:\n"
-"{0}"
+"Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
+"Freastalaí á chuardach le haghaidh liosta mheicníochtaí fíordheimhnithe "
+"tacaithe."
 
-#: ../mail/mail.error.xml.h:125
-msgid "The script file must exist and be executable."
+#: ../mail/mail.error.xml.h:123
+msgid "Synchronize folders locally for offline usage?"
 msgstr ""
 
+#: ../mail/mail.error.xml.h:124
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:125
+#, fuzzy
+msgid "Do _Not Synchronize"
+msgstr "_Ná Sioncronaigh"
+
 #: ../mail/mail.error.xml.h:126
 #, fuzzy
-msgid "These messages are not copies."
-msgstr "Teachtaireacht mar Ghnáth-théacs"
+msgid "_Synchronize"
+msgstr "Sioncronaigh"
 
 #: ../mail/mail.error.xml.h:127
-msgid ""
-"This folder may have been added implicitly,\n"
-"go to the Search Folder editor to add it explicitly, if required."
+msgid "Do you want to mark all messages as read?"
 msgstr ""
 
+#: ../mail/mail.error.xml.h:128
+#, fuzzy
+msgid "This will mark all messages as read in the selected folder."
+msgstr "Níl aon teachtaireacht ann san fhillteán seo."
+
 #: ../mail/mail.error.xml.h:129
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
-msgstr ""
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "Bog Teachtaireachtaí go Fillteán"
 
 #: ../mail/mail.error.xml.h:130
 msgid ""
-"This message cannot be sent because you have not specified any recipients"
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:131
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
+#, fuzzy
+msgid "In Current Folder and _Subfolders"
+msgstr "Cruthaigh fillteán"
 
 #: ../mail/mail.error.xml.h:132
-msgid "This signature has been changed, but has not been saved."
-msgstr ""
+#, fuzzy
+msgid "In Current _Folder Only"
+msgstr "Fillteán Reatha"
 
 #: ../mail/mail.error.xml.h:133
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
+msgid "Should Evolution close this window when replying or forwarding?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:134
 #, fuzzy
-msgid "This will mark all messages as read in the selected folder."
-msgstr "Níl aon teachtaireacht ann san fhillteán seo."
+msgid "_Yes, Always"
+msgstr "I gCónaí"
 
 #: ../mail/mail.error.xml.h:135
-msgid "Unable to connect to the GroupWise server."
-msgstr "Ní féidir nasc leis an bhfreastalaí GroupWise."
+#, fuzzy
+msgid "_No, Never"
+msgstr "Riamh"
 
 #: ../mail/mail.error.xml.h:136
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
+#, fuzzy
+msgid "Copy folder in folder tree."
+msgstr "Fillteán %s á chóipeáil"
 
 #: ../mail/mail.error.xml.h:137
-msgid "Unable to read license file."
-msgstr "Ní féidir comhad ceadúnais a léamh."
+#, fuzzy
+msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an meamram '{0}' a scriosadh?"
 
 #: ../mail/mail.error.xml.h:138
-#, fuzzy
-msgid "Unable to retrieve message."
-msgstr "Ní féidir an teachtaireacht a rá"
+msgid "_Yes"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:139
-msgid "Use _Default"
-msgstr "Úsáid _Réamhshocrú"
+#, fuzzy
+msgid "_No"
+msgstr "Ná Déan"
 
 #: ../mail/mail.error.xml.h:140
-msgid "Use default drafts folder?"
-msgstr "Úsáid fillteán dréachtaí réamhshocraithe?"
+#, fuzzy
+msgid "_Always"
+msgstr "I gCónaí"
 
 #: ../mail/mail.error.xml.h:141
 #, fuzzy
-msgid "Would you like to close the message window?"
-msgstr "Ar mhaith leat an chluiche seo a shábháil?"
+msgid "N_ever"
+msgstr "Riamh"
 
 #: ../mail/mail.error.xml.h:142
-msgid ""
-"You are replying privately to a message which arrived via a mailing list, "
-"but the list is trying to redirect your reply to go back to the list. Are "
-"you sure you want to proceed?"
-msgstr ""
+#, fuzzy
+msgid "Move folder in folder tree."
+msgstr "Fillteán %s á bhogadh"
 
 #: ../mail/mail.error.xml.h:143
-msgid ""
-"You are replying to a message which arrived via a mailing list, but you are "
-"replying privately to the sender; not to the list. Are you sure you want to "
-"proceed?"
-msgstr ""
+#, fuzzy
+msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an tasc '{0}' a scriosadh?"
 
 #: ../mail/mail.error.xml.h:144
 msgid ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:145
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "Níl ceadanna go leor agat an post seo a scriosadh."
+msgid "Please enable the account or send using another account."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:146
-msgid "You have not filled in all of the required information."
-msgstr ""
+msgid "Mail Deletion Failed"
+msgstr "Theip ar Scriosadh Poist"
 
 #: ../mail/mail.error.xml.h:147
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr ""
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "Níl ceadanna go leor agat an post seo a scriosadh."
 
 #: ../mail/mail.error.xml.h:148
-msgid "You may not create two accounts with the same name."
-msgstr ""
+#, fuzzy
+msgid "\"Check Junk\" Failed"
+msgstr "Lorg N&uashonruithe..."
 
 #: ../mail/mail.error.xml.h:149
-msgid "You must name this Search Folder."
-msgstr "Ní mór duit an Fillteán Cuardaigh a ainmniú."
+#, fuzzy
+msgid "\"Report Junk\" Failed"
+msgstr "Iompórtáil Comhad"
 
 #: ../mail/mail.error.xml.h:150
-msgid "You must specify a folder."
-msgstr "Ní mór duit fillteán a shonrú."
+#, fuzzy
+msgid "\"Report Not Junk\" Failed"
+msgstr "Iompórtáil Comhad"
 
 #: ../mail/mail.error.xml.h:151
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
-msgstr ""
+#, fuzzy
+msgid "Remove duplicate messages?"
+msgstr "Bain Gníomh"
 
-#: ../mail/mail.error.xml.h:153
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr ""
+#: ../mail/mail.error.xml.h:152
+#, fuzzy
+msgid "No duplicate messages found."
+msgstr "Aimsíodh teachtaireachtaí gan chríochnú"
 
+#. Translators: {0} is replaced with a folder name
 #: ../mail/mail.error.xml.h:154
-#, fuzzy
-msgid "_Always"
-msgstr "I gCónaí"
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:155
-msgid "_Append"
-msgstr "_Iarcheangail"
-
-#: ../mail/mail.error.xml.h:156
-#: ../plugins/publish-calendar/publish-calendar.c:619
-msgid "_Disable"
-msgstr "_Díchumasaigh"
+msgid "Failed to disconnect account &quot;{0}&quot;."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:157
-msgid "_Discard changes"
-msgstr "Cuir athruithe i _leataobh"
+#, fuzzy
+msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
+msgstr "Díliostáil ó fhillteán \"%s\" i ndáiríre?"
 
 #: ../mail/mail.error.xml.h:158
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
-msgid "_Empty Trash"
-msgstr "_Folmhaigh Bruscar"
+#, fuzzy
+msgid "Unable to retrieve message."
+msgstr "Ní féidir an teachtaireacht a rá"
 
 #: ../mail/mail.error.xml.h:159
-#, fuzzy
-msgid "_Exit Evolution"
-msgstr "Evolution"
+msgid "{0}"
+msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:160
-msgid "_Expunge"
-msgstr "_Glan"
+#, fuzzy
+msgid "Failed to open folder."
+msgstr "theip ar oscailt leabhar"
 
 #: ../mail/mail.error.xml.h:161
 #, fuzzy
-msgid "_Migrate Now"
-msgstr "Cumraíocht"
+msgid "Failed to find duplicate messages."
+msgstr "Theip ar sheoladh %d as %d teachtaireacht"
 
 #: ../mail/mail.error.xml.h:162
 #, fuzzy
-msgid "_No"
-msgstr "Ná Déan"
+msgid "Failed to retrieve messages."
+msgstr "Ní féidir an teachtaireacht a rá"
 
 #: ../mail/mail.error.xml.h:163
-msgid "_Open Messages"
-msgstr "_Oscail Teachtaireachtaí"
+#, fuzzy
+msgid "Failed to mark messages as read."
+msgstr "Theip ar sheoladh %d as %d teachtaireacht"
+
+#: ../mail/mail.error.xml.h:164
+#, fuzzy
+msgid "Failed to remove attachments from messages."
+msgstr "Theip ar sheoladh %d as %d teachtaireacht"
+
+#: ../mail/mail.error.xml.h:165
+#, fuzzy
+msgid "Failed to download messages for offline viewing."
+msgstr "Íosl_uchtaigh Teachtaireachtaí le hAghaidh Úsáide as Líne"
 
 #: ../mail/mail.error.xml.h:166
 #, fuzzy
-msgid "_Send Receipt"
-msgstr "&Ná seol admháil léite riamh"
+msgid "Failed to save messages to disk."
+msgstr "Theip ar sheoladh %d as %d teachtaireacht"
 
 #: ../mail/mail.error.xml.h:167
-#, fuzzy
-msgid "_Synchronize"
-msgstr "Sioncronaigh"
+msgid "Hidden file is attached."
+msgstr ""
 
 #: ../mail/mail.error.xml.h:168
-msgid "_Yes"
+msgid ""
+"The attachment named {0} is a hidden file and may contain sensitive data. "
+"Please review it before sending."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:169
-msgid "{0}"
-msgstr "{0}"
+#, fuzzy
+msgid "Printing failed."
+msgstr "Priontáil an féilire seo"
+
+#: ../mail/mail.error.xml.h:170
+#, fuzzy
+msgid "The printer replied &quot;{0}&quot;."
+msgstr "GenericName=Eagarthóir Sloinn Ionadaíochta"
+
+#: ../mail/mail.error.xml.h:171
+#, fuzzy
+msgid "Could not perform this operation on {0}."
+msgstr "Níorbh fhéidir sprioc a oscailt"
+
+#: ../mail/mail.error.xml.h:172
+msgid "You must be working online to complete this operation."
+msgstr ""
+
+#: ../mail/mail-send-recv.c:202
+msgid "Canceling..."
+msgstr "Á Chealú..."
+
+#: ../mail/mail-send-recv.c:546
+msgid "Send & Receive Mail"
+msgstr "Seol & Faigh Post"
+
+#: ../mail/mail-send-recv.c:562
+msgid "Cancel _All"
+msgstr "Cealaigh _Gach Rud"
+
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1047
+msgid "Updating..."
+msgstr "Á Nuashonrú..."
 
-#: ../mail/message-list.c:1261
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:736
+msgid "Waiting..."
+msgstr "Ag Feitheamh..."
+
+#: ../mail/mail-send-recv.c:1020
+#, fuzzy, c-format
+msgid "Checking for new mail at '%s'"
+msgstr "Lorg poist nua"
+
+#: ../mail/mail-vfolder-ui.c:78
+msgid "Search Folders"
+msgstr "Fillteáin Cuardaigh"
+
+#: ../mail/mail-vfolder-ui.c:158
+msgid "Edit Search Folder"
+msgstr "Cuir Fillteán Cuardaigh in Eagar"
+
+#: ../mail/mail-vfolder-ui.c:279
+msgid "New Search Folder"
+msgstr "Fillteán Cuardaigh Nua"
+
+#: ../mail/message-list.c:298
 msgid "Unseen"
 msgstr "Gan Fheiceáil"
 
-#: ../mail/message-list.c:1262
+#: ../mail/message-list.c:299
 msgid "Seen"
 msgstr "Feicthe"
 
-#: ../mail/message-list.c:1263
+#: ../mail/message-list.c:300
 msgid "Answered"
 msgstr "Freagartha"
 
-#: ../mail/message-list.c:1264
+#: ../mail/message-list.c:301
 msgid "Forwarded"
 msgstr "Curtha ar Aghaidh"
 
-#: ../mail/message-list.c:1265
+#: ../mail/message-list.c:302
 msgid "Multiple Unseen Messages"
 msgstr "Teachtaireachtaí gan Fheiceáil Iomadúla"
 
-#: ../mail/message-list.c:1266
+#: ../mail/message-list.c:303
 msgid "Multiple Messages"
 msgstr "Teachtaireachtaí Iomadúla"
 
-#: ../mail/message-list.c:1270
+#: ../mail/message-list.c:316
 msgid "Lowest"
 msgstr "Is Ísle"
 
-#: ../mail/message-list.c:1271
+#: ../mail/message-list.c:317
 msgid "Lower"
 msgstr "Níos Ísle"
 
-#: ../mail/message-list.c:1275
+#: ../mail/message-list.c:321
 msgid "Higher"
 msgstr "Níos Airde"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:322
 msgid "Highest"
 msgstr "Is Airde"
 
-#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
-msgid "?"
-msgstr "?"
+#: ../mail/message-list.c:466 ../mail/message-list.c:5717
+msgid "Generating message list"
+msgstr "Liosta teachtaireachtaí á ghiniúint"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1858 ../modules/itip-formatter/itip-view.c:244
 msgid "Today %l:%M %p"
 msgstr "Inniu %l:%M %p"
 
-#: ../mail/message-list.c:1925
+#: ../mail/message-list.c:1867
 msgid "Yesterday %l:%M %p"
 msgstr "Inné %l:%M %p"
 
-#: ../mail/message-list.c:1937
+#: ../mail/message-list.c:1879
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1945
+#: ../mail/message-list.c:1887
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1947
+#: ../mail/message-list.c:1889
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2752
+#: ../mail/message-list.c:2767
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Taispeáin gach rabhadh"
 
-#: ../mail/message-list.c:2912 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:3395 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Teachtaireachtaí"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4160
+#: ../mail/message-list.c:4762
 #, fuzzy
 msgid "Follow-up"
 msgstr "Teachtaireacht leantach go %s%s?"
 
-#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
-msgid "Generating message list"
-msgstr "Liosta teachtaireachtaí á ghiniúint"
-
-#: ../mail/message-list.c:4912
+#: ../mail/message-list.c:5655
 msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
+"No message satisfies your search criteria. Change search criteria by "
+"selecting a new Show message filter from the drop down list above or by "
+"running a new search either by clearing it with Search->Clear menu item or "
+"by changing the query above."
 msgstr ""
 
-#: ../mail/message-list.c:4914
+#: ../mail/message-list.c:5663
 msgid "There are no messages in this folder."
 msgstr "Níl aon teachtaireacht ann san fhillteán seo."
 
-#: ../mail/message-list.etspec.h:3
-msgid "Due By"
-msgstr "Spriocdháta"
+#: ../mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr ""
 
-#: ../mail/message-list.etspec.h:4
+#: ../mail/message-list.etspec.h:8
+msgid "Received"
+msgstr "Faighte"
+
+#: ../mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr "Stádas Brataí"
 
-#: ../mail/message-list.etspec.h:5
-msgid "Flagged"
-msgstr ""
-
-#: ../mail/message-list.etspec.h:6
+#: ../mail/message-list.etspec.h:12
 #, fuzzy
 msgid "Follow Up Flag"
 msgstr "Teachtaireacht leantach go %s%s?"
 
-#: ../mail/message-list.etspec.h:11
-msgid "Received"
-msgstr "Faighte"
-
-#: ../mail/message-list.etspec.h:15
-msgid "Sent Messages"
-msgstr "Teachtaireachtaí Seolta"
+#: ../mail/message-list.etspec.h:13
+msgid "Due By"
+msgstr "Spriocdháta"
 
-#: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:572
-msgid "Size"
-msgstr "Méid"
+#: ../mail/message-list.etspec.h:18
+#, fuzzy
+msgid "Messages To"
+msgstr "Teachtaireachtaí"
 
-#: ../mail/message-list.etspec.h:19
+#: ../mail/message-list.etspec.h:20
 #, fuzzy
 msgid "Subject - Trimmed"
 msgstr "Gan ábhar"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1562
-msgid "Body contains"
-msgstr "Corp ina bhfuil"
+msgid "Subject or Addresses contains"
+msgstr "Ábhar nó Seoltaí ina bhfuil"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1569
-msgid "Message contains"
-msgstr "Teachtaireacht ina bhfuil"
-
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1576
+#: ../modules/mail/e-mail-shell-view-actions.c:1997
 msgid "Recipients contain"
 msgstr "Faighteoirí ina bhfuil"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
-msgid "Sender contains"
-msgstr "Seoltóir ina bhfuil"
+#: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
+msgid "Message contains"
+msgstr "Teachtaireacht ina bhfuil"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:2011
 msgid "Subject contains"
 msgstr "Ábhar ina bhfuil"
 
-#: ../mail/searchtypes.xml.h:6
-msgid "Subject or Addresses contains"
-msgstr "Ábhar nó Seoltaí ina bhfuil"
-
-#: ../modules/addressbook/addressbook-config.c:207
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-
-#: ../modules/addressbook/addressbook-config.c:209
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-
-#: ../modules/addressbook/addressbook-config.c:211
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
+#: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
+msgid "Sender contains"
+msgstr "Seoltóir ina bhfuil"
 
-#: ../modules/addressbook/addressbook-config.c:641
-msgid "U_se in Birthday & Anniversaries calendar"
-msgstr "Úsáid san _fhéilire Breithlaethanta & Cothroim Lae"
+#: ../mail/searchtypes.xml.h:6
+#: ../modules/mail/e-mail-shell-view-actions.c:1983
+msgid "Body contains"
+msgstr "Corp ina bhfuil"
 
-#: ../modules/addressbook/addressbook-config.c:683
-msgid "Copy _book content locally for offline operation"
-msgstr "Cóipeáil ábhar an _leabhair go logánta chun oibríochta as líne"
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
+#: ../modules/addressbook/autocompletion-config.c:123
+#: ../modules/mail/em-mailer-prefs.c:1213
+msgid "_Table column:"
+msgstr "Colún an _tábla:"
 
-#: ../modules/addressbook/addressbook-config.c:798
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
+#: ../modules/addressbook/autocompletion-config.c:126
+#, fuzzy
+msgid "Address formatting"
+msgstr "Eolas Saor/Gnóthach"
 
-#: ../modules/addressbook/addressbook-config.c:879
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
+#: ../modules/addressbook/autocompletion-config.c:129
+msgid "_Format address according to standard of its destination country"
 msgstr ""
 
-#: ../modules/addressbook/addressbook-config.c:962
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
+#: ../modules/addressbook/autocompletion-config.c:137
+msgid "Autocompletion"
+msgstr "Comhlánú Uathoibríoch"
 
-#: ../modules/addressbook/addressbook-config.c:1086
-msgid "Server Information"
-msgstr "Eolas faoin bhFreastalaí"
+#: ../modules/addressbook/autocompletion-config.c:140
+msgid "Always _show address of the autocompleted contact"
+msgstr "Taispeáin _seoladh na teagmhála a gcomhlánaíodh go huathoibríoch"
 
-#: ../modules/addressbook/addressbook-config.c:1091
-#: ../smime/gui/smime-ui.ui.h:13
-msgid "Details"
-msgstr "Mionsonraí"
+#: ../modules/addressbook/eab-composer-util.c:148
+msgid "Multiple vCards"
+msgstr "vCardanna Iomadúla"
 
-#: ../modules/addressbook/addressbook-config.c:1092
-#: ../modules/mail/e-mail-shell-view.c:58
-msgid "Searching"
-msgstr "Á chuardach"
+#: ../modules/addressbook/eab-composer-util.c:156
+#, c-format
+msgid "vCard for %s"
+msgstr "vCard do %s"
 
-#: ../modules/addressbook/addressbook-config.c:1094
-msgid "Downloading"
-msgstr "Á íosluchtú"
+#: ../modules/addressbook/eab-composer-util.c:168
+#: ../modules/addressbook/eab-composer-util.c:195
+#, c-format
+msgid "Contact information"
+msgstr "Eolas teagmhála"
 
-#: ../modules/addressbook/addressbook-config.c:1309
-msgid "Address Book Properties"
-msgstr "Airíonna an Leabhar Seoltaí"
+#: ../modules/addressbook/eab-composer-util.c:197
+#, c-format
+msgid "Contact information for %s"
+msgstr "Eolas teagmhála le %s"
 
-#: ../modules/addressbook/addressbook-config.c:1311
+#: ../modules/addressbook/e-book-shell-backend.c:259
+#: ../modules/addressbook/e-book-shell-view-actions.c:125
 msgid "New Address Book"
 msgstr "Leabhar Seoltaí Nua"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-#, fuzzy
-msgid "Contact layout style"
-msgstr "Liosta Teagmhálacha"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
-msgid "Contact preview pane position (horizontal)"
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
-msgid "Contact preview pane position (vertical)"
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
-msgid "EFolderList XML for the list of completion URIs"
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
-msgid "EFolderList XML for the list of completion URIs."
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
-msgid "Position of the contact preview pane when oriented horizontally."
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
-msgid "Position of the contact preview pane when oriented vertically."
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-#, fuzzy
-msgid "Primary address book"
-msgstr "leabhar seoltaí evolution"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
-msgid "Show autocompleted name with an address"
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-#, fuzzy
-msgid "Show maps"
-msgstr "Taispeán Beocháin"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid "Show preview pane"
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view."
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. \"0\" (Classic View) places the preview pane below the "
-"contact list. \"1\" (Vertical View) places the preview pane next to the "
-"contact list."
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
-msgid "URI for the folder last used in the select names dialog"
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
-msgid "URI for the folder last used in the select names dialog."
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
-#, fuzzy
-msgid "Whether to show maps in preview pane."
-msgstr "Taispeáin an pána \"Réamhamharc\""
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
-msgid "Whether to show the preview pane."
-msgstr ""
-
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../modules/addressbook/autocompletion-config.c:194
-#: ../modules/mail/em-mailer-prefs.c:1049
-msgid "_Table column:"
-msgstr "Colún an _tábla:"
-
-#: ../modules/addressbook/autocompletion-config.c:197
-msgid "Autocompletion"
-msgstr "Comhlánú Uathoibríoch"
-
-#: ../modules/addressbook/autocompletion-config.c:200
-msgid "Always _show address of the autocompleted contact"
-msgstr "Taispeáin _seoladh na teagmhála a gcomhlánaíodh go huathoibríoch"
-
-#. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:102
-#: ../modules/addressbook/e-book-shell-migrate.c:154
-msgid "On LDAP Servers"
-msgstr "Ar Fhreastalaithe LDAP"
-
-#: ../modules/addressbook/e-book-shell-backend.c:302
+#: ../modules/addressbook/e-book-shell-backend.c:268
 msgctxt "New"
 msgid "_Contact"
 msgstr "Te_agmháil"
 
-#: ../modules/addressbook/e-book-shell-backend.c:304
-#: ../modules/addressbook/e-book-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-backend.c:270
+#: ../modules/addressbook/e-book-shell-view-actions.c:977
 msgid "Create a new contact"
 msgstr "Cruthaigh teaghmháil nua"
 
-#: ../modules/addressbook/e-book-shell-backend.c:309
+#: ../modules/addressbook/e-book-shell-backend.c:275
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Liosta Tea_gmhálacha"
 
-#: ../modules/addressbook/e-book-shell-backend.c:311
-#: ../modules/addressbook/e-book-shell-view-actions.c:912
+#: ../modules/addressbook/e-book-shell-backend.c:277
+#: ../modules/addressbook/e-book-shell-view-actions.c:984
 msgid "Create a new contact list"
 msgstr "Cruthaigh liosta tadhaill nua"
 
-#: ../modules/addressbook/e-book-shell-backend.c:319
+#: ../modules/addressbook/e-book-shell-backend.c:285
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Leabhar Seoltaí"
 
-#: ../modules/addressbook/e-book-shell-backend.c:321
-#: ../modules/addressbook/e-book-shell-view-actions.c:835
+#: ../modules/addressbook/e-book-shell-backend.c:287
+#: ../modules/addressbook/e-book-shell-view-actions.c:900
 msgid "Create a new address book"
 msgstr "Cruthaigh leabhar seoltaí nua"
 
-#. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:338
-#: ../modules/addressbook/e-book-shell-view.c:405
-#: ../modules/calendar/e-cal-shell-backend.c:115
-#: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:366
-msgid "Contacts"
-msgstr "Teagmhálacha"
-
-#: ../modules/addressbook/e-book-shell-backend.c:348
+#: ../modules/addressbook/e-book-shell-backend.c:315
 msgid "Certificates"
 msgstr "Teastais"
 
+#: ../modules/addressbook/e-book-shell-view-actions.c:198
+msgid "Address Book Properties"
+msgstr "Airíonna an Leabhar Seoltaí"
+
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:387
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:474
+#: ../modules/addressbook/e-book-shell-view-actions.c:770
 msgid "Save as vCard"
 msgstr "Sábháil mar vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Co_py All Contacts To..."
 msgstr "Cói_peáil Gach Teagmháil Go..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
 #, fuzzy
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Post an sceál seo"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:819
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "D_elete Address Book"
 msgstr "Scrios _Leabhar Seoltaí"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
 msgid "Delete the selected address book"
 msgstr "Scrios an leabhar seoltaí roghnaithe"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:826
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Mo_ve All Contacts To..."
 msgstr "Bog Gach _Teagmháil Go..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:893
 #, fuzzy
 msgid "Move the contacts of the selected address book to another"
 msgstr "Post an sceál seo"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:833
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "_New Address Book"
 msgstr "Leabhar Seoltaí _Nua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:840
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Address _Book Properties"
 msgstr "Airíonna an _Leabhair Seoltaí"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:907
 #, fuzzy
 msgid "Show properties of the selected address book"
 msgstr "Airíonna an mhodúil/phoirt roghnaithe:"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:847
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-task-shell-view-actions.c:760
+msgid "Re_fresh"
+msgstr "Athn_uaigh"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:914
+#, fuzzy
+msgid "Refresh the selected address book"
+msgstr "Athainmnigh an fillteán roghnaithe"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 #, fuzzy
 msgid "Address Book _Map"
 msgstr "Leabhar Seoltaí"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#: ../modules/addressbook/e-book-shell-view-actions.c:921
 #, fuzzy
 msgid "Show map with all contacts from selected address book"
 msgstr "Post an sceál seo"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:854
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
-#: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/mail/e-mail-shell-view-actions.c:1605
 msgid "_Rename..."
 msgstr "Atha_inmnigh..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:856
+#: ../modules/addressbook/e-book-shell-view-actions.c:928
 #, fuzzy
 msgid "Rename the selected address book"
 msgstr "Athainmnigh an fillteán roghnaithe"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/addressbook/e-book-shell-view-actions.c:935
 #, fuzzy
 msgid "Stop loading"
 msgstr "Stad Luchtú"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:868
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
 msgid "_Copy Contact To..."
 msgstr "Cóip_eáil Teagmháil Go..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
 #, fuzzy
 msgid "Copy selected contacts to another address book"
 msgstr "Cóipeáil Teagmhálacha Roghnaithe go Fillteán Eile..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:875
+#: ../modules/addressbook/e-book-shell-view-actions.c:947
 msgid "_Delete Contact"
 msgstr "Scr_ios Teagmháil"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:882
+#: ../modules/addressbook/e-book-shell-view-actions.c:954
 msgid "_Find in Contact..."
 msgstr "_Aimsigh i dTeagmháil..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
 msgid "Search for text in the displayed contact"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:889
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 msgid "_Forward Contact..."
 msgstr "Cuir Teagmháil ar _Aghaidh..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:891
+#: ../modules/addressbook/e-book-shell-view-actions.c:963
 msgid "Send selected contacts to another person"
 msgstr "Seol teagmhálacha roghnaithe chuig duine eile"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
+#: ../modules/addressbook/e-book-shell-view-actions.c:968
 msgid "_Move Contact To..."
 msgstr "_Bog Teagmháil Go..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:898
+#: ../modules/addressbook/e-book-shell-view-actions.c:970
 msgid "Move selected contacts to another address book"
 msgstr "Bog teagmhálacha roghnaithe go leabhar seoltaí eile"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
+#: ../modules/addressbook/e-book-shell-view-actions.c:975
 msgid "_New Contact..."
 msgstr "Teagmháil _Nua..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:910
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
 msgid "New Contact _List..."
 msgstr "_Liosta Teagmhálacha Nua..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:917
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "_Open Contact"
 msgstr "Oscail _Teagmháil"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:919
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "View the current contact"
 msgstr "Amharc ar an teagmháil reatha"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:924
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "_Send Message to Contact..."
 msgstr "_Seol Teachtaireacht Chuig Teagmháil..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:926
+#: ../modules/addressbook/e-book-shell-view-actions.c:998
 #, fuzzy
 msgid "Send a message to the selected contacts"
 msgstr "Brúigh anseo chun an teachtaireacht a sheoladh"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:933
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
-#: ../modules/calendar/e-task-shell-view-actions.c:822
+#: ../modules/addressbook/e-book-shell-view-actions.c:1005
+#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "_Actions"
 msgstr "_Gníomhartha"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:940
-#: ../modules/calendar/e-memo-shell-view-actions.c:677
-#: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../modules/addressbook/e-book-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
+#: ../modules/calendar/e-task-shell-view-actions.c:832
+#: ../modules/mail/e-mail-shell-view-actions.c:1770
 msgid "_Preview"
 msgstr "_Réamhamharc"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:949
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
-#: ../modules/calendar/e-memo-shell-view-actions.c:690
-#: ../modules/calendar/e-task-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:1021
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-memo-shell-view-actions.c:693
+#: ../modules/calendar/e-task-shell-view-actions.c:845
 msgid "_Delete"
 msgstr "Scr_ios"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "_Properties"
 msgstr "_Airíonna"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:1033
 #, fuzzy
 msgid "Address Book Map"
 msgstr "Leabhar Seoltaí"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:989
+#: ../modules/addressbook/e-book-shell-view-actions.c:1065
 msgid "Contact _Preview"
 msgstr "_Réamhamharc Teagmhála"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:991
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
 #, fuzzy
 msgid "Show contact preview window"
 msgstr "Oscail an fhuinneog réamhamhairc priontála"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
 #, fuzzy
 msgid "Show _Maps"
 msgstr "Taispeáin mar liosta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#: ../modules/addressbook/e-book-shell-view-actions.c:1075
 #, fuzzy
 msgid "Show maps in contact preview window"
 msgstr "Oscail an fhuinneog réamhamhairc priontála"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1018
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
-#: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1472
+#: ../modules/addressbook/e-book-shell-view-actions.c:1094
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/mail/e-mail-shell-view-actions.c:1900
 msgid "_Classic View"
 msgstr "Amharc _Clasaiceach"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1020
+#: ../modules/addressbook/e-book-shell-view-actions.c:1096
 #, fuzzy
 msgid "Show contact preview below the contact list"
 msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1025
-#: ../modules/calendar/e-memo-shell-view-actions.c:754
-#: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/addressbook/e-book-shell-view-actions.c:1101
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/mail/e-mail-shell-view-actions.c:1907
 msgid "_Vertical View"
 msgstr "Amharc _Ingearach"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1027
+#: ../modules/addressbook/e-book-shell-view-actions.c:1103
 #, fuzzy
 msgid "Show contact preview alongside the contact list"
 msgstr "Oscail an fhuinneog réamhamhairc priontála"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1035
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
-#: ../modules/calendar/e-memo-shell-view-actions.c:764
-#: ../modules/calendar/e-task-shell-view-actions.c:935
-msgid "Any Category"
-msgstr "Catagóir ar Bith"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1042
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:970
+#: ../modules/addressbook/e-book-shell-view-actions.c:1118
+#: ../modules/calendar/e-cal-shell-view-actions.c:1755
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Unmatched"
 msgstr "Gan Chomhoiriúnú"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1052
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
-#: ../shell/e-shell-content.c:665
+#: ../modules/addressbook/e-book-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-actions.c:1765
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:1976
+#: ../shell/e-shell-content.c:656
 msgid "Advanced Search"
 msgstr "Cuardach Casta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1085
+#: ../modules/addressbook/e-book-shell-view-actions.c:1161
 #, fuzzy
 msgid "Print all shown contacts"
 msgstr "Priontáil teagmhálacha roghnaithe"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1092
+#: ../modules/addressbook/e-book-shell-view-actions.c:1168
 #, fuzzy
 msgid "Preview the contacts to be printed"
 msgstr "Réamhamharcann sé seo na teagmhálacha le priontáil"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1099
+#: ../modules/addressbook/e-book-shell-view-actions.c:1175
 msgid "Print selected contacts"
 msgstr "Priontáil teagmhálacha roghnaithe"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+#: ../modules/addressbook/e-book-shell-view-actions.c:1190
 msgid "S_ave Address Book as vCard"
 msgstr "Sá_bháil Leabhar Seoltaí mar vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../modules/addressbook/e-book-shell-view-actions.c:1192
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Sábháil teagmhálacha an leabhar seoltaí roghnaithe mar vCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1122
-#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+#: ../modules/addressbook/e-book-shell-view-actions.c:1198
+#: ../modules/addressbook/e-book-shell-view-actions.c:1208
 msgid "_Save as vCard..."
 msgstr "Sábháil mar _vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1124
+#: ../modules/addressbook/e-book-shell-view-actions.c:1200
 msgid "Save selected contacts as a vCard"
 msgstr "Sábháil teagmhálacha roghnaithe mar vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:349
+#: ../modules/addressbook/e-book-shell-view.c:312
 msgid "_Forward Contacts"
 msgstr "_Cuir Teagmhálacha ar Aghaidh"
 
-#: ../modules/addressbook/e-book-shell-view.c:351
+#: ../modules/addressbook/e-book-shell-view.c:314
 msgid "_Forward Contact"
 msgstr "_Cuir Teagmháil ar Aghaidh"
 
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Send Message to Contacts"
 msgstr "_Seol Teachtaireacht Chuig Teagmhálacha"
 
-#: ../modules/addressbook/e-book-shell-view.c:384
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Send Message to List"
 msgstr "_Seol Teachtaireacht Chuig Liosta"
 
-#: ../modules/addressbook/e-book-shell-view.c:386
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Send Message to Contact"
 msgstr "_Seol Teachtaireacht Chuig Teagmháil"
 
-#: ../modules/addressbook/eab-composer-util.c:149
-msgid "Multiple vCards"
-msgstr "vCardanna Iomadúla"
-
-#: ../modules/addressbook/eab-composer-util.c:157
-#, c-format
-msgid "vCard for %s"
-msgstr "vCard do %s"
-
-#: ../modules/addressbook/eab-composer-util.c:169
-#: ../modules/addressbook/eab-composer-util.c:196
-#, c-format
-msgid "Contact information"
-msgstr "Eolas teagmhála"
-
-#: ../modules/addressbook/eab-composer-util.c:198
-#, c-format
-msgid "Contact information for %s"
-msgstr "Eolas teagmhála le %s"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "1"
-msgstr "1"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:4
-msgid "5"
-msgstr "5"
-
-#: ../modules/addressbook/ldap-config.ui.h:5
-msgid "Anonymously"
+#: ../modules/audio-inline/e-mail-formatter-audio.c:316
+msgid "Audio Player"
 msgstr ""
 
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time 
limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:7
-msgid "B_rowse this book until limit reached"
+#: ../modules/audio-inline/e-mail-formatter-audio.c:317
+msgid "Play the attachment in embedded audio player"
 msgstr ""
 
-#: ../modules/addressbook/ldap-config.ui.h:8
-msgid "Lo_gin:"
-msgstr "_Logáil Isteach:"
-
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this 
file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:11
+#: ../modules/backup-restore/e-mail-config-restore-page.c:165
 #, fuzzy
-msgid "One"
-msgstr "Ar Líne"
-
-#: ../modules/addressbook/ldap-config.ui.h:13
-msgid "Search Filter"
-msgstr ""
-
-#: ../modules/addressbook/ldap-config.ui.h:14
-msgid "Search _base:"
-msgstr ""
-
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Search _filter:"
-msgstr ""
-
-#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
+"You can restore Evolution from a backup file.\n"
+"\n"
+"This will restore all your personal data, settings mail filters, etc."
 msgstr ""
+"Is féidir leat Evolution a athchóiriú ó do chúltaca. Is féidir leis gach "
+"Post, Féilire, Tasc, Meamram agus Teagmháil a athchóiriú. Athchóiríonn sé do "
+"chuid socruithe pearsanta, scagairí poist, srl."
 
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this 
file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:18
+#: ../modules/backup-restore/e-mail-config-restore-page.c:180
 #, fuzzy
-msgid "Sub"
-msgstr "Do"
-
-#: ../modules/addressbook/ldap-config.ui.h:19
-msgid "Supported Search Bases"
-msgstr ""
-
-#: ../modules/addressbook/ldap-config.ui.h:21
-msgid "Using distinguished name (DN)"
-msgstr ""
+msgid "_Restore from a backup file:"
+msgstr "Athchóirigh ó chúltaca"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/backup-restore/e-mail-config-restore-page.c:191
 #, fuzzy
-msgid "Using email address"
-msgstr "_Seoladh Ríomhphoist:"
-
-#: ../modules/addressbook/ldap-config.ui.h:23
-msgid "_Download limit:"
-msgstr ""
-
-#: ../modules/addressbook/ldap-config.ui.h:24
-msgid "_Find Possible Search Bases"
-msgstr ""
-
-#: ../modules/addressbook/ldap-config.ui.h:25
-msgid "_Login method:"
-msgstr ""
-
-#: ../modules/addressbook/ldap-config.ui.h:28
-msgid "_Search scope:"
-msgstr ""
-
-#: ../modules/addressbook/ldap-config.ui.h:30
-msgid "_Timeout:"
-msgstr ""
+msgid "Choose a backup file to restore"
+msgstr "Roghnaigh comhad le hathchóiriú"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
-msgid "cards"
-msgstr "cartaí"
+#. Keep the title identical to EMailConfigRestorePage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/backup-restore/e-mail-config-restore-page.c:311
+#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
+#, fuzzy
+msgid "Restore from Backup"
+msgstr "Athchóirigh ó chúltaca"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:146
-#, fuzzy, c-format
-msgid "Failed to spawn Bogofilter (%s): "
-msgstr "theip ar oscailt leabhar"
+#: ../modules/backup-restore/evolution-backup-restore.c:217
+msgid "Select name of the Evolution backup file"
+msgstr "Roghnaigh ainm an chomhaid cúltaca Evolution"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:164
-msgid "Failed to stream mail message content to Bogofilter: "
-msgstr ""
+#: ../modules/backup-restore/evolution-backup-restore.c:250
+msgid "_Restart Evolution after backup"
+msgstr "_Atosaigh Evolution tar éis cúltaca"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:213
-msgid "Bogofilter either crashed or failed to process a mail message"
-msgstr ""
+#: ../modules/backup-restore/evolution-backup-restore.c:277
+msgid "Select name of the Evolution backup file to restore"
+msgstr "Roghnaigh ainm an chomhaid cúltaca Evolution le hathchóiriú"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:312
-msgid "Bogofilter Options"
-msgstr "Roghanna Bogofilter"
+#: ../modules/backup-restore/evolution-backup-restore.c:290
+msgid "_Restart Evolution after restore"
+msgstr "_Atosaigh Evolution tar éis athchóirithe"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:321
-msgid "Convert message text to _Unicode"
-msgstr "Tiontaigh téacs na teachtaireachta go _Unicode"
+#: ../modules/backup-restore/evolution-backup-restore.c:308
+msgid "_Back up Evolution Data..."
+msgstr "Déan _Cóip Chúltaca Sonraí Evolution..."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:477
+#: ../modules/backup-restore/evolution-backup-restore.c:310
 #, fuzzy
-msgid "Bogofilter"
-msgstr "Roghanna Bogofilter"
-
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "Tiontaigh teachtaireachtaí poist go Unicode"
-
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
+msgid "Back up Evolution data and settings to an archive file"
 msgstr ""
+"Déan cúltaca ar shonraí agus ar shocruithe Evolution agus athchóirigh iad."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
-#, no-c-format
-msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr ""
+#: ../modules/backup-restore/evolution-backup-restore.c:315
+msgid "R_estore Evolution Data..."
+msgstr "A_thchóirigh na Sonraí Evolution..."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
-msgid "(Shown in a Day View)"
+#: ../modules/backup-restore/evolution-backup-restore.c:317
+#, fuzzy
+msgid "Restore Evolution data and settings from an archive file"
 msgstr ""
+"Déan cúltaca ar shonraí agus ar shocruithe Evolution agus athchóirigh iad."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
-msgid "05 minutes"
-msgstr "05 nóiméad"
+#: ../modules/backup-restore/evolution-backup-tool.c:84
+#, fuzzy
+msgid "Back up Evolution directory"
+msgstr "Comhadlann saincheaptha chúltaca:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
-msgid "10 minutes"
-msgstr "10 nóiméad"
+#: ../modules/backup-restore/evolution-backup-tool.c:86
+#, fuzzy
+msgid "Restore Evolution directory"
+msgstr "ní féidir an chomhadlann reatha a athchóiriú"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
-msgid "15 minutes"
-msgstr "15 nóiméad"
+#: ../modules/backup-restore/evolution-backup-tool.c:88
+#, fuzzy
+msgid "Check Evolution Back up"
+msgstr "Seiceáil an Cúltaca Evolution"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
-msgid "30 minutes"
-msgstr "30 nóiméad"
+#: ../modules/backup-restore/evolution-backup-tool.c:90
+msgid "Restart Evolution"
+msgstr "Atosaigh Evolution"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
-msgid "60 minutes"
-msgstr "60 nóiméad"
+#: ../modules/backup-restore/evolution-backup-tool.c:92
+#, fuzzy
+msgid "With Graphical User Interface"
+msgstr "*.ui *.UI|Comhaid Chomhéadain"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alerts"
-msgstr "Foláirimh"
+#. FIXME Will the versioned setting always work?
+#: ../modules/backup-restore/evolution-backup-tool.c:321
+#: ../modules/backup-restore/evolution-backup-tool.c:515
+msgid "Shutting down Evolution"
+msgstr "Evolution á mhúchadh"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
-msgid "Day _ends:"
+#: ../modules/backup-restore/evolution-backup-tool.c:330
+msgid "Backing Evolution accounts and settings"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
-msgid "Days"
+#: ../modules/backup-restore/evolution-backup-tool.c:347
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Default Free/Busy Server"
-msgstr "Freastalaí Saor/Gnóthach Réamhshocraithe"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
-msgid "Display"
-msgstr "Taispeáin"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/backup-restore/evolution-backup-tool.c:363
 #, fuzzy
-msgid "Display reminders in _notification area only"
-msgstr "Taispeáin deilbhín sa limistéar fógartha"
+msgid "Back up complete"
+msgstr "Cúltaca críochnaithe"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
-#, fuzzy
-msgid "Hours"
-msgstr "uair"
+#: ../modules/backup-restore/evolution-backup-tool.c:370
+#: ../modules/backup-restore/evolution-backup-tool.c:702
+msgid "Restarting Evolution"
+msgstr "Evolution á atosú"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#: ../modules/backup-restore/evolution-backup-tool.c:521
 #, fuzzy
-msgid "Minutes"
-msgstr "noimeaíd"
+msgid "Back up current Evolution data"
+msgstr "Foinse Sonraí na Cáipéise Reatha"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../modules/backup-restore/evolution-backup-tool.c:528
 #, fuzzy
-msgid "Publishing Information"
-msgstr "Suíomh réamhshocraithe foilsithe"
-
-#. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-msgid "S_un"
-msgstr "_Domh"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
-msgid "Sc_roll Month View by a week"
-msgstr ""
+msgid "Extracting files from back up"
+msgstr "Fainéis á léamh ó chúltaca"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
-msgid "Se_cond zone:"
-msgstr ""
+#: ../modules/backup-restore/evolution-backup-tool.c:610
+msgid "Loading Evolution settings"
+msgstr "Socruithe Evolution á luchtú"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
+#: ../modules/backup-restore/evolution-backup-tool.c:676
 #, fuzzy
-msgid "Select the calendars for reminder notification"
-msgstr "Eolas féilire"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
-msgid "Sh_ow a reminder"
-msgstr ""
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
-msgid "Show a _reminder"
-msgstr ""
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
-msgid "Show r_ecurring events in italic in bottom left calendar"
-msgstr ""
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
-msgid "Show week _numbers"
-msgstr ""
+msgid "Removing temporary back up files"
+msgstr "An iomarca comhad cúltaca?"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
-msgid "T_asks due today:"
+#: ../modules/backup-restore/evolution-backup-tool.c:687
+msgid "Reloading registry service"
 msgstr ""
 
-#. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
-msgid "T_hu"
-msgstr "Déa_r"
+#: ../modules/backup-restore/evolution-backup-tool.c:914
+#, fuzzy
+msgid "Evolution Back Up"
+msgstr "Cúltaca Evolution"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
-msgid "Template:"
-msgstr "Teimpléad:"
+#: ../modules/backup-restore/evolution-backup-tool.c:915
+#, fuzzy, c-format
+msgid "Backing up to the folder %s"
+msgstr "Theip ar léamh na comhadlainne."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
-#: ../widgets/misc/e-dateedit.c:592
-msgid "Time"
-msgstr "Am"
+#: ../modules/backup-restore/evolution-backup-tool.c:919
+msgid "Evolution Restore"
+msgstr "Athchóiriú Evolution"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "Time format:"
-msgstr "Formáid ama:"
+#: ../modules/backup-restore/evolution-backup-tool.c:920
+#, fuzzy, c-format
+msgid "Restoring from the folder %s"
+msgstr "Ag díliostáil ón bhfillteán %S..."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
-msgid "Use s_ystem time zone"
-msgstr "Úsáid crios ama an chó_rais"
+#: ../modules/backup-restore/evolution-backup-tool.c:990
+#, fuzzy
+msgid "Backing up Evolution Data"
+msgstr "Foinse Sonraí na Cáipéise Reatha"
 
-#. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-msgid "Wee_k starts on:"
+#: ../modules/backup-restore/evolution-backup-tool.c:991
+msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
-msgid "Work Week"
-msgstr "Seachtain Oibre"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
-msgid "Work days:"
-msgstr "Laethanta oibre:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
-msgid "_12 hour (AM/PM)"
-msgstr "_12 uair (AM/PM)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
-msgid "_24 hour"
-msgstr "_24 uair"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "_Ask for confirmation when deleting items"
-msgstr ""
+#: ../modules/backup-restore/evolution-backup-tool.c:993
+#, fuzzy
+msgid "Restoring Evolution Data"
+msgstr "Evolution á Atosú"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
-msgid "_Compress weekends in month view"
+#: ../modules/backup-restore/evolution-backup-tool.c:994
+msgid "Please wait while Evolution is restoring your data."
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "_Day begins:"
+#: ../modules/backup-restore/evolution-backup-tool.c:1016
+msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 
-#. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
-msgid "_Fri"
-msgstr "_Aoine"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
+#, fuzzy
+msgid "Invalid Evolution backup file"
+msgstr "Comhad cúltaca Evolution neamhbhailí"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-msgid "_Hide completed tasks after"
-msgstr ""
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
+#, fuzzy
+msgid "Please select a valid backup file to restore."
+msgstr "Dealaigh na tadhallaí roghnaithe"
 
-#. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
-msgid "_Mon"
-msgstr "_Luan"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid "Are you sure you want to close Evolution?"
+msgstr "An bhfuil tú cinnte gur mhaith leat Evolution a dhúnadh?"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
-msgid "_Overdue tasks:"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
 msgstr ""
 
-#. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
-msgid "_Sat"
-msgstr "_Sath"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#, fuzzy
+msgid "Close and Back up Evolution"
+msgstr "Foinse Sonraí na Cáipéise Reatha"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
-msgid "_Show appointment end times in week and month view"
-msgstr ""
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#, fuzzy
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "An bhfuil tú cinnte gur mhaith leat Evolution a dhúnadh?"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:68
-msgid "_Time divisions:"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid ""
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
 msgstr ""
 
-#. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:70
-msgid "_Tue"
-msgstr "_Máirt"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
+#, fuzzy
+msgid "Close and Restore Evolution"
+msgstr "Ní féidir Evolution a thosú"
 
-#. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
-msgid "_Wed"
-msgstr "_Céad"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid "Insufficient Permissions"
+msgstr "Diúltaíodh Cead"
 
-#. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
-msgid "before every anniversary/birthday"
-msgstr ""
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
+#, fuzzy
+msgid "The selected folder is not writable."
+msgstr "Post an sceál seo"
 
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
-msgid "before every appointment"
-msgstr "roimh gach coinne"
+#: ../modules/bogofilter/evolution-bogofilter.c:145
+#, fuzzy, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "theip ar oscailt leabhar"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
-msgid "Ask for confirmation when deleting items"
+#: ../modules/bogofilter/evolution-bogofilter.c:163
+msgid "Failed to stream mail message content to Bogofilter: "
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+#: ../modules/bogofilter/evolution-bogofilter.c:212
+msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr ""
+#: ../modules/bogofilter/evolution-bogofilter.c:308
+msgid "Bogofilter Options"
+msgstr "Roghanna Bogofilter"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
-#, fuzzy
-msgid "Birthday and anniversary reminder"
-msgstr "Breithlaethanta & Cothroim Lae"
+#: ../modules/bogofilter/evolution-bogofilter.c:317
+msgid "Convert message text to _Unicode"
+msgstr "Tiontaigh téacs na teachtaireachta go _Unicode"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#: ../modules/bogofilter/evolution-bogofilter.c:474
 #, fuzzy
-msgid "Birthday and anniversary reminder units"
-msgstr "Breithlaethanta & Cothroim Lae"
+msgid "Bogofilter"
+msgstr "Roghanna Bogofilter"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
 #, fuzzy
-msgid "Birthday and anniversary reminder value"
-msgstr "Breithlaethanta & Cothroim Lae"
+msgid "Standard LDAP Port"
+msgstr "Cló _Caighdeánach:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-msgid "Calendars to run reminders for"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:625
+msgid "LDAP over SSL (deprecated)"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
+msgid "Microsoft Global Catalog"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "Color to draw the Marcus Bains line in the Day View."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:465
+msgid "Microsoft Global Catalog over SSL"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
-msgid "Compress weekends in month view"
-msgstr ""
+#. Page 1
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:570
+#, fuzzy
+msgid "Connecting to LDAP"
+msgstr "Ag athnasc le %s"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
-msgid "Confirm expunge"
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:587
+msgid "Server Information"
+msgstr "Eolas faoin bhFreastalaí"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
-msgid "Days on which the start and end of work hours should be indicated."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
+msgid "StartTLS (recommended)"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
-msgid "Default appointment reminder"
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
+#, fuzzy
+msgid "Encryption:"
+msgstr "Criptigh"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
-msgid "Default reminder units"
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:654
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:246
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:180
+msgid "Authentication"
+msgstr "Fíordheimhniú"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder value"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
+msgid "Anonymous"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:680
 #, fuzzy
-msgid "Directory for saving reminder audio files"
-msgstr "Comhadlann a sábhálfar comhaid uathúla chúltaca inti"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Free/busy server URLs"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
-msgid "Free/busy template URL"
-msgstr ""
+msgid "Using email address"
+msgstr "_Seoladh Ríomhphoist:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
-msgid "Hide completed tasks"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
-msgid "Hide task units"
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
+#, fuzzy
+msgid "Method:"
+msgstr "Modhanna Ionchurtha"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
-msgid "Hide task value"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Using email address\" requires anonymous access to your "
+"LDAP server."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
-msgid "Horizontal pane position"
+#. Page 2
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:705
+msgid "Using LDAP"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
+#: ../modules/mail/e-mail-shell-view.c:117
+msgid "Searching"
+msgstr "Á chuardach"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:744
+#, fuzzy
+msgid "Search Base:"
+msgstr "Cuardaigh"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
-msgid "If \"true\", show the memo preview pane in the main window."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:749
+msgid "Find Possible Search Bases"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
-msgid "If \"true\", show the task preview pane in the main window."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:774
+msgid "One Level"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
-msgid "Intervals shown in Day and Work Week views, in minutes."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
+msgid "Subtree"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 #, fuzzy
-msgid "Last reminder time"
-msgstr "Am aláraim is déanaí"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
-msgid "List of recently used second time zones in a Day View."
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
-msgid "List of server URLs for free/busy publishing."
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
-msgid "Marcus Bains Line"
-msgstr ""
+msgid "Search Scope:"
+msgstr "Fillteáin Cuardaigh"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
-msgid "Marcus Bains Line Color - Day View"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:783
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree.  A search scope of \"Subtree\" will include all entries "
+"below your search base.  A search scope of \"One Level\" will only include "
+"the entries one level beneath your search base."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
-msgid "Marcus Bains Line Color - Time bar"
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:792
+#, fuzzy
+msgid "Search Filter:"
+msgstr "Fillteáin Cuardaigh"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr ""
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:804
+msgid "Downloading"
+msgstr "Á íosluchtú"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
-msgid "Maximum number of recently used timezones to remember."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
+msgid "Limit:"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
 #, fuzzy
-msgid "Memo layout style"
-msgstr "Stíl na hImlíne"
+msgid "contacts"
+msgstr "Teagmhálacha"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
-msgid "Memo preview pane position (horizontal)"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:841
+msgid "Browse until limit is reached"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
-msgid "Memo preview pane position (vertical)"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
-msgid "Minute the workday ends on, 0 to 59."
-msgstr ""
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:136
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:205
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:128
+msgid "URL:"
+msgstr "URL:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
-msgid "Minute the workday starts on, 0 to 59."
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:146
+msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
-msgid "Month view horizontal pane position"
-msgstr ""
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#, fuzzy, c-format
+msgid "HTTP Error: %s"
+msgstr "Earráid GConf: %s"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
-msgid "Month view vertical pane position"
-msgstr ""
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:475
+#, fuzzy
+msgid "Could not parse response"
+msgstr "Níorbh fhéidir teachtaireacht PGP a pharsáil"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
-msgid "Number of units for determining a birthday or anniversary reminder."
-msgstr ""
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:484
+#, fuzzy
+msgid "Empty response"
+msgstr "_Folmhaigh Bruscar"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
-msgid "Number of units for determining a default reminder."
-msgstr ""
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:492
+#, fuzzy
+msgid "Unexpected reply from server"
+msgstr "Seol _freagra don seoltóir"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
-msgid "Number of units for determining when to hide tasks."
-msgstr ""
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1124
+#, fuzzy
+msgid "Could not locate user's calendars"
+msgstr "Ní féidir an soláthraí cuardaigh a aimsiú."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
-msgid "Overdue tasks color"
-msgstr ""
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1348
+#, fuzzy
+msgid "Path"
+msgstr "_Cosán:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr ""
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
+#, fuzzy
+msgid "Choose a Calendar"
+msgstr "Roghnaigh comhad féilire"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+#, fuzzy
+msgid "Choose a Memo List"
+msgstr "Liosta Meamram Nua"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr ""
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+#, fuzzy
+msgid "Choose a Task List"
+msgstr "Roghnaigh Liosta Tascanna"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
-msgid "Position of the task preview pane when oriented horizontally."
-msgstr ""
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:219
+#, fuzzy
+msgid "Find Calendars"
+msgstr "Féilirí Gréasáin"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the task preview pane when oriented vertically."
-msgstr ""
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:222
+#, fuzzy
+msgid "Find Memo Lists"
+msgstr "Liosta Meamram"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:225
+#, fuzzy
+msgid "Find Task Lists"
+msgstr "Liosta Tascanna"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:243
+msgid "Email:"
+msgstr "Ríomhphost:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
-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."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:248
+#, fuzzy
+msgid "Server handles meeting invitations"
 msgstr ""
+"Seoladh teachtaireacht chuig:\n"
+"%1%2"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-msgid "Primary calendar"
-msgstr "Príomhfhéilire"
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:71
+#, fuzzy
+msgid "Choose which address books to use."
+msgstr "Ná taispeáin ach fillteáin atá oscailte"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
-msgid "Primary memo list"
-msgstr "Príomhliosta meamram"
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:201
+#, fuzzy
+msgid "Use in Birthdays & Anniversaries calendar"
+msgstr "Úsáid san _fhéilire Breithlaethanta & Cothroim Lae"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
-msgid "Primary task list"
-msgstr "Príomhliosta tascanna"
+#: ../modules/cal-config-google/e-google-chooser-button.c:127
+#, fuzzy
+msgid "Default User Calendar"
+msgstr "Roghnaigh Féilire"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
-msgid "Programs that are allowed to be run by reminders."
-msgstr ""
+#: ../modules/cal-config-google/e-google-chooser.c:515
+#, fuzzy, c-format
+msgid "Enter Google password for user '%s'."
+msgstr "Iontráil an focal faire le `%s'"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Recently used second time zones in a Day View"
+#: ../modules/cal-config-google/e-google-chooser.c:532
+msgid "User declined to provide a password"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
-msgid "Recurrent Events in Italic"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:160
+msgid "Use an existing iCalendar (ics) file"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#: ../modules/cal-config-local/evolution-cal-config-local.c:185
 #, fuzzy
-msgid "Reminder programs"
-msgstr "Rith roghchlár"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for reminder audio"
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
-msgid "Scroll Month View by a week"
-msgstr ""
+msgid "iCalendar File"
+msgstr "iCalendar (.ics)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr ""
+#: ../modules/cal-config-local/evolution-cal-config-local.c:197
+#, fuzzy
+msgid "Choose an iCalendar file"
+msgstr "Roghnaigh comhad féilire"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
-msgid "Show Role field in the event/task/meeting editor"
-msgstr ""
+#: ../modules/cal-config-local/evolution-cal-config-local.c:200
+msgid "File:"
+msgstr "Comhad:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
-msgid "Show appointment end times in week and month views"
-msgstr ""
+#: ../modules/cal-config-local/evolution-cal-config-local.c:215
+#, fuzzy
+msgid "Allow Evolution to update the file"
+msgstr "Comhad cúltaca Evolution neamhbhailí"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
-msgid "Show categories field in the event/meeting/task editor"
-msgstr ""
+#: ../modules/calendar/e-cal-attachment-handler.c:320
+#: ../smime/gui/smime-ui.ui.h:9
+msgid "I_mport"
+msgstr "Io_mpórtáil"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
-msgid "Show days with recurrent events in italic font in bottom left calendar."
-msgstr ""
+#: ../modules/calendar/e-cal-attachment-handler.c:406
+msgid "Select a Calendar"
+msgstr "Roghnaigh Féilire"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-#, fuzzy
-msgid "Show display reminders in notification tray"
-msgstr "Taispeáin deilbhín sa limistéar fógartha"
+#: ../modules/calendar/e-cal-attachment-handler.c:433
+msgid "Select a Task List"
+msgstr "Roghnaigh Liosta Tascanna"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
-msgid "Show status field in the event/task/meeting editor"
-msgstr ""
+#: ../modules/calendar/e-cal-attachment-handler.c:443
+msgid "I_mport to Calendar"
+msgstr "Io_mpórtáil go Féilire"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
-#, fuzzy
-msgid "Show the memo preview pane"
-msgstr "Taispeáin an pána \"Réamhamharc\""
+#: ../modules/calendar/e-cal-attachment-handler.c:450
+msgid "I_mport to Tasks"
+msgstr "Io_mpórtáil go Tascanna"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
+#: ../modules/calendar/e-calendar-preferences.c:517
 #, fuzzy
-msgid "Show the task preview pane"
-msgstr "Taispeáin an pána \"Réamhamharc\""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
-msgid "Show timezone field in the event/meeting editor"
-msgstr ""
+msgid "Selected Calendars for Alarms"
+msgstr "Post an sceál seo"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
-msgid "Show type field in the event/task/meeting editor"
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.c:925
+msgid "Ti_me and date:"
+msgstr "A_m agus dáta:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.c:926
+msgid "_Date only:"
+msgstr "_Dáta amháin:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
+msgid "Minutes"
+msgstr "Nóiméid"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
-msgid "Task layout style"
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
+msgid "Hours"
+msgstr "Uaireanta"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
-msgid "Task preview pane position (horizontal)"
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
+msgid "Days"
+msgstr "Lá"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
-msgid "Task preview pane position (vertical)"
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
+msgid "60 minutes"
+msgstr "60 nóiméad"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
-msgid "Tasks due today color"
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
+msgid "30 minutes"
+msgstr "30 nóiméad"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
+msgid "15 minutes"
+msgstr "15 nóiméad"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
-msgid ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view."
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
+msgid "10 minutes"
+msgstr "10 nóiméad"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view."
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
+msgid "05 minutes"
+msgstr "05 nóiméad"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
-#, 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."
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Se_cond zone:"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+msgid "(Shown in a Day View)"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "Use s_ystem time zone"
+msgstr "Úsáid crios ama an chó_rais"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "Time format:"
+msgstr "Formáid ama:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
-msgid "The second timezone for a Day View"
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "_12 hour (AM/PM)"
+msgstr "_12 uair (AM/PM)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+msgid "_24 hour"
+msgstr "_24 uair"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
-msgid "Time divisions"
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+msgid "Work Week"
+msgstr "Seachtain Oibre"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last reminder ran, in time_t."
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Wee_k starts on:"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
-msgid "Timezone"
-msgstr "Crios Ama"
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Work days:"
+msgstr "Laethanta oibre:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
-msgid "Twenty four hour time format"
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "_Day begins:"
+msgstr "Tosaíonn an _lá:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
-msgstr ""
+#. Monday
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
+msgid "_Mon"
+msgstr "_Luan"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
+#. Tuesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "_Tue"
+msgstr "_Máirt"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
+#. Wednesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
+msgid "_Wed"
+msgstr "_Céad"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
-msgid "Use system timezone"
-msgstr ""
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "T_hu"
+msgstr "Déa_r"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr ""
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
+msgid "_Fri"
+msgstr "_Aoine"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
-msgid "Vertical pane position"
-msgstr ""
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "_Sat"
+msgstr "_Sath"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
-msgid "Week start"
-msgstr "Tosach seachtaine"
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
+msgid "S_un"
+msgstr "_Domh"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+msgid "Day _ends:"
+msgstr "Is é _deireadh an lae:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display reminders."
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Alerts"
+msgstr "Foláirimh"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
-msgid "Whether to ask for confirmation when deleting an appointment or task."
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "_Time divisions:"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
+msgid "_Show appointment end times in week and month view"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
-msgid "Whether to display the end time of events in the week and month views."
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
+msgid "_Compress weekends in month view"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+msgid "Show week _numbers"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
-msgid "Whether to hide completed tasks in the tasks view."
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
-msgid "Whether to scroll a Month View by a week, not by a month."
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
+msgid "Sc_roll Month View by a week"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
-msgid "Whether to set a default reminder for appointments."
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "Display"
+msgstr "Taispeáin"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
-msgid "Whether to set a reminder for birthdays and anniversaries."
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "Task List"
+msgstr "Liosta Tascanna"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
-msgid "Whether to show RSVP field in the event/task/meeting editor"
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "Highlight t_asks due today"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#, fuzzy
+msgid "Highlight _overdue tasks"
+msgstr "RockRidge le díth ainm"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
-msgid "Whether to show role field in the event/task/meeting editor"
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "_Hide completed tasks after"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#, fuzzy
+msgid "Display reminders in _notification area only"
+msgstr "Taispeáin deilbhín sa limistéar fógartha"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
+msgid "before every appointment"
+msgstr "roimh gach coinne"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
-msgid "Whether to show type field in the event/task/meeting editor"
+#. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
+msgid "Show a _reminder"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week numbers in various places in the Calendar."
+#. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
+msgid "before every anniversary/birthday"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
-msgid "Work days"
-msgstr "Laethanta oibre"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
-msgid "Workday end hour"
-msgstr "Uair deiridh an lae oibre"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
-msgid "Workday end minute"
-msgstr "Nóiméad deiridh an lae oibre"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
-msgid "Workday start hour"
-msgstr "Uair tosaigh an lae oibre"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
-msgid "Workday start minute"
-msgstr "Nóiméad tosaigh an lae oibre"
-
-#: ../modules/calendar/e-cal-attachment-handler.c:312
-#: ../smime/gui/smime-ui.ui.h:22
-msgid "I_mport"
-msgstr "Io_mpórtáil"
-
-#: ../modules/calendar/e-cal-attachment-handler.c:393
-msgid "Select a Calendar"
-msgstr "Roghnaigh Féilire"
-
-#: ../modules/calendar/e-cal-attachment-handler.c:420
-msgid "Select a Task List"
-msgstr "Roghnaigh Liosta Tascanna"
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
+#, fuzzy
+msgid "Select the calendars for reminder notification"
+msgstr "Eolas féilire"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:430
-msgid "I_mport to Calendar"
-msgstr "Io_mpórtáil go Féilire"
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "Default Free/Busy Server"
+msgstr "Freastalaí Saor/Gnóthach Réamhshocraithe"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:437
-msgid "I_mport to Tasks"
-msgstr "Io_mpórtáil go Tascanna"
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
+msgid "Template:"
+msgstr "Teimpléad:"
 
-#: ../modules/calendar/e-calendar-preferences.c:461
-#, fuzzy
-msgid "Selected Calendars for Reminders"
-msgstr "Post an sceál seo"
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.c:863
-#, fuzzy
-msgid "Ti_me and date:"
-msgstr "Am agus dáta:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+msgid "Publishing Information"
+msgstr "Eolas Foilsithe"
 
-#: ../modules/calendar/e-calendar-preferences.c:864
-#, fuzzy
-msgid "_Date only:"
-msgstr "Dáta amháin:"
-
-#. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:117
-#: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:104
-#: ../modules/calendar/e-memo-shell-migrate.c:152
-#: ../modules/calendar/e-task-shell-backend.c:104
-#: ../modules/calendar/e-task-shell-migrate.c:164
-msgid "On The Web"
-msgstr "Ar An nGréasán"
-
-#: ../modules/calendar/e-cal-shell-backend.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:127
-msgid "Weather"
-msgstr "Aimsir"
-
-#: ../modules/calendar/e-cal-shell-backend.c:206
-#: ../modules/calendar/e-cal-shell-migrate.c:66
-msgid "Birthdays & Anniversaries"
-msgstr "Breithlaethanta & Cothroim Lae"
+#: ../modules/calendar/e-cal-shell-backend.c:313
+#: ../modules/calendar/e-cal-shell-view-actions.c:191
+msgid "New Calendar"
+msgstr "Féilire Nua"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:322
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Coinne"
 
-#: ../modules/calendar/e-cal-shell-backend.c:441
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-backend.c:324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1522
 msgid "Create a new appointment"
 msgstr "Cruthaigh coinne nua"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:329
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "C_oinne an Lae ar Fad"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-backend.c:331
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:336
 msgctxt "New"
 msgid "M_eeting"
 msgstr "Cr_uinniú"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:338
 msgid "Create a new meeting request"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-backend.c:463
+#: ../modules/calendar/e-cal-shell-backend.c:346
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Fé_ilire"
 
-#: ../modules/calendar/e-cal-shell-backend.c:465
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Create a new calendar"
 msgstr "Cruthaigh féilire nua"
 
-#: ../modules/calendar/e-cal-shell-backend.c:788
+#: ../modules/calendar/e-cal-shell-backend.c:703
 msgid "Calendar and Tasks"
 msgstr "Féilire agus Tascanna"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:184
-#, fuzzy
-msgid "Loading calendars"
-msgstr "Féilire á Luchtú"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:755
-#, fuzzy
-msgid "_New Calendar..."
-msgstr "Féilire _Nua"
+#: ../modules/calendar/e-cal-shell-sidebar.c:119
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "Féilire '%s' á oscailt"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:772
+#: ../modules/calendar/e-cal-shell-sidebar.c:597
 #, fuzzy
 msgid "Calendar Selector"
 msgstr "Earráid iCalendar"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1123
-#, fuzzy, c-format
-msgid "Opening calendar at %s"
-msgstr "Féilire á oscailt"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:232
-#: ../modules/calendar/e-cal-shell-view-actions.c:261
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
 msgid "Print"
 msgstr "Priontáil"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:320
+#: ../modules/calendar/e-cal-shell-view-actions.c:291
+msgid "Calendar Properties"
+msgstr "Roghnachais na Fheilire"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:322
 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 "
@@ -14872,529 +16612,555 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:337
+#: ../modules/calendar/e-cal-shell-view-actions.c:339
 msgid "Purge events older than"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:564
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:585
 msgid "Copying Items"
-msgstr "Míreanna á gcóipeáil"
+msgstr "Míreanna á gCóipeáil"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:848
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:878
 msgid "Moving Items"
-msgstr "Míreanna á mbogadh"
+msgstr "Míreanna á mBogadh"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1175
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "event"
-msgstr ""
+msgstr "imeacht"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1177
-#: ../modules/calendar/e-cal-shell-view-memopad.c:219
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
-#: ../modules/calendar/e-task-shell-view-actions.c:641
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
+#: ../modules/calendar/e-cal-shell-view-memopad.c:231
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:527
+#: ../modules/calendar/e-task-shell-view-actions.c:644
 msgid "Save as iCalendar"
-msgstr "Roghnaigh Féilire"
+msgstr "Sábháil mar iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "_Copy..."
 msgstr "_Cóipeáil..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "D_elete Calendar"
-msgstr "Roghnaigh Féilire"
+msgstr "Sc_rios Féilire"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Delete the selected calendar"
-msgstr "Scrios an fillteán roghnaithe"
+msgstr "Scrios an féilire roghnaithe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Go Back"
-msgstr "Déan Cúltaca"
+msgstr "Téigh ar Ais"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "Go Forward"
-msgstr "Téigh ar aghaidh"
+msgstr "Téigh ar Aghaidh"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "Select today"
 msgstr "Roghnaigh an lá inniu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "Select _Date"
 msgstr "Roghnaigh _Dáta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Select a specific date"
 msgstr "Roghnaigh dáta áirithe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "_New Calendar"
 msgstr "Féilire _Nua"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "Purg_e"
 msgstr "Purg_aigh"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
 msgid "Purge old appointments and meetings"
 msgstr "Purgaigh seanchoinní agus seanchruinnithe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
-#: ../modules/calendar/e-task-shell-view-actions.c:757
-msgid "Re_fresh"
-msgstr "Athn_uaigh"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "Refresh the selected calendar"
-msgstr "Athainmnigh an fillteán roghnaithe"
+msgstr "Athnuaigh an féilire roghnaithe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Rename the selected calendar"
-msgstr "Athainmnigh an fillteán roghnaithe"
+msgstr "Athainmnigh an féilire roghnaithe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1429
+msgid "Find _next"
+msgstr "Aimsigh an chéad cheann _eile"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
+msgid "Find next occurrence of the current search string"
+msgstr "Aimsigh céad tarlú eile an teaghrán cuardaigh"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+msgid "Find _previous"
+msgstr "Aimsigh an ceann _roimhe seo"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
+msgid "Find previous occurrence of the current search string"
+msgstr "Aimsigh tarlú roimhe seo an teaghrán cuardaigh"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+msgid "Stop _running search"
+msgstr "Stad cuardach ag rith"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
+msgid "Stop currently running search"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1450
 msgid "Show _Only This Calendar"
 msgstr "Taispeáin an Féilire Seo A_mháin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1457
 msgid "Cop_y to Calendar..."
 msgstr "Cóip_eáil go Féilire..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1464
 msgid "_Delegate Meeting..."
-msgstr ""
+msgstr "_Tarmlig Cruinniú..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
 msgid "_Delete Appointment"
-msgstr "Scrios an choinne seo"
+msgstr "_Scrios Coinne"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "Delete selected appointments"
-msgstr "Scrios an choinne seo"
+msgstr "Scrios coinní roghnaithe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1478
 msgid "Delete This _Occurrence"
-msgstr "Scrios an tarlú seo"
+msgstr "Scrios an _Tarlú Seo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Delete this occurrence"
 msgstr "Scrios an tarlú seo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1485
 msgid "Delete All Occ_urrences"
 msgstr "Scrios _Gach Tarlú"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
 msgid "Delete all occurrences"
 msgstr "Scrios gach tarlú"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1492
 msgid "New All Day _Event..."
-msgstr "_Teagmhas an Lae ar Fad Nua"
+msgstr "_Imeacht Nua an Lae ar Fad..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1494
 msgid "Create a new all day event"
-msgstr "Cruthaigh féilire nua"
+msgstr "Cruthaigh imeacht nua an lae ar fad"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
-#: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-cal-shell-view-actions.c:1499
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "_Forward as iCalendar..."
 msgstr "_Cuir ar Aghaidh mar iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1506
 msgid "New _Meeting..."
-msgstr "_Cruinniú Nua"
+msgstr "_Cruinniú Nua..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1508
 msgid "Create a new meeting"
-msgstr "Cruthaigh meamram nua"
+msgstr "Cruthaigh cruinniú nua"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
 msgid "Mo_ve to Calendar..."
 msgstr "Bo_g go Féilire..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1520
 msgid "New _Appointment..."
 msgstr "_Coinne Nua..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1489
+#: ../modules/calendar/e-cal-shell-view-actions.c:1527
 msgid "Make this Occurrence _Movable"
-msgstr ""
+msgstr "Déan _Inbhogtha an Tarlú Seo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1534
 msgid "_Open Appointment"
 msgstr "_Oscail Coinne"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1536
 msgid "View the current appointment"
 msgstr "Amharc ar an gcoinne reatha"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1541
 msgid "_Reply"
 msgstr "_Freagair"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1555
 msgid "_Schedule Meeting..."
-msgstr ""
+msgstr "_Sceidealaigh Cruinniú..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
 #, fuzzy
 msgid "Converts an appointment to a meeting"
 msgstr "Purgaigh seanchoinní agus seanchruinnithe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1562
 #, fuzzy
 msgid "Conv_ert to Appointment..."
 msgstr "_Coinne Nua..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1564
 #, fuzzy
 msgid "Converts a meeting to an appointment"
 msgstr "Cruthaigh coinne nua"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1569
 msgid "Quit"
-msgstr "_Scoir"
+msgstr "Scoir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Day"
 msgstr "Lá"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1691
 msgid "Show one day"
 msgstr "Taispeáin lá amháin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
 msgid "List"
 msgstr "Liosta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-cal-shell-view-actions.c:1698
 msgid "Show as list"
 msgstr "Taispeáin mar liosta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Month"
 msgstr "Mí"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-cal-shell-view-actions.c:1705
 msgid "Show one month"
 msgstr "Taispeáin mí amháin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
 msgid "Week"
 msgstr "Seachtain"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-cal-shell-view-actions.c:1712
 msgid "Show one week"
 msgstr "Taispeáin seachtain amháin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1681
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
 msgid "Show one work week"
-msgstr "Taispeáin seachtain amháin"
+msgstr "Taispeáin seachtain oibre amháin"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
 msgid "Active Appointments"
 msgstr "Coinní Gníomhacha"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
 msgid "Next 7 Days' Appointments"
 msgstr "Coinní an Chéad 7 Lae Eile"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:994
+#: ../modules/calendar/e-cal-shell-view-actions.c:1748
+msgid "Occurs Less Than 5 Times"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1779
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:997
 msgid "Description contains"
 msgstr "Cur síos ina bhfuil"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
-#: ../modules/calendar/e-memo-shell-view-actions.c:802
-#: ../modules/calendar/e-task-shell-view-actions.c:1001
+#: ../modules/calendar/e-cal-shell-view-actions.c:1786
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
 msgid "Summary contains"
 msgstr "Achoimre ina bhfuil"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-cal-shell-view-actions.c:1798
 msgid "Print this calendar"
 msgstr "Priontáil an féilire seo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1805
 #, fuzzy
 msgid "Preview the calendar to be printed"
 msgstr "Réamhamharcann sé seo an féilire le priontáil"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1782
-#: ../modules/calendar/e-cal-shell-view-memopad.c:294
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:381
-#: ../modules/calendar/e-memo-shell-view-actions.c:843
-#: ../modules/calendar/e-task-shell-view-actions.c:1042
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1827
+#: ../modules/calendar/e-cal-shell-view-memopad.c:306
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:393
+#: ../modules/calendar/e-memo-shell-view-actions.c:846
+#: ../modules/calendar/e-task-shell-view-actions.c:1045
 msgid "_Save as iCalendar..."
-msgstr "_Cuir ar Aghaidh mar iCalendar..."
+msgstr "_Sábháil mar iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1859
+#: ../modules/calendar/e-cal-shell-view-actions.c:1904
 msgid "Go To"
 msgstr "Téigh Go"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:217
-#: ../modules/calendar/e-memo-shell-view-actions.c:522
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-memopad.c:229
+#: ../modules/calendar/e-memo-shell-view-actions.c:525
 msgid "memo"
-msgstr "%d mheamram"
+msgstr "meamram"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
 msgid "New _Memo"
-msgstr "Meamram nua"
+msgstr "_Meamram Nua"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../modules/calendar/e-memo-shell-backend.c:300
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-memo-shell-backend.c:219
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
 msgid "Create a new memo"
 msgstr "Cruthaigh meamram nua"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:267
-#: ../modules/calendar/e-memo-shell-view-actions.c:661
+#: ../modules/calendar/e-cal-shell-view-memopad.c:279
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
 msgid "_Open Memo"
 msgstr "_Oscail Meamram"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:269
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-cal-shell-view-memopad.c:281
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
 msgid "View the selected memo"
 msgstr "Amharc ar an meamram roghnaithe"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-memo-shell-view-actions.c:668
-#: ../modules/calendar/e-task-shell-view-actions.c:806
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "Open _Web Page"
 msgstr "Oscail Leathanach _Gréasáin"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-memopad.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:831
 msgid "Print the selected memo"
-msgstr "Amharc ar an meamram roghnaithe"
+msgstr "Priontáil an meamram roghnaithe"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1591
+#, fuzzy
+msgid "Searching next matching event"
+msgstr "Priontáil an teachtaireacht seo"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1592
+msgid "Searching previous matching event"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1613
+#, c-format
+msgid "Cannot find matching event in the next %d year"
+msgid_plural "Cannot find matching event in the next %d years"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1617
+#, c-format
+msgid "Cannot find matching event in the previous %d year"
+msgid_plural "Cannot find matching event in the previous %d years"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1642
+msgid "Cannot search with no active calendar"
+msgstr ""
 
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:284
-#: ../modules/calendar/e-task-shell-view-actions.c:639
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
+#: ../modules/calendar/e-task-shell-view-actions.c:642
 msgid "task"
-msgstr "%d tasc"
+msgstr "tasc"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-task-shell-view-actions.c:704
 msgid "_Assign Task"
 msgstr "_Sann Tasc"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "_Mark as Complete"
 msgstr "_Marcáil mar Críochnaithe"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Mark selected tasks as complete"
 msgstr "Marcáil tascanna roghnaithe mar chríochnaithe"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
 msgid "_Mark as Incomplete"
 msgstr "_Marcáil mar Gan Chríochnú"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
-#: ../modules/calendar/e-task-shell-view-actions.c:787
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:790
 msgid "Mark selected tasks as incomplete"
-msgstr "Marcáil tascanna roghnaithe mar chríochnaithe"
+msgstr "Marcáil tascanna roghnaithe mar gan chríochnú"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "New _Task"
 msgstr "_Tasc Nua"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
-#: ../modules/calendar/e-task-shell-backend.c:299
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-task-shell-backend.c:216
+#: ../modules/calendar/e-task-shell-view-actions.c:797
 msgid "Create a new task"
 msgstr "Cruthaigh tasc nua"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Open Task"
 msgstr "_Oscail Tasc"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
+#: ../modules/calendar/e-task-shell-view-actions.c:804
 msgid "View the selected task"
 msgstr "Amharc ar an dtasc roghnaithe"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-task-shell-view-actions.c:1027
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:385
+#: ../modules/calendar/e-task-shell-view-actions.c:1030
 msgid "Print the selected task"
-msgstr "Amharc ar an dtasc roghnaithe"
+msgstr "Priontáil an tasc roghnaithe"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-backend.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
+msgid "New Memo List"
+msgstr "Liosta Meamram Nua"
+
+#: ../modules/calendar/e-memo-shell-backend.c:217
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Meamram"
 
-#: ../modules/calendar/e-memo-shell-backend.c:305
+#: ../modules/calendar/e-memo-shell-backend.c:224
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "Comhmh_eamram"
 
-#: ../modules/calendar/e-memo-shell-backend.c:307
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-backend.c:226
 msgid "Create a new shared memo"
 msgstr "Cruthaigh meamram comhroinnte nua"
 
-#: ../modules/calendar/e-memo-shell-backend.c:315
+#: ../modules/calendar/e-memo-shell-backend.c:234
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Liosta Meam_ram"
 
-#: ../modules/calendar/e-memo-shell-backend.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-backend.c:236
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
 msgid "Create a new memo list"
 msgstr "Cruthaigh liosta meamram nua"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:179
-msgid "Loading memos"
-msgstr "Meamraim á luchtú"
+#: ../modules/calendar/e-memo-shell-sidebar.c:117
+#, c-format
+msgid "Opening memo list '%s'"
+msgstr "Liosta meamram '%s' á oscailt"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:696
+#: ../modules/calendar/e-memo-shell-sidebar.c:553
 #, fuzzy
 msgid "Memo List Selector"
 msgstr "Liosta Meamram"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:1009
-#, c-format
-msgid "Opening memos at %s"
-msgstr "Meamraim á n-oscailt ag %s"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:231
-#: ../modules/calendar/e-memo-shell-view-actions.c:246
+#: ../modules/calendar/e-memo-shell-view-actions.c:212
+#: ../modules/calendar/e-memo-shell-view-actions.c:227
 msgid "Print Memos"
 msgstr "Priontáil Meamraim"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:268
+msgid "Memo List Properties"
+msgstr "Airíonna Liosta Meamram"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "_Delete Memo"
-msgstr "_Scrios Teachtaireacht"
+msgstr "_Scrios Meamram"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "_Find in Memo..."
-msgstr "_Aimsigh i dTeachtaireacht..."
+msgstr "_Aimsigh i Meamram..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:596
 msgid "Search for text in the displayed memo"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 #, fuzzy
 msgid "D_elete Memo List"
 msgstr "Liosta Meamram _Nua"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 #, fuzzy
 msgid "Delete the selected memo list"
 msgstr "Scrios meamraim roghnaithe"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "_New Memo List"
 msgstr "Liosta Meamram _Nua"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
 #, fuzzy
 msgid "Refresh the selected memo list"
 msgstr "Scrios meamraim roghnaithe"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 #, fuzzy
 msgid "Rename the selected memo list"
 msgstr "Athainmnigh an fillteán roghnaithe"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:650
 msgid "Show _Only This Memo List"
 msgstr "Taispeáin an Liosta Meamram Seo A_mháin"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Memo _Preview"
 msgstr "_Réamhamharc Meamraim"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:731
 #, fuzzy
 msgid "Show memo preview pane"
 msgstr "Taispeáin an pána \"Réamhamharc\""
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:749
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 #, fuzzy
 msgid "Show memo preview below the memo list"
 msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:756
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 #, fuzzy
 msgid "Show memo preview alongside the memo list"
 msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
 msgid "Print the list of memos"
 msgstr "Priontáil liosta meamram"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
 #, fuzzy
 msgid "Preview the list of memos to be printed"
 msgstr "Roghnaigh na míreanna atá le priontáil"
 
-#: ../modules/calendar/e-memo-shell-view.c:227
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view.c:239
 msgid "Delete Memos"
-msgstr "_Scrios Teachtaireacht"
+msgstr "Scrios Meamraim"
 
-#: ../modules/calendar/e-memo-shell-view.c:229
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view.c:241
 msgid "Delete Memo"
-msgstr "Súmáil go %1 %%"
+msgstr "Scrios Meamram"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
+#: ../modules/calendar/e-memo-shell-view-private.c:538
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -15404,57 +17170,61 @@ msgstr[2] "%d mheamram"
 msgstr[3] "%d meamram"
 msgstr[4] "%d meamram"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:585
-#, fuzzy, c-format
+#: ../modules/calendar/e-memo-shell-view-private.c:542
+#: ../modules/calendar/e-task-shell-view-private.c:746
+#, c-format
 msgid "%d selected"
-msgstr ", %d roghnaithe"
+msgstr "%d roghnaithe"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-backend.c:205
+#: ../modules/calendar/e-task-shell-view-actions.c:219
+msgid "New Task List"
+msgstr "Liosta Tascanna Nua"
+
+#: ../modules/calendar/e-task-shell-backend.c:214
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tasc"
 
-#: ../modules/calendar/e-task-shell-backend.c:304
+#: ../modules/calendar/e-task-shell-backend.c:221
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tasc _Sannta"
 
-#: ../modules/calendar/e-task-shell-backend.c:306
+#: ../modules/calendar/e-task-shell-backend.c:223
 msgid "Create a new assigned task"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-backend.c:314
+#: ../modules/calendar/e-task-shell-backend.c:231
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Liosta Tasca_nna"
 
-#: ../modules/calendar/e-task-shell-backend.c:316
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-backend.c:233
+#: ../modules/calendar/e-task-shell-view-actions.c:748
 msgid "Create a new task list"
 msgstr "Cruthaigh liosta tascanna nua"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:179
-msgid "Loading tasks"
-msgstr "Tascanna á luchtú"
+#: ../modules/calendar/e-task-shell-sidebar.c:117
+#, fuzzy, c-format
+msgid "Opening task list '%s'"
+msgstr "Tascanna á n-oscailt ag %s"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:696
+#: ../modules/calendar/e-task-shell-sidebar.c:553
 #, fuzzy
 msgid "Task List Selector"
 msgstr "Liosta Tascanna"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:1010
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Tascanna á n-oscailt ag %s"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:254
-#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view-actions.c:250
 msgid "Print Tasks"
 msgstr "Priontáil Tascanna"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:583
+#: ../modules/calendar/e-task-shell-view-actions.c:291
+msgid "Task List Properties"
+msgstr "Airíonna Liosta Tascanna"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:586
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15462,131 +17232,124 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:590
+#: ../modules/calendar/e-task-shell-view-actions.c:593
 #, fuzzy
 msgid "Do not ask me again"
 msgstr "Ná fiafraigh díom arís."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:711
 msgid "_Delete Task"
-msgstr "Scr_ios"
+msgstr "_Scrios Tasc"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "_Find in Task..."
-msgstr "_Aimsigh i dTeachtaireacht..."
+msgstr "_Aimsigh i dTasc..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:720
 msgid "Search for text in the displayed task"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "Copy..."
-msgstr "_Cóipeáil..."
+msgstr "Cóipeáil..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "D_elete Task List"
-msgstr "Roghnaigh Liosta Tascanna"
+msgstr "Sc_rios Liosta Tascanna"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 #, fuzzy
 msgid "Delete the selected task list"
 msgstr "Scrios tascanna roghnaithe"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "_New Task List"
 msgstr "Liosta Tascanna _Nua"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 #, fuzzy
 msgid "Refresh the selected task list"
 msgstr "Scrios tascanna roghnaithe"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 #, fuzzy
 msgid "Rename the selected task list"
 msgstr "Athainmnigh an fillteán roghnaithe"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 #, fuzzy
 msgid "Show _Only This Task List"
 msgstr "Taispeáin an Liosta Tascanna Seo A_mháin"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "Mar_k as Incomplete"
-msgstr "_Marcáil mar Gan Chríochnú"
+msgstr "Ma_rcáil mar Gan Chríochnú"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-task-shell-view-actions.c:818
 msgid "Delete completed tasks"
 msgstr "Scrios tascanna críochnaithe"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Task _Preview"
 msgstr "_Réamhamharc Taisc"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 #, fuzzy
 msgid "Show task preview pane"
 msgstr "Taispeáin fuinneog réamhamhairc taisc"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:913
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 #, fuzzy
 msgid "Show task preview below the task list"
 msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:920
+#: ../modules/calendar/e-task-shell-view-actions.c:923
 #, fuzzy
 msgid "Show task preview alongside the task list"
 msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:931
 msgid "Active Tasks"
 msgstr "Tascanna Gníomhacha"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:945
 msgid "Completed Tasks"
 msgstr "Tascanna Críochnaithe"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:952
 msgid "Next 7 Days' Tasks"
 msgstr "Tascanna na Chéad 7 Lá Eile"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Overdue Tasks"
 msgstr "Tascanna Déanacha"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:963
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Tasks with Attachments"
 msgstr "Tascanna le hIatáin"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-task-shell-view-actions.c:1016
 msgid "Print the list of tasks"
 msgstr "Priontáil an liosta tascanna"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#: ../modules/calendar/e-task-shell-view-actions.c:1023
 #, fuzzy
 msgid "Preview the list of tasks to be printed"
 msgstr "Réamhamharcann sé seo na teagmhálacha le priontáil"
 
-#: ../modules/calendar/e-task-shell-view.c:362
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view.c:374
 msgid "Delete Tasks"
-msgstr "Tascanna Críochnaithe"
+msgstr "Scrios Tascanna"
 
-#: ../modules/calendar/e-task-shell-view.c:364
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view.c:376
 msgid "Delete Task"
-msgstr "Súmáil go %1 %%"
+msgstr "Scrios Tasc"
 
-#: ../modules/calendar/e-task-shell-view-private.c:472
+#: ../modules/calendar/e-task-shell-view-private.c:631
 msgid "Expunging"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-view-private.c:581
+#: ../modules/calendar/e-task-shell-view-private.c:742
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -15596,382 +17359,1300 @@ msgstr[2] "%d thasc"
 msgstr[3] "%d dtasc"
 msgstr[4] "%d tasc"
 
-#: ../modules/mail/em-account-prefs.c:261
-msgid "Evolution Account Assistant"
-msgstr "Cúntóir Cuntais Evolution"
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
+msgid "ITIP"
+msgstr "ITIP"
 
-#: ../modules/mail/em-account-prefs.c:310
-msgid "Account Editor"
-msgstr "Eagarthóir Cuntas"
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
+msgid "Display part as an invitation"
+msgstr ""
 
-#. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:384
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:235
+msgid "Today %H:%M"
+msgstr "Inniu %H:%M"
+
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:239
+msgid "Today %H:%M:%S"
+msgstr "Inniu %H:%M:%S"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:248
+msgid "Today %l:%M:%S %p"
+msgstr "Inniu %l:%M:%S %p"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:263
+msgid "Tomorrow %H:%M"
+msgstr "Amárach %H:%M"
+
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:267
+msgid "Tomorrow %H:%M:%S"
+msgstr "Amárach %H:%M:%S"
+
+#. strftime format of a time,
+#. * in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:272
+msgid "Tomorrow %l:%M %p"
+msgstr "Amárach %l:%M %p"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:276
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "Amárach %l:%M:%S %p"
+
+#. strftime format of a weekday.
+#: ../modules/itip-formatter/itip-view.c:295
+#, c-format
+msgid "%A"
+msgstr "%A"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:300
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:304
+msgid "%A %H:%M:%S"
+msgstr "%A %H:%M:%S"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:309
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:313
+msgid "%A %l:%M:%S %p"
+msgstr "%A %I:%M:%S %p"
+
+#. strftime format of a weekday and a date
+#. * without a year.
+#: ../modules/itip-formatter/itip-view.c:322
+msgid "%A, %B %e"
+msgstr "%A, %e %B"
+
+#. strftime format of a weekday, a date
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:328
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %e %B %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:332
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %e %B %H:%M:%S"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:337
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %e %B %l:%M %p"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:341
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %e %B %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../modules/itip-formatter/itip-view.c:347
+msgid "%A, %B %e, %Y"
+msgstr "%A, %e %B, %Y"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:352
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %e %B, %Y %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:356
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %e %B, %Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:361
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %e %B, %Y %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:365
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %e %B, %Y %l:%M:%S %p"
+
+#: ../modules/itip-formatter/itip-view.c:403
+#: ../modules/itip-formatter/itip-view.c:404
+#: ../modules/itip-formatter/itip-view.c:493
+#: ../modules/itip-formatter/itip-view.c:494
+#: ../modules/itip-formatter/itip-view.c:583
+msgid "An unknown person"
+msgstr "Duine anaithnid"
+
+#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:587
+#, fuzzy, c-format
+msgid "Please respond on behalf of %s"
+msgstr "Ar fanacht (logánta)"
+
+#: ../modules/itip-formatter/itip-view.c:410
+#: ../modules/itip-formatter/itip-view.c:500
+#: ../modules/itip-formatter/itip-view.c:589
+#, fuzzy, c-format
+msgid "Received on behalf of %s"
+msgstr "Ar fanacht (logánta)"
+
+#: ../modules/itip-formatter/itip-view.c:415
 #, fuzzy, c-format
-msgid "%d attached messages"
-msgstr "Teachtaireacht Faoi Iamh"
+msgid "%s through %s has published the following meeting information:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../modules/itip-formatter/itip-view.c:417
+#, fuzzy, c-format
+msgid "%s has published the following meeting information:"
+msgstr "Tharla an earráid inmheánach a leanas: "
+
+#: ../modules/itip-formatter/itip-view.c:422
+#, fuzzy, c-format
+msgid "%s has delegated the following meeting to you:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:425
+#, fuzzy, c-format
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:427
+#, fuzzy, c-format
+msgid "%s requests your presence at the following meeting:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:433
+#, fuzzy, c-format
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "Cuir meamram nua leis an mbunachar sonraí."
+
+#: ../modules/itip-formatter/itip-view.c:435
+#, fuzzy, c-format
+msgid "%s wishes to add to an existing meeting:"
+msgstr "Cuir meamram nua leis an mbunachar sonraí."
+
+#: ../modules/itip-formatter/itip-view.c:439
+#, fuzzy, c-format
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:441
+#, c-format
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:445
+#, fuzzy, c-format
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:447
+#, fuzzy, c-format
+msgid "%s has sent back the following meeting response:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:451
+#, fuzzy, c-format
+msgid "%s through %s has canceled the following meeting:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:453
+#, fuzzy, c-format
+msgid "%s has canceled the following meeting:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:457
+#, fuzzy, c-format
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:459
+#, fuzzy, c-format
+msgid "%s has proposed the following meeting changes:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:463
+#, fuzzy, c-format
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:465
+#, fuzzy, c-format
+msgid "%s has declined the following meeting changes:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:505
+#, fuzzy, c-format
+msgid "%s through %s has published the following task:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../modules/itip-formatter/itip-view.c:507
+#, fuzzy, c-format
+msgid "%s has published the following task:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../modules/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s requests the assignment of %s to the following task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:515
+#, fuzzy, c-format
+msgid "%s through %s has assigned you a task:"
+msgstr "Tá $a díreach tar éis tú a bhípeáil!"
+
+#: ../modules/itip-formatter/itip-view.c:517
+#, fuzzy, c-format
+msgid "%s has assigned you a task:"
+msgstr "Tá $a díreach tar éis tú a bhípeáil!"
+
+#: ../modules/itip-formatter/itip-view.c:523
+#, fuzzy, c-format
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "Cuir an tasc seo leis an phainéal"
+
+#: ../modules/itip-formatter/itip-view.c:525
+#, fuzzy, c-format
+msgid "%s wishes to add to an existing task:"
+msgstr "Cuir an tasc seo leis an phainéal"
+
+#: ../modules/itip-formatter/itip-view.c:529
+#, c-format
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:531
+#, c-format
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:535
+#, fuzzy, c-format
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "Foilsíodh an tasc seo"
 
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/itip-formatter/itip-view.c:537
+#, c-format
+msgid "%s has sent back the following assigned task response:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:541
+#, fuzzy, c-format
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:543
+#, fuzzy, c-format
+msgid "%s has canceled the following assigned task:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:547
+#, fuzzy, c-format
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../modules/itip-formatter/itip-view.c:549
+#, fuzzy, c-format
+msgid "%s has proposed the following task assignment changes:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../modules/itip-formatter/itip-view.c:553
+#, fuzzy, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../modules/itip-formatter/itip-view.c:555
+#, fuzzy, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../modules/itip-formatter/itip-view.c:594
+#, fuzzy, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../modules/itip-formatter/itip-view.c:596
+#, fuzzy, c-format
+msgid "%s has published the following memo:"
+msgstr "Tharla an earráid inmheánach a leanas: "
+
+#: ../modules/itip-formatter/itip-view.c:601
+#, fuzzy, c-format
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "Cuir meamram nua leis an mbunachar sonraí."
+
+#: ../modules/itip-formatter/itip-view.c:603
+#, fuzzy, c-format
+msgid "%s wishes to add to an existing memo:"
+msgstr "Cuir meamram nua leis an mbunachar sonraí."
+
+#: ../modules/itip-formatter/itip-view.c:607
+#, fuzzy, c-format
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:609
+#, fuzzy, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:682
+msgid "All day:"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:688
+#, fuzzy
+msgid "Start day:"
+msgstr "Dáta to_saigh:"
+
+#: ../modules/itip-formatter/itip-view.c:688
+#: ../modules/itip-formatter/itip-view.c:1490
+msgid "Start time:"
+msgstr "Am tosaithe:"
+
+#: ../modules/itip-formatter/itip-view.c:697
+#, fuzzy
+msgid "End day:"
+msgstr "%d lá"
+
+#: ../modules/itip-formatter/itip-view.c:697
+#: ../modules/itip-formatter/itip-view.c:1491
+msgid "End time:"
+msgstr "Am deiridh:"
+
+#: ../modules/itip-formatter/itip-view.c:1016
+msgid "Ope_n Calendar"
+msgstr "Oscai_l Féilire"
+
+#: ../modules/itip-formatter/itip-view.c:1019
+msgid "_Decline all"
+msgstr "_Diúltaigh Gach Rud"
+
+#: ../modules/itip-formatter/itip-view.c:1022
+msgid "_Decline"
+msgstr "_Diúltaigh"
+
+#: ../modules/itip-formatter/itip-view.c:1025
+#, fuzzy
+msgid "_Tentative all"
+msgstr "Gach Comhad"
+
+#: ../modules/itip-formatter/itip-view.c:1028
+#, fuzzy
+msgid "_Tentative"
+msgstr "Sealadach"
+
+#: ../modules/itip-formatter/itip-view.c:1031
+msgid "Acce_pt all"
+msgstr "_Glac le Gach Rud"
+
+#: ../modules/itip-formatter/itip-view.c:1034
+msgid "Acce_pt"
+msgstr "_Glac Leis"
+
+#: ../modules/itip-formatter/itip-view.c:1037
+msgid "Send _Information"
+msgstr "_Seol Eolas"
+
+#: ../modules/itip-formatter/itip-view.c:1040
+#, fuzzy
+msgid "_Update Attendee Status"
+msgstr "Sealadach"
+
+#: ../modules/itip-formatter/itip-view.c:1043
+msgid "_Update"
+msgstr "_Nuashonraigh"
+
+#: ../modules/itip-formatter/itip-view.c:1493
+#: ../modules/itip-formatter/itip-view.c:1541
+#: ../modules/itip-formatter/itip-view.c:1612
+msgid "Comment:"
+msgstr "Nóta:"
+
+#. RSVP area
+#: ../modules/itip-formatter/itip-view.c:1529
+#, fuzzy
+msgid "Send reply to sender"
+msgstr "Seol _freagra don seoltóir"
+
+#. Updates
+#: ../modules/itip-formatter/itip-view.c:1544
+#, fuzzy
+msgid "Send _updates to attendees"
+msgstr "(Ath)sheol Údarú Go"
+
+#. The recurrence check button
+#: ../modules/itip-formatter/itip-view.c:1547
+#, fuzzy
+msgid "_Apply to all instances"
+msgstr "Cuir i bhfeidhm i ng&ach fheidhmchlár"
+
+#: ../modules/itip-formatter/itip-view.c:1548
+#, fuzzy
+msgid "Show time as _free"
+msgstr "Taispeáin colúi&n mar uimhreacha"
+
+#: ../modules/itip-formatter/itip-view.c:1549
+msgid "_Preserve my reminder"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:1550
+#, fuzzy
+msgid "_Inherit reminder"
+msgstr "&Scoránaigh Meabhrúchán"
+
+#: ../modules/itip-formatter/itip-view.c:1880
+msgid "_Tasks:"
+msgstr "_Tascanna:"
+
+#: ../modules/itip-formatter/itip-view.c:1883
+msgid "_Memos:"
+msgstr "_Meamraim:"
+
+#: ../modules/itip-formatter/itip-view.c:3111
+msgid "Sa_ve"
+msgstr "Sá_bháil"
+
+#: ../modules/itip-formatter/itip-view.c:3571
+#: ../modules/itip-formatter/itip-view.c:5020
+#, fuzzy
+msgid "Attendee status updated"
+msgstr "Sealadach"
+
+#: ../modules/itip-formatter/itip-view.c:3751
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:3780
+#, fuzzy, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "Taispeáin &Tascanna san Fhéilire"
+
+#: ../modules/itip-formatter/itip-view.c:3893
+#, fuzzy
+msgid "Unable to find any calendars"
+msgstr "Ní féidir an soláthraí cuardaigh a aimsiú."
+
+#: ../modules/itip-formatter/itip-view.c:3901
+msgid "Unable to find this meeting in any calendar"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:3906
+msgid "Unable to find this task in any task list"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:3911
+msgid "Unable to find this memo in any memo list"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4257
+#, fuzzy
+msgid "Opening the calendar. Please wait..."
+msgstr "Féilire á oscailt"
+
+#: ../modules/itip-formatter/itip-view.c:4262
+msgid "Searching for an existing version of this appointment"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4653
+#, fuzzy, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "Ní féidir sonraí an fhéilire a léamh: "
+
+#: ../modules/itip-formatter/itip-view.c:4669
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4674
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4680
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4686
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4707
+#: ../modules/itip-formatter/itip-view.c:5166
+#: ../modules/itip-formatter/itip-view.c:5273
+#, fuzzy
+msgid "Saving changes to the calendar. Please wait..."
+msgstr "Féilire á oscailt"
+
+#: ../modules/itip-formatter/itip-view.c:4748
+#, fuzzy
+msgid "Unable to parse item"
+msgstr "Earráid: Ní féidir an comhad %1 a pharsáil.\n"
+
+#: ../modules/itip-formatter/itip-view.c:4941
+#, fuzzy, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr "Bainte"
+
+#: ../modules/itip-formatter/itip-view.c:4958
+msgid "Sent a cancelation notice to the delegate"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:4962
+#, fuzzy
+msgid "Could not send the cancelation notice to the delegate"
+msgstr "Teíp ag dealaigh fillteán: %s"
+
+#: ../modules/itip-formatter/itip-view.c:5013
+#, fuzzy, c-format
+msgid "Unable to update attendee. %s"
+msgstr "Ní féidir sonraí an leabhair seoltaí a nuashonrú: "
+
+#: ../modules/itip-formatter/itip-view.c:5055
+msgid "The meeting is invalid and cannot be updated"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5131
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5203
+#: ../modules/itip-formatter/itip-view.c:5243
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5306
+#, fuzzy
+msgid "Meeting information sent"
+msgstr ""
+"Seoladh teachtaireacht chuig:\n"
+"%1%2"
+
+#: ../modules/itip-formatter/itip-view.c:5311
+#, fuzzy
+msgid "Task information sent"
+msgstr ""
+"Seoladh teachtaireacht chuig:\n"
+"%1%2"
+
+#: ../modules/itip-formatter/itip-view.c:5316
+#, fuzzy
+msgid "Memo information sent"
+msgstr ""
+"Seoladh teachtaireacht chuig:\n"
+"%1%2"
+
+#: ../modules/itip-formatter/itip-view.c:5327
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5332
+msgid "Unable to send task information, the task does not exist"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5337
+msgid "Unable to send memo information, the memo does not exist"
+msgstr ""
+
+#. Translators: This is a default filename for a calendar.
+#: ../modules/itip-formatter/itip-view.c:5402
+#, fuzzy
+msgid "calendar.ics"
+msgstr "Féilirí"
+
+#: ../modules/itip-formatter/itip-view.c:5407
+#, fuzzy
+msgid "Save Calendar"
+msgstr "Féilire Nua"
+
+#: ../modules/itip-formatter/itip-view.c:5456
+#: ../modules/itip-formatter/itip-view.c:5469
+#, fuzzy
+msgid "The calendar attached is not valid"
+msgstr "Níl an t-am sonraithe bailí."
+
+#: ../modules/itip-formatter/itip-view.c:5457
+#: ../modules/itip-formatter/itip-view.c:5470
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5512
+#: ../modules/itip-formatter/itip-view.c:5542
+#: ../modules/itip-formatter/itip-view.c:5643
+msgid "The item in the calendar is not valid"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5513
+#: ../modules/itip-formatter/itip-view.c:5543
+#: ../modules/itip-formatter/itip-view.c:5644
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5558
+msgid "The calendar attached contains multiple items"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:5559
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:6060
+msgctxt "cal-itip"
+msgid "None"
+msgstr "Neamhní"
+
+#: ../modules/itip-formatter/itip-view.c:6076
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: ../modules/itip-formatter/itip-view.c:6236
+#, fuzzy
+msgid "This meeting recurs"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/itip-view.c:6239
+#, fuzzy
+msgid "This task recurs"
+msgstr "Mionathraigh an Tasc seo..."
+
+#: ../modules/itip-formatter/itip-view.c:6242
+#, fuzzy
+msgid "This memo recurs"
+msgstr "Name=Comhad Meamraim"
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#, fuzzy
+msgid "This meeting has been delegated"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr ""
+
+#: ../modules/itip-formatter/plugin/config-ui.c:82
+#, fuzzy
+msgid "Meeting Invitations"
+msgstr ""
+"Seoladh teachtaireacht chuig:\n"
+"%1%2"
+
+#: ../modules/itip-formatter/plugin/config-ui.c:108
+#, fuzzy
+msgid "_Delete message after acting"
+msgstr "Scrios Dialóga Dúnta tar éis (Lá)"
+
+#: ../modules/itip-formatter/plugin/config-ui.c:122
+#: ../modules/itip-formatter/plugin/config-ui.c:153
+#, fuzzy
+msgid "Conflict Search"
+msgstr "Inneall Cuardaigh"
+
+#. Source selector
+#: ../modules/itip-formatter/plugin/config-ui.c:137
+msgid "Select the calendars to search for meeting conflicts"
+msgstr ""
+
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
+#, fuzzy
+msgid "Itip Formatter"
+msgstr "GenericName=Uirlis Fhormáidithe Dioscaí Boga"
+
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:252
+#, fuzzy
+msgid "Google Features"
+msgstr "Féilire Gnome"
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:261
+#, fuzzy
+msgid "Add Google Ca_lendar to this account"
+msgstr "Féilire Gnome"
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:269
+msgid "Add Google Con_tacts to this account"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:277
+msgid "You may need to enable IMAP access"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#, fuzzy
+msgid "Mail _Directory:"
+msgstr "Sábháil comhadlann"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:247
+#, fuzzy
+msgid "Choose a MH mail directory"
+msgstr "Roghnaigh comhad le hathchóiriú"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+msgid "Local Delivery _File:"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#, fuzzy
+msgid "Choose a local delivery file"
+msgstr "Roghnaigh comhad féilire"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+#, fuzzy
+msgid "Choose a Maildir mail directory"
+msgstr "Roghnaigh comhad le hathchóiriú"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#, fuzzy
+msgid "Spool _File:"
+msgstr "_Comhad:"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+#, fuzzy
+msgid "Choose a mbox spool file"
+msgstr "Roghnaigh Comhad"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#, fuzzy
+msgid "Spool _Directory:"
+msgstr "Sábháil comhadlann"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+#, fuzzy
+msgid "Choose a mbox spool directory"
+msgstr "Roghnaigh comhad le hathchóiriú"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:80
+#: ../modules/plugin-manager/evolution-plugin-manager.c:159
+msgid "Configuration"
+msgstr "Cumraíocht"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:98
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_Server:"
+msgstr "_Freastalaí:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:227
+msgid "User_name:"
+msgstr "Ai_nm úsáideora:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:214
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:148
+#, fuzzy
+msgid "Encryption _method:"
+msgstr "Criptigh"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
+msgid "STARTTLS after connecting"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:233
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:167
+msgid "SSL on a dedicated port"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
+msgid "_Use custom binary, instead of 'sendmail'"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
+#, fuzzy
+msgid "_Custom binary:"
+msgstr "Ceanntásc Saincheaptha"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
+#, fuzzy
+msgid "U_se custom arguments"
+msgstr "Úsáid clónna saincheaptha"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
+#, fuzzy
+msgid "Cus_tom arguments:"
+msgstr "_Argóintí:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
+msgid ""
+"Default arguments are '-i -f %F -- %R', where\n"
+"   %F - stands for the From address\n"
+"   %R - stands for the recipient addresses"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+#, fuzzy
+msgid "Send mail also when in offline _mode"
+msgstr "Tosaigh i mód as líne"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
+msgid "Ser_ver requires authentication"
+msgstr "Tá fíordheimhniú de dhíth ar an _bhfreastalaí"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:209
+msgid "T_ype:"
+msgstr "_Cineál:"
+
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
+#, fuzzy
+msgid "Yahoo! Features"
+msgstr "Ardtréithe"
+
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
+msgid "Add Yahoo! Ca_lendar and Tasks to this account"
+msgstr ""
+
+#: ../modules/mail/e-mail-attachment-handler.c:425
+#, fuzzy, c-format
+msgid "%d attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Teachtaireacht Faoi Iamh"
+msgstr[1] "Teachtaireacht Faoi Iamh"
+msgstr[2] "Teachtaireacht Faoi Iamh"
+msgstr[3] "Teachtaireacht Faoi Iamh"
+msgstr[4] "Teachtaireacht Faoi Iamh"
+
+#: ../modules/mail/e-mail-shell-backend.c:237
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "Teachtaireacht _Phoist"
 
-#: ../modules/mail/e-mail-shell-backend.c:197
+#: ../modules/mail/e-mail-shell-backend.c:239
 msgid "Compose a new mail message"
 msgstr "Cum teachtaireacht phoist nua"
 
-#: ../modules/mail/e-mail-shell-backend.c:205
+#: ../modules/mail/e-mail-shell-backend.c:247
+msgctxt "New"
+msgid "Mail Acco_unt"
+msgstr "C_untas Poist"
+
+#: ../modules/mail/e-mail-shell-backend.c:249
+msgid "Create a new mail account"
+msgstr "Cruthaigh cuntas nua poist"
+
+#: ../modules/mail/e-mail-shell-backend.c:254
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Fillteán Poist"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:256
 msgid "Create a new mail folder"
 msgstr "Cruthaigh fillteán poist nua"
 
-#: ../modules/mail/e-mail-shell-backend.c:412
+#: ../modules/mail/e-mail-shell-backend.c:551
 msgid "Mail Accounts"
 msgstr "Cuntais Poist"
 
-#: ../modules/mail/e-mail-shell-backend.c:420
+#: ../modules/mail/e-mail-shell-backend.c:560
 msgid "Mail Preferences"
 msgstr "Sainroghanna Poist"
 
-#: ../modules/mail/e-mail-shell-backend.c:428
+#: ../modules/mail/e-mail-shell-backend.c:569
 msgid "Composer Preferences"
 msgstr "Sainroghanna Cumadóra"
 
-#: ../modules/mail/e-mail-shell-backend.c:436
+#: ../modules/mail/e-mail-shell-backend.c:578
 msgid "Network Preferences"
 msgstr "Sainroghanna Líonra"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
-#: ../modules/mail/e-mail-shell-view.c:960
+#. Translators: The first item in the list, to be able to set rule: [Label] [is/is-not] [None]
+#: ../modules/mail/e-mail-shell-backend.c:867
+msgctxt "label"
+msgid "None"
+msgstr "Neamhní"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:655
 #, fuzzy
+msgid "Marking messages as read..."
+msgstr "Marcáil _Teachtaireachtaí mar Léite"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1507
 msgid "_Disable Account"
-msgstr "Díchumasaigh Cuntas"
+msgstr "_Díchumasaigh Cuntas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1509
 msgid "Disable this account"
-msgstr "Díchumasaigh Cuntas"
+msgstr "Díchumasaigh an cuntas seo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../modules/mail/e-mail-shell-view-actions.c:1516
 #, fuzzy
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 "An bhfuil tú cinnte go dteastaíonn uait an leabharmharc <b>%1</b> a "
 "scriosadh?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1523
+msgid "Edit properties of this account"
+msgstr "Cuir airíonna an chuntais seo in eagar"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
+msgid "_Refresh"
+msgstr "_Athnuaigh"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1530
+#, fuzzy
+msgid "Refresh list of folders of this account"
+msgstr "Athnuaigh an fillteán"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "_Download Messages for Offline Usage"
 msgstr "Íosl_uchtaigh Teachtaireachtaí le hAghaidh Úsáide as Líne"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1537
 #, fuzzy
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Íosl_uchtaigh Teachtaireachtaí le hAghaidh Úsáide as Líne"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1542
 #, fuzzy
 msgid "Fl_ush Outbox"
 msgstr "NASCLITIR BHEAG LAIDINE FL"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1549
 msgid "_Copy Folder To..."
 msgstr "_Cóipeáil Fillteán Go..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1551
 msgid "Copy the selected folder into another folder"
 msgstr "Cóipeáil an fillteán roghnaithe isteach i bhfillteán eile"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1558
 #, fuzzy
 msgid "Permanently remove this folder"
 msgstr "Is fillteán poiblí é seo."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
 msgid "E_xpunge"
 msgstr "G_lan"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1570
+#: ../modules/mail/e-mail-shell-view-actions.c:1670
 msgid "Mar_k All Messages as Read"
 msgstr "_Marcáil Gach Teachtaireacht mar Léite"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1672
 #, fuzzy
 msgid "Mark all messages in the folder as read"
 msgstr "Marcáil teachtaireachtaí mar &leite ó:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1577
 msgid "_Move Folder To..."
 msgstr "_Bog Fillteán Go..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
 #, fuzzy
 msgid "Move the selected folder into another folder"
 msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../modules/mail/e-mail-shell-view-actions.c:1584
 msgid "_New..."
 msgstr "_Nua..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1586
 msgid "Create a new folder for storing mail"
 msgstr "Cruthaigh fillteán nua le haghaidh stóráil poist"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "Change the properties of this folder"
 msgstr "Athraigh airíonna an fhillteáin seo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "Refresh the folder"
 msgstr "Athnuaigh an fillteán"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "Change the name of this folder"
 msgstr "Athraigh ainm an fhillteáin seo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "Select Message _Thread"
 msgstr "Roghnaigh _Snáithe Teachtaireachta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "Select Message S_ubthread"
 msgstr "Roghnaigh _Foshnáithe Teachtaireachta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 #, fuzzy
 msgid "Select all replies to the currently selected message"
 msgstr "&Scrios Teachtaireachtaí Roghnaithe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Empty _Trash"
 msgstr "Folmhaigh _Bruscar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1635
 #, fuzzy
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 "An bhfuil tú cinnte go dteastaíonn uait an leabharmharc <b>%1</b> a "
 "scriosadh?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "_New Label"
 msgstr "_Lipéad Nua"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1649
 msgid "N_one"
 msgstr "_Neamhní"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1257
+#: ../modules/mail/e-mail-shell-view-actions.c:1663
 #, fuzzy
 msgid "_Manage Subscriptions"
 msgstr "_Síntiúis..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
+#: ../modules/mail/e-mail-shell-view-actions.c:1749
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Send / _Receive"
 msgstr "Seol / Fa_igh"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1679
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "R_eceive All"
 msgstr "_Faigh Gach"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1686
 msgid "Receive new items from all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "_Send All"
 msgstr "_Seol Gach"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1693
 msgid "Send queued items in all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
-#: ../widgets/misc/e-activity-proxy.c:310
-msgid "Cancel"
-msgstr "Cealaigh"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../modules/mail/e-mail-shell-view-actions.c:1721
 msgid "Cancel the current mail operation"
 msgstr "Cealaigh an oibríocht phoist reatha"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Collapse All _Threads"
 msgstr "Laghdaigh Gach _Snáithe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1728
 msgid "Collapse all message threads"
 msgstr "Laghdaigh gach snáithe teachtaireachtaí"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 msgid "E_xpand All Threads"
 msgstr "Lea_thnaigh Gach Snáithe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1735
 #, fuzzy
 msgid "Expand all message threads"
 msgstr "laghdaigh/leathnaigh gach snáithe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1740
 msgid "_Message Filters"
 msgstr "Scagairí _Teachtaireachta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1742
 msgid "Create or edit rules for filtering new mail"
 msgstr "Cruthaigh rialacha le haghaidh scagadh poist nua nó cuir iad in eagar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1747
 msgid "_Subscriptions..."
 msgstr "_Síntiúis..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1756
 msgid "F_older"
 msgstr "_Fillteán"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1763
 msgid "_Label"
 msgstr "_Lipéad"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1367
+#: ../modules/mail/e-mail-shell-view-actions.c:1780
 msgid "C_reate Search Folder From Search..."
 msgstr "C_ruthaigh Fillteán Cuardaigh ó Chuardach..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1374
+#: ../modules/mail/e-mail-shell-view-actions.c:1787
 msgid "Search F_olders"
 msgstr "F_illteáin Cuardaigh"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1789
 #, fuzzy
 msgid "Create or edit search folder definitions"
 msgstr "Cruthaigh sainmhínithe Fhillteán Cuardaigh nó cuir iad in eagar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
+#: ../modules/mail/e-mail-shell-view-actions.c:1828
 msgid "_New Folder..."
 msgstr "Fillteán _Nua..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1856
 msgid "Show Message _Preview"
 msgstr "Taispeáin _Réamhamharc Teachtaireachta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1858
 #, fuzzy
 msgid "Show message preview pane"
 msgstr "Taispeáin &teachtaireacht i bpreabfhuinneog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1864
 msgid "Show _Deleted Messages"
 msgstr "Taispeáin Teachtaireachtaí Scr_iosta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1866
 #, fuzzy
 msgid "Show deleted messages with a line through them"
 msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Group By Threads"
 msgstr "_Grúpáil de Réir Snáithe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 #, fuzzy
 msgid "Threaded message list"
 msgstr "Liosta &snáithithe teachtaireachtaí"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../modules/mail/e-mail-shell-view-actions.c:1880
+msgid "_Unmatched Folder Enabled"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1882
+msgid "Toggles whether Unmatched search folder is enabled"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
 #, fuzzy
 msgid "Show message preview below the message list"
 msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1481
+#: ../modules/mail/e-mail-shell-view-actions.c:1909
 #, fuzzy
 msgid "Show message preview alongside the message list"
 msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1489
+#: ../modules/mail/e-mail-shell-view-actions.c:1917
 msgid "All Messages"
 msgstr "Gach Teachtaireacht"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1496
+#: ../modules/mail/e-mail-shell-view-actions.c:1924
 msgid "Important Messages"
 msgstr "Teachtaireachtaí Tábhachtacha"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1503
+#: ../modules/mail/e-mail-shell-view-actions.c:1931
 msgid "Last 5 Days' Messages"
 msgstr "Teachtaireachtaí na 5 Lá is Déanaí"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-shell-view-actions.c:1938
 msgid "Messages Not Junk"
 msgstr "Teachtaireachtaí Nach Dramhphost"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1517
+#: ../modules/mail/e-mail-shell-view-actions.c:1945
 msgid "Messages with Attachments"
 msgstr "Teachtaireachtaí le hIatáin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1524
+#: ../modules/mail/e-mail-shell-view-actions.c:1952
 msgid "No Label"
 msgstr "Gan Lipéad"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1531
+#: ../modules/mail/e-mail-shell-view-actions.c:1959
 msgid "Read Messages"
 msgstr "Teachtaireachtaí Léite"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1538
-msgid "Recent Messages"
-msgstr "Teachtaireachtaí le Déanaí"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1966
 msgid "Unread Messages"
 msgstr "Teachtaireachtaí Gan Léamh"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1597
+#: ../modules/mail/e-mail-shell-view-actions.c:2018
 msgid "Subject or Addresses contain"
 msgstr "Ábhar nó Seoltaí ina bhfuil"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:2028
 msgid "All Accounts"
 msgstr "nGach Cuntas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:2035
 msgid "Current Account"
 msgstr "gCuntas Reatha"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:2042
 msgid "Current Folder"
 msgstr "bhFillteán Reatha"
 
-#: ../modules/mail/e-mail-shell-view.c:563
+#: ../modules/mail/e-mail-shell-view.c:630
 msgid "All Account Search"
 msgstr "Cuardach Gach Cuntais"
 
-#: ../modules/mail/e-mail-shell-view.c:736
+#: ../modules/mail/e-mail-shell-view.c:734
 msgid "Account Search"
 msgstr "Cuardach Cuntas"
 
-#: ../modules/mail/e-mail-shell-view.c:958
-#, fuzzy
-msgid "Proxy _Logout"
-msgstr "Name=Logáil Amach"
-
-#: ../modules/mail/e-mail-shell-view-private.c:997
+#: ../modules/mail/e-mail-shell-view-private.c:988
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -15981,7 +18662,8 @@ msgstr[2] "%d roghnaithe, "
 msgstr[3] "%d roghnaithe, "
 msgstr[4] "%d roghnaithe, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1008
+#: ../modules/mail/e-mail-shell-view-private.c:997
+#: ../modules/mail/e-mail-shell-view-private.c:1014
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -15991,8 +18673,8 @@ msgstr[2] "%d scriosta"
 msgstr[3] "%d scriosta"
 msgstr[4] "%d scriosta"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1014
-#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1023
+#: ../modules/mail/e-mail-shell-view-private.c:1029
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -16002,7 +18684,7 @@ msgstr[2] "%d dhramhphost"
 msgstr[3] "%d ndramhphost"
 msgstr[4] "%d dramhphost"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1027
+#: ../modules/mail/e-mail-shell-view-private.c:1036
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -16012,7 +18694,7 @@ msgstr[2] "%d dhréacht"
 msgstr[3] "%d ndréacht"
 msgstr[4] "%d dréacht"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1033
+#: ../modules/mail/e-mail-shell-view-private.c:1042
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -16022,7 +18704,7 @@ msgstr[2] "%d gan seoladh"
 msgstr[3] "%d gan seoladh"
 msgstr[4] "%d gan seoladh"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../modules/mail/e-mail-shell-view-private.c:1048
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -16032,7 +18714,7 @@ msgstr[2] "%d sheolta"
 msgstr[3] "%d seolta"
 msgstr[4] "%d seolta"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1051
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -16042,7 +18724,7 @@ msgstr[2] "%d gan léamh, "
 msgstr[3] "%d gan léamh, "
 msgstr[4] "%d gan léamh, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1063
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16052,251 +18734,289 @@ msgstr[2] "%d iomlán"
 msgstr[3] "%d iomlán"
 msgstr[4] "%d iomlán"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../modules/mail/e-mail-shell-view-private.c:1084
 msgid "Trash"
 msgstr "Bruscar"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1542
+#: ../modules/mail/e-mail-shell-view-private.c:1522
 msgid "Send / Receive"
 msgstr "Seol / Faigh"
 
-#: ../modules/mail/em-composer-prefs.c:495
-#: ../modules/plugin-manager/evolution-plugin-manager.c:360
-#: ../plugins/publish-calendar/publish-calendar.c:857
-#: ../widgets/misc/e-account-tree-view.c:385
-msgid "Enabled"
-msgstr "Cumasaithe"
-
-#: ../modules/mail/em-composer-prefs.c:499
+#: ../modules/mail/em-composer-prefs.c:447
 msgid "Language(s)"
 msgstr "Teang(ach)a"
 
-#: ../modules/mail/em-mailer-prefs.c:91
-msgid "Every time"
+#: ../modules/mail/em-mailer-prefs.c:81
+#, fuzzy
+msgid "On exit, every time"
 msgstr "Gach uair"
 
-#: ../modules/mail/em-mailer-prefs.c:92
-msgid "Once per day"
+#: ../modules/mail/em-mailer-prefs.c:82
+#, fuzzy
+msgid "On exit, once per day"
 msgstr "Uair sa lá"
 
-#: ../modules/mail/em-mailer-prefs.c:93
-msgid "Once per week"
+#: ../modules/mail/em-mailer-prefs.c:83
+#, fuzzy
+msgid "On exit, once per week"
 msgstr "Uair sa seachtain"
 
-#: ../modules/mail/em-mailer-prefs.c:94
-msgid "Once per month"
+#: ../modules/mail/em-mailer-prefs.c:84
+#, fuzzy
+msgid "On exit, once per month"
 msgstr "Uair sa mhí"
 
-#: ../modules/mail/em-mailer-prefs.c:293
+#: ../modules/mail/em-mailer-prefs.c:85
+msgid "Immediately, on folder leave"
+msgstr ""
+
+#: ../modules/mail/em-mailer-prefs.c:356
 msgid "Header"
 msgstr "Ceanntásc"
 
-#: ../modules/mail/em-mailer-prefs.c:297
+#: ../modules/mail/em-mailer-prefs.c:360
 msgid "Contains Value"
 msgstr "Luach Ann"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1051
+#: ../modules/mail/em-mailer-prefs.c:1215
 #, fuzzy
 msgid "_Date header:"
 msgstr "Ceanntásc dáta:"
 
-#: ../modules/mail/em-mailer-prefs.c:1052
+#: ../modules/mail/em-mailer-prefs.c:1216
 #, fuzzy
 msgid "Show _original header value"
 msgstr "Taispeáin _Bunmhéid"
 
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
+#: ../modules/mailto-handler/evolution-mailto-handler.c:142
+msgid "Do you want to make Evolution your default email client?"
 msgstr ""
+"Ar mhaith leat Evolution a úsáid mar do chliant ríomhphoist réamhshocraithe?"
 
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+#. Translators: First %s is an email address, second %s
+#. * is the subject of the email, third %s is the date.
+#: ../modules/mdn/evolution-mdn.c:311
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr ""
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
-msgid "Do you want to make Evolution your default email client?"
+#. Translators: %s is the subject of the email message.
+#: ../modules/mdn/evolution-mdn.c:378
+#, fuzzy, c-format
+msgid "Delivery Notification for \"%s\""
+msgstr "&Fógairt an Chórais"
+
+#: ../modules/mdn/evolution-mdn.c:543
+#, fuzzy, c-format
+msgid "Send a read receipt to '%s'"
+msgstr "_Seol admhálacha teachtaireachta:"
+
+#. name doesn't matter
+#: ../modules/mdn/evolution-mdn.c:548
+#, fuzzy
+msgid "_Notify Sender"
+msgstr "_Ná Seol"
+
+#: ../modules/mdn/evolution-mdn.error.xml.h:1
+msgid "Sender wants to be notified when you have read this message."
+msgstr ""
+
+#: ../modules/mdn/evolution-mdn.error.xml.h:2
+msgid "Sender has been notified that you have read this message."
 msgstr ""
-"Ar mhaith leat Evolution a úsáid mar do chliant ríomhphoist réamhshocraithe?"
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Evolution is currently offline."
+msgstr "Tá Evolution as líne faoi láthair."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
 msgid "Click 'Work Online' to return to online mode."
 msgstr ""
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
 msgid "Evolution is currently offline due to a network outage."
 msgstr "Tá Evolution as líne faoi láthair mar gheall ar bhriseadh an líonra."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
-msgid "Evolution is currently offline."
-msgstr "Tá Evolution as líne faoi láthair."
-
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
 msgid ""
 "Evolution will return to online mode once a network connection is "
 "established."
 msgstr ""
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:374
-msgid ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an authentication token."
-msgstr ""
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:461
-msgid "OAuth"
-msgstr ""
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:463
-msgid ""
-"This option will connect to the server by way of the GNOME Online Accounts "
-"service"
-msgstr ""
-
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Author(s)"
 msgstr "Úda(i)r"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:255
+#: ../modules/plugin-manager/evolution-plugin-manager.c:254
 msgid "Plugin Manager"
 msgstr "Bainisteoir Breiseán"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:270
+#: ../modules/plugin-manager/evolution-plugin-manager.c:269
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:299
+#: ../modules/plugin-manager/evolution-plugin-manager.c:298
 msgid "Overview"
 msgstr "Foramharc"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:368
-#: ../modules/plugin-manager/evolution-plugin-manager.c:451
+#: ../modules/plugin-manager/evolution-plugin-manager.c:367
+#: ../modules/plugin-manager/evolution-plugin-manager.c:450
 msgid "Plugin"
 msgstr "Breiseán"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "_Plugins"
 msgstr "_Breiseáin"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "Enable and disable plugins"
 msgstr "Cumasaigh agus díchumasaigh breiseáin"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
+#, fuzzy
+msgid "Display plain text version"
+msgstr "An Chéad Teachtaireacht &Neamhléite Eile"
+
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
+#, fuzzy
+msgid "Display plain text version of multipart/alternative message"
+msgstr "Liosta Teachtaireachtaí - Teachtaireachtaí Tábhachtacha"
+
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
+msgid "Display HTML version"
 msgstr ""
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
+#, fuzzy
+msgid "Display HTML version of multipart/alternative message"
+msgstr "Liosta Teachtaireachtaí - Teachtaireachtaí Tábhachtacha"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/plugin/config-ui.c:44
+msgid "Show HTML if present"
+msgstr "Taispeáin HTML má tá sé ann"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:45
+msgid "Let Evolution choose the best part to show."
 msgstr ""
 
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/plugin/config-ui.c:48
 #, fuzzy
-msgid "Hello Python"
-msgstr "Fón Baile"
+msgid "Show plain text if present"
+msgstr "Taispeáin HTML má tá sé ann"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:49
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/plugin/config-ui.c:53
+#, fuzzy
+msgid "Only ever show plain text"
+msgstr "Ná taispeáin ach PLAIN"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:54
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
 
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
+#: ../modules/prefer-plain/plugin/config-ui.c:105
+msgid "Show s_uppressed HTML parts as attachments"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:191
+#: ../modules/prefer-plain/plugin/config-ui.c:127
+msgid "HTML _Mode"
+msgstr "_Mód HTML"
+
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
+msgid "Prefer Plain Text"
+msgstr "Úsáid Gnáth-Théacs de Rogha"
+
+#. but then we also need to create our own section frame
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Plain Text Mode"
+msgstr "Mód Gnáth-Théacs"
+
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr ""
+"Amharc ar theachtaireachtaí poist mar ghnáth-théacs, fiú má tá ábhar HTML "
+"ann."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:151
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:214
+#: ../modules/spamassassin/evolution-spamassassin.c:174
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:233
+#: ../modules/spamassassin/evolution-spamassassin.c:193
 #, fuzzy, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Theip ar sheoladh %d as %d teachtaireacht"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:261
+#: ../modules/spamassassin/evolution-spamassassin.c:221
 #, fuzzy
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Theip ar sheoladh %d as %d teachtaireacht"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:316
+#: ../modules/spamassassin/evolution-spamassassin.c:276
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:835
+#: ../modules/spamassassin/evolution-spamassassin.c:356
 msgid "SpamAssassin Options"
 msgstr "Roghanna SpamAssassin"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:850
+#: ../modules/spamassassin/evolution-spamassassin.c:371
 #, fuzzy
 msgid "I_nclude remote tests"
 msgstr "GenericName=Teisteanna agus Scrúduithe"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:864
+#: ../modules/spamassassin/evolution-spamassassin.c:385
 #, fuzzy
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Níl aon teachtaireacht ann san fhillteán seo."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1073
+#: ../modules/spamassassin/evolution-spamassassin.c:559
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
-msgid "Use SpamAssassin daemon and client"
-msgstr ""
-
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr ""
-
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
-msgid "Use only local spam tests."
-msgstr ""
-
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
-msgid "Use only the local spam tests (no DNS)."
-msgstr ""
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:280
-#: ../widgets/misc/e-import-assistant.c:396
-#, fuzzy
-msgid "Please select the information that you would like to import:"
-msgstr "Roghnaigh cineál an chomhaid a theastaíonn uait a iompórtáil:"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:312
-#: ../widgets/misc/e-import-assistant.c:552
-#, c-format
-msgid "From %s:"
-msgstr "Ó %s:"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:323
-#: ../modules/startup-wizard/evolution-startup-wizard.c:421
+#. Keep the title identical to EMailConfigImportPage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/startup-wizard/e-mail-config-import-page.c:262
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
 #, fuzzy
 msgid "Importing Files"
 msgstr "Comhaid nua ríomhphoist á n-iompórtáil..."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:399
-msgid "Import cancelled. Click \"Forward\" to continue."
-msgstr ""
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:417
-msgid "Import complete. Click \"Forward\" to continue."
-msgstr ""
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:497
-msgid "Evolution Setup Assistant"
-msgstr "Cúntóir Socraithe Evolution"
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
+#, fuzzy
+msgid "Import cancelled."
+msgstr "%s (cealaithe)"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:503
-msgid "Welcome"
-msgstr "Fáilte"
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
+#, fuzzy
+msgid "Import complete."
+msgstr "Críochnaithe."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:508
+#: ../modules/startup-wizard/e-startup-assistant.c:156
+#, fuzzy
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution.\n"
 "\n"
-"Please click the \"Forward\" button to continue. "
+"The next few screens will allow Evolution to connect to your email accounts, "
+"and to import files from other applications."
 msgstr ""
 "Fáilte go Evolution. Ceadófar an chéad cúpla scáileáin eile d'Evolution nasc "
 "le do chuntais ríomhphoist, agus comhaid a iompórtáil ó fheidhmchláir "
@@ -16304,798 +19024,500 @@ msgstr ""
 "\n"
 "Cliceáil an cnaipe \"Ar Aghaidh\" chun leanúint ar aghaidh, le do thoil. "
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+#: ../modules/startup-wizard/evolution-startup-wizard.c:229
 #, fuzzy
 msgid "Loading accounts..."
 msgstr "Á Luchtú..."
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
 #, fuzzy
-msgid "Add local address books to Evolution."
-msgstr "Ná taispeáin ach fillteáin atá oscailte"
+msgid "_Format as..."
+msgstr "Formáidigh Colúi_n..."
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Local Address Books"
-msgstr "Leabhair Seoltaí Logánta"
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
+#, fuzzy
+msgid "_Other languages"
+msgstr "Teanga"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:367
+msgid "Text Highlight"
 msgstr ""
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
-msgid "_Do not show this message again."
-msgstr "_Ná taispeáin an teachtaireacht seo arís."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:464
-#: ../plugins/templates/templates.c:462
-msgid "Keywords"
-msgstr "Lorgfhocail"
-
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid ""
-"Evolution has found some keywords that suggest that this message should "
-"contain an attachment, but cannot find one."
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:368
+msgid "Syntax highlighting of mail parts"
 msgstr ""
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid "Message has no attachments"
-msgstr "Níl aon iatán ag an teachtaireacht"
-
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-#, fuzzy
-msgid "_Add Attachment..."
-msgstr "Cuir _Iatán Leis..."
-
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Edit Message"
-msgstr "Cuir Teachtaireacht in _Eagar"
-
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../modules/text-highlight/languages.c:32
 #, fuzzy
-msgid "Attachment Reminder"
-msgstr "&Scoránaigh Meabhrúchán"
+msgid "_Plain text"
+msgstr "Mód Gnáth-Théacs"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid "Reminds you when you forgot to add an attachment to a mail message."
+#: ../modules/text-highlight/languages.c:38
+msgid "_Assembler"
 msgstr ""
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-#, fuzzy
-msgid "Inline Audio"
-msgstr "vCardanna Iomadúla"
-
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly in mail messages."
+#: ../modules/text-highlight/languages.c:43
+msgid "_Bash"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:192
-msgid "Select name of the Evolution backup file"
-msgstr "Roghnaigh ainm an chomhaid cúltaca Evolution"
-
-#: ../plugins/backup-restore/backup-restore.c:225
-msgid "_Restart Evolution after backup"
-msgstr "_Atosaigh Evolution tar éis cúltaca"
-
-#: ../plugins/backup-restore/backup-restore.c:251
-msgid "Select name of the Evolution backup file to restore"
-msgstr "Roghnaigh ainm an chomhaid cúltaca Evolution le hathchóiriú"
-
-#: ../plugins/backup-restore/backup-restore.c:264
-msgid "_Restart Evolution after restore"
-msgstr "_Atosaigh Evolution tar éis athchóirithe"
-
-#: ../plugins/backup-restore/backup-restore.c:337
-msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
+#: ../modules/text-highlight/languages.c:54
+msgid "_C/C++"
 msgstr ""
-"Is féidir leat Evolution a athchóiriú ó do chúltaca. Is féidir leis gach "
-"Post, Féilire, Tasc, Meamram agus Teagmháil a athchóiriú. Athchóiríonn sé do "
-"chuid socruithe pearsanta, scagairí poist, srl."
-
-#: ../plugins/backup-restore/backup-restore.c:344
-msgid "_Restore Evolution from the backup file"
-msgstr "_Athchóirigh Evolution ón gcomhad cúltaca"
-
-#: ../plugins/backup-restore/backup-restore.c:351
-msgid "Please select an Evolution Archive to restore:"
-msgstr "Roghnaigh Cartlann Evolution le hathchóiriú, le do thoil:"
-
-#: ../plugins/backup-restore/backup-restore.c:354
-msgid "Choose a file to restore"
-msgstr "Roghnaigh comhad le hathchóiriú"
 
-#: ../plugins/backup-restore/backup-restore.c:362
-msgid "Restore from backup"
-msgstr "Athchóirigh ó chúltaca"
-
-#: ../plugins/backup-restore/backup-restore.c:402
-msgid "_Back up Evolution Data..."
-msgstr "Déan _Cóip Chúltaca Sonraí Evolution..."
-
-#: ../plugins/backup-restore/backup-restore.c:404
-#, fuzzy
-msgid "Back up Evolution data and settings to an archive file"
+#: ../modules/text-highlight/languages.c:63
+msgid "_C#"
 msgstr ""
-"Déan cúltaca ar shonraí agus ar shocruithe Evolution agus athchóirigh iad."
-
-#: ../plugins/backup-restore/backup-restore.c:409
-msgid "R_estore Evolution Data..."
-msgstr "A_thchóirigh na Sonraí Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:411
-#, fuzzy
-msgid "Restore Evolution data and settings from an archive file"
+#: ../modules/text-highlight/languages.c:68
+msgid "_Cascade Style Sheet"
 msgstr ""
-"Déan cúltaca ar shonraí agus ar shocruithe Evolution agus athchóirigh iad."
 
-#: ../plugins/backup-restore/backup.c:77
-#, fuzzy
-msgid "Back up Evolution directory"
-msgstr "Comhadlann saincheaptha chúltaca:"
-
-#: ../plugins/backup-restore/backup.c:79
-#, fuzzy
-msgid "Restore Evolution directory"
-msgstr "ní féidir an chomhadlann reatha a athchóiriú"
-
-#: ../plugins/backup-restore/backup.c:81
-#, fuzzy
-msgid "Check Evolution Back up"
-msgstr "Seiceáil an Cúltaca Evolution"
-
-#: ../plugins/backup-restore/backup.c:83
-msgid "Restart Evolution"
-msgstr "Atosaigh Evolution"
-
-#: ../plugins/backup-restore/backup.c:85
-#, fuzzy
-msgid "With Graphical User Interface"
-msgstr "*.ui *.UI|Comhaid Chomhéadain"
-
-#. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:299
-#: ../plugins/backup-restore/backup.c:418
-msgid "Shutting down Evolution"
-msgstr "Evolution á mhúchadh"
-
-#: ../plugins/backup-restore/backup.c:308
-msgid "Backing Evolution accounts and settings"
+#: ../modules/text-highlight/languages.c:73
+msgid "_HTML"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:318
-msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+#: ../modules/text-highlight/languages.c:81
+msgid "_Java"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:331
+#: ../modules/text-highlight/languages.c:87
 #, fuzzy
-msgid "Back up complete"
-msgstr "Cúltaca críochnaithe"
-
-#: ../plugins/backup-restore/backup.c:338
-#: ../plugins/backup-restore/backup.c:527
-msgid "Restarting Evolution"
-msgstr "Evolution á atosú"
+msgid "_JavaScript"
+msgstr "_Script:"
 
-#: ../plugins/backup-restore/backup.c:424
-#, fuzzy
-msgid "Back up current Evolution data"
-msgstr "Foinse Sonraí na Cáipéise Reatha"
+#: ../modules/text-highlight/languages.c:93
+msgid "_Patch/diff"
+msgstr ""
 
-#: ../plugins/backup-restore/backup.c:432
+#: ../modules/text-highlight/languages.c:99
 #, fuzzy
-msgid "Extracting files from back up"
-msgstr "Fainéis á léamh ó chúltaca"
+msgid "_Perl"
+msgstr "_Pearsanta"
 
-#: ../plugins/backup-restore/backup.c:491
-msgid "Loading Evolution settings"
-msgstr "Socruithe Evolution á luchtú"
+#: ../modules/text-highlight/languages.c:110
+msgid "_PHP"
+msgstr ""
 
-#: ../plugins/backup-restore/backup.c:508
+#: ../modules/text-highlight/languages.c:123
 #, fuzzy
-msgid "Removing temporary back up files"
-msgstr "An iomarca comhad cúltaca?"
+msgid "_Python"
+msgstr "Fón Baile"
 
-#: ../plugins/backup-restore/backup.c:520
-msgid "Ensuring local sources"
+#: ../modules/text-highlight/languages.c:128
+msgid "_Ruby"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:707
-#, fuzzy, c-format
-msgid "Backing up to the folder %s"
-msgstr "Theip ar léamh na comhadlainne."
-
-#: ../plugins/backup-restore/backup.c:712
-#, fuzzy, c-format
-msgid "Restoring from the folder %s"
-msgstr "Ag díliostáil ón bhfillteán %S..."
+#: ../modules/text-highlight/languages.c:135
+msgid "_Tcl/Tk"
+msgstr ""
 
-#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:736
-#, fuzzy
-msgid "Evolution Back up"
-msgstr "Cúltaca Evolution"
+#: ../modules/text-highlight/languages.c:141
+msgid "_TeX/LaTeX"
+msgstr ""
 
-#: ../plugins/backup-restore/backup.c:736
-msgid "Evolution Restore"
-msgstr "Athchóiriú Evolution"
+#: ../modules/text-highlight/languages.c:147
+msgid "_Vala"
+msgstr ""
 
-#: ../plugins/backup-restore/backup.c:774
+#: ../modules/text-highlight/languages.c:152
 #, fuzzy
-msgid "Backing up Evolution Data"
-msgstr "Foinse Sonraí na Cáipéise Reatha"
+msgid "_Visual Basic"
+msgstr "Infheicthe"
 
-#: ../plugins/backup-restore/backup.c:775
-msgid "Please wait while Evolution is backing up your data."
+#: ../modules/text-highlight/languages.c:159
+msgid "_XML"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:777
+#: ../modules/text-highlight/languages.c:177
 #, fuzzy
-msgid "Restoring Evolution Data"
-msgstr "Evolution á Atosú"
+msgid "_ActionScript"
+msgstr "_Gníomhartha"
 
-#: ../plugins/backup-restore/backup.c:778
-msgid "Please wait while Evolution is restoring your data."
+#: ../modules/text-highlight/languages.c:182
+msgid "_ADA95"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:796
-msgid "This may take a while depending on the amount of data in your account."
+#: ../modules/text-highlight/languages.c:189
+msgid "_ALGOL 68"
 msgstr ""
 
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-#, fuzzy
-msgid "Back up and Restore"
-msgstr "Cúltaca agus Athchóiriú"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-#, fuzzy
-msgid "Back up and restore your Evolution data and settings."
+#: ../modules/text-highlight/languages.c:194
+msgid "(_G)AWK"
 msgstr ""
-"Déan cúltaca ar do chuid sonraí agus ar do chuid socruithe Evolution agus "
-"athchóirigh iad."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
-msgid "Are you sure you want to close Evolution?"
-msgstr "An bhfuil tú cinnte gur mhaith leat Evolution a dhúnadh?"
+#: ../modules/text-highlight/languages.c:199
+msgid "_COBOL"
+msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#, fuzzy
-msgid ""
-"Are you sure you want to restore Evolution from the selected back up file?"
-msgstr "An bhfuil tú cinnte gur mhaith leat Evolution a dhúnadh?"
+#: ../modules/text-highlight/languages.c:204
+msgid "_DOS Batch"
+msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-#, fuzzy
-msgid "Close and Back up Evolution"
-msgstr "Foinse Sonraí na Cáipéise Reatha"
+#: ../modules/text-highlight/languages.c:209
+msgid "_D"
+msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-#, fuzzy
-msgid "Close and Restore Evolution"
-msgstr "Ní féidir Evolution a thosú"
+#: ../modules/text-highlight/languages.c:214
+msgid "_Erlang"
+msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Insufficient Permissions"
-msgstr "Diúltaíodh Cead"
+#: ../modules/text-highlight/languages.c:219
+msgid "_FORTRAN 77"
+msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-#, fuzzy
-msgid "Invalid Evolution back up file"
-msgstr "Comhad cúltaca Evolution neamhbhailí"
+#: ../modules/text-highlight/languages.c:225
+msgid "_FORTRAN 90"
+msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-#, fuzzy
-msgid "Please select a valid back up file to restore."
-msgstr "Dealaigh na tadhallaí roghnaithe"
+#: ../modules/text-highlight/languages.c:230
+msgid "_F#"
+msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+#: ../modules/text-highlight/languages.c:235
 #, fuzzy
-msgid "The selected folder is not writable."
-msgstr "Post an sceál seo"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
-msgid ""
-"To back up your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding."
-msgstr ""
+msgid "_Go"
+msgstr "Ná Déan"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
-msgid ""
-"To restore your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your back "
-"up."
+#: ../modules/text-highlight/languages.c:240
+msgid "_Haskell"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-msgid "Automatic Contacts"
-msgstr "Teagmhálacha Uathoibríoch"
-
-#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
-msgid "Create _address book entries when sending mails"
+#: ../modules/text-highlight/languages.c:245
+msgid "_JSP"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../modules/text-highlight/languages.c:250
 #, fuzzy
-msgid "Select Address book for Automatic Contacts"
-msgstr "Tadhallaí Phoiblí"
-
-#: ../plugins/bbdb/bbdb.c:731
-msgid "Instant Messaging Contacts"
-msgstr "Teagmhálacha Chur Teachtaireachtaí Meandaracha"
+msgid "_Lisp"
+msgstr "Liosta"
 
-#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "_Synchronize contact info and images from Pidgin buddy list"
+#: ../modules/text-highlight/languages.c:258
+msgid "_Lotus"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:752
-msgid "Select Address book for Pidgin buddy list"
+#: ../modules/text-highlight/languages.c:263
+msgid "_Lua"
 msgstr ""
 
-#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
-msgid "Synchronize with _buddy list now"
+#: ../modules/text-highlight/languages.c:268
+msgid "_Maple"
 msgstr ""
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid "BBDB"
-msgstr "BBDB"
+#: ../modules/text-highlight/languages.c:273
+msgid "_Matlab"
+msgstr ""
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid ""
-"Takes the gruntwork out of managing your address book.\n"
-"\n"
-"Automatically fills your address book with names and email addresses as you "
-"reply to messages.  Also fills in IM contact information from your buddy "
-"lists."
+#: ../modules/text-highlight/languages.c:278
+msgid "_Maya"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:214
-msgid "Authentication failed. Server requires correct login."
+#: ../modules/text-highlight/languages.c:283
+msgid "_Oberon"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:216
-msgid "Given URL cannot be found."
+#: ../modules/text-highlight/languages.c:288
+#, fuzzy
+msgid "_Objective C"
+msgstr "Sínitheoir an Réada"
+
+#: ../modules/text-highlight/languages.c:294
+msgid "_OCaml"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:220
-#, c-format
-msgid ""
-"Server returned unexpected data.\n"
-"%d - %s"
+#: ../modules/text-highlight/languages.c:299
+msgid "_Octave"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:360
-#: ../plugins/caldav/caldav-browse-server.c:694
+#: ../modules/text-highlight/languages.c:304
 #, fuzzy
-msgid "Failed to parse server response."
-msgstr "Ag dul i dteagmháil le freastalaí na nuashonruithe..."
+msgid "_Object Script"
+msgstr "Sínitheoir an Réada"
 
-#: ../plugins/caldav/caldav-browse-server.c:454
-msgid "Events"
+#: ../modules/text-highlight/languages.c:309
+msgid "_Pascal"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:476
-#, fuzzy
-msgid "User's calendars"
-msgstr "Féilire nua"
-
-#: ../plugins/caldav/caldav-browse-server.c:588
-#: ../plugins/caldav/caldav-browse-server.c:763
-#, fuzzy
-msgid "Failed to get server URL."
+#: ../modules/text-highlight/languages.c:314
+msgid "_POV-Ray"
 msgstr ""
-"Teip ag cruthaigh eolaire '%s':\n"
-"%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:761
-#: ../plugins/caldav/caldav-browse-server.c:802
-#: ../plugins/caldav/caldav-browse-server.c:1493
+#: ../modules/text-highlight/languages.c:319
 #, fuzzy
-msgid "Searching for user's calendars..."
-msgstr "Féilire á luchtú..."
+msgid "_Prolog"
+msgstr "_Clár:"
 
-#: ../plugins/caldav/caldav-browse-server.c:800
+#: ../modules/text-highlight/languages.c:324
 #, fuzzy
-msgid "Could not find any user calendar."
-msgstr "Ní féidir an soláthraí cuardaigh a aimsiú."
+msgid "_PostScript"
+msgstr "_Script:"
 
-#: ../plugins/caldav/caldav-browse-server.c:938
-#, c-format
-msgid "Previous attempt failed: %s"
+#: ../modules/text-highlight/languages.c:329
+msgid "_R"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:940
-#, c-format
-msgid "Previous attempt failed with code %d"
+#: ../modules/text-highlight/languages.c:334
+msgid "_RPM Spec"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:945
-#, fuzzy, c-format
-msgid "Enter password for user %s on server %s"
-msgstr "Iontráil focal faire do %s (úsáideoir %s)"
+#: ../modules/text-highlight/languages.c:339
+msgid "_Scala"
+msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:1008
-#, fuzzy, c-format
-msgid "Cannot create soup message for URL '%s'"
+#: ../modules/text-highlight/languages.c:344
+msgid "_Smalltalk"
 msgstr ""
-"Ní féidir comhad aschurtha a chruthú: %s:\n"
-"%s"
 
-#. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1266
-#, fuzzy
-msgid "Searching folder content..."
-msgstr "Fillteán Cuardaigh ó _Sheoltóir..."
+#: ../modules/text-highlight/languages.c:350
+msgid "_TCSH"
+msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:1325
-#: ../plugins/caldav/caldav-source.c:261
-msgid "Server _handles meeting invitations"
+#: ../modules/text-highlight/languages.c:355
+msgid "_VHDL"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:1332
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:129
+#: ../modules/vcard-inline/e-mail-part-vcard.c:152
 #, fuzzy
-msgid "List of available calendars:"
-msgstr "Féilirí Logánta"
+msgid "Show F_ull vCard"
+msgstr "Taispeáin/Folaigh vCárta"
 
-#: ../plugins/caldav/caldav-browse-server.c:1370
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:132
+#: ../modules/vcard-inline/e-mail-part-vcard.c:170
 #, fuzzy
-msgid "Supports"
-msgstr "Tacaíocht CalDAV"
+msgid "Show Com_pact vCard"
+msgstr "Taispeáin/Folaigh vCárta"
 
-#: ../plugins/caldav/caldav-browse-server.c:1397
-#: ../plugins/caldav/caldav-source.c:259
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:157
 #, fuzzy
-msgid "User e_mail:"
-msgstr "Ríomhphost nua"
-
-#: ../plugins/caldav/caldav-browse-server.c:1469
-#, fuzzy, c-format
-msgid "Failed to create thread: %s"
-msgstr ""
-"Teip ag cruthaigh eolaire '%s':\n"
-"%s"
-
-#: ../plugins/caldav/caldav-browse-server.c:1585
-#, c-format
-msgid "Server URL '%s' is not a valid URL"
-msgstr ""
+msgid "Save _To Addressbook"
+msgstr "Sábháil sa Leabhar Seoltaí"
 
-#: ../plugins/caldav/caldav-browse-server.c:1591
-msgid "Browse for a CalDAV calendar"
-msgstr ""
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:178
+#, fuzzy
+msgid "There is one other contact."
+msgstr "E427: Tá aon chlib chomhoiriúnach amháin"
 
-#: ../plugins/caldav/caldav-source.c:240
-#: ../plugins/calendar-http/calendar-http.c:107
-msgid "_URL:"
-msgstr "_URL:"
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
+#, fuzzy, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "E427: Tá aon chlib chomhoiriúnach amháin"
+msgstr[1] "agus aon carta eile."
 
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:145
-#: ../plugins/google-account-setup/google-contacts-source.c:359
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:209
 #, fuzzy
-msgid "Use _secure connection"
-msgstr "Úsáid nasc daingean:"
-
-#: ../plugins/caldav/caldav-source.c:249
-#: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:669
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
-msgid "User_name:"
-msgstr "Ai_nm úsáideora:"
+msgid "Addressbook Contact"
+msgstr "Leabhar Seoltaí"
 
-#: ../plugins/caldav/caldav-source.c:264
-msgid "Brows_e server for a calendar"
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:210
+msgid "Display the part as an addressbook contact"
 msgstr ""
 
-#: ../plugins/caldav/caldav-source.c:282
-#: ../plugins/calendar-file/calendar-file.c:204
-#: ../plugins/calendar-http/calendar-http.c:129
-#: ../plugins/calendar-weather/calendar-weather.c:421
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/google-account-setup/google-source.c:675
-msgid "Re_fresh:"
-msgstr "A_thnuaigh:"
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "Add CalDAV support to Evolution."
-msgstr "Cuir tacaíocht le CalDAV le Evolution."
+#: ../modules/web-inspector/evolution-web-inspector.c:96
+#, fuzzy
+msgid "Evolution Web Inspector"
+msgstr "Suíomh Gréasáin Evolution"
 
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV Support"
-msgstr "Tacaíocht CalDAV"
+#: ../plugins/attachment-reminder/attachment-reminder.c:121
+msgid "_Do not show this message again."
+msgstr "_Ná taispeáin an teachtaireacht seo arís."
 
-#: ../plugins/calendar-file/calendar-file.c:134
-msgid "_Customize options"
-msgstr "_Saincheap roghanna"
+#: ../plugins/attachment-reminder/attachment-reminder.c:583
+#: ../plugins/templates/templates.c:480
+msgid "Keywords"
+msgstr "Lorgfhocail"
 
-#: ../plugins/calendar-file/calendar-file.c:153
-msgid "File _name:"
-msgstr "_Ainm comhaid:"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Message has no attachments"
+msgstr "Níl aon iatán ag an teachtaireacht"
 
-#: ../plugins/calendar-file/calendar-file.c:157
-msgid "Choose calendar file"
-msgstr "Roghnaigh comhad féilire"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
 
-#: ../plugins/calendar-file/calendar-file.c:209
-msgid "On open"
-msgstr "Ag am oscailte"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#, fuzzy
+msgid "_Add Attachment..."
+msgstr "Cuir _Iatán Leis..."
 
-#: ../plugins/calendar-file/calendar-file.c:210
-msgid "On file change"
-msgstr "Ag am athraithe comhaid"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Edit Message"
+msgstr "Cuir Teachtaireacht in _Eagar"
 
-#: ../plugins/calendar-file/calendar-file.c:211
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #, fuzzy
-msgid "Periodically"
-msgstr "Pearsanta"
-
-#: ../plugins/calendar-file/calendar-file.c:228
-msgid "Force read _only"
-msgstr ""
+msgid "Attachment Reminder"
+msgstr "&Scoránaigh Meabhrúchán"
 
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Add local calendars to Evolution."
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr ""
 
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Local Calendars"
-msgstr "Féilirí Logánta"
-
-#: ../plugins/calendar-http/calendar-http.c:207
-msgid "Userna_me:"
-msgstr "_Ainm úsáideora:"
+#: ../plugins/bbdb/bbdb.c:627 ../plugins/bbdb/bbdb.c:636
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic Contacts"
+msgstr "Teagmhálacha Uathoibríoch"
 
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "Add web calendars to Evolution."
+#. Enable BBDB checkbox
+#: ../plugins/bbdb/bbdb.c:651
+msgid "Create _address book entries when sending mails"
 msgstr ""
 
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Web Calendars"
-msgstr "Féilirí Gréasáin"
-
-#: ../plugins/calendar-weather/calendar-weather.c:65
-msgid "Weather: Fog"
-msgstr "Aimsir: Ceo"
-
-#: ../plugins/calendar-weather/calendar-weather.c:66
-msgid "Weather: Cloudy"
-msgstr "Aimsir: Scamallach"
-
-#: ../plugins/calendar-weather/calendar-weather.c:67
-msgid "Weather: Cloudy Night"
-msgstr "Aimsir: Oíche Scamallach"
-
-#: ../plugins/calendar-weather/calendar-weather.c:68
-msgid "Weather: Overcast"
-msgstr "Aimsir: Modartha"
-
-#: ../plugins/calendar-weather/calendar-weather.c:69
-msgid "Weather: Showers"
-msgstr "Aimsir: Ceathanna"
-
-#: ../plugins/calendar-weather/calendar-weather.c:70
-msgid "Weather: Snow"
-msgstr "Aimsir: Sneachta"
-
-#: ../plugins/calendar-weather/calendar-weather.c:71
-msgid "Weather: Sunny"
-msgstr "Aimsir: Grianmhar"
-
-#: ../plugins/calendar-weather/calendar-weather.c:72
-msgid "Weather: Clear Night"
-msgstr "Aimsir: Oíche Ghlan"
-
-#: ../plugins/calendar-weather/calendar-weather.c:73
-msgid "Weather: Thunderstorms"
-msgstr "Aimsir: Stoirmeacha Toirní"
-
-#: ../plugins/calendar-weather/calendar-weather.c:239
-msgid "Select a location"
-msgstr "Roghnaigh suíomh"
-
-#. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:350
-#: ../plugins/calendar-weather/calendar-weather.c:398
-msgctxt "weather-cal-location"
-msgid "None"
-msgstr "Neamhní"
+#: ../plugins/bbdb/bbdb.c:658
+#, fuzzy
+msgid "Select Address book for Automatic Contacts"
+msgstr "Tadhallaí Phoiblí"
 
-#: ../plugins/calendar-weather/calendar-weather.c:477
-msgid "_Units:"
-msgstr "_Aonaid:"
+#: ../plugins/bbdb/bbdb.c:675
+msgid "Instant Messaging Contacts"
+msgstr "Teagmhálacha Chur Teachtaireachtaí Meandaracha"
 
-#: ../plugins/calendar-weather/calendar-weather.c:486
-msgid "Metric (Celsius, cm, etc)"
+#. Enable Gaim Checkbox
+#: ../plugins/bbdb/bbdb.c:690
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:489
-msgid "Imperial (Fahrenheit, inches, etc)"
+#: ../plugins/bbdb/bbdb.c:697
+msgid "Select Address book for Pidgin buddy list"
 msgstr ""
 
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Add weather calendars to Evolution."
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:710
+msgid "Synchronize with _buddy list now"
 msgstr ""
 
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
-msgid "Weather Calendars"
-msgstr "Féilirí Aimsire"
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
 
-#: ../plugins/dbx-import/dbx-importer.c:284
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+
+#: ../plugins/dbx-import/dbx-importer.c:282
 #, fuzzy
 msgid "Importing Outlook Express data"
 msgstr "Earráid agus Sonraí á nIompórtáil"
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
 #, fuzzy
-msgid "Import Outlook Express messages from DBX file"
-msgstr "Iompórtáil Ó Phost OS X"
-
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
-#, fuzzy
 msgid "Outlook DBX import"
 msgstr "Comhphairt Coimriú Evolution"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr ""
 
-#: ../plugins/default-source/default-source.c:168
-msgid "Mark as _default address book"
-msgstr "Marcáil mar leabhar seoltaí _réamhshocraithe"
-
-#: ../plugins/default-source/default-source.c:182
-msgid "A_utocomplete with this address book"
-msgstr "Comhlánaigh go h_uathoibríoch leis an leabhar seoltaí seo"
-
-#: ../plugins/default-source/default-source.c:191
-msgid "Mark as _default calendar"
-msgstr "Marcáil mar féilire _réamhshocraithe"
-
-#: ../plugins/default-source/default-source.c:192
-msgid "Mark as _default task list"
-msgstr "Marcáil mar liosta tascanna _réamhshocraithe"
-
-#: ../plugins/default-source/default-source.c:193
-msgid "Mark as _default memo list"
-msgstr "Marcáil mar liosta meamram _réamhshocraithe"
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
-msgid "Default Sources"
-msgstr "Foinsí Réamhshocraithe"
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid "Mark your preferred address book and calendar as default."
-msgstr ""
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "Liosta Cheanntásc Saincheaptha"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#, fuzzy
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Iompórtáil Ó Phost OS X"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:291
 #, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Slándáil:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:326
+#: ../plugins/email-custom-header/email-custom-header.c:295
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Pearsanta"
 
-#: ../plugins/email-custom-header/email-custom-header.c:327
+#: ../plugins/email-custom-header/email-custom-header.c:296
 #, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Gan Siniú"
 
-#: ../plugins/email-custom-header/email-custom-header.c:328
+#: ../plugins/email-custom-header/email-custom-header.c:297
 #, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Cruthaithe"
 
-#: ../plugins/email-custom-header/email-custom-header.c:329
+#: ../plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr ""
 
-#: ../plugins/email-custom-header/email-custom-header.c:330
+#: ../plugins/email-custom-header/email-custom-header.c:299
 #, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Scór"
 
-#: ../plugins/email-custom-header/email-custom-header.c:331
+#: ../plugins/email-custom-header/email-custom-header.c:300
 #, fuzzy
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Scór"
 
-#: ../plugins/email-custom-header/email-custom-header.c:388
+#: ../plugins/email-custom-header/email-custom-header.c:360
 #, fuzzy
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Neamhní"
 
-#: ../plugins/email-custom-header/email-custom-header.c:584
+#: ../plugins/email-custom-header/email-custom-header.c:536
 msgid "_Custom Header"
 msgstr "Ceanntásc _Saincheaptha"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:847
+#: ../plugins/email-custom-header/email-custom-header.c:806
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
 msgstr ""
 
-#: ../plugins/email-custom-header/email-custom-header.c:901
+#: ../plugins/email-custom-header/email-custom-header.c:859
 msgid "Key"
 msgstr "Eochair"
 
-#: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:468
+#: ../plugins/email-custom-header/email-custom-header.c:876
+#: ../plugins/templates/templates.c:489
 msgid "Values"
 msgstr "Luachanna"
 
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
+msgid "Custom Header"
+msgstr "Ceanntásc Saincheaptha"
+
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to 
specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Add custom headers to outgoing mail messages."
 msgstr ""
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-msgid "Custom Header"
-msgstr "Ceanntásc Saincheaptha"
-
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
 msgstr "Ceanntásc Ríomhphoist Saincheaptha"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
-msgid "Automatically launch editor when key is pressed in the mail composer"
-msgstr ""
-
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:132
-msgid "Automatically launch when a new mail is edited"
-msgstr ""
-
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
-msgid "Default External Editor"
-msgstr "Eagarthóir Seachtrach Réamhshocraithe"
-
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
-msgid "The default command that must be used as the editor."
-msgstr ""
-
-#: ../plugins/external-editor/external-editor.c:121
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:122
+#: ../plugins/external-editor/external-editor.c:113
+#, fuzzy
 msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim -f\""
+"For XEmacs use \"xemacs\"\n"
+"For Vim use \"gvim -f\""
 msgstr ""
 "Le haghaidh Emacs úsáid \"xemacs\"\n"
 "Le haghaidh VI úsáid \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:402
-#: ../plugins/external-editor/external-editor.c:404
+#: ../plugins/external-editor/external-editor.c:123
+msgid "_Automatically launch when a new mail is edited"
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:413
+#: ../plugins/external-editor/external-editor.c:415
 msgid "Compose in External Editor"
 msgstr "Cum in Eagarthóir Seachtrach"
 
@@ -17108,70 +19530,64 @@ msgid "Use an external editor to compose plain-text mail messages."
 msgstr ""
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
-msgid "Cannot create Temporary File"
-msgstr "Ní féidir Comhad Sealadach a chruthú"
+msgid "Editor not launchable"
+msgstr ""
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
-msgid "Editor not launchable"
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
 msgstr ""
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+msgid "Cannot create Temporary File"
+msgstr "Ní féidir Comhad Sealadach a chruthú"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr ""
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
 #, fuzzy
 msgid "External editor still running"
 msgstr "Cumraigh an tEagarthóir"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
 msgstr ""
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-msgstr ""
-
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
-msgid "Insert Face picture by default"
-msgstr ""
-
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
-msgid ""
-"Whether insert Face picture to outgoing messages by default. The picture "
-"should be set before checking this, otherwise nothing happens."
-msgstr ""
+#: ../plugins/face/face.c:171 ../smime/gui/certificate-manager.c:322
+msgid "Unknown error"
+msgstr "Earráid anaithnid"
 
-#: ../plugins/face/face.c:292
+#: ../plugins/face/face.c:289
 #, fuzzy
 msgid "Select a Face Picture"
 msgstr "Roghnaigh Comhad"
 
-#: ../plugins/face/face.c:302
+#: ../plugins/face/face.c:299
 #, fuzzy
 msgid "Image files"
 msgstr "Comhaid nua ríomhphoist á n-iompórtáil..."
 
-#: ../plugins/face/face.c:359
+#: ../plugins/face/face.c:358
 msgid "_Insert Face picture by default"
 msgstr ""
 
-#: ../plugins/face/face.c:370
+#: ../plugins/face/face.c:371
 msgid "Load new _Face picture"
 msgstr ""
 
-#: ../plugins/face/face.c:429
+#: ../plugins/face/face.c:432
 #, fuzzy
 msgid "Include _Face"
 msgstr "Sná&itheanna ar a dtugtar neamhaird"
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Attach a small picture of your face to outgoing messages."
 msgstr ""
 
@@ -17181,13 +19597,13 @@ msgstr ""
 
 #: ../plugins/face/org-gnome-face.error.xml.h:2
 #, fuzzy
-msgid "Invalid Image Size"
-msgstr "Luach Dáta Neamhbhailí"
+msgid "The file cannot be read"
+msgstr "Níorbh fhéidir an mhír a sheoladh!\n"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:3
 #, fuzzy
-msgid "Not an image"
-msgstr "_Gan íomhá"
+msgid "Invalid Image Size"
+msgstr "Luach Dáta Neamhbhailí"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
 #, fuzzy
@@ -17196,55 +19612,13 @@ msgstr "Roghnaigh úsáideoir le do thoil."
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
 #, fuzzy
-msgid "The file cannot be read"
-msgstr "Níorbh fhéidir an mhír a sheoladh!\n"
+msgid "Not an image"
+msgstr "_Gan íomhá"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
 
-#: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
-#, fuzzy
-msgid "Server"
-msgstr "_Freastalaí:"
-
-#: ../plugins/google-account-setup/google-source.c:459
-#, c-format
-msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr ""
-
-#: ../plugins/google-account-setup/google-source.c:576
-#, c-format
-msgid ""
-"Cannot read data from Google server.\n"
-"%s"
-msgstr ""
-
-#: ../plugins/google-account-setup/google-source.c:576
-#: ../plugins/mail-to-task/mail-to-task.c:820
-#: ../plugins/mail-to-task/mail-to-task.c:1084
-msgid "Unknown error."
-msgstr "Earráid anaithnid."
-
-#: ../plugins/google-account-setup/google-source.c:679
-msgid "Cal_endar:"
-msgstr "_Féilire:"
-
-#: ../plugins/google-account-setup/google-source.c:714
-#, fuzzy
-msgid "Retrieve _List"
-msgstr "`%s' á Fháil"
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Add Google Calendars to Evolution."
-msgstr ""
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-#, fuzzy
-msgid "Google Calendars"
-msgstr "Féilire Gnome"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 #, fuzzy
 msgid "Inline Image"
@@ -17254,925 +19628,199 @@ msgstr "vCardanna Iomadúla"
 msgid "View image attachments directly in mail messages."
 msgstr ""
 
-#: ../plugins/imap-features/imap-headers.c:337
-#: ../plugins/imap-features/imap-headers.ui.h:2
-msgid "Custom Headers"
-msgstr "Ceanntásca Saincheaptha"
-
-#: ../plugins/imap-features/imap-headers.c:349
-#: ../plugins/imap-features/imap-headers.ui.h:5
-msgid "IMAP Headers"
-msgstr "Ceanntásca IMAP"
-
-#: ../plugins/imap-features/imap-headers.ui.h:1
-msgid "Basic and _Mailing List Headers (Default)"
-msgstr ""
-
-#: ../plugins/imap-features/imap-headers.ui.h:3
-msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
-msgstr ""
-
-#: ../plugins/imap-features/imap-headers.ui.h:6
-msgid ""
-"Select your IMAP Header Preferences. \n"
-"The more headers you have the more time it will take to download."
-msgstr ""
-
-#: ../plugins/imap-features/imap-headers.ui.h:8
-msgid ""
-"_Basic Headers (Fastest) \n"
-"Use this if you do not have filters based on mailing lists"
-msgstr ""
-
-#: ../plugins/imap-features/imap-headers.ui.h:10
-#, fuzzy
-msgid "_Fetch All Headers"
-msgstr "Faigh _Gach Ceanntásc"
-
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "Fine-tune your IMAP accounts."
-msgstr ""
-
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
-#, fuzzy
-msgid "IMAP Features"
-msgstr "Ardtréithe"
-
-#. Translators: The first '%s' is replaced with a calendar name,
-#. * the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:499
-#, fuzzy, c-format
-msgid "Failed to load the calendar '%s' (%s)"
-msgstr "Comhad féilire le luchtú"
-
-#: ../plugins/itip-formatter/itip-formatter.c:659
-#, c-format
-msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:683
-#, fuzzy, c-format
-msgid "Found the appointment in the calendar '%s'"
-msgstr "Taispeáin &Tascanna san Fhéilire"
-
-#: ../plugins/itip-formatter/itip-formatter.c:789
-#, fuzzy
-msgid "Unable to find any calendars"
-msgstr "Ní féidir an soláthraí cuardaigh a aimsiú."
-
-#: ../plugins/itip-formatter/itip-formatter.c:796
-msgid "Unable to find this meeting in any calendar"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:800
-msgid "Unable to find this task in any task list"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:804
-msgid "Unable to find this memo in any memo list"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1082
-#, fuzzy
-msgid "Opening the calendar. Please wait..."
-msgstr "Féilire á oscailt"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
+msgid "Get List _Archive"
+msgstr "Faigh C_artlann an Liosta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1085
-msgid "Searching for an existing version of this appointment"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:370
+msgid "Get an archive of the list this message belongs to"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1362
-#, fuzzy
-msgid "Unable to parse item"
-msgstr "Earráid: Ní féidir an comhad %1 a pharsáil.\n"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1451
-#, fuzzy, c-format
-msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "Ní féidir sonraí an fhéilire a léamh: "
-
-#: ../plugins/itip-formatter/itip-formatter.c:1463
-#, c-format
-msgid "Sent to calendar '%s' as accepted"
-msgstr ""
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
+msgid "Get List _Usage Information"
+msgstr "Faigh Eolas Ú_sáide an Liosta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1467
-#, c-format
-msgid "Sent to calendar '%s' as tentative"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:377
+msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1472
-#, c-format
-msgid "Sent to calendar '%s' as declined"
-msgstr ""
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
+msgid "Contact List _Owner"
+msgstr "Déan Teagmháil le hÚ_inéir Liosta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1477
-#, c-format
-msgid "Sent to calendar '%s' as canceled"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:384
+msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1579
-#, fuzzy, c-format
-msgid "Organizer has removed the delegate %s "
-msgstr "Bainte"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+msgid "_Post Message to List"
+msgstr "_Postáil Teachtaireacht go Liosta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1586
-msgid "Sent a cancelation notice to the delegate"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:391
+msgid "Post a message to the mailing list this message belongs to"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#, fuzzy
-msgid "Could not send the cancelation notice to the delegate"
-msgstr "Teíp ag dealaigh fillteán: %s"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
+msgid "_Subscribe to List"
+msgstr "_Liostáil le Liosta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1700
-msgid "Attendee status could not be updated because the status is invalid"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:398
+msgid "Subscribe to the mailing list this message belongs to"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1729
-#, fuzzy, c-format
-msgid "Unable to update attendee. %s"
-msgstr "Ní féidir sonraí an leabhair seoltaí a nuashonrú: "
-
-#: ../plugins/itip-formatter/itip-formatter.c:1733
-#, fuzzy
-msgid "Attendee status updated"
-msgstr "Sealadach"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1737
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
+msgid "_Unsubscribe from List"
+msgstr "_Díliostáil ó Liosta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1759
-#, fuzzy
-msgid "Meeting information sent"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:405
+msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr ""
-"Seoladh teachtaireacht chuig:\n"
-"%1%2"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1762
-#, fuzzy
-msgid "Task information sent"
-msgstr ""
-"Seoladh teachtaireacht chuig:\n"
-"%1%2"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:412
+msgid "Mailing _List"
+msgstr "Liosta _Postála"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1765
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 #, fuzzy
-msgid "Memo information sent"
-msgstr ""
-"Seoladh teachtaireacht chuig:\n"
-"%1%2"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1774
-msgid "Unable to send meeting information, the meeting does not exist"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1777
-msgid "Unable to send task information, the task does not exist"
-msgstr ""
+msgid "Mailing List Actions"
+msgstr "&Liosta ríomhphoist na teanga:"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1780
-msgid "Unable to send memo information, the memo does not exist"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr ""
 
-#. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1846
-#, fuzzy
-msgid "calendar.ics"
-msgstr "Féilirí"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1851
-#, fuzzy
-msgid "Save Calendar"
-msgstr "Féilire Nua"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1914
-#: ../plugins/itip-formatter/itip-formatter.c:1925
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 #, fuzzy
-msgid "The calendar attached is not valid"
-msgstr "Níl an t-am sonraithe bailí."
-
-#: ../plugins/itip-formatter/itip-formatter.c:1915
-#: ../plugins/itip-formatter/itip-formatter.c:1926
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1966
-#: ../plugins/itip-formatter/itip-formatter.c:1994
-#: ../plugins/itip-formatter/itip-formatter.c:2103
-msgid "The item in the calendar is not valid"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:1967
-#: ../plugins/itip-formatter/itip-formatter.c:1995
-#: ../plugins/itip-formatter/itip-formatter.c:2104
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2008
-msgid "The calendar attached contains multiple items"
-msgstr ""
+msgid "Action not available"
+msgstr "Níl comhbhrúiteoir ar fáil"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2009
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2672
-msgctxt "cal-itip"
-msgid "None"
-msgstr "Neamhní"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2688
-msgid "Tentatively Accepted"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-formatter.c:2806
-#, fuzzy
-msgid "This meeting recurs"
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2809
-#, fuzzy
-msgid "This task recurs"
-msgstr "Mionathraigh an Tasc seo..."
-
-#: ../plugins/itip-formatter/itip-formatter.c:2812
-#, fuzzy
-msgid "This memo recurs"
-msgstr "Name=Comhad Meamraim"
-
-#: ../plugins/itip-formatter/itip-formatter.c:3036
-#, fuzzy
-msgid "Meeting Invitations"
+"This message does not contain the header information required for this "
+"action."
 msgstr ""
-"Seoladh teachtaireacht chuig:\n"
-"%1%2"
 
-#. Delete message after acting
-#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:3061
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
 #, fuzzy
-msgid "_Delete message after acting"
-msgstr "Scrios Dialóga Dúnta tar éis (Lá)"
-
-#: ../plugins/itip-formatter/itip-formatter.c:3071
-#: ../plugins/itip-formatter/itip-formatter.c:3104
-#, fuzzy
-msgid "Conflict Search"
-msgstr "Inneall Cuardaigh"
-
-#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3086
-msgid "Select the calendars to search for meeting conflicts"
-msgstr ""
-
-#. strftime format of a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:196
-msgid "Today %H:%M"
-msgstr "Inniu %H:%M"
-
-#. strftime format of a time,
-#. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:200
-msgid "Today %H:%M:%S"
-msgstr "Inniu %H:%M:%S"
-
-#. strftime format of a time,
-#. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:209
-msgid "Today %l:%M:%S %p"
-msgstr "Inniu %l:%M:%S %p"
-
-#. strftime format of a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:224
-msgid "Tomorrow %H:%M"
-msgstr "Amárach %H:%M"
-
-#. strftime format of a time,
-#. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:228
-msgid "Tomorrow %H:%M:%S"
-msgstr "Amárach %H:%M:%S"
-
-#. strftime format of a time,
-#. * in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:233
-msgid "Tomorrow %l:%M %p"
-msgstr "Amárach %l:%M %p"
-
-#. strftime format of a time,
-#. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:237
-msgid "Tomorrow %l:%M:%S %p"
-msgstr "Amárach %l:%M:%S %p"
-
-#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
-#, c-format
-msgid "%A"
-msgstr "%A"
-
-#. strftime format of a weekday and a
-#. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:261
-msgid "%A %H:%M"
-msgstr "%A %H:%M"
-
-#. strftime format of a weekday and a
-#. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:265
-msgid "%A %H:%M:%S"
-msgstr "%A %H:%M:%S"
-
-#. strftime format of a weekday and a
-#. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:270
-msgid "%A %l:%M %p"
-msgstr "%A %l:%M %p"
-
-#. strftime format of a weekday and a
-#. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:274
-msgid "%A %l:%M:%S %p"
-msgstr "%A %I:%M:%S %p"
-
-#. strftime format of a weekday and a date
-#. * without a year.
-#: ../plugins/itip-formatter/itip-view.c:283
-msgid "%A, %B %e"
-msgstr "%A, %e %B"
-
-#. strftime format of a weekday, a date
-#. * without a year and a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:289
-msgid "%A, %B %e %H:%M"
-msgstr "%A, %e %B %H:%M"
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:293
-msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %e %B %H:%M:%S"
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:298
-msgid "%A, %B %e %l:%M %p"
-msgstr "%A, %e %B %l:%M %p"
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:302
-msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%A, %e %B %l:%M:%S %p"
-
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:308
-msgid "%A, %B %e, %Y"
-msgstr "%A, %e %B, %Y"
-
-#. strftime format of a weekday, a date and a
-#. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:313
-msgid "%A, %B %e, %Y %H:%M"
-msgstr "%A, %e %B, %Y %H:%M"
-
-#. strftime format of a weekday, a date and a
-#. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:317
-msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%A, %e %B, %Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a
-#. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:322
-msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%A, %e %B, %Y %l:%M %p"
-
-#. strftime format of a weekday, a date and a
-#. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:326
-msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%A, %e %B, %Y %l:%M:%S %p"
-
-#: ../plugins/itip-formatter/itip-view.c:364
-#: ../plugins/itip-formatter/itip-view.c:365
-#: ../plugins/itip-formatter/itip-view.c:452
-#: ../plugins/itip-formatter/itip-view.c:453
-#: ../plugins/itip-formatter/itip-view.c:540
-msgid "An unknown person"
-msgstr "Duine anaithnid"
-
-#: ../plugins/itip-formatter/itip-view.c:369
-#: ../plugins/itip-formatter/itip-view.c:457
-#: ../plugins/itip-formatter/itip-view.c:544
-#, fuzzy, c-format
-msgid "Please respond on behalf of %s"
-msgstr "Ar fanacht (logánta)"
-
-#: ../plugins/itip-formatter/itip-view.c:371
-#: ../plugins/itip-formatter/itip-view.c:459
-#: ../plugins/itip-formatter/itip-view.c:546
-#, fuzzy, c-format
-msgid "Received on behalf of %s"
-msgstr "Ar fanacht (logánta)"
-
-#: ../plugins/itip-formatter/itip-view.c:376
-#, fuzzy, c-format
-msgid "%s through %s has published the following meeting information:"
-msgstr "Foilsíodh an tasc seo"
-
-#: ../plugins/itip-formatter/itip-view.c:378
-#, fuzzy, c-format
-msgid "%s has published the following meeting information:"
-msgstr "Tharla an earráid inmheánach a leanas: "
-
-#: ../plugins/itip-formatter/itip-view.c:383
-#, fuzzy, c-format
-msgid "%s has delegated the following meeting to you:"
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:386
-#, fuzzy, c-format
-msgid "%s through %s requests your presence at the following meeting:"
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:388
-#, fuzzy, c-format
-msgid "%s requests your presence at the following meeting:"
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:394
-#, fuzzy, c-format
-msgid "%s through %s wishes to add to an existing meeting:"
-msgstr "Cuir meamram nua leis an mbunachar sonraí."
-
-#: ../plugins/itip-formatter/itip-view.c:396
-#, fuzzy, c-format
-msgid "%s wishes to add to an existing meeting:"
-msgstr "Cuir meamram nua leis an mbunachar sonraí."
-
-#: ../plugins/itip-formatter/itip-view.c:400
-#, fuzzy, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"meeting:"
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:402
-#, c-format
-msgid "%s wishes to receive the latest information for the following meeting:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:406
-#, fuzzy, c-format
-msgid "%s through %s has sent back the following meeting response:"
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:408
-#, fuzzy, c-format
-msgid "%s has sent back the following meeting response:"
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:412
-#, fuzzy, c-format
-msgid "%s through %s has canceled the following meeting:"
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:414
-#, fuzzy, c-format
-msgid "%s has canceled the following meeting."
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:418
-#, fuzzy, c-format
-msgid "%s through %s has proposed the following meeting changes."
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:420
-#, fuzzy, c-format
-msgid "%s has proposed the following meeting changes."
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:424
-#, fuzzy, c-format
-msgid "%s through %s has declined the following meeting changes:"
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:426
-#, fuzzy, c-format
-msgid "%s has declined the following meeting changes."
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:464
-#, fuzzy, c-format
-msgid "%s through %s has published the following task:"
-msgstr "Foilsíodh an tasc seo"
-
-#: ../plugins/itip-formatter/itip-view.c:466
-#, fuzzy, c-format
-msgid "%s has published the following task:"
-msgstr "Foilsíodh an tasc seo"
-
-#: ../plugins/itip-formatter/itip-view.c:471
-#, c-format
-msgid "%s requests the assignment of %s to the following task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:474
-#, fuzzy, c-format
-msgid "%s through %s has assigned you a task:"
-msgstr "Tá $a díreach tar éis tú a bhípeáil!"
-
-#: ../plugins/itip-formatter/itip-view.c:476
-#, fuzzy, c-format
-msgid "%s has assigned you a task:"
-msgstr "Tá $a díreach tar éis tú a bhípeáil!"
-
-#: ../plugins/itip-formatter/itip-view.c:482
-#, fuzzy, c-format
-msgid "%s through %s wishes to add to an existing task:"
-msgstr "Cuir an tasc seo leis an phainéal"
-
-#: ../plugins/itip-formatter/itip-view.c:484
-#, fuzzy, c-format
-msgid "%s wishes to add to an existing task:"
-msgstr "Cuir an tasc seo leis an phainéal"
-
-#: ../plugins/itip-formatter/itip-view.c:488
-#, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
+msgid "Posting not allowed"
+msgstr "Ní cheadaítear spásanna"
 
-#: ../plugins/itip-formatter/itip-view.c:490
-#, c-format
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
 msgid ""
-"%s wishes to receive the latest information for the following assigned task:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:494
-#, fuzzy, c-format
-msgid "%s through %s has sent back the following assigned task response:"
-msgstr "Foilsíodh an tasc seo"
-
-#: ../plugins/itip-formatter/itip-view.c:496
-#, c-format
-msgid "%s has sent back the following assigned task response:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:500
-#, fuzzy, c-format
-msgid "%s through %s has canceled the following assigned task:"
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:502
-#, fuzzy, c-format
-msgid "%s has canceled the following assigned task:"
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:506
-#, fuzzy, c-format
-msgid "%s through %s has proposed the following task assignment changes:"
-msgstr "Foilsíodh an tasc seo"
-
-#: ../plugins/itip-formatter/itip-view.c:508
-#, fuzzy, c-format
-msgid "%s has proposed the following task assignment changes:"
-msgstr "Foilsíodh an tasc seo"
-
-#: ../plugins/itip-formatter/itip-view.c:512
-#, fuzzy, c-format
-msgid "%s through %s has declined the following assigned task:"
-msgstr "Foilsíodh an tasc seo"
-
-#: ../plugins/itip-formatter/itip-view.c:514
-#, fuzzy, c-format
-msgid "%s has declined the following assigned task:"
-msgstr "Foilsíodh an tasc seo"
-
-#: ../plugins/itip-formatter/itip-view.c:551
-#, fuzzy, c-format
-msgid "%s through %s has published the following memo:"
-msgstr "Foilsíodh an tasc seo"
-
-#: ../plugins/itip-formatter/itip-view.c:553
-#, fuzzy, c-format
-msgid "%s has published the following memo:"
-msgstr "Tharla an earráid inmheánach a leanas: "
-
-#: ../plugins/itip-formatter/itip-view.c:558
-#, fuzzy, c-format
-msgid "%s through %s wishes to add to an existing memo:"
-msgstr "Cuir meamram nua leis an mbunachar sonraí."
-
-#: ../plugins/itip-formatter/itip-view.c:560
-#, fuzzy, c-format
-msgid "%s wishes to add to an existing memo:"
-msgstr "Cuir meamram nua leis an mbunachar sonraí."
-
-#: ../plugins/itip-formatter/itip-view.c:564
-#, fuzzy, c-format
-msgid "%s through %s has canceled the following shared memo:"
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:566
-#, fuzzy, c-format
-msgid "%s has canceled the following shared memo:"
-msgstr "Cealaíodh an cruinniú seo"
-
-#: ../plugins/itip-formatter/itip-view.c:690
-msgid "All day:"
-msgstr ""
-
-#: ../plugins/itip-formatter/itip-view.c:700
-#, fuzzy
-msgid "Start day:"
-msgstr "Dáta to_saigh:"
-
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:700
-#: ../plugins/itip-formatter/itip-view.c:1062
-msgid "Start time:"
-msgstr "Am tosaithe:"
-
-#: ../plugins/itip-formatter/itip-view.c:712
-#, fuzzy
-msgid "End day:"
-msgstr "%d lá"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:712
-#: ../plugins/itip-formatter/itip-view.c:1073
-msgid "End time:"
-msgstr "Am deiridh:"
-
-#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:848
-msgid "_Open Calendar"
-msgstr "_Oscail Féilire"
-
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:881
-#: ../plugins/itip-formatter/itip-view.c:886
-msgid "_Decline"
-msgstr "_Diúltaigh"
-
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:867
-#: ../plugins/itip-formatter/itip-view.c:883
-#: ../plugins/itip-formatter/itip-view.c:888
-#, fuzzy
-msgid "A_ccept"
-msgstr "Glac Leis"
-
-#: ../plugins/itip-formatter/itip-view.c:858
-#, fuzzy
-msgid "_Decline all"
-msgstr "Gach Comhad"
-
-#: ../plugins/itip-formatter/itip-view.c:859
-#, fuzzy
-msgid "_Tentative all"
-msgstr "Gach Comhad"
-
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:882
-#: ../plugins/itip-formatter/itip-view.c:887
-#, fuzzy
-msgid "_Tentative"
-msgstr "Sealadach"
-
-#: ../plugins/itip-formatter/itip-view.c:860
-#, fuzzy
-msgid "A_ccept all"
-msgstr "Glac Uile"
-
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Send Information"
-msgstr "_Seol Eolas"
-
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:875
-#, fuzzy
-msgid "_Update Attendee Status"
-msgstr "Sealadach"
-
-#: ../plugins/itip-formatter/itip-view.c:878
-msgid "_Update"
-msgstr "_Nuashonraigh"
-
-#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1093
-#: ../plugins/itip-formatter/itip-view.c:1147
-msgid "Comment:"
-msgstr "Nóta:"
-
-#: ../plugins/itip-formatter/itip-view.c:1132
-msgid "Send _reply to sender"
-msgstr "Seol _freagra don seoltóir"
-
-#: ../plugins/itip-formatter/itip-view.c:1162
-#, fuzzy
-msgid "Send _updates to attendees"
-msgstr "(Ath)sheol Údarú Go"
-
-#: ../plugins/itip-formatter/itip-view.c:1171
-#, fuzzy
-msgid "_Apply to all instances"
-msgstr "Cuir i bhfeidhm i ng&ach fheidhmchlár"
-
-#: ../plugins/itip-formatter/itip-view.c:1180
-#, fuzzy
-msgid "Show time as _free"
-msgstr "Taispeáin colúi&n mar uimhreacha"
-
-#: ../plugins/itip-formatter/itip-view.c:1183
-msgid "_Preserve my reminder"
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
 msgstr ""
 
-#. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1189
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 #, fuzzy
-msgid "_Inherit reminder"
-msgstr "&Scoránaigh Meabhrúchán"
-
-#: ../plugins/itip-formatter/itip-view.c:1965
-msgid "_Tasks:"
-msgstr "_Tascanna:"
-
-#: ../plugins/itip-formatter/itip-view.c:1967
-msgid "_Memos:"
-msgstr "_Meamraim:"
+msgid "Send e-mail message to mailing list?"
+msgstr "Post sceál do tadhall"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Display \"text/calendar\" MIME parts in mail messages."
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
-#, fuzzy
-msgid "Itip Formatter"
-msgstr "GenericName=Uirlis Fhormáidithe Dioscaí Boga"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "_Send message"
+msgstr "_Seol teachtaireacht"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
-msgstr ""
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+msgid "_Edit message"
+msgstr "Cuir teachtaireacht in _eagar"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
-#, fuzzy
-msgid "This meeting has been delegated"
-msgstr "Cealaíodh an cruinniú seo"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
+msgid "Malformed header"
+msgstr "Ceanntásc míchumtha"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
 msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
 #, fuzzy
-msgid "Beep or play sound file."
-msgstr "Roghnaigh Comhad Fuaime"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable icon in notification area."
-msgstr ""
+msgid "No e-mail action"
+msgstr "Níl aon ghníomh socraithe"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
-msgstr "Ar theacht teachtaireachtaí nua i"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-#, fuzzy
-msgid "Notify new messages for Inbox only."
-msgstr "Bog Teachtaireachtaí go Fillteán"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-#, fuzzy
-msgid "Play sound when new messages arrive."
-msgstr "Ar theacht teachtaireachtaí nua i"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-#, fuzzy
-msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr "Ar theacht teachtaireachtaí nua i"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Show new mail icon in notification area when new messages arrive."
-msgstr ""
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid "Sound file name to be played."
-msgstr ""
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr ""
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-msgid "Use sound theme"
-msgstr ""
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
-msgid "Whether play sound or beep when new messages arrive."
-msgstr ""
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
-msgid "Whether to notify new messages in Inbox folder only."
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
+"\n"
+"Header: {0}"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:391
+#: ../plugins/mail-notification/mail-notification.c:384
+#: ../plugins/mail-notification/mail-notification.c:420
 #, fuzzy, c-format
-msgid ""
-"You have received %d new message\n"
-"in %s."
-msgid_plural ""
-"You have received %d new messages\n"
-"in %s."
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
 msgstr[0] "Oscail &Teachtaireacht i bhFuinneog Nua"
 msgstr[1] "Oscail &Teachtaireacht i bhFuinneog Nua"
 msgstr[2] "Oscail &Teachtaireacht i bhFuinneog Nua"
 msgstr[3] "Oscail &Teachtaireacht i bhFuinneog Nua"
 msgstr[4] "Oscail &Teachtaireacht i bhFuinneog Nua"
 
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:395
+#, fuzzy, c-format
+msgid "From: %s"
+msgstr "Ó %s:"
+
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:416
+#: ../plugins/mail-notification/mail-notification.c:409
 #, c-format
 msgid "Subject: %s"
 msgstr "Ábhar: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:427
-#, fuzzy, c-format
-msgid "You have received %d new message."
-msgid_plural "You have received %d new messages."
-msgstr[0] "Oscail &Teachtaireacht i bhFuinneog Nua"
-msgstr[1] "Oscail &Teachtaireacht i bhFuinneog Nua"
-msgstr[2] "Oscail &Teachtaireacht i bhFuinneog Nua"
-msgstr[3] "Oscail &Teachtaireacht i bhFuinneog Nua"
-msgstr[4] "Oscail &Teachtaireacht i bhFuinneog Nua"
-
-#: ../plugins/mail-notification/mail-notification.c:436
-#: ../plugins/mail-notification/mail-notification.c:444
-#: ../plugins/mail-notification/mail-notification.c:447
-msgid "New email"
-msgstr "Ríomhphost nua"
+#: ../plugins/mail-notification/mail-notification.c:426
+#, fuzzy
+msgid "New email in Evolution"
+msgstr "Evolution á atosú"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:468
+#: ../plugins/mail-notification/mail-notification.c:461
 #, fuzzy, c-format
 msgid "Show %s"
 msgstr "Taispeáin Réimsí"
 
-#: ../plugins/mail-notification/mail-notification.c:673
+#: ../plugins/mail-notification/mail-notification.c:663
 #, fuzzy
 msgid "_Play sound when a new message arrives"
 msgstr "Ar theacht teachtaireachtaí nua i"
 
-#: ../plugins/mail-notification/mail-notification.c:703
+#: ../plugins/mail-notification/mail-notification.c:695
 msgid "_Beep"
 msgstr "_Bíp"
 
-#: ../plugins/mail-notification/mail-notification.c:716
+#: ../plugins/mail-notification/mail-notification.c:708
 msgid "Use sound _theme"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:735
+#: ../plugins/mail-notification/mail-notification.c:727
 #, fuzzy
 msgid "Play _file:"
 msgstr "Seinn comhad _fuaime"
 
-#: ../plugins/mail-notification/mail-notification.c:744
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "Select sound file"
 msgstr "Roghnaigh comhad fuaime"
 
-#: ../plugins/mail-notification/mail-notification.c:801
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Notify new messages for _Inbox only"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:811
+#: ../plugins/mail-notification/mail-notification.c:802
 #, fuzzy
 msgid "Show _notification when a new message arrives"
 msgstr "Ar theacht teachtaireachtaí nua i"
@@ -18188,135 +19836,149 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Ar theacht teachtaireachtaí nua i"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:239
+#: ../plugins/mail-to-task/mail-to-task.c:233
 #, c-format
 msgid "Created from a mail by %s"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:610
+#: ../plugins/mail-to-task/mail-to-task.c:617
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:613
+#: ../plugins/mail-to-task/mail-to-task.c:620
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:633
+#: ../plugins/mail-to-task/mail-to-task.c:643
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:650
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:639
+#: ../plugins/mail-to-task/mail-to-task.c:657
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
-msgstr ""
+msgid_plural ""
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:658
+#: ../plugins/mail-to-task/mail-to-task.c:678
 #, fuzzy
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Ar mhaith leat é a fhorscríobh?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:733
+#: ../plugins/mail-to-task/mail-to-task.c:754
 msgid "[No Summary]"
 msgstr "[Gan Achoimre]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:745
+#: ../plugins/mail-to-task/mail-to-task.c:767
 msgid "Invalid object returned from a server"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:795
+#: ../plugins/mail-to-task/mail-to-task.c:819
 #, fuzzy, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Tharla earráid anaithnid le linn priontála."
 
-#: ../plugins/mail-to-task/mail-to-task.c:820
+#: ../plugins/mail-to-task/mail-to-task.c:852
 #, fuzzy, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ní féidir an comhad %1 a oscailt"
 
-#: ../plugins/mail-to-task/mail-to-task.c:827
+#: ../plugins/mail-to-task/mail-to-task.c:859
 msgid ""
-"Selected source is read only, thus cannot create event there. Select other "
-"source, please."
+"Selected calendar is read only, thus cannot create event there. Select other "
+"calendar, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:830
+#: ../plugins/mail-to-task/mail-to-task.c:862
 msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
+"Selected task list is read only, thus cannot create task there. Select other "
+"task list, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:833
+#: ../plugins/mail-to-task/mail-to-task.c:865
 msgid ""
-"Selected source is read only, thus cannot create memo there. Select other "
-"source, please."
+"Selected memo list is read only, thus cannot create memo there. Select other "
+"memo list, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
-#, fuzzy, c-format
-msgid "Cannot get source list. %s"
-msgstr ""
-"Teip ag cruthaigh comhad aschur: %s:\n"
-" %s"
-
-#: ../plugins/mail-to-task/mail-to-task.c:1145
+#: ../plugins/mail-to-task/mail-to-task.c:1196
 #, fuzzy
 msgid "No writable calendar is available."
 msgstr "Gan chur síos le fáil."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1237
-msgid "Create an _Event"
-msgstr "Cruthaigh T_eagmhas"
+#: ../plugins/mail-to-task/mail-to-task.c:1273
+msgid "Create an _Appointment"
+msgstr "Cruthaigh _Coinne"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1239
+#: ../plugins/mail-to-task/mail-to-task.c:1275
 msgid "Create a new event from the selected message"
 msgstr "Cruthaigh teagmhas nua ón dteachtaireacht roghnaithe"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1244
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create a Mem_o"
 msgstr "Cruthaigh Meamr_am"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1246
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 msgid "Create a new memo from the selected message"
 msgstr "Cruthaigh meamram nua ón dteachtaireacht roghnaithe"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1251
+#: ../plugins/mail-to-task/mail-to-task.c:1287
 msgid "Create a _Task"
 msgstr "Cruthaigh _Tasc"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1253
+#: ../plugins/mail-to-task/mail-to-task.c:1289
 msgid "Create a new task from the selected message"
 msgstr "Cruthaigh tasc nua ón dteachtaireacht roghnaithe"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1297
 msgid "Create a _Meeting"
 msgstr "Cruthaigh _Cruinniú"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1299
 msgid "Create a new meeting from the selected message"
 msgstr "Cruthaigh cruinniú nua ón dteachtaireacht roghnaithe"
 
@@ -18325,271 +19987,53 @@ msgstr "Cruthaigh cruinniú nua ón dteachtaireacht roghnaithe"
 msgid "Convert a mail message to a task."
 msgstr "Post an sceál seo"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:346
-msgid "Get List _Archive"
-msgstr "Faigh C_artlann an Liosta"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:348
-msgid "Get an archive of the list this message belongs to"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:353
-msgid "Get List _Usage Information"
-msgstr "Faigh Eolas Ú_sáide an Liosta"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:355
-msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:360
-msgid "Contact List _Owner"
-msgstr "Déan Teagmháil le hÚ_inéir Liosta"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:362
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
-msgid "_Post Message to List"
-msgstr "_Postáil Teachtaireacht go Liosta"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
-msgid "Post a message to the mailing list this message belongs to"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
-msgid "_Subscribe to List"
-msgstr "_Liostáil le Liosta"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
-msgid "_Unsubscribe from List"
-msgstr "_Díliostáil ó Liosta"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
-msgid "Unsubscribe from the mailing list this message belongs to"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
-msgid "Mailing _List"
-msgstr "Liosta _Postála"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-#, fuzzy
-msgid "Mailing List Actions"
-msgstr "&Liosta ríomhphoist na teanga:"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-msgstr ""
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
-#, fuzzy
-msgid "Action not available"
-msgstr "Níl comhbhrúiteoir ar fáil"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
-msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
-"\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
-msgstr ""
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
-msgid "Malformed header"
-msgstr "Ceanntásc míchumtha"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
-#, fuzzy
-msgid "No e-mail action"
-msgstr "Níl aon ghníomh socraithe"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
-#, fuzzy
-msgid "Posting not allowed"
-msgstr "Ní cheadaítear spásanna"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
-msgstr ""
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
-#, fuzzy
-msgid "Send e-mail message to mailing list?"
-msgstr "Post sceál do tadhall"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
-msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
-"\n"
-"Header: {0}"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
-msgid ""
-"The {0} header of this message is malformed and could not be processed.\n"
-"\n"
-"Header: {1}"
-msgstr ""
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
-msgstr ""
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
-msgid "_Edit message"
-msgstr "Cuir teachtaireacht in _eagar"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
-msgid "_Send message"
-msgstr "_Seol teachtaireacht"
-
-#: ../plugins/mark-all-read/mark-all-read.c:42
-#, fuzzy
-msgid "Also mark messages in subfolders?"
-msgstr "Bog Teachtaireachtaí go Fillteán"
-
-#: ../plugins/mark-all-read/mark-all-read.c:44
-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 ""
-
-#: ../plugins/mark-all-read/mark-all-read.c:215
-#, fuzzy
-msgid "In Current Folder and _Subfolders"
-msgstr "Cruthaigh fillteán"
-
-#: ../plugins/mark-all-read/mark-all-read.c:229
-#, fuzzy
-msgid "In Current _Folder Only"
-msgstr "Fillteán Reatha"
-
-#: ../plugins/mark-all-read/mark-all-read.c:575
-msgid "Mark Me_ssages as Read"
-msgstr "Marcáil _Teachtaireachtaí mar Léite"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
-#, fuzzy
-msgid "Mark All Read"
-msgstr "Marcáil mar léite"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-#, fuzzy
-msgid "Mark all messages in a folder as read."
-msgstr "Marcáil teachtaireachtaí mar &leite ó:"
-
-#. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
-msgid "Plain Text Mode"
-msgstr "Mód Gnáth-Théacs"
-
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-msgid "Prefer Plain Text"
-msgstr "Úsáid Gnáth-Théacs de Rogha"
-
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
-msgid "View mail messages as plain text, even if they contain HTML content."
-msgstr ""
-"Amharc ar theachtaireachtaí poist mar ghnáth-théacs, fiú má tá ábhar HTML "
-"ann."
-
-#: ../plugins/prefer-plain/prefer-plain.c:251
-msgid "Show HTML if present"
-msgstr "Taispeáin HTML má tá sé ann"
-
-#: ../plugins/prefer-plain/prefer-plain.c:252
-msgid "Let Evolution choose the best part to show."
-msgstr ""
-
-#: ../plugins/prefer-plain/prefer-plain.c:255
-#, fuzzy
-msgid "Show plain text if present"
-msgstr "Taispeáin HTML má tá sé ann"
-
-#: ../plugins/prefer-plain/prefer-plain.c:256
-msgid ""
-"Show plain text part, if present, otherwise let Evolution choose the best "
-"part to show."
-msgstr ""
-
-#: ../plugins/prefer-plain/prefer-plain.c:260
-#, fuzzy
-msgid "Only ever show plain text"
-msgstr "Ná taispeáin ach PLAIN"
-
-#: ../plugins/prefer-plain/prefer-plain.c:261
-msgid ""
-"Always show plain text part and make attachments from other parts, if "
-"requested."
-msgstr ""
-
-#: ../plugins/prefer-plain/prefer-plain.c:313
-msgid "Show s_uppressed HTML parts as attachments"
-msgstr ""
-
-#: ../plugins/prefer-plain/prefer-plain.c:333
-msgid "HTML _Mode"
-msgstr "_Mód HTML"
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 #, fuzzy
-msgid "Import Outlook messages from PST file"
-msgstr "Iompórtáil Ó Phost OS X"
-
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
-#, fuzzy
 msgid "Outlook PST import"
 msgstr "Comhphairt Coimriú Evolution"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook personal folders (.pst)"
 msgstr ""
 
-#: ../plugins/pst-import/pst-importer.c:450
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+#, fuzzy
+msgid "Import Outlook messages from PST file"
+msgstr "Iompórtáil Ó Phost OS X"
+
+#: ../plugins/pst-import/pst-importer.c:530
 msgid "_Mail"
 msgstr "_Post"
 
-#: ../plugins/pst-import/pst-importer.c:469
+#: ../plugins/pst-import/pst-importer.c:559
 msgid "Destination folder:"
 msgstr "Sprioc-fhillteán:"
 
-#: ../plugins/pst-import/pst-importer.c:475
+#: ../plugins/pst-import/pst-importer.c:569
 msgid "_Address Book"
 msgstr "Lea_bhar Seoltaí"
 
-#: ../plugins/pst-import/pst-importer.c:476
+#: ../plugins/pst-import/pst-importer.c:574
 msgid "A_ppointments"
 msgstr "_Coinní"
 
-#: ../plugins/pst-import/pst-importer.c:477 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:579 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "T_ascanna"
 
-#: ../plugins/pst-import/pst-importer.c:478
+#: ../plugins/pst-import/pst-importer.c:584
 #, fuzzy
 msgid "_Journal entries"
 msgstr "Iris"
 
-#: ../plugins/pst-import/pst-importer.c:585
+#: ../plugins/pst-import/pst-importer.c:704
 #, fuzzy
 msgid "Importing Outlook data"
 msgstr "Earráid agus Sonraí á nIompórtáil"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:147
-#: ../plugins/publish-calendar/publish-calendar.c:155
-#: ../plugins/publish-calendar/publish-calendar.c:157
+#: ../plugins/publish-calendar/publish-calendar.c:141
+#: ../plugins/publish-calendar/publish-calendar.c:148
 msgid "Calendar Publishing"
 msgstr "Foilsiú Féilirí"
 
@@ -18602,38 +20046,38 @@ msgstr "Suíomhanna"
 msgid "Publish calendars to the web."
 msgstr "Roghnaigh na míreanna atá le priontáil"
 
-#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../plugins/publish-calendar/publish-calendar.c:213
 #: ../plugins/publish-calendar/publish-calendar.c:471
 #, c-format
 msgid "Could not open %s:"
 msgstr "Níorbh fhéidir %s a oscailt:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:218
+#: ../plugins/publish-calendar/publish-calendar.c:215
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Níorbh fhéidir %s a oscailt: Earráid anaithnid"
 
-#: ../plugins/publish-calendar/publish-calendar.c:238
+#: ../plugins/publish-calendar/publish-calendar.c:235
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:240
+#: ../plugins/publish-calendar/publish-calendar.c:237
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:288
+#: ../plugins/publish-calendar/publish-calendar.c:281
 #, c-format
 msgid "Mount of %s failed:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:619
-#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../plugins/publish-calendar/publish-calendar.c:634
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "_Cumasaigh"
 
-#: ../plugins/publish-calendar/publish-calendar.c:767
+#: ../plugins/publish-calendar/publish-calendar.c:784
 #, fuzzy
 msgid "Are you sure you want to remove this location?"
 msgstr "An bhfuil tú cinnte gur main leat an chatagóir seo a bhaint?"
@@ -18641,216 +20085,206 @@ msgstr "An bhfuil tú cinnte gur main leat an chatagóir seo a bhaint?"
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1099
+#: ../plugins/publish-calendar/publish-calendar.c:1123
 #, fuzzy
 msgid "Could not create publish thread."
 msgstr "Níorbh Fhéidir an Teachtaireacht a Sheoladh"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1107
-#, fuzzy
+#: ../plugins/publish-calendar/publish-calendar.c:1133
 msgid "_Publish Calendar Information"
-msgstr "Eolas faoin Fhillteán Líonra"
+msgstr "_Foilsigh Eolas an Fhéilire"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-#, fuzzy
-msgid "Custom Location"
-msgstr "&Fógairt an Chórais"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+msgid "iCal"
+msgstr "iCal"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:3
 msgid "Daily"
-msgstr ""
+msgstr "Laethúil"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "Weekly"
+msgstr "Seachtainiúil"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:5
-msgid "FTP (with login)"
+msgid "Manual (via Actions menu)"
 msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:9
-msgid "Manual (via Actions menu)"
-msgstr ""
+msgid "Secure FTP (SFTP)"
+msgstr "Secure FTP (SFTP)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+msgid "Public FTP"
+msgstr "FTP Poiblí"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:11
-msgid "P_ort:"
-msgstr "_Port:"
+msgid "FTP (with login)"
+msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:12
-#, fuzzy
-msgid "Public FTP"
-msgstr "Poiblí"
+msgid "Windows share"
+msgstr "Comhroinnt Windows"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:13
-#, fuzzy
-msgid "Publishing Location"
-msgstr "Suíomh réamhshocraithe foilsithe"
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:14
-#, fuzzy
-msgid "Publishing _Frequency:"
-msgstr "Minicíocht an Chloig"
+msgid "Secure WebDAV (HTTPS)"
+msgstr "WebDAV Daingean (HTTPS)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:15
-msgid "Secure FTP (SSH)"
-msgstr ""
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
-msgid "Secure WebDAV (HTTPS)"
-msgstr ""
+msgid "Custom Location"
+msgstr "Suíomh Saincheaptha"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:17
-#, fuzzy
-msgid "Service _type:"
-msgstr "Cineál na Seirbhíse"
+msgid "_Publish as:"
+msgstr "_Foilsigh mar:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
 #, fuzzy
-msgid "Sources"
-msgstr "Foinse"
+msgid "Publishing _Frequency:"
+msgstr "Minicíocht an Chloig"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
-#, fuzzy
 msgid "Time _duration:"
-msgstr "Am _Críos:"
+msgstr "_Fad ama:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:20
-#, fuzzy
-msgid "WebDAV (HTTP)"
-msgstr "WebDAV"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-#, fuzzy
-msgid "Weekly"
-msgstr "Seachtain"
+msgid "Sources"
+msgstr "Foinsí"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#, fuzzy
-msgid "Windows share"
-msgstr "_Fuinneog"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+msgid "Service _type:"
+msgstr "_Cineál seirbhíse:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_File:"
 msgstr "_Comhad:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+msgid "P_ort:"
+msgstr "_Port:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+msgid "_Username:"
+msgstr "_Ainm úsáideora:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Password:"
 msgstr "_Focal faire:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
-msgid "_Publish as:"
-msgstr "_Foilsigh mar:"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "_Remember password"
 msgstr "_Meabhraigh focal faire"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29
-msgid "_Username:"
-msgstr "_Ainm úsáideora:"
-
 #: ../plugins/publish-calendar/publish-calendar.ui.h:31
-msgid "iCal"
-msgstr "iCal"
+msgid "Publishing Location"
+msgstr "Suíomh Foilsithe"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:95
-#: ../plugins/publish-calendar/publish-format-ical.c:92
-#, c-format
-msgid "Could not publish calendar: Calendar backend no longer exists"
-msgstr ""
+#: ../plugins/publish-calendar/publish-format-fb.c:100
+#: ../plugins/publish-calendar/publish-format-ical.c:98
+#, fuzzy, c-format
+msgid "Invalid source UID '%s'"
+msgstr "Fillteán neamhbhailí: `%s'"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:518
+#: ../plugins/publish-calendar/url-editor-dialog.c:540
 msgid "New Location"
 msgstr "Suíomh Nua"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:520
+#: ../plugins/publish-calendar/url-editor-dialog.c:542
 msgid "Edit Location"
 msgstr "Cuir Suíomh in Eagar"
 
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:168
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:377
 #, fuzzy
 msgid "Description List"
 msgstr "Liosta Cainéal"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Categories List"
 msgstr "Liosta Catagóirí"
 
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Comment List"
 msgstr "Liosta Nótaí"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Contact List"
 msgstr "Liosta Teagmhálacha"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Start"
 msgstr "Tús"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "End"
 msgstr "Deireadh"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Due"
 msgstr "Spriocdháta"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:386
 #, fuzzy
 msgid "percent Done"
 msgstr "Á Shábháil... Críochnaithe"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:389
 #, fuzzy
 msgid "Attendees List"
 msgstr "Liosta Cainéal"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "Modified"
 msgstr "Athraithe"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:566
 msgid "A_dvanced options for the CSV format"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:574
 #, fuzzy
 msgid "Prepend a _header"
 msgstr "Priontáil an &ceanntásc"
 
-#: ../plugins/save-calendar/csv-format.c:590
+#: ../plugins/save-calendar/csv-format.c:583
 #, fuzzy
 msgid "_Value delimiter:"
 msgstr "&Teormharcóir idir eochairfhocail:"
 
-#: ../plugins/save-calendar/csv-format.c:601
+#: ../plugins/save-calendar/csv-format.c:594
 #, fuzzy
 msgid "_Record delimiter:"
 msgstr "&Teormharcóir idir eochairfhocail:"
 
-#: ../plugins/save-calendar/csv-format.c:612
+#: ../plugins/save-calendar/csv-format.c:605
 #, fuzzy
 msgid "_Encapsulate values with:"
 msgstr "RockRidge le díth ainm"
 
-#: ../plugins/save-calendar/csv-format.c:638
+#: ../plugins/save-calendar/csv-format.c:631
 #, fuzzy
 msgid "Comma separated values (.csv)"
 msgstr "Comhad 'luachanna deighilte le camóga' (*.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+#: ../plugins/save-calendar/ical-format.c:171 ../shell/e-shell-utils.c:175
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -18868,439 +20302,81 @@ msgstr "Sábháil an tadhallaí seo mar VCard."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:156
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:389
+#: ../plugins/save-calendar/rdf-format.c:386
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:127
+#: ../plugins/save-calendar/save-calendar.c:121
 msgid "_Format:"
 msgstr "_Formáid:"
 
-#: ../plugins/save-calendar/save-calendar.c:189
+#: ../plugins/save-calendar/save-calendar.c:187
 msgid "Select destination file"
 msgstr "Roghnaigh sprioc-chomhad"
 
-#: ../plugins/save-calendar/save-calendar.c:344
+#: ../plugins/save-calendar/save-calendar.c:343
 #, fuzzy
 msgid "Save the selected calendar to disk"
 msgstr "Post an sceál seo"
 
-#: ../plugins/save-calendar/save-calendar.c:375
+#: ../plugins/save-calendar/save-calendar.c:374
 #, fuzzy
 msgid "Save the selected memo list to disk"
 msgstr "Post an sceál seo"
 
-#: ../plugins/save-calendar/save-calendar.c:406
+#: ../plugins/save-calendar/save-calendar.c:405
 #, fuzzy
 msgid "Save the selected task list to disk"
 msgstr "Sábháil an tadhallaí seo mar VCard."
 
-#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
-msgstr ""
-
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
 "an email you are replying to."
 msgstr ""
 
-#: ../plugins/templates/templates.c:1094
+#: ../plugins/templates/templates.c:1148
 #, fuzzy
 msgid "No Title"
 msgstr "Gan teideal"
 
-#: ../plugins/templates/templates.c:1195
+#: ../plugins/templates/templates.c:1257
 msgid "Save as _Template"
 msgstr "Sábháil mar T_heimpléad"
 
-#: ../plugins/templates/templates.c:1197
+#: ../plugins/templates/templates.c:1259
 msgid "Save as Template"
 msgstr "Sábháil mar Theimpléad"
 
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr ""
-
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-#, fuzzy
-msgid "TNEF Decoder"
-msgstr ""
-"Iatán neamhbhailí ríomhphoist:\n"
-"%1"
-
-#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
-#, fuzzy
-msgid "Inline vCards"
-msgstr "vCardanna Iomadúla"
-
-#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
-msgid "Show vCards directly in mail messages."
-msgstr ""
-
-#: ../plugins/vcard-inline/vcard-inline.c:207
-#: ../plugins/vcard-inline/vcard-inline.c:292
-#, fuzzy
-msgid "Show Full vCard"
-msgstr "Taispeáin/Folaigh vCárta"
-
-#: ../plugins/vcard-inline/vcard-inline.c:210
-#, fuzzy
-msgid "Show Compact vCard"
-msgstr "Taispeáin/Folaigh vCárta"
-
-#: ../plugins/vcard-inline/vcard-inline.c:271
-#, fuzzy
-msgid "There is one other contact."
-msgstr "E427: Tá aon chlib chomhoiriúnach amháin"
-
-#: ../plugins/vcard-inline/vcard-inline.c:280
-#, fuzzy, c-format
-msgid "There is %d other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "E427: Tá aon chlib chomhoiriúnach amháin"
-msgstr[1] "agus aon carta eile."
-
-#: ../plugins/vcard-inline/vcard-inline.c:301
-msgid "Save in Address Book"
-msgstr "Sábháil sa Leabhar Seoltaí"
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "Add WebDAV contacts to Evolution."
-msgstr ""
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
-msgid "WebDAV contacts"
-msgstr "Teagmhálacha WebDAV"
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
-msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "Authenticate proxy server connections"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
+#: ../shell/e-shell.c:278
 #, fuzzy
-msgid "Automatic proxy configuration URL"
-msgstr "Aithint uathoibríoch cineálacha"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Configuration version"
-msgstr "Leagan cumraíochta"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Default sidebar width"
-msgstr "Leithead barra taoibh réamhshocraithe"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-#, fuzzy
-msgid "Default window X coordinate"
-msgstr "Staid fhuinneog réamhshocraithe"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:6
-#, fuzzy
-msgid "Default window Y coordinate"
-msgstr "Staid fhuinneog réamhshocraithe"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:7
-msgid "Default window height"
-msgstr "Airde fhuinneog réamhshocraithe"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid "Default window state"
-msgstr "Staid fhuinneog réamhshocraithe"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:9
-msgid "Default window width"
-msgstr "Leithead fuinneog réamhshocraithe"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:10
-#, fuzzy
-msgid "Enable express mode"
-msgstr "Cumasaigh fillteáin cuardaigh"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-msgid "Flag that enables a much simplified user interface."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "HTTP proxy host name"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14
-#, fuzzy
-msgid "HTTP proxy password"
-msgstr "Iontráil focal faire"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "HTTP proxy port"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "HTTP proxy username"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:19
-#, fuzzy
-msgid "Initial attachment view"
-msgstr "&Oscail Iatán"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-#, fuzzy
-msgid "Initial file chooser folder"
-msgstr "Cuir comhfhillteáin leis"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Initial folder for GtkFileChooser dialogs."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:22
-msgid ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:23
-#, fuzzy
-msgid "Last upgraded configuration version"
-msgstr "Tá an leagan mícheart i gcomhad na cumraíochta."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:25
-msgid "Non-proxy hosts"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:26
-msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:27
-#, fuzzy
-msgid "Proxy configuration mode"
-msgstr "Cumraíocht"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "SOCKS proxy host name"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "SOCKS proxy port"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-msgid "Secure HTTP proxy host name"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:31
-msgid "Secure HTTP proxy port"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:32
-msgid ""
-"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
-"representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig url"
-"\" respectively."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:33
-#, fuzzy
-msgid "Sidebar is visible"
-msgstr "Tá an barra taoibh suiteáilte."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:34
-#, fuzzy
-msgid "Skip development warning dialog"
-msgstr "Tabhair foláireamh dom agus mé ar tí:"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
-msgid "Start in offline mode"
-msgstr "Tosaigh i mód as líne"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:36
-msgid "Statusbar is visible"
-msgstr "Tá an barra stádais infheicthe"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:38
-#, fuzzy
-msgid "The default X coordinate for the main window."
-msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:39
-#, fuzzy
-msgid "The default Y coordinate for the main window."
-msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid "The default height for the main window, in pixels."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid "The default width for the main window, in pixels."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:42
-msgid "The default width for the sidebar, in pixels."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The machine name to proxy HTTP through."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:45
-msgid "The machine name to proxy secure HTTP through."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:46
-msgid "The machine name to proxy socks through."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:47
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:48
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:52
-#, fuzzy
-msgid "Toolbar is visible"
-msgstr "($Arg1) dofheicthe"
+msgid "Preparing to go offline..."
+msgstr "Míreanna le húsáid as líne"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/e-shell.c:331
 #, fuzzy
-msgid "URL that provides proxy configuration values."
-msgstr "Tá an leagan mícheart i gcomhad na cumraíochta."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Use HTTP proxy"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Username to pass as authentication when doing HTTP proxying."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
+msgid "Preparing to go online..."
+msgstr "Míreanna le húsáid as líne"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/e-shell.c:412
 #, fuzzy
-msgid "Whether or not the window should be maximized."
-msgstr "Cé acu atá an phríomhfhuinneog uasmhéadaithe nó nach bhfuil."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:58
-msgid "Whether the sidebar should be visible."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:59
-msgid "Whether the status bar should be visible."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:60
-msgid "Whether the toolbar should be visible."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
+msgid "Preparing to quit"
+msgstr "Míreanna le húsáid as líne"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:62
-msgid "Whether the window buttons should be visible."
+#: ../shell/e-shell.c:418
+msgid "Preparing to quit..."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:63
-#, fuzzy
-msgid "Window button style"
-msgstr "Roghnaigh stíl chnaipe"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:64
-#, fuzzy
-msgid "Window buttons are visible"
-msgstr "Níl aon teachtaireacht chlibeáilte le feiceáil!"
-
-#: ../shell/e-shell-content.c:728 ../shell/e-shell-content.c:729
+#: ../shell/e-shell-content.c:719 ../shell/e-shell-content.c:720
 msgid "Searches"
 msgstr "Cuardaigh"
 
-#: ../shell/e-shell-content.c:772
+#: ../shell/e-shell-content.c:763
 msgid "Save Search"
 msgstr "Sábháil Cuardach"
 
@@ -19308,351 +20384,333 @@ msgstr "Sábháil Cuardach"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:938
+#: ../shell/e-shell-searchbar.c:1102
 msgid "Sho_w:"
 msgstr "_Taispeáin:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:971
+#: ../shell/e-shell-searchbar.c:1136
 msgid "Sear_ch:"
 msgstr "C_uardaigh:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1034
+#: ../shell/e-shell-searchbar.c:1217
 msgid "i_n"
 msgstr "_i"
 
-#: ../shell/e-shell-utils.c:223
+#: ../shell/e-shell-utils.c:173
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:246
+#: ../shell/e-shell-utils.c:196
 msgid "All Files (*)"
 msgstr "Gach Comhad (*)"
 
-#: ../shell/e-shell-view.c:296
+#: ../shell/e-shell-view.c:292
 msgid "Saving user interface state"
 msgstr ""
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:645
+#: ../shell/e-shell-window-actions.c:74
 msgid "translator-credits"
 msgstr ""
 "Alastair McKinstry <mckinstry computer org>\n"
 "David O'Callaghan <david ocallaghan cs tcd ie>\n"
 "Seán de Búrca <leftmostcat gmail com>"
 
-#: ../shell/e-shell-window-actions.c:656
+#: ../shell/e-shell-window-actions.c:85
 msgid "Evolution Website"
 msgstr "Suíomh Gréasáin Evolution"
 
-#: ../shell/e-shell-window-actions.c:902
+#: ../shell/e-shell-window-actions.c:341
 #, fuzzy
 msgid "Categories Editor"
 msgstr "Liosta Catagóirí"
 
-#: ../shell/e-shell-window-actions.c:1237
+#: ../shell/e-shell-window-actions.c:672
 #, fuzzy
 msgid "Bug Buddy is not installed."
 msgstr "Níl bug-buddy suiteáilte."
 
-#: ../shell/e-shell-window-actions.c:1239
+#: ../shell/e-shell-window-actions.c:673
 #, fuzzy
 msgid "Bug Buddy could not be run."
 msgstr "Níorbh fhéidir bug-buddy a rith."
 
-#: ../shell/e-shell-window-actions.c:1420
+#: ../shell/e-shell-window-actions.c:853
 msgid "Show information about Evolution"
 msgstr "Taispeáin eolas faoi Evolution"
 
-#: ../shell/e-shell-window-actions.c:1425
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:858 ../shell/e-shell-window-actions.c:872
 msgid "_Close Window"
 msgstr "_Dún Fuinneog"
 
-#: ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:879
 msgid "_Contents"
 msgstr "_Inneachar"
 
-#: ../shell/e-shell-window-actions.c:1448
+#: ../shell/e-shell-window-actions.c:881
 #, fuzzy
 msgid "Open the Evolution User Guide"
 msgstr "Oscail Fillteán Úsáideora Eile"
 
-#: ../shell/e-shell-window-actions.c:1474
-msgid "_Forget Passwords"
-msgstr "Déan D_earmad ar na Focail Faire"
-
-#: ../shell/e-shell-window-actions.c:1476
-#, fuzzy
-msgid "Forget all remembered passwords"
-msgstr "_Meabhraigh focal faire"
-
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:907
 msgid "I_mport..."
 msgstr "_Iompórtáil..."
 
-#: ../shell/e-shell-window-actions.c:1483
+#: ../shell/e-shell-window-actions.c:909
 msgid "Import data from other programs"
 msgstr "Iompórtáil sonraí ó chláir eile"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:914
 msgid "New _Window"
 msgstr "_Fuinneog Nua"
 
-#: ../shell/e-shell-window-actions.c:1490
+#: ../shell/e-shell-window-actions.c:916
 msgid "Create a new window displaying this view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1502
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:928
 msgid "Available Cate_gories"
-msgstr "Réimsí ar Fáil"
+msgstr "Catagóirí le Fáil"
 
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:930
 msgid "Manage available categories"
-msgstr ""
+msgstr "Bainistigh na catagóirí le fáil"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:942
 msgid "_Quick Reference"
 msgstr "Carta Tagartha _Tapa"
 
-#: ../shell/e-shell-window-actions.c:1518
+#: ../shell/e-shell-window-actions.c:944
 #, fuzzy
 msgid "Show Evolution's shortcut keys"
 msgstr "Athraigh socruithe Evolution"
 
-#: ../shell/e-shell-window-actions.c:1525
+#: ../shell/e-shell-window-actions.c:951
 msgid "Exit the program"
 msgstr "Scoir an ríomhchlár"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:956
 msgid "_Advanced Search..."
 msgstr "Cuardach C_asta..."
 
-#: ../shell/e-shell-window-actions.c:1532
+#: ../shell/e-shell-window-actions.c:958
 msgid "Construct a more advanced search"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1539
+#: ../shell/e-shell-window-actions.c:965
 #, fuzzy
 msgid "Clear the current search parameters"
 msgstr "Cuardaigh i gcónaí"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:970
 msgid "_Edit Saved Searches..."
 msgstr "Cuir Cuardaigh Sábháilte in _Eagar..."
 
-#: ../shell/e-shell-window-actions.c:1546
+#: ../shell/e-shell-window-actions.c:972
 #, fuzzy
 msgid "Manage your saved searches"
 msgstr "Bainstigh do chuid ríomhphoist, do chuid teagmhálacha agus do sceideal"
 
-#: ../shell/e-shell-window-actions.c:1553
+#: ../shell/e-shell-window-actions.c:979
 msgid "Click here to change the search type"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:984
 msgid "_Find Now"
 msgstr "_Aimsigh Anois"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1560
+#: ../shell/e-shell-window-actions.c:986
 #, fuzzy
 msgid "Execute the current search parameters"
 msgstr "Cealaigh an oibríocht phoist reatha"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:991
 msgid "_Save Search..."
 msgstr "_Sábháil Cuardach..."
 
-#: ../shell/e-shell-window-actions.c:1567
+#: ../shell/e-shell-window-actions.c:993
 #, fuzzy
 msgid "Save the current search parameters"
 msgstr "Sábháil an comhad reatha"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1005
 msgid "Submit _Bug Report..."
 msgstr "Seol Tuairisc faoi _Fhabht..."
 
-#: ../shell/e-shell-window-actions.c:1581
+#: ../shell/e-shell-window-actions.c:1007
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1012
 msgid "_Work Offline"
 msgstr "_Oibrigh as Líne"
 
-#: ../shell/e-shell-window-actions.c:1588
+#: ../shell/e-shell-window-actions.c:1014
 #, fuzzy
 msgid "Put Evolution into offline mode"
 msgstr "Tosaigh i mód as líne"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1019
 msgid "_Work Online"
 msgstr "_Oibrigh ar Líne"
 
-#: ../shell/e-shell-window-actions.c:1595
+#: ../shell/e-shell-window-actions.c:1021
 #, fuzzy
 msgid "Put Evolution into online mode"
 msgstr "Tosaigh i mód ar líne"
 
-#: ../shell/e-shell-window-actions.c:1623
+#: ../shell/e-shell-window-actions.c:1049
 msgid "Lay_out"
 msgstr "Leagan _Amach"
 
-#: ../shell/e-shell-window-actions.c:1630
+#: ../shell/e-shell-window-actions.c:1056
 msgid "_New"
 msgstr "_Nua"
 
-#: ../shell/e-shell-window-actions.c:1637
+#: ../shell/e-shell-window-actions.c:1063
 msgid "_Search"
 msgstr "Cuar_daigh"
 
-#: ../shell/e-shell-window-actions.c:1644
+#: ../shell/e-shell-window-actions.c:1070
 msgid "_Switcher Appearance"
 msgstr "Cuma _Athraitheora"
 
-#: ../shell/e-shell-window-actions.c:1658
+#: ../shell/e-shell-window-actions.c:1084
 msgid "_Window"
 msgstr "_Fuinneog"
 
-#: ../shell/e-shell-window-actions.c:1687
+#: ../shell/e-shell-window-actions.c:1113
 msgid "Show Side _Bar"
 msgstr "Taispeáin _Barra Taoibh"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1115
 #, fuzzy
 msgid "Show the side bar"
 msgstr "Taispeáin _Barra Taoibh"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1121
 msgid "Show _Buttons"
 msgstr "Taispeán _Cnaipí"
 
-#: ../shell/e-shell-window-actions.c:1697
+#: ../shell/e-shell-window-actions.c:1123
 msgid "Show the switcher buttons"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1703
+#: ../shell/e-shell-window-actions.c:1129
 msgid "Show _Status Bar"
 msgstr "Taispeáin Barra _Stádais"
 
-#: ../shell/e-shell-window-actions.c:1705
+#: ../shell/e-shell-window-actions.c:1131
 msgid "Show the status bar"
 msgstr "Taispeáin an barra stádais"
 
-#: ../shell/e-shell-window-actions.c:1711
+#: ../shell/e-shell-window-actions.c:1137
 msgid "Show _Tool Bar"
 msgstr "Taispeáin Barra _Uirlisí"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1139
 msgid "Show the tool bar"
 msgstr "Taispeáin an barra uirlisí"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1161
 msgid "_Icons Only"
 msgstr "_Deilbhíní Amháin"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1163
 msgid "Display window buttons with icons only"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1742
+#: ../shell/e-shell-window-actions.c:1168
 msgid "_Text Only"
 msgstr "_Téacs Amháin"
 
-#: ../shell/e-shell-window-actions.c:1744
+#: ../shell/e-shell-window-actions.c:1170
 msgid "Display window buttons with text only"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Icons _and Text"
 msgstr "Deilbhíní _agus Téacs"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1177
 msgid "Display window buttons with icons and text"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Tool_bar Style"
 msgstr "Stíl _Bharra Uirlisí"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1184
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1766
-msgid "Define Views..."
-msgstr "Sainmhínigh Amhairc..."
-
-#: ../shell/e-shell-window-actions.c:1768
-msgid "Create or edit views"
-msgstr "Cruthaigh amhairc nó cuir iad in eagar"
+#: ../shell/e-shell-window-actions.c:1192
+#, fuzzy
+msgid "Delete Current View"
+msgstr "Sábháil Amharc Reatha"
 
-#: ../shell/e-shell-window-actions.c:1773
+#: ../shell/e-shell-window-actions.c:1199
 msgid "Save Custom View..."
 msgstr "Sábháil Amharc Saincheaptha..."
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1201
 msgid "Save current custom view"
 msgstr "Sábháil amharc saincheaptha reatha"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1208
 msgid "C_urrent View"
 msgstr "Amharc _Reatha"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Custom View"
 msgstr "Amharc Saincheaptha"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1220
 msgid "Current view is a customized view"
 msgstr "Is amharc saincheaptha é an t-amharc reatha"
 
-#: ../shell/e-shell-window-actions.c:1804
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Change the page settings for your current printer"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:2194
+#: ../shell/e-shell-window-actions.c:1591
 #, c-format
 msgid "Switch to %s"
 msgstr "Athraigh go %s"
 
-#: ../shell/e-shell-window-actions.c:2414
+#: ../shell/e-shell-window-actions.c:1714
+#, fuzzy, c-format
+msgid "Select view: %s"
+msgstr "Roghnaigh Comhad"
+
+#: ../shell/e-shell-window-actions.c:1731
+#, fuzzy, c-format
+msgid "Delete view: %s"
+msgstr "_Scrios Teachtaireacht"
+
+#: ../shell/e-shell-window-actions.c:1825
 msgid "Execute these search parameters"
 msgstr ""
 
+#: ../shell/e-shell-window.c:455
+msgid "New"
+msgstr "Nua"
+
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:584
+#: ../shell/e-shell-window-private.c:580
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:442
-msgid "New"
-msgstr "Nua"
-
-#: ../shell/e-shell.c:361
-#, fuzzy
-msgid "Preparing to go offline..."
-msgstr "Míreanna le húsáid as líne"
-
-#: ../shell/e-shell.c:414
-#, fuzzy
-msgid "Preparing to go online..."
-msgstr "Míreanna le húsáid as líne"
-
-#: ../shell/e-shell.c:476
-msgid "Preparing to quit..."
-msgstr ""
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:195
+#: ../shell/main.c:183
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19689,7 +20747,7 @@ msgstr ""
 "Tá súil againn go mbaineann tú sult as torthaí ár n-obair dian, agus\n"
 "fanaimid go díocasach le do chuid rannchuidithe!\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19697,120 +20755,82 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: ../shell/main.c:226
+#: ../shell/main.c:213
 msgid "Do not tell me again"
 msgstr "Ná tabhair rabhadh dom arís"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:308
+#: ../shell/main.c:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr ""
 
-#: ../shell/main.c:312
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr ""
 
-#: ../shell/main.c:316
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr "Tosaigh i mód ar líne"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:312
 msgid "Ignore network availability"
 msgstr ""
 
-#: ../shell/main.c:320
-#, fuzzy
-msgid "Start in \"express\" mode"
-msgstr "Tosaigh i mód ar líne"
-
-#: ../shell/main.c:323
+#: ../shell/main.c:315
 #, fuzzy
 msgid "Forcibly shut down Evolution"
 msgstr "Evolution á mhúchadh"
 
-#: ../shell/main.c:326
-msgid "Send the debugging output of all components to a file."
-msgstr ""
-
-#: ../shell/main.c:328
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "Díchumasaigh luchtú aon bhreiseáin."
 
-#: ../shell/main.c:330
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 
-#: ../shell/main.c:334
-msgid "Import URIs or file names given as rest of arguments."
+#: ../shell/main.c:324
+msgid "Import URIs or filenames given as rest of arguments."
 msgstr ""
 
-#: ../shell/main.c:336
+#: ../shell/main.c:326
 #, fuzzy
 msgid "Request a running Evolution process to quit"
 msgstr "Evolution á atosú"
 
-#: ../shell/main.c:512 ../shell/main.c:520
+#: ../shell/main.c:403
+#, c-format
+msgid ""
+"Cannot start Evolution.  Another Evolution instance may be unresponsive. "
+"System error: %s"
+msgstr ""
+
+#: ../shell/main.c:499 ../shell/main.c:504
 msgid "- The Evolution PIM and Email Client"
 msgstr "- An Cliaint PIM agus Poist Evolution"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:571
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
 
-#: ../shell/main.c:589
+#: ../shell/main.c:577
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:1
-msgid "Are you sure you want to forget all remembered passwords?"
-msgstr ""
-
 #: ../shell/shell.error.xml.h:2
-#, fuzzy
-msgid "Cannot upgrade directly from version {0}"
-msgstr "  -P,  --directory-prefix=RÉIMÍR  sábháil comhaid i RÉIMÍR/...\n"
-
-#: ../shell/shell.error.xml.h:3
-#, fuzzy
-msgid "Continue Anyway"
-msgstr "Ar Aghaidh"
-
-#: ../shell/shell.error.xml.h:4
-msgid ""
-"Evolution no longer supports upgrading directly from version {0}. However as "
-"a workaround you might try first upgrading to Evolution 2, and then "
-"upgrading to Evolution 3."
-msgstr ""
-
-#: ../shell/shell.error.xml.h:5
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-
-#: ../shell/shell.error.xml.h:7
-#, fuzzy
-msgid "Quit Now"
-msgstr "_Scoir"
-
-#: ../shell/shell.error.xml.h:8
 msgid "Upgrade from previous version failed:"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:9
-msgid "_Forget"
-msgstr "Déan D_earmad"
-
-#: ../shell/shell.error.xml.h:10
+#: ../shell/shell.error.xml.h:3
 msgid ""
 "{0}\n"
 "\n"
@@ -19818,95 +20838,29 @@ msgid ""
 "data.\n"
 msgstr ""
 
-#: ../shell/test/e-test-shell-backend.c:56
-#, fuzzy
-msgctxt "New"
-msgid "_Test Item"
-msgstr "_Tástáil"
-
-#: ../shell/test/e-test-shell-backend.c:58
-#, fuzzy
-msgid "Create a new test item"
-msgstr "Roghnaigh Cineál na Míre Nuaí"
-
-#: ../shell/test/e-test-shell-backend.c:66
-#, fuzzy
-msgctxt "New"
-msgid "Test _Source"
-msgstr "Acmhainn"
-
-#: ../shell/test/e-test-shell-backend.c:68
+#: ../shell/shell.error.xml.h:7
 #, fuzzy
-msgid "Create a new test source"
-msgstr "Roghnaigh Cineál na Míre Nuaí"
-
-#: ../smclient/eggdesktopfile.c:166
-#, c-format
-msgid "File is not a valid .desktop file"
-msgstr ""
-
-#: ../smclient/eggdesktopfile.c:189
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr ""
-
-#: ../smclient/eggdesktopfile.c:959
-#, fuzzy, c-format
-msgid "Starting %s"
-msgstr "%s á scanadh"
-
-#: ../smclient/eggdesktopfile.c:1102
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr ""
-
-#: ../smclient/eggdesktopfile.c:1170
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr ""
-
-#: ../smclient/eggdesktopfile.c:1370
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
-
-#: ../smclient/eggdesktopfile.c:1391
-#, c-format
-msgid "Not a launchable item"
-msgstr ""
-
-#: ../smclient/eggsmclient.c:226
-msgid "Disable connection to session manager"
-msgstr ""
+msgid "Continue Anyway"
+msgstr "Ar Aghaidh"
 
-#: ../smclient/eggsmclient.c:229
+#: ../shell/shell.error.xml.h:8
 #, fuzzy
-msgid "Specify file containing saved configuration"
-msgstr "Socrú cumraíocht Pilot"
-
-#: ../smclient/eggsmclient.c:229
-msgid "FILE"
-msgstr ""
-
-#: ../smclient/eggsmclient.c:232
-msgid "Specify session management ID"
-msgstr ""
+msgid "Quit Now"
+msgstr "_Scoir"
 
-#: ../smclient/eggsmclient.c:232
+#: ../shell/shell.error.xml.h:9
 #, fuzzy
-msgid "ID"
-msgstr "UID"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "  -P,  --directory-prefix=RÉIMÍR  sábháil comhaid i RÉIMÍR/...\n"
 
-#: ../smclient/eggsmclient.c:253
-msgid "Session management options:"
+#: ../shell/shell.error.xml.h:10
+msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
 msgstr ""
 
-#: ../smclient/eggsmclient.c:254
-#, fuzzy
-msgid "Show session management options"
-msgstr "Taispeáin cineál na híomhá"
-
-#: ../smime/gui/ca-trust-dialog.c:107
+#: ../smime/gui/ca-trust-dialog.c:109
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19914,28 +20868,6 @@ msgid ""
 "Edit trust settings:"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:146
-#, fuzzy
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"Mar nach bhfuil muinín agat as an údarás teastais a d'eisigh an teastas seo, "
-"níl muinín agat as fordheimhniú an teastais seo ach amháin má léiríonn tú "
-"anseo é."
-
-#: ../smime/gui/cert-trust-dialog.c:150
-#, fuzzy
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-"Mar nach bhfuil aithne agat ar an údarás teastais a d'eisigh an teastas seo, "
-"níl muinín agat as fordheimhniú an teastais seo ach amháin má léiríonn tú a "
-"mhalairt anseo."
-
 #: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
 #: ../smime/gui/certificate-manager.c:112
 msgid "Certificate Name"
@@ -19952,8 +20884,8 @@ msgid "Issued To Organizational Unit"
 msgstr "Aonad an Eagrais (Organizational Unit, OU)"
 
 #: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-viewer.c:638 ../smime/lib/e-asn1-object.c:134
 msgid "Serial Number"
 msgstr "Sraithuimhir"
 
@@ -19963,7 +20895,8 @@ msgid "Purposes"
 msgstr "Aidhmeanna"
 
 #: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/certificate-manager.c:116
+#: ../smime/gui/certificate-viewer.c:640
 #, fuzzy
 msgid "Issued By"
 msgstr "Eisithe ar an"
@@ -19996,13 +20929,15 @@ msgstr "As feidhm"
 
 #: ../smime/gui/certificate-manager.c:83
 #: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-viewer.c:650
 msgid "SHA1 Fingerprint"
 msgstr "Méarlorg SHA1"
 
 #: ../smime/gui/certificate-manager.c:84
 #: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-viewer.c:651
 msgid "MD5 Fingerprint"
 msgstr "Méarlorg MD5"
 
@@ -20012,429 +20947,437 @@ msgstr "Méarlorg MD5"
 msgid "Email Address"
 msgstr "_Seoladh Ríomhphoist:"
 
-#: ../smime/gui/certificate-manager.c:575
+#: ../smime/gui/certificate-manager.c:614
 #, fuzzy
 msgid "Select a certificate to import..."
 msgstr "Roghnaigh an Catalóg le hIompórtáil"
 
-#: ../smime/gui/certificate-manager.c:588
+#: ../smime/gui/certificate-manager.c:628
 msgid "All files"
 msgstr "Gach comhad"
 
-#: ../smime/gui/certificate-manager.c:623
+#: ../smime/gui/certificate-manager.c:664
 #, fuzzy
 msgid "Failed to import certificate"
 msgstr "Iompórtáladh Teastas"
 
-#: ../smime/gui/certificate-manager.c:991
+#: ../smime/gui/certificate-manager.c:1046
 msgid "All PKCS12 files"
 msgstr "Gach comhad PKCS12"
 
-#: ../smime/gui/certificate-manager.c:1009
+#: ../smime/gui/certificate-manager.c:1063
 #, fuzzy
 msgid "All email certificate files"
 msgstr ""
 "*.kat|Comhaid Katalog\n"
 "*|Gach Comhad"
 
-#: ../smime/gui/certificate-manager.c:1027
+#: ../smime/gui/certificate-manager.c:1080
 #, fuzzy
 msgid "All CA certificate files"
 msgstr ""
 "*.kat|Comhaid Katalog\n"
 "*|Gach Comhad"
 
-#: ../smime/gui/certificate-viewer.c:345
-#, c-format
-msgid "Certificate Viewer: %s"
-msgstr "Amharcán Teastais: %s"
+#: ../smime/gui/certificate-viewer.c:292
+#, fuzzy
+msgid "Not part of certificate"
+msgstr "<Ní ina chuid den Teastas>"
 
-#: ../smime/gui/component.c:50
+#: ../smime/gui/certificate-viewer.c:600
+#, fuzzy
+msgid "This certificate has been verified for the following uses:"
+msgstr "Tá an teastas seo fíoraithe do na húsáidí seo a leanas:"
+
+#: ../smime/gui/certificate-viewer.c:604 ../smime/lib/e-asn1-object.c:387
+msgid "SSL Client Certificate"
+msgstr "Teastas Cliaint SSL"
+
+#: ../smime/gui/certificate-viewer.c:609 ../smime/lib/e-asn1-object.c:391
+msgid "SSL Server Certificate"
+msgstr "Teastas Freastalaí SSL"
+
+#: ../smime/gui/certificate-viewer.c:614
+#, fuzzy
+msgid "Email Signer Certificate"
+msgstr "Teastas sínitheora ríomhphoist"
+
+#: ../smime/gui/certificate-viewer.c:619
+#, fuzzy
+msgid "Email Recipient Certificate"
+msgstr "Teastas faighteora ríomhphoist"
+
+#: ../smime/gui/certificate-viewer.c:634
+#, fuzzy
+msgid "Issued To"
+msgstr "Eisithe ar an"
+
+#: ../smime/gui/certificate-viewer.c:635 ../smime/gui/certificate-viewer.c:641
+#, fuzzy
+msgid "Common Name (CN)"
+msgstr "Ainm Coiteann (Common Name, CN)"
+
+#: ../smime/gui/certificate-viewer.c:636 ../smime/gui/certificate-viewer.c:642
+msgid "Organization (O)"
+msgstr "Eagras (O)"
+
+#: ../smime/gui/certificate-viewer.c:637 ../smime/gui/certificate-viewer.c:643
+#, fuzzy
+msgid "Organizational Unit (OU)"
+msgstr "Aonad an Eagrais (Organizational Unit, OU)"
+
+#: ../smime/gui/certificate-viewer.c:645
+#, fuzzy
+msgid "Validity"
+msgstr "Bailíocht..."
+
+#: ../smime/gui/certificate-viewer.c:646
+#, fuzzy
+msgid "Issued On"
+msgstr "Eisithe ar an"
+
+#: ../smime/gui/certificate-viewer.c:647
+#, fuzzy
+msgid "Expires On"
+msgstr "Le síothlú"
+
+#: ../smime/gui/certificate-viewer.c:649
+#, fuzzy
+msgid "Fingerprints"
+msgstr "Méarlorg MD5"
+
+#: ../smime/gui/certificate-viewer.c:671
+#, fuzzy
+msgid "Certificate Hierarchy"
+msgstr "O&rdlathas Teastais"
+
+#: ../smime/gui/certificate-viewer.c:674
+#, fuzzy
+msgid "Certificate Fields"
+msgstr "&Réimsí Teastais"
+
+#: ../smime/gui/certificate-viewer.c:677
+#, fuzzy
+msgid "Field Value"
+msgstr "Ainm Réimse"
+
+#: ../smime/gui/certificate-viewer.c:679
+msgid "Details"
+msgstr "Mionsonraí"
+
+#: ../smime/gui/cert-trust-dialog.c:153
+#, fuzzy
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"Mar nach bhfuil muinín agat as an údarás teastais a d'eisigh an teastas seo, "
+"níl muinín agat as fordheimhniú an teastais seo ach amháin má léiríonn tú "
+"anseo é."
+
+#: ../smime/gui/cert-trust-dialog.c:158
+#, fuzzy
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+"Mar nach bhfuil aithne agat ar an údarás teastais a d'eisigh an teastas seo, "
+"níl muinín agat as fordheimhniú an teastais seo ach amháin má léiríonn tú a "
+"mhalairt anseo."
+
+#: ../smime/gui/component.c:56
+#, fuzzy, c-format
+msgid "Enter the password for '%s', token '%s'"
+msgstr "Iontráil an focal faire le `%s'"
+
+#: ../smime/gui/component.c:58
 #, fuzzy, c-format
 msgid "Enter the password for '%s'"
 msgstr "Iontráil an focal faire le `%s'"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:76
+#: ../smime/gui/component.c:86
 #, fuzzy
 msgid "Enter new password for certificate database"
 msgstr "Iontráil an focal faire nua do <b>%1</b>, le do thoil:"
 
-#: ../smime/gui/component.c:78
+#: ../smime/gui/component.c:89
 msgid "Enter new password"
 msgstr "Iontráil focal faire nua"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:122
 #, fuzzy, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr "Cliceáil chun sórtáil de réir ábhair"
 
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:123
 #, fuzzy, c-format
 msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr "CRL Eisithe ag:"
 
-#: ../smime/gui/e-cert-selector.c:172
+#: ../smime/gui/e-cert-selector.c:176
 msgid "Select certificate"
 msgstr "Roghnaigh teastas"
 
-#: ../smime/gui/smime-ui.ui.h:1
-#, fuzzy
-msgid "<Not Part of Certificate>"
-msgstr "<Ní ina chuid den Teastas>"
-
-#: ../smime/gui/smime-ui.ui.h:2
-msgid "Authorities"
-msgstr "Údaráis"
-
 #: ../smime/gui/smime-ui.ui.h:3
 #, fuzzy
-msgid "Backup _All"
-msgstr "Gach Comhad"
+msgid "You have certificates from these organizations that identify you:"
+msgstr "Tá teastais agat ó na heagrais seo a shainaithníonn tusa:"
 
 #: ../smime/gui/smime-ui.ui.h:4
 #, fuzzy
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"Sula gcuireann tú muinín san údarás deimhniúcháin seo, ba cheart duit a "
-"theastas, a pholasaithe agus a mhodhanna oibre a scrúdú má tá fáil orthu."
-
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1097
-msgid "Certificate"
-msgstr "Teastas"
-
-#: ../smime/gui/smime-ui.ui.h:6
-#, fuzzy
-msgid "Certificate Authority Trust"
-msgstr "Cuir eagar ar Mhuinín Teastais"
+msgid "Certificates Table"
+msgstr "Cuir Tábla Leis"
 
+#. This is a verb, as in "make a backup".
 #: ../smime/gui/smime-ui.ui.h:7
 #, fuzzy
-msgid "Certificate Fields"
-msgstr "&Réimsí Teastais"
+msgid "_Backup"
+msgstr "Déan Cúltaca"
 
 #: ../smime/gui/smime-ui.ui.h:8
 #, fuzzy
-msgid "Certificate Hierarchy"
-msgstr "O&rdlathas Teastais"
-
-#: ../smime/gui/smime-ui.ui.h:9
-msgid "Certificate details"
-msgstr "Sonraí teastais"
+msgid "Backup _All"
+msgstr "Gach Comhad"
 
 #: ../smime/gui/smime-ui.ui.h:10
-#, fuzzy
-msgid "Certificates Table"
-msgstr "Cuir Tábla Leis"
+msgid "Your Certificates"
+msgstr "Do Theastais"
 
 #: ../smime/gui/smime-ui.ui.h:11
 #, fuzzy
-msgid "Common Name (CN)"
-msgstr "Ainm Coiteann (Common Name, CN)"
+msgid "You have certificates on file that identify these people:"
+msgstr "Tá teastais agat a shainaithníonn na daoine seo:"
 
 #: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Teastais Teagmhálacha"
 
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../smime/gui/smime-ui.ui.h:13
 #, fuzzy
-msgid "Do not trust the authenticity of this certificate"
-msgstr "Níl muinín agat as fíordheimhniú an teastais seo."
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr "Tá teastais agat a shainaithníonn na húdaráis deimhniúcháin seo:"
+
+#: ../smime/gui/smime-ui.ui.h:14
+msgid "Authorities"
+msgstr "Údaráis"
 
 #: ../smime/gui/smime-ui.ui.h:15
 #, fuzzy
-msgid "Email Certificate Trust Settings"
-msgstr "Cuir socruithe muiníne na dteastas ríomhphoist in eagar"
+msgid "Certificate Authority Trust"
+msgstr "Cuir eagar ar Mhuinín Teastais"
 
 #: ../smime/gui/smime-ui.ui.h:16
 #, fuzzy
-msgid "Email Recipient Certificate"
-msgstr "Teastas faighteora ríomhphoist"
+msgid "Trust this CA to identify _websites."
+msgstr "Tá muinín agat as an ÚD seo chun suíomhanna Gréasáin a shainaithint."
 
 #: ../smime/gui/smime-ui.ui.h:17
 #, fuzzy
-msgid "Email Signer Certificate"
-msgstr "Teastas sínitheora ríomhphoist"
+msgid "Trust this CA to identify _email users."
+msgstr ""
+"Tá muinín agat as an ÚD seo chun úsáideoirí ríomhphoist a shainaithint."
 
 #: ../smime/gui/smime-ui.ui.h:18
 #, fuzzy
-msgid "Expires On"
-msgstr "Le síothlú"
+msgid "Trust this CA to identify _software developers."
+msgstr "Tá muinín agat as an ÚD seo chun déantóirí bogearraí a shainaithint."
 
 #: ../smime/gui/smime-ui.ui.h:19
 #, fuzzy
-msgid "Field Value"
-msgstr "Ainm Réimse"
-
-#: ../smime/gui/smime-ui.ui.h:20
-#, fuzzy
-msgid "Fingerprints"
-msgstr "Méarlorg MD5"
-
-#: ../smime/gui/smime-ui.ui.h:24
-#, fuzzy
-msgid "Issued On"
-msgstr "Eisithe ar an"
-
-#: ../smime/gui/smime-ui.ui.h:25
-#, fuzzy
-msgid "Issued To"
-msgstr "Eisithe ar an"
-
-#: ../smime/gui/smime-ui.ui.h:27
-msgid "Organization (O)"
-msgstr "Eagras (O)"
-
-#: ../smime/gui/smime-ui.ui.h:28
-#, fuzzy
-msgid "Organizational Unit (OU)"
-msgstr "Aonad an Eagrais (Organizational Unit, OU)"
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"Sula gcuireann tú muinín san údarás deimhniúcháin seo, ba cheart duit a "
+"theastas, a pholasaithe agus a mhodhanna oibre a scrúdú má tá fáil orthu."
 
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
-msgid "SSL Client Certificate"
-msgstr "Teastas Cliaint SSL"
+#: ../smime/gui/smime-ui.ui.h:21 ../smime/lib/e-asn1-object.c:658
+msgid "Certificate"
+msgstr "Teastas"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:833
-msgid "SSL Server Certificate"
-msgstr "Teastas Freastalaí SSL"
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "Certificate details"
+msgstr "Sonraí teastais"
 
-#: ../smime/gui/smime-ui.ui.h:33
+#: ../smime/gui/smime-ui.ui.h:23
 #, fuzzy
-msgid "This certificate has been verified for the following uses:"
-msgstr "Tá an teastas seo fíoraithe do na húsáidí seo a leanas:"
+msgid "Email Certificate Trust Settings"
+msgstr "Cuir socruithe muiníne na dteastas ríomhphoist in eagar"
 
-#: ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/smime-ui.ui.h:24
 #, fuzzy
 msgid "Trust the authenticity of this certificate"
 msgstr "Tá muinín agat as fíordheimhniú an teastais seo."
 
-#: ../smime/gui/smime-ui.ui.h:35
-#, fuzzy
-msgid "Trust this CA to identify email users."
-msgstr ""
-"Tá muinín agat as an ÚD seo chun úsáideoirí ríomhphoist a shainaithint."
-
-#: ../smime/gui/smime-ui.ui.h:36
-#, fuzzy
-msgid "Trust this CA to identify software developers."
-msgstr "Tá muinín agat as an ÚD seo chun déantóirí bogearraí a shainaithint."
-
-#: ../smime/gui/smime-ui.ui.h:37
-#, fuzzy
-msgid "Trust this CA to identify websites."
-msgstr "Tá muinín agat as an ÚD seo chun suíomhanna Gréasáin a shainaithint."
-
-#: ../smime/gui/smime-ui.ui.h:38
-#, fuzzy
-msgid "Validity"
-msgstr "Bailíocht..."
-
-#: ../smime/gui/smime-ui.ui.h:39
-#, fuzzy
-msgid "You have certificates from these organizations that identify you:"
-msgstr "Tá teastais agat ó na heagrais seo a shainaithníonn tusa:"
-
-#: ../smime/gui/smime-ui.ui.h:40
-#, fuzzy
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr "Tá teastais agat a shainaithníonn na húdaráis deimhniúcháin seo:"
-
-#: ../smime/gui/smime-ui.ui.h:41
-#, fuzzy
-msgid "You have certificates on file that identify these people:"
-msgstr "Tá teastais agat a shainaithníonn na daoine seo:"
-
-#: ../smime/gui/smime-ui.ui.h:42
-msgid "Your Certificates"
-msgstr "Do Theastais"
-
-#. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:25
 #, fuzzy
-msgid "_Backup"
-msgstr "Déan Cúltaca"
+msgid "Do not trust the authenticity of this certificate"
+msgstr "Níl muinín agat as fíordheimhniú an teastais seo."
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:26
 #, fuzzy
 msgid "_Edit CA Trust"
 msgstr "Cuir socruithe muiníne do theastais na nÚdarás Deimhniúcháin in eagar"
 
-#: ../smime/lib/e-cert-db.c:912
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Tá an teastas ann cheana."
-
-#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
-msgid "%d/%m/%Y"
-msgstr "%d/%m/%Y"
-
-#. x509 certificate usage types
-#: ../smime/lib/e-cert.c:417
-msgid "Sign"
-msgstr "Sínigh"
-
-#: ../smime/lib/e-cert.c:418
-msgid "Encrypt"
-msgstr "Criptigh"
-
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-asn1-object.c:95
 msgid "Version"
 msgstr "Leagan"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-asn1-object.c:110
 msgid "Version 1"
 msgstr "Leagan 1"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-asn1-object.c:113
 msgid "Version 2"
 msgstr "Leagan 2"
 
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-asn1-object.c:116
 msgid "Version 3"
 msgstr "Leagan 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-asn1-object.c:192
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "Criptiú PKCS #1 MD2 le RSA"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-asn1-object.c:195
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "Criptiú PKCS #1 MD5 le RSA"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-asn1-object.c:198
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "Criptiú PKCS #1 SHA-1 le RSA"
 
-#: ../smime/lib/e-cert.c:643
+#: ../smime/lib/e-asn1-object.c:201
 #, fuzzy
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "Criptiú PKCS #1 SHA-1 le RSA"
 
-#: ../smime/lib/e-cert.c:646
+#: ../smime/lib/e-asn1-object.c:204
 #, fuzzy
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "Criptiú PKCS #1 SHA-1 le RSA"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-asn1-object.c:207
 #, fuzzy
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "Criptiú PKCS #1 SHA-1 le RSA"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-asn1-object.c:234
 msgid "PKCS #1 RSA Encryption"
 msgstr "Criptiú PKCS #1 RSA"
 
-#: ../smime/lib/e-cert.c:679
+#: ../smime/lib/e-asn1-object.c:237
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Úsáid Eochrach an Teastais"
 
-#: ../smime/lib/e-cert.c:682
+#: ../smime/lib/e-asn1-object.c:240
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "Cineál teastais Netscape"
 
-#: ../smime/lib/e-cert.c:685
+#: ../smime/lib/e-asn1-object.c:243
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Aitheantóir Eochrach na nÚdarás Deimhniúcháin"
 
-#: ../smime/lib/e-cert.c:697
+#: ../smime/lib/e-asn1-object.c:255
 #, fuzzy, c-format
 msgid "Object Identifier (%s)"
 msgstr "Aitheantóir an Réada"
 
-#: ../smime/lib/e-cert.c:749
+#: ../smime/lib/e-asn1-object.c:306
 #, fuzzy
 msgid "Algorithm Identifier"
 msgstr "Aitheantóir an Algartaim"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-asn1-object.c:314
 #, fuzzy
 msgid "Algorithm Parameters"
 msgstr "Paraiméadair an Algartaim"
 
-#: ../smime/lib/e-cert.c:779
+#: ../smime/lib/e-asn1-object.c:336
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr "Faisnéis maidir le heochair phoiblí an aonáin ainmnithe"
 
-#: ../smime/lib/e-cert.c:784
+#: ../smime/lib/e-asn1-object.c:341
 #, fuzzy
 msgid "Subject Public Key Algorithm"
 msgstr "Algartam eochrach poiblí an aonáin ainmnithe"
 
-#: ../smime/lib/e-cert.c:799
+#: ../smime/lib/e-asn1-object.c:356
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Eochair phoiblí an aonáin ainmnithe"
 
-#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-asn1-object.c:378 ../smime/lib/e-asn1-object.c:428
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Earráid: ní féidir an eisínteacht a phróiseáil"
 
-#: ../smime/lib/e-cert.c:841 ../smime/lib/e-cert.c:853
+#: ../smime/lib/e-asn1-object.c:399 ../smime/lib/e-asn1-object.c:411
 msgid "Object Signer"
 msgstr "Sínitheoir an Réada"
 
-#: ../smime/lib/e-cert.c:845
+#: ../smime/lib/e-asn1-object.c:403
 msgid "SSL Certificate Authority"
 msgstr "Údarás Deimhniúcháin SSL"
 
-#: ../smime/lib/e-cert.c:849
+#: ../smime/lib/e-asn1-object.c:407
 msgid "Email Certificate Authority"
 msgstr "Údarás Deimhniúcháin Ríomhphoist"
 
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-asn1-object.c:436
 msgid "Signing"
 msgstr "Á Shíniú"
 
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-asn1-object.c:440
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Neamhdhiúltú"
 
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-asn1-object.c:444
 #, fuzzy
 msgid "Key Encipherment"
 msgstr "Criptiúchán na n-eochracha"
 
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-asn1-object.c:448
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "Criptiúchán na sonraí"
 
-#: ../smime/lib/e-cert.c:894
+#: ../smime/lib/e-asn1-object.c:452
 #, fuzzy
 msgid "Key Agreement"
 msgstr "Comhaontas Eochrach"
 
-#: ../smime/lib/e-cert.c:898
+#: ../smime/lib/e-asn1-object.c:456
 msgid "Certificate Signer"
 msgstr "Sínitheoir an Teastais"
 
-#: ../smime/lib/e-cert.c:902
+#: ../smime/lib/e-asn1-object.c:460
 msgid "CRL Signer"
 msgstr "Sínitheoir CRL"
 
-#: ../smime/lib/e-cert.c:951
+#: ../smime/lib/e-asn1-object.c:509
 msgid "Critical"
 msgstr "Criticiúil"
 
-#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
+#: ../smime/lib/e-asn1-object.c:511 ../smime/lib/e-asn1-object.c:514
 msgid "Not Critical"
 msgstr "Neamh-Chriticiúil"
 
-#: ../smime/lib/e-cert.c:977
+#: ../smime/lib/e-asn1-object.c:535
 msgid "Extensions"
 msgstr "Eisínteachtaí"
 
@@ -20446,93 +21389,111 @@ msgstr "Eisínteachtaí"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1055
+#: ../smime/lib/e-asn1-object.c:615
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
+#: ../smime/lib/e-asn1-object.c:672 ../smime/lib/e-asn1-object.c:807
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Algartam Sínithe Teastais"
 
-#: ../smime/lib/e-cert.c:1120
+#: ../smime/lib/e-asn1-object.c:681
 msgid "Issuer"
 msgstr "Eisitheoir"
 
-#: ../smime/lib/e-cert.c:1175
+#: ../smime/lib/e-asn1-object.c:735
 #, fuzzy
 msgid "Issuer Unique ID"
 msgstr "Aitheantas uathúil an eisitheora"
 
-#: ../smime/lib/e-cert.c:1194
+#: ../smime/lib/e-asn1-object.c:754
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Aitheantas Uathúil an aonáin ainmnithe"
 
-#: ../smime/lib/e-cert.c:1240
+#: ../smime/lib/e-asn1-object.c:813
 msgid "Certificate Signature Value"
 msgstr "Luach Sínithe Teastais"
 
-#: ../smime/lib/e-pkcs12.c:256
+#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#. x509 certificate usage types
+#: ../smime/lib/e-cert.c:392
+msgid "Sign"
+msgstr "Sínigh"
+
+#: ../smime/lib/e-cert.c:393
+msgid "Encrypt"
+msgstr "Criptigh"
+
+#: ../smime/lib/e-cert-db.c:864
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Tá an teastas ann cheana."
+
+#: ../smime/lib/e-pkcs12.c:199
 msgid "PKCS12 File Password"
 msgstr "Focal Faire Comhaid PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:257
+#: ../smime/lib/e-pkcs12.c:200
 msgid "Enter password for PKCS12 file:"
 msgstr "Iontráil focal faire don chomhad PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:307
 msgid "Imported Certificate"
 msgstr "Iompórtáladh Teastas"
 
 #: ../views/addressbook/galview.xml.h:1
-msgid "By _Company"
-msgstr "De Réir _Comhlachta"
-
-#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "C_artaí Sheoladh"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
 msgid "_List View"
 msgstr "Amharc _Liosta"
 
-#: ../views/calendar/galview.xml.h:1
-msgid "W_eek View"
-msgstr "Amharc _Seachtaine"
+#: ../views/addressbook/galview.xml.h:3
+msgid "By _Company"
+msgstr "De Réir _Comhlachta"
 
-#: ../views/calendar/galview.xml.h:2
+#: ../views/calendar/galview.xml.h:1
 msgid "_Day View"
 msgstr "Amharc _Lae"
 
+#: ../views/calendar/galview.xml.h:2
+msgid "_Work Week View"
+msgstr "Amharc Sheachtain _Oibre"
+
+#: ../views/calendar/galview.xml.h:3
+msgid "W_eek View"
+msgstr "Amharc _Seachtaine"
+
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "Amharc _Míosa"
 
-#: ../views/calendar/galview.xml.h:5
-msgid "_Work Week View"
-msgstr "Amharc Sheachtain _Oibre"
-
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Mar Fhillteán Seolta d'Amharc L_eathan"
+msgid "_Messages"
+msgstr "_Teachtaireachtaí"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Mar Fhillteán _Seolta"
 
 #: ../views/mail/galview.xml.h:3
-msgid "By S_tatus"
-msgstr "Mar _Stádas"
+msgid "By Su_bject"
+msgstr "Mar _Ábhar"
 
 #: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
 msgstr "De Réir _Seoltóra"
 
 #: ../views/mail/galview.xml.h:5
-msgid "By Su_bject"
-msgstr "Mar _Ábhar"
+msgid "By S_tatus"
+msgstr "Mar _Stádas"
 
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
@@ -20543,1106 +21504,17 @@ msgid "For _Wide View"
 msgstr "D'Amharc _Leathan"
 
 #: ../views/mail/galview.xml.h:8
-msgid "_Messages"
-msgstr "_Teachtaireachtaí"
+msgid "As Sent Folder for Wi_de View"
+msgstr "Mar Fhillteán Seolta d'Amharc L_eathan"
 
 #: ../views/memos/galview.xml.h:1
 msgid "_Memos"
 msgstr "_Meamraim"
 
-#: ../views/tasks/galview.xml.h:1
+#: ../views/tasks/galview.xml.h:2
 msgid "With _Due Date"
 msgstr "Le Sprioc_dháta"
 
-#: ../views/tasks/galview.xml.h:2
+#: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "Le _Stádas"
-
-#. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:789
-msgid "UTC"
-msgstr "AUL"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
-msgid "Select a Time Zone"
-msgstr "Roghnaigh Crios Ama"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
-#, fuzzy
-msgid "Time Zones"
-msgstr "_Crios Ama"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
-msgid "Timezone drop-down combination box"
-msgstr ""
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
-#, fuzzy
-msgid "_Selection"
-msgstr "Mód Roghnaithe"
-
-#: ../widgets/menus/gal-define-views-dialog.c:359
-#: ../widgets/menus/gal-define-views.ui.h:4
-#, no-c-format
-msgid "Define Views for %s"
-msgstr "Sainmhínigh Amhairc do \"%s\""
-
-#: ../widgets/menus/gal-define-views-dialog.c:367
-#: ../widgets/menus/gal-define-views-dialog.c:369
-msgid "Define Views"
-msgstr "Sainmhínigh Amhairc"
-
-#: ../widgets/menus/gal-define-views.ui.h:2
-#, no-c-format
-msgid "Define Views for \"%s\""
-msgstr "Sainmhínigh Amhairc do \"%s\""
-
-#: ../widgets/menus/gal-view-factory-etable.c:111
-msgid "Table"
-msgstr "Tábla"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
-msgid "Save Current View"
-msgstr "Sábháil Amharc Reatha"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "_Cruthaigh amharc nua"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr ""
-
-#: ../widgets/menus/gal-view-new-dialog.c:108
-msgid "Define New View"
-msgstr "Sainmhínigh Amharc Nua"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:1
-msgid "Name of new view:"
-msgstr "Ainm an amhairc nua:"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:2
-msgid "Type of View"
-msgstr "Cineál Amhairc"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:3
-msgid "Type of view:"
-msgstr "Cineál amhairc:"
-
-#: ../widgets/misc/e-account-manager.c:383
-msgid "Use default Evolution _sort order for accounts"
-msgstr ""
-
-#: ../widgets/misc/e-account-manager.c:438
-msgid "De_fault"
-msgstr "_Réamhshocrú"
-
-#: ../widgets/misc/e-account-tree-view.c:404
-msgid "Account Name"
-msgstr "Ainm Cuntais"
-
-#: ../widgets/misc/e-account-tree-view.c:435
-msgid "Protocol"
-msgstr "Prótacal"
-
-#: ../widgets/misc/e-attachment-dialog.c:308
-msgid "Attachment Properties"
-msgstr "Airíonna Iatáin"
-
-#: ../widgets/misc/e-attachment-dialog.c:330
-msgid "_Filename:"
-msgstr "A_inm Comhaid:"
-
-#: ../widgets/misc/e-attachment-dialog.c:365
-msgid "MIME Type:"
-msgstr "Cineál MIME:"
-
-#: ../widgets/misc/e-attachment-dialog.c:373
-#: ../widgets/misc/e-attachment-store.c:559
-msgid "_Suggest automatic display of attachment"
-msgstr ""
-
-#: ../widgets/misc/e-attachment-handler-image.c:95
-msgid "Could not set as background"
-msgstr ""
-
-#: ../widgets/misc/e-attachment-handler-image.c:145
-msgid "Set as _Background"
-msgstr "Socraigh mar _Chúlra"
-
-#: ../widgets/misc/e-attachment-handler-sendto.c:93
-msgid "Could not send attachment"
-msgid_plural "Could not send attachments"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-
-#: ../widgets/misc/e-attachment-handler-sendto.c:135
-msgid "_Send To..."
-msgstr "_Seol Chuig..."
-
-#: ../widgets/misc/e-attachment-handler-sendto.c:137
-msgid "Send the selected attachments somewhere"
-msgstr ""
-
-#: ../widgets/misc/e-attachment-icon-view.c:162
-#: ../widgets/misc/e-attachment-tree-view.c:547
-msgid "Loading"
-msgstr "Á Luchtú"
-
-#: ../widgets/misc/e-attachment-icon-view.c:174
-#: ../widgets/misc/e-attachment-tree-view.c:559
-msgid "Saving"
-msgstr "Á Shábháil"
-
-#: ../widgets/misc/e-attachment-paned.c:97
-msgid "Hide Attachment _Bar"
-msgstr "Folaigh _Barra Iatán"
-
-#: ../widgets/misc/e-attachment-paned.c:99
-#: ../widgets/misc/e-attachment-paned.c:639
-msgid "Show Attachment _Bar"
-msgstr "Taispeáin _Barra Iatán"
-
-#: ../widgets/misc/e-attachment-store.c:547
-msgid "Add Attachment"
-msgstr "Cuir Iatán Leis"
-
-#: ../widgets/misc/e-attachment-store.c:550
-msgid "A_ttach"
-msgstr "_Ceangail"
-
-#: ../widgets/misc/e-attachment-store.c:613
-msgid "Save Attachment"
-msgid_plural "Save Attachments"
-msgstr[0] "Sábháil Iatáin"
-msgstr[1] "Sábháil Iatán"
-msgstr[2] "Sábháil Iatáin"
-msgstr[3] "Sábháil Iatáin"
-msgstr[4] "Sábháil Iatáin"
-
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:642
-#: ../widgets/misc/e-attachment.c:1810 ../widgets/misc/e-attachment.c:2352
-msgid "attachment.dat"
-msgstr "iatán.dat"
-
-#: ../widgets/misc/e-attachment-view.c:404
-msgid "Open With Other Application..."
-msgstr ""
-
-#: ../widgets/misc/e-attachment-view.c:411
-msgid "S_ave All"
-msgstr "Sábháil G_ach Rud"
-
-#: ../widgets/misc/e-attachment-view.c:437
-msgid "A_dd Attachment..."
-msgstr "Cuir _Iatán Leis..."
-
-#: ../widgets/misc/e-attachment-view.c:461
-msgid "_Hide"
-msgstr "_Folaigh"
-
-#: ../widgets/misc/e-attachment-view.c:468
-#, fuzzy
-msgid "Hid_e All"
-msgstr "Sábháil G_ach Rud"
-
-#: ../widgets/misc/e-attachment-view.c:475
-#, fuzzy
-msgid "_View Inline"
-msgstr "&Inlíne"
-
-#: ../widgets/misc/e-attachment-view.c:482
-#, fuzzy
-msgid "Vie_w All Inline"
-msgstr "&Inlíne"
-
-#: ../widgets/misc/e-attachment-view.c:803
-#, fuzzy, c-format
-msgid "Open With \"%s\""
-msgstr "Oscail le \"%s\""
-
-#: ../widgets/misc/e-attachment-view.c:806
-#, c-format
-msgid "Open this attachment in %s"
-msgstr "Oscail an t-iatán seo i %s"
-
-#. To Translators: This text is set as a description of an attached
-#. * message when, for example, attaching it to a composer. When the
-#. * message to be attached has also filled Subject, then this text is
-#. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:998
-msgid "Attached message"
-msgstr ""
-
-#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
-msgid "A load operation is already in progress"
-msgstr ""
-
-#: ../widgets/misc/e-attachment.c:1861 ../widgets/misc/e-attachment.c:2662
-msgid "A save operation is already in progress"
-msgstr ""
-
-#: ../widgets/misc/e-attachment.c:1953
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Níorbh fhéidir '%s' a luchtú"
-
-#: ../widgets/misc/e-attachment.c:1956
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Níorbh fhéidir an t-iatán a luchtú"
-
-#: ../widgets/misc/e-attachment.c:2232
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Níorbh fhéidir '%s' a oscailt"
-
-#: ../widgets/misc/e-attachment.c:2235
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Níorbh fhéidir an t-iatán a oscailt"
-
-#: ../widgets/misc/e-attachment.c:2670
-msgid "Attachment contents not loaded"
-msgstr ""
-
-#: ../widgets/misc/e-attachment.c:2746
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Níorbh fhéidir '%s' a shábháil"
-
-#: ../widgets/misc/e-attachment.c:2749
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Níorbh fhéidir an t-iatán a shábháil"
-
-#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:387
-#, fuzzy
-msgid "Ctrl-click to open a link"
-msgstr "Cliceáil chun %s a oscailt"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1250
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../widgets/misc/e-calendar.c:226
-msgid "Month Calendar"
-msgstr "Féilire Míosa"
-
-#: ../widgets/misc/e-charset-combo-box.c:96
-msgid "Character Encoding"
-msgstr "Ionchódú Carachtar"
-
-#: ../widgets/misc/e-charset-combo-box.c:119
-msgid "Enter the character set to use"
-msgstr "Iontráil an tacar carachtar le húsáid"
-
-#: ../widgets/misc/e-charset-combo-box.c:339
-msgid "Other..."
-msgstr "Eile..."
-
-#: ../widgets/misc/e-contact-map-window.c:355
-#, fuzzy
-msgid "Contacts Map"
-msgstr "Teagmhálacha:"
-
-#: ../widgets/misc/e-dateedit.c:501
-msgid "Date and Time"
-msgstr "Dáta agus Am"
-
-#: ../widgets/misc/e-dateedit.c:522
-msgid "Text entry to input date"
-msgstr ""
-
-#: ../widgets/misc/e-dateedit.c:544
-msgid "Click this button to show a calendar"
-msgstr "Cliceáil an cnaipe seo chun féilire a thaispeáint"
-
-#: ../widgets/misc/e-dateedit.c:591
-msgid "Drop-down combination box to select time"
-msgstr ""
-
-#: ../widgets/misc/e-dateedit.c:663
-msgid "No_w"
-msgstr "_Anois"
-
-#: ../widgets/misc/e-dateedit.c:669
-msgid "_Today"
-msgstr "_Inniu"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. * is not permitted.
-#: ../widgets/misc/e-dateedit.c:677
-msgid "_None"
-msgstr "_Neamhní"
-
-#. Translators: "None" for date field of a date edit, shown when
-#. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1921
-#, fuzzy
-msgctxt "date"
-msgid "None"
-msgstr "Neamhní"
-
-#: ../widgets/misc/e-dateedit.c:1815
-msgid "Invalid Date Value"
-msgstr "Luach Dáta Neamhbhailí"
-
-#: ../widgets/misc/e-dateedit.c:1859
-msgid "Invalid Time Value"
-msgstr "Luach Ama Neamhbhailí"
-
-#: ../widgets/misc/e-import-assistant.c:249
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr ""
-
-#: ../widgets/misc/e-import-assistant.c:266
-msgid "F_ilename:"
-msgstr "A_inm Comhaid:"
-
-#: ../widgets/misc/e-import-assistant.c:276
-msgid "Select a file"
-msgstr "Roghnaigh comhad"
-
-#: ../widgets/misc/e-import-assistant.c:290
-#: ../widgets/misc/e-import-assistant.c:465
-msgid "File _type:"
-msgstr "_Cineál comhaid:"
-
-#: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:913
-#, fuzzy
-msgid "Choose the destination for this import"
-msgstr "Roghnaigh am críochnaithe don imeacht seo"
-
-#: ../widgets/misc/e-import-assistant.c:358
-#, fuzzy
-msgid "Choose the type of importer to run:"
-msgstr "Roghnaigh cineál an mhéarchlár le cumrú."
-
-#: ../widgets/misc/e-import-assistant.c:366
-msgid "Import data and settings from _older programs"
-msgstr "Iompórtáil sonraí agus socruithe ó fheidhmchláir níos _sine"
-
-#: ../widgets/misc/e-import-assistant.c:374
-msgid "Import a _single file"
-msgstr "Iompórtáil comhad _aonair"
-
-#: ../widgets/misc/e-import-assistant.c:526
-msgid ""
-"Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
-msgstr ""
-
-#. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:768
-#, fuzzy
-msgid "_Cancel Import"
-msgstr "_Iompórtáil"
-
-#: ../widgets/misc/e-import-assistant.c:912
-#, fuzzy
-msgid "Preview data to be imported"
-msgstr "Roghnaigh na míreanna atá le priontáil"
-
-#: ../widgets/misc/e-import-assistant.c:918
-#: ../widgets/misc/e-import-assistant.c:931
-#: ../widgets/misc/e-import-assistant.c:1276
-#: ../widgets/misc/e-import-assistant.c:1352
-#: ../widgets/misc/e-import-assistant.c:1361
-#, fuzzy
-msgid "Import Data"
-msgstr "Tábhachtach"
-
-#: ../widgets/misc/e-import-assistant.c:926
-msgid "Select what type of file you want to import from the list."
-msgstr ""
-
-#: ../widgets/misc/e-import-assistant.c:1266
-#: ../widgets/misc/e-import-assistant.c:1301
-#, fuzzy
-msgid "Evolution Import Assistant"
-msgstr "Iompórtáil Comhaid mbox (UNIX, Evolution)"
-
-#: ../widgets/misc/e-import-assistant.c:1283
-#: ../widgets/misc/e-import-assistant.c:1339
-msgid "Import Location"
-msgstr "Iompórtáil Suíomh"
-
-#: ../widgets/misc/e-import-assistant.c:1294
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
-msgstr ""
-
-#: ../widgets/misc/e-import-assistant.c:1311
-msgid "Importer Type"
-msgstr "Cineál Iompórtálaí"
-
-#: ../widgets/misc/e-import-assistant.c:1321
-msgid "Select Information to Import"
-msgstr "Roghnaigh Eolas le hIompórtáil"
-
-#: ../widgets/misc/e-import-assistant.c:1330
-msgid "Select a File"
-msgstr "Roghnaigh Comhad"
-
-#: ../widgets/misc/e-import-assistant.c:1347
-msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr ""
-
-#: ../widgets/misc/e-map.c:883
-msgid "World Map"
-msgstr "Léarscáil an Domhain"
-
-#: ../widgets/misc/e-map.c:886
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
-msgstr ""
-
-#: ../widgets/misc/e-online-button.c:27
-msgid "Evolution is currently online.  Click this button to work offline."
-msgstr ""
-"Tá Evolution ar líne faoi láthair.  Cliceáil ar an gcnaipe seo chun oibriú "
-"as líne."
-
-#: ../widgets/misc/e-online-button.c:30
-msgid "Evolution is currently offline.  Click this button to work online."
-msgstr ""
-"Tá Evolution as líne faoi láthair.  Cliceáil ar an gcnaipe seo chun oibriú "
-"ar líne."
-
-#: ../widgets/misc/e-online-button.c:33
-msgid "Evolution is currently offline because the network is unavailable."
-msgstr "Tá Evolution as líne faoi láthair mar níl an líonra ar fáil."
-
-#: ../widgets/misc/e-preferences-window.c:279
-msgid "Evolution Preferences"
-msgstr "Sainroghanna Evolution"
-
-#: ../widgets/misc/e-search-bar.c:81
-#, c-format
-msgid "Matches: %d"
-msgstr ""
-
-#: ../widgets/misc/e-search-bar.c:563
-#, fuzzy
-msgid "Close the find bar"
-msgstr "Dún an fhuinneog seo"
-
-#: ../widgets/misc/e-search-bar.c:571
-msgid "Fin_d:"
-msgstr "Ai_msigh:"
-
-#: ../widgets/misc/e-search-bar.c:583
-#, fuzzy
-msgid "Clear the search"
-msgstr "Cuardaigh i gcónaí"
-
-#: ../widgets/misc/e-search-bar.c:607
-msgid "_Previous"
-msgstr "_Roimhe Seo"
-
-#: ../widgets/misc/e-search-bar.c:613
-msgid "Find the previous occurrence of the phrase"
-msgstr ""
-
-#: ../widgets/misc/e-search-bar.c:626
-msgid "_Next"
-msgstr "_Ar Aghaidh"
-
-#: ../widgets/misc/e-search-bar.c:632
-msgid "Find the next occurrence of the phrase"
-msgstr ""
-
-#: ../widgets/misc/e-search-bar.c:645
-msgid "Mat_ch case"
-msgstr "_Comhoiriúnaigh an cás"
-
-#: ../widgets/misc/e-search-bar.c:673
-msgid "Reached bottom of page, continued from top"
-msgstr ""
-
-#: ../widgets/misc/e-search-bar.c:695
-msgid "Reached top of page, continued from bottom"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.c:552
-msgid "When de_leted:"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:1
-msgid "A_uto-delete sent item"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:3
-msgid "Creat_e a sent item to track information"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:4
-msgid "Deli_vered and opened"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:5
-#, fuzzy
-msgid "Delivery Options"
-msgstr "Roghanna _Ginearálta"
-
-#: ../widgets/misc/e-send-options.ui.h:6
-#, fuzzy
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_Go Dtí:"
-
-#: ../widgets/misc/e-send-options.ui.h:7
-#, fuzzy
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_Tar Éis:"
-
-#: ../widgets/misc/e-send-options.ui.h:8
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "lá"
-
-#: ../widgets/misc/e-send-options.ui.h:9
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:10
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "lá"
-
-#: ../widgets/misc/e-send-options.ui.h:11
-msgid "For Your Eyes Only"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:12
-msgid "Gene_ral Options"
-msgstr "Roghanna _Ginearálta"
-
-#: ../widgets/misc/e-send-options.ui.h:15
-#, fuzzy
-msgid "Mail Receipt"
-msgstr "&Ná seol admháil léite riamh"
-
-#: ../widgets/misc/e-send-options.ui.h:17
-#, fuzzy
-msgid "Proprietary"
-msgstr "_Airíonna"
-
-#: ../widgets/misc/e-send-options.ui.h:18
-msgid "R_eply requested"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:20
-#, fuzzy
-msgid "Return Notification"
-msgstr "&Fógairt an Chórais"
-
-#: ../widgets/misc/e-send-options.ui.h:21
-#, fuzzy
-msgid "Secret"
-msgstr "Scór"
-
-#: ../widgets/misc/e-send-options.ui.h:23
-msgid "Sta_tus Tracking"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:24
-#, fuzzy
-msgid "Standard"
-msgstr "Cló Comhrá"
-
-#: ../widgets/misc/e-send-options.ui.h:25
-#, fuzzy
-msgid "Status Tracking"
-msgstr "Sonraí _Stádais"
-
-#: ../widgets/misc/e-send-options.ui.h:26
-#, fuzzy
-msgid "Top Secret"
-msgstr "Scór"
-
-#: ../widgets/misc/e-send-options.ui.h:28
-msgid "When acce_pted:"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "When co_mpleted:"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:30
-msgid "When decli_ned:"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:31
-msgid "_All information"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:32
-msgid "_Classification:"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:33
-msgid "_Delay message delivery"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:34
-msgid "_Delivered"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Set expiration date"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:37
-msgid "_When convenient"
-msgstr ""
-
-#: ../widgets/misc/e-send-options.ui.h:38
-msgid "_When opened:"
-msgstr ""
-
-#. Translators: Used in send options dialog
-#: ../widgets/misc/e-send-options.ui.h:40
-#, fuzzy
-msgctxt "send-options"
-msgid "None"
-msgstr "Neamhní"
-
-#: ../widgets/misc/e-signature-editor.c:138
-#: ../widgets/misc/e-signature-editor.c:564
-#: ../widgets/misc/e-signature-manager.c:372
-#: ../widgets/misc/e-signature-script-dialog.c:219
-msgid "Unnamed"
-msgstr "Gan Ainm"
-
-#: ../widgets/misc/e-signature-editor.c:214
-msgid "_Save and Close"
-msgstr "_Sábháil agus Dún"
-
-#: ../widgets/misc/e-signature-editor.c:431
-msgid "Edit Signature"
-msgstr "Cuir Síniú in Eagar"
-
-#: ../widgets/misc/e-signature-editor.c:446
-msgid "_Signature Name:"
-msgstr "Ainm _Sínithe:"
-
-#: ../widgets/misc/e-signature-manager.c:317
-#, fuzzy
-msgid "Add Signature Script"
-msgstr "Cuir script sínithe leis"
-
-#: ../widgets/misc/e-signature-manager.c:382
-#, fuzzy
-msgid "Edit Signature Script"
-msgstr "Cuir Síniú in Eagar"
-
-#: ../widgets/misc/e-signature-manager.c:602
-msgid "Add _Script"
-msgstr "Cuir _Script Leis"
-
-#: ../widgets/misc/e-signature-script-dialog.c:268
-#, fuzzy
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only."
-msgstr ""
-"Iontráil ainm tuairisciúil don chuntas seo sa spás thíos, le do thoil. "
-"Úsáidfear an t-ainm seo le haghaidh taispeána amháin."
-
-#: ../widgets/misc/e-signature-script-dialog.c:313
-#, fuzzy
-msgid "S_cript:"
-msgstr "_Script:"
-
-#: ../widgets/misc/e-signature-script-dialog.c:344
-msgid "Script file must be executable."
-msgstr ""
-
-#: ../widgets/misc/e-url-entry.c:78
-msgid "Click here to go to URL"
-msgstr ""
-
-#: ../widgets/misc/e-web-view.c:410
-msgid "_Copy Link Location"
-msgstr "_Cóipeáil Suíomh an Naisc"
-
-#: ../widgets/misc/e-web-view.c:412
-#, fuzzy
-msgid "Copy the link to the clipboard"
-msgstr "Cóipeáil rudaí go dtí an gearrthaisce."
-
-#: ../widgets/misc/e-web-view.c:420
-msgid "_Open Link in Browser"
-msgstr "_Oscail Nasc i mBrabhsálaí"
-
-#: ../widgets/misc/e-web-view.c:422
-#, fuzzy
-msgid "Open the link in a web browser"
-msgstr "_Oscail Nasc i mBrabhsálaí"
-
-#: ../widgets/misc/e-web-view.c:430
-#, fuzzy
-msgid "_Copy Email Address"
-msgstr "Cóipeáil _Seoladh Ríomhphoist"
-
-#: ../widgets/misc/e-web-view.c:447
-#, fuzzy
-msgid "_Copy Image"
-msgstr "_Gan íomhá"
-
-#: ../widgets/misc/e-web-view.c:449
-#, fuzzy
-msgid "Copy the image to the clipboard"
-msgstr "Cóipeáil rudaí go dtí an gearrthaisce."
-
-#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
-#, fuzzy
-msgid "Select all text and images"
-msgstr "Comment=Taispeáin Teachtaireacht Téacs i bPreabfhuinneog"
-
-#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
-#: ../widgets/misc/e-web-view.c:986
-#, fuzzy, c-format
-msgid "Click to call %s"
-msgstr "Theip ar ghlao '%s': %s\n"
-
-#: ../widgets/misc/e-web-view.c:988
-#, fuzzy
-msgid "Click to hide/unhide addresses"
-msgstr "Cliceáil chun féilire an mhíosa a fholú"
-
-#: ../widgets/misc/e-web-view.c:990
-#, c-format
-msgid "Click to open %s"
-msgstr "Cliceáil chun %s a oscailt"
-
-#: ../widgets/misc/ea-calendar-item.c:306
-#: ../widgets/misc/ea-calendar-item.c:315
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
-
-#: ../widgets/misc/ea-calendar-item.c:318
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Féilire: ó %s go %s"
-
-#: ../widgets/misc/ea-calendar-item.c:354
-msgid "evolution calendar item"
-msgstr ""
-
-#: ../widgets/table/e-cell-combo.c:187
-msgid "popup list"
-msgstr "preabliosta"
-
-#: ../widgets/table/e-cell-date-edit.c:299
-msgid "Now"
-msgstr "Anois"
-
-#. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:316
-msgctxt "table-date"
-msgid "None"
-msgstr "Neamhní"
-
-#: ../widgets/table/e-cell-date-edit.c:324
-msgid "OK"
-msgstr "Ceart go Leor"
-
-#: ../widgets/table/e-cell-date-edit.c:868
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr ""
-
-#: ../widgets/table/e-cell-percent.c:80
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-
-#: ../widgets/table/e-table-click-to-add.c:607
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
-msgid "click to add"
-msgstr "cliceáil chun cur leis"
-
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
-msgid "(Ascending)"
-msgstr "(Ag dul suas)"
-
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
-msgid "(Descending)"
-msgstr "(Ag dul síos)"
-
-#: ../widgets/table/e-table-config.c:400
-msgid "Not sorted"
-msgstr "Gan sórtáil"
-
-#: ../widgets/table/e-table-config.c:441
-msgid "No grouping"
-msgstr "Gan grúpáil"
-
-#: ../widgets/table/e-table-config.c:666
-#: ../widgets/table/e-table-config.ui.h:11
-msgid "Show Fields"
-msgstr "Taispeáin Réimsí"
-
-#: ../widgets/table/e-table-config.c:686
-msgid "Available Fields"
-msgstr "Réimsí ar Fáil"
-
-#: ../widgets/table/e-table-config.ui.h:1
-msgid "A_vailable Fields:"
-msgstr "Réimsí ar _Fáil:"
-
-#: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1717
-msgid "Ascending"
-msgstr "Ag dul suas"
-
-#: ../widgets/table/e-table-config.ui.h:3
-msgid "Clear All"
-msgstr "Glan Gach Rud"
-
-#: ../widgets/table/e-table-config.ui.h:4
-msgid "Clear _All"
-msgstr "Glan _Gach Rud"
-
-#: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1717
-msgid "Descending"
-msgstr "Ag dul síos"
-
-#: ../widgets/table/e-table-config.ui.h:8
-msgid "Group Items By"
-msgstr "Grúpáil Míreanna de Réir"
-
-#: ../widgets/table/e-table-config.ui.h:9
-msgid "Move _Down"
-msgstr "Bog _Síos"
-
-#: ../widgets/table/e-table-config.ui.h:10
-msgid "Move _Up"
-msgstr "Bog S_uas"
-
-#: ../widgets/table/e-table-config.ui.h:12
-msgid "Show _field in View"
-msgstr ""
-
-#: ../widgets/table/e-table-config.ui.h:13
-msgid "Show field i_n View"
-msgstr ""
-
-#: ../widgets/table/e-table-config.ui.h:14
-msgid "Show field in _View"
-msgstr ""
-
-#: ../widgets/table/e-table-config.ui.h:15
-msgid "Sort"
-msgstr "Sórtáil"
-
-#: ../widgets/table/e-table-config.ui.h:16
-msgid "Sort Items By"
-msgstr "Sórtáil Míreanna de Réir"
-
-#: ../widgets/table/e-table-config.ui.h:17
-msgid "Then By"
-msgstr "Ansin de Réir"
-
-#: ../widgets/table/e-table-config.ui.h:19
-msgid "_Fields Shown..."
-msgstr "_Réimsí Taispeánta..."
-
-#: ../widgets/table/e-table-config.ui.h:20
-msgid "_Group By..."
-msgstr "_Grúpáil de Réir..."
-
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "B_ain"
-
-#: ../widgets/table/e-table-config.ui.h:22
-msgid "_Show field in View"
-msgstr ""
-
-#: ../widgets/table/e-table-config.ui.h:23
-msgid "_Show these fields in order:"
-msgstr ""
-
-#: ../widgets/table/e-table-config.ui.h:24
-msgid "_Sort..."
-msgstr "_Sórtáil..."
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:119
-msgid "Add a Column"
-msgstr "Cuir Colún Leis"
-
-#: ../widgets/table/e-table-field-chooser.c:153
-msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
-msgstr ""
-
-#. Translators: This text is used as a special row when an ETable
-#. * has turned on grouping on a column, which has set a title.
-#. * The first %s is replaced with a column title.
-#. * The second %s is replaced with an actual  group value.
-#. * Finally the %d is replaced with count of items in this group.
-#. * Example: "Family name: Smith (13 items)"
-#.
-#: ../widgets/table/e-table-group-container.c:361
-#, c-format
-msgid "%s: %s (%d item)"
-msgid_plural "%s: %s (%d items)"
-msgstr[0] "%s: %s (%d mhír)"
-msgstr[1] "%s: %s (%d mhír)"
-msgstr[2] "%s: %s (%d mhír)"
-msgstr[3] "%s: %s (%d mír)"
-msgstr[4] "%s: %s (%d mír)"
-
-#. Translators: This text is used as a special row when an ETable
-#. * has turned on grouping on a column, which doesn't have set a title.
-#. * The %s is replaced with an actual group value.
-#. * The %d is replaced with count of items in this group.
-#. * Example: "Smith (13 items)"
-#.
-#: ../widgets/table/e-table-group-container.c:373
-#, c-format
-msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d mhír)"
-msgstr[1] "%s (%d mhír)"
-msgstr[2] "%s (%d mhír)"
-msgstr[3] "%s (%d mír)"
-msgstr[4] "%s (%d mír)"
-
-#: ../widgets/table/e-table-header-item.c:1557
-#, fuzzy
-msgid "Customize Current View"
-msgstr "Féach ar an gcomhad reatha"
-
-#: ../widgets/table/e-table-header-item.c:1579
-#, fuzzy
-msgid "Sort _Ascending"
-msgstr "Sórtáil in ord Ardaitheach"
-
-#: ../widgets/table/e-table-header-item.c:1582
-#, fuzzy
-msgid "Sort _Descending"
-msgstr "Sórtáil in ord Íslitheach"
-
-#: ../widgets/table/e-table-header-item.c:1585
-msgid "_Unsort"
-msgstr "_Díshórtáil"
-
-#: ../widgets/table/e-table-header-item.c:1588
-#, fuzzy
-msgid "Group By This _Field"
-msgstr "&Seiceáil litriú an réimse seo"
-
-#: ../widgets/table/e-table-header-item.c:1591
-#, fuzzy
-msgid "Group By _Box"
-msgstr "Grúpáil de réir &Suímh"
-
-#: ../widgets/table/e-table-header-item.c:1595
-msgid "Remove This _Column"
-msgstr "Bain an Co_lún Seo"
-
-#: ../widgets/table/e-table-header-item.c:1598
-msgid "Add a C_olumn..."
-msgstr "Cuir C_olún Leis..."
-
-#: ../widgets/table/e-table-header-item.c:1602
-#, fuzzy
-msgid "A_lignment"
-msgstr "Ai&líniú..."
-
-#: ../widgets/table/e-table-header-item.c:1605
-#, fuzzy
-msgid "B_est Fit"
-msgstr "Laghdaigh go leithead leathanaigh"
-
-#: ../widgets/table/e-table-header-item.c:1608
-msgid "Format Column_s..."
-msgstr "Formáidigh Colúi_n..."
-
-#: ../widgets/table/e-table-header-item.c:1612
-#, fuzzy
-msgid "Custo_mize Current View..."
-msgstr "Dún an t-amharc reatha cáipéise"
-
-#: ../widgets/table/e-table-header-item.c:1674
-msgid "_Sort By"
-msgstr "_Sórtáil De Réir"
-
-#. Custom
-#: ../widgets/table/e-table-header-item.c:1692
-msgid "_Custom"
-msgstr "_Saincheaptha"
-
-#. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:125
-msgid "popup a child"
-msgstr ""
-
-#. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
-msgid "toggle the cell"
-msgstr ""
-
-#. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:214
-msgid "expands the row in the ETree containing this cell"
-msgstr ""
-
-#. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:221
-msgid "collapses the row in the ETree containing this cell"
-msgstr ""
-
-#: ../widgets/table/gal-a11y-e-cell.c:123
-msgid "Table Cell"
-msgstr ""
-
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
-msgid "click"
-msgstr "cliceáil"
-
-#: ../widgets/table/gal-a11y-e-table-column-header.c:158
-msgid "sort"
-msgstr "sórtáil"
-
-#: ../widgets/text/e-text.c:2327
-msgid "Select All"
-msgstr "Roghnaigh Gach Rud"
-
-#: ../widgets/text/e-text.c:2339
-msgid "Input Methods"
-msgstr "Modhanna Ionchurtha"