Updated Irish Translation, submitted by David O'Callaghan <david.ocallaghan@cs.tcd.ie>

svn path=/trunk/; revision=23665

1 files changed, 3882 insertions, 4559 deletions

diff --git a/po/ga.po b/po/ga.po
index fb16b37fe3..bcbabd0b9a 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,94 +1,225 @@
 # Locales (language & country names) translations for Irish
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
-#
+# David O'Callaghan <david.ocallaghan@cs.tcd.ie>, 2003.
+# 
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: locales 0.01\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
-"PO-Revision-Date: 2002-01-25 14:00-0000\n"
-"Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
-"Language-Team: Irish <ga@li.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 20:47+0000\n"
+"PO-Revision-Date: 2003-11-02 21:56+0000\n"
+"Last-Translator: David O'Callaghan <david.ocallaghan@cs.tcd.ie>\n"
+"Language-Team: Irish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: addressbook/conduit/address-conduit.c:272
-#, fuzzy
 msgid "Default Sync Address:"
-msgstr "Seoladh Rpost:"
+msgstr "Seoladh Shionc. Loicthe:"
 
 #: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
 #, fuzzy
 msgid "Could not load addressbook"
-msgstr "Eagar Leabhar Sheoladh"
+msgstr "Leabhar Sheoladh Evolution"
 
 #: addressbook/conduit/address-conduit.c:1214
 #: addressbook/conduit/address-conduit.c:1217
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "_Fillteán"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Certificates"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Configure autocomple here"
+msgstr ""
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Tadhallaí"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Leabhar Sheoladh Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Alairm Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution - Cruthaigh fillteán nua"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Leabhar Seoladh:"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Álbachtaí..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Dealaigh"
+
+# vi
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "Bhítneaimis"
+
+#: addressbook/gui/component/addressbook-component.c:217
+msgid "New Contact"
+msgstr "Tadhall Nua"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Tadhall"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Cruthaigh tadhall nua"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Líosta Tadhall Nua"
+
+#: addressbook/gui/component/addressbook-component.c:225
+msgid "Contact _List"
+msgstr "_Liosta Tadhaill"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Cruthaigh liosta tadhaill nua"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+#, fuzzy
+msgid "Personal"
+msgstr "Gnáth"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Obair"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Freastalaí LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+msgid "Could not create a directory for the new addressbook."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1636
-#, fuzzy
-msgid "Account Name"
-msgstr "Ainm _Chuntas:"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Ainm do Fhreastalaí"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Tadhallaí Eile"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -96,7 +227,7 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -107,46 +238,45 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Teíp ag fork: %s"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Pasfhocal do %s, le do thoil (úsáideoir %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 #, fuzzy
 msgid "Email begins with"
 msgstr "Rphost 2"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
-msgstr ""
+msgstr "Ardmód..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -154,7 +284,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -162,88 +292,40 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1102
-msgid "URI of the contacts that the control will display"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Tadhallaí"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Eagar Leabhar Sheoladh"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
+#: addressbook/gui/component/addressbook.c:1063
+msgid "UID of the contacts source that the view will display"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Alairm Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution - Cruthaigh fillteán nua"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -266,26 +348,26 @@ msgstr ""
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
-msgstr ""
+msgstr "*"
 
 #: addressbook/gui/component/ldap-config.glade.h:5
-#, fuzzy
 msgid "1:00"
-msgstr "100%"
+msgstr "1:00"
 
 #: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
-msgstr ""
+msgstr "2:30"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
-msgstr ""
+msgstr "3268"
 
 #: addressbook/gui/component/ldap-config.glade.h:8
 msgid "389"
@@ -293,16 +375,16 @@ msgstr "389"
 
 #: addressbook/gui/component/ldap-config.glade.h:9
 msgid "5:00"
-msgstr ""
+msgstr "5:00"
 
 #: addressbook/gui/component/ldap-config.glade.h:10
 msgid "636"
-msgstr ""
+msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
-msgid "Add LDAP Server"
-msgstr "Freastalaí LDAP"
+msgid "Addressbook Creation Assistant"
+msgstr "Socrú"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -315,70 +397,63 @@ msgstr ""
 # aa 
 #: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:66
 #: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Always"
-msgstr "Afáiris"
+msgstr "i gCónaí"
 
 #: addressbook/gui/component/ldap-config.glade.h:14
-#, fuzzy
 msgid "Anonymously"
-msgstr "Gan anim"
+msgstr "Gan ainm"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
-msgstr "_Tadhall"
+msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
-msgstr "Freastalaí LDAP"
+msgstr "Eagar Freastalaí LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
-msgstr "_Seoladh RPost:"
+msgstr "Seoladh Rphost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
-msgstr "Cuardaigh:"
+msgstr "Críochnaithe"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Gnáth"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
-msgid "LDAP Configuration Assistant"
-msgstr "Socrú"
+msgid "Group:"
+msgstr "Grupa"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Never"
 msgstr "_gach"
@@ -402,8 +477,8 @@ msgid "S_earch scope: "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Cuardaigh"
 
@@ -448,27 +523,28 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Step 1: Server Information"
-msgstr "Eolas"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
-msgid "Step 2: Connecting to Server"
-msgstr "Cumraigh do %s"
+msgid "Step 2: Server Information"
+msgstr "Eolas"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr ""
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Cumraigh do %s"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr ""
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Cumraigh do %s"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -480,14 +556,6 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -495,7 +563,7 @@ msgid ""
 "need to change these options."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -503,7 +571,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -513,43 +581,48 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -576,22 +649,29 @@ msgid "Using email address"
 msgstr "Seoladh Rpost:"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:83
-#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
-msgstr "_Taispeaín"
+msgstr "Ainm _taispeáint:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -599,60 +679,57 @@ msgstr ""
 msgid "_Edit"
 msgstr "_Eagar"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Poirt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "_Search base:"
 msgstr "C_uardaigh..."
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "Ainm _Freastalaí:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
-msgstr "Gan cartaí"
+msgstr "cartaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Cumraigh do %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 #, fuzzy
 msgid "general-tab"
 msgstr "Gnáth"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 #, fuzzy
 msgid "searching-tab"
 msgstr "Cuardaigh"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Ainm"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Scríos Gach Rud"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Scríos"
@@ -681,6 +758,12 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Ainm"
+
 # Avoid; either use KR or KP
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
@@ -688,22 +771,13 @@ msgstr ""
 msgid "Source"
 msgstr "Scór"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Tóg Tadhallaí o Leabhar Seoladh"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr ""
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-#, fuzzy
 msgid "Find"
-msgstr "Cuardaigh:"
+msgstr "Faigh"
 
 # FIXME SP?
 #: addressbook/gui/component/select-names/select-names.glade.h:3
@@ -735,38 +809,33 @@ msgid "_Folder:"
 msgstr "_Fillteaín:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#, fuzzy
 msgid " B_usiness:"
-msgstr "_Gnó"
+msgstr " _Gnó:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-#, fuzzy
 msgid "A_ddress..."
 msgstr "S_eoladh..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
-#, fuzzy
 msgid "A_ssistant's name:"
-msgstr "Ainm Chúntóir:"
+msgstr "_Ainm Chúntóir:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Anni_versary:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#, fuzzy
 msgid "Birthda_y:"
-msgstr "_Breithlá:"
+msgstr "Brei_thlá:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
 #, fuzzy
 msgid "Blog address:"
-msgstr "_Seoladh RPost:"
+msgstr "Seoladh Rphost:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#, fuzzy
 msgid "Business fa_x:"
-msgstr "Facs Ghnó"
+msgstr "Fa_cs Ghnó:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
@@ -779,12 +848,12 @@ msgid "Contact Editor"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#, fuzzy
 msgid "D_epartment:"
-msgstr "_Rang:"
+msgstr "_Roinn:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Sonraí"
 
@@ -793,12 +862,10 @@ msgid "F_ree/Busy URL:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#, fuzzy
 msgid "File a_s:"
-msgstr "Sábháil _Mar:"
+msgstr "Comhdaigh _mar:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
-#, fuzzy
 msgid "Full _Name..."
 msgstr "Ainm _Fhada..."
 
@@ -832,7 +899,6 @@ msgid "Primary _email:"
 msgstr "Fón Thósaiocht"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
-#, fuzzy
 msgid "S_pouse:"
 msgstr "_Céile:"
 
@@ -845,32 +911,27 @@ msgid "_Add"
 msgstr "_Suimigh"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
 msgid "_Business:"
-msgstr "_Gnó"
+msgstr "_Gnó:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#, fuzzy
 msgid "_Categories..."
-msgstr ""
-"\n"
-"Aicmí:"
+msgstr "_Catagóire..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Dealaigh"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#, fuzzy
 msgid "_Home:"
-msgstr "_Baile"
+msgstr "_Baile:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
@@ -882,9 +943,8 @@ msgid "_Manager's name:"
 msgstr "Ainm _Bainisteoir:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#, fuzzy
 msgid "_Mobile:"
-msgstr "Fón _Póca"
+msgstr "Fón _Póca:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
@@ -908,9 +968,8 @@ msgid "_Web page address:"
 msgstr "Seoladh leathanach greasán:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#, fuzzy
 msgid "Address"
-msgstr "_Seoladh:"
+msgstr "Seoladh"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
@@ -2079,17 +2138,15 @@ msgstr "An tSiombáib"
 #: addressbook/gui/widgets/e-addressbook-view.c:177
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
-#, fuzzy
 msgid "Book"
-msgstr "Críochnaithe"
+msgstr "Leabhar"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:191
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
-#, fuzzy
 msgid "Contact"
-msgstr "Tadhallaí"
+msgstr "Tadhall"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:198
 #, fuzzy
@@ -2102,9 +2159,8 @@ msgstr ""
 
 # FR
 #: addressbook/gui/contact-editor/e-contact-editor.c:219
-#, fuzzy
 msgid "Changed"
-msgstr "An Fhrainc"
+msgstr "Athraithe"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:855
 msgid "Category editor not available."
@@ -2158,23 +2214,18 @@ msgid "_Edit Full"
 msgstr "Eagar Ainm Fhada"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#, fuzzy
 msgid "_Full Name:"
 msgstr "Ainm _Fhada:"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:317
-#, fuzzy
 msgid "E-_mail:"
-msgstr ""
-"\n"
-"R-phost:"
+msgstr "R-_phost:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Seoladh _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:3
-#, fuzzy
 msgid "Ci_ty:"
 msgstr "_Cathair:"
 
@@ -2183,9 +2234,8 @@ msgid "Countr_y:"
 msgstr "_Tír:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:5
-#, fuzzy
 msgid "Full Address"
-msgstr "_Seoladh:"
+msgstr "Seoladh"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
@@ -2212,7 +2262,7 @@ msgid "Esq."
 msgstr ""
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Ainm Fhada"
 
@@ -2308,11 +2358,25 @@ msgstr ""
 msgid "Save List as VCard"
 msgstr "Sábháil mar VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr ""
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Tadhall Nua:"
@@ -2327,25 +2391,11 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr ""
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr ""
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
-msgstr ""
+msgstr "Cuardach Ardmód"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
@@ -2355,7 +2405,7 @@ msgstr "Tadhallaí"
 #: addressbook/gui/widgets/e-addressbook-model.c:151
 #, fuzzy
 msgid "1 contact"
-msgstr "Tadhallaí"
+msgstr "Tadhall"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:154
 #, fuzzy, c-format
@@ -2368,18 +2418,16 @@ msgstr "Tadhallaí"
 #: addressbook/gui/widgets/e-addressbook-view.c:184
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
-#, fuzzy
 msgid "Query"
-msgstr "An Ghearmáin"
+msgstr "Ceist"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:448
 msgid "Error getting book view"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-#, fuzzy
 msgid "Model"
-msgstr "Gúthan Póca"
+msgstr "Samhail"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:114
 msgid "Error modifying card"
@@ -2406,9 +2454,8 @@ msgid "Save as VCard"
 msgstr "Sábháil mar VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:881
-#, fuzzy
 msgid "New Contact..."
-msgstr "Tadhall Nua"
+msgstr "Tadhall Nua..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
@@ -2416,9 +2463,8 @@ msgid "New Contact List..."
 msgstr "Líosta Tadhall Nua"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:885
-#, fuzzy
 msgid "Go to Folder..."
-msgstr "_Cóip do Fillteán..."
+msgstr "Téigh go dtí Fillteán..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 #, fuzzy
@@ -2450,9 +2496,9 @@ msgid "Send Message to Contact"
 msgstr ""
 
 # fa 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Priontáil"
@@ -2462,23 +2508,24 @@ msgid "Print Envelope"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#, fuzzy
 msgid "Copy to folder..."
-msgstr "_Cóip do Fillteán..."
+msgstr "Cóip do Fillteán..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:904
-#, fuzzy
 msgid "Move to folder..."
-msgstr "Sábháil 'san _fillteán"
+msgstr "Bog go fillteán..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:907
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Gearr"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Cóip"
 
@@ -2487,19 +2534,10 @@ msgstr "Cóip"
 msgid "Paste"
 msgstr "Greamaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Dealaigh"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
-#, fuzzy
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
-msgstr "Radharc Carta"
+msgstr "Radharc Reatha"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1099
 #, c-format
@@ -2510,181 +2548,184 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
-msgstr ""
+msgstr "Cúntóir"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Fón Chúntóir"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
-msgstr "Seoladh sa GhN"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Facs Ghnó"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Fón Ghnó"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Fón Ghnó 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Fón Char"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Fón Ghnó"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Roinn"
-
 # ta
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "Rpost"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "Rphost 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "Rphost 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Ainm Chlainn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Sábháil Mar"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Seoladh Bhaile"
+#, fuzzy
+msgid "Given Name"
+msgstr "Ainm Réimse"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Facs Bhaile"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Fón sa Baile"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Fón Bhaile 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Críochnaithe"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+# JO
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "An Iordáin"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Bainisteoir"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Fón Phóca"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Leasainm"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Oifig"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Eagrú"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Seoladh Eile"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Facs Eile"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Fón Eile"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Fón Thósaiocht"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Dearbhú"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Raidio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Céile"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Teideal"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Gan Tidéal"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Idirlíon"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:145
-#, fuzzy
 msgid "Width"
-msgstr "Leitheid:"
+msgstr "Leitheid"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:152
-#, fuzzy
 msgid "Height"
-msgstr "Airde:"
+msgstr "Airde"
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:160
@@ -2693,14 +2734,12 @@ msgstr ""
 
 # FI
 #: addressbook/gui/widgets/e-minicard-label.c:136
-#, fuzzy
 msgid "Field"
-msgstr "An Fhionlainn"
+msgstr "Réimse"
 
 #: addressbook/gui/widgets/e-minicard-label.c:143
-#, fuzzy
 msgid "Field Name"
-msgstr "Ainm Chlainn"
+msgstr "Ainm Réimse"
 
 #: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
@@ -2712,9 +2751,8 @@ msgstr ""
 
 # CO
 #: addressbook/gui/widgets/e-minicard-view-widget.c:126
-#, fuzzy
 msgid "Column Width"
-msgstr "An Cholóim"
+msgstr ""
 
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
@@ -2733,9 +2771,8 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/widgets/e-minicard-view.c:453
-#, fuzzy
 msgid "Adapter"
-msgstr "Bainisteoir"
+msgstr "Adaptar"
 
 #: addressbook/gui/widgets/e-minicard.c:168
 #, fuzzy
@@ -2765,11 +2802,19 @@ msgstr "Ball"
 msgid "Job Title"
 msgstr "Tideal _Post:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Seoladh Bhaile"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Seoladh Bhaile"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Seoladh Eile"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2783,171 +2828,165 @@ msgstr "Facs Bhaile"
 msgid "Blog"
 msgstr "_Larger"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "iEarraidh gan Aithne"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Tadhall Nua"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Contact ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Ceangailte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Údarú"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Údarú"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "Leabhar Seoladh:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Earraidh Eile"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
-#, fuzzy
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
-msgstr "Priontáil carta"
+msgstr "_Caith uait"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
-msgstr "Scríos an sceal seo"
+msgstr "Cruthaigh tadhall nua"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
-#, fuzzy, c-format
+#: addressbook/gui/widgets/eab-gui-util.c:270
+#, c-format
 msgid "Error saving %s: %s"
-msgstr ""
-"Earraidh ag sábhháil scéalaí do: %s\n"
-" %s"
+msgstr "Earráid ag sábhháil %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "carta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "líosta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
-msgstr "Gan cartaí"
+msgstr "Bog carta go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
-msgstr "Gan cartaí"
+msgstr "Cóip carta go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
-msgstr "Gan cartaí"
+msgstr "Bog cartaí go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
-msgstr "Gan cartaí"
+msgstr "Cóip cartaí go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard do %s"
@@ -2999,13 +3038,13 @@ msgstr "agus %d cartaí eile."
 #: addressbook/gui/widgets/eab-vcard-control.c:142
 #, fuzzy
 msgid "and one other contact."
-msgstr "agus aon card eile."
+msgstr "agus aon carta eile."
 
 #: addressbook/gui/widgets/eab-vcard-control.c:225
 #: addressbook/gui/widgets/eab-vcard-control.c:275
 #, fuzzy
 msgid "Show Full VCard"
-msgstr "Taispeán gach Rud"
+msgstr "Taispeán gach Rud"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:229
 #, fuzzy
@@ -3034,7 +3073,8 @@ msgstr ""
 #: addressbook/printing/test-print.c:53
 #, fuzzy
 msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Cóipcheart 1999, 2000, 2001 Ximian, Inc."
+msgstr ""
+"Cóipcheart 1999, 2000, 2001 Ximian, Inc."
 
 #: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
@@ -3058,11 +3098,11 @@ msgstr "Priontáil an tadhallaí seo"
 
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
-msgstr "Tahoma 10pt."
+msgstr "Tahoma 10 pt."
 
 #: addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
-msgstr "Tahoma 8pt."
+msgstr "Tahoma 8 pt."
 
 #: addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
@@ -3070,7 +3110,7 @@ msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
-msgstr ""
+msgstr "Corp"
 
 #: addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
@@ -3144,7 +3184,7 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Roghanna"
 
@@ -3235,7 +3275,7 @@ msgstr ""
 #: addressbook/printing/test-print.c:52
 #, fuzzy
 msgid "Contact Print Test"
-msgstr "Liost Tadhall"
+msgstr "_Liosta Tadhaill"
 
 #: addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
@@ -3272,7 +3312,7 @@ msgstr ""
 #: addressbook/tools/evolution-addressbook-export.c:60
 #, fuzzy
 msgid "[vcard|csv]"
-msgstr "Gan cartaí"
+msgstr "cartaí"
 
 #: addressbook/tools/evolution-addressbook-export.c:61
 msgid "Export in asynchronous mode "
@@ -3331,52 +3371,114 @@ msgstr "Liost Tadhall"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
 #: calendar/conduits/todo/todo-conduit.c:206
-#, fuzzy
 msgid "Default Priority:"
-msgstr "Tosaíocht"
+msgstr "Tosaíocht Loicthe:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Teachtaireacht Féilire"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Féilire"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Teachtaireacht Féilire"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution - Cruthaigh fillteán nua"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Eagarthóir Nuachráin Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Eagarthóir Nuachráin Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Alairm Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Comhpháirt Trialach Evolution"
+
+# tg
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Teascanna"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 #, fuzzy
 msgid "Starting:"
 msgstr "Álbachtaí"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
-#, fuzzy
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
-msgstr "Rabhadh"
+msgstr "Ag Críochnach:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
-#, fuzzy
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
-msgstr "Evolution "
+msgstr "Aláram Evolution"
 
 # ##
 # ## Languages (ISO 639 code in brackets)
 # ## 	The 'msgid' names and spellings for languages are those listed
 # ##     in iso-639.def from glibc
 # aa 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alairm on %s"
@@ -3441,126 +3543,276 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "am neamhbhailí"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Féilire"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+msgid "Color of tasks that are due today"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+msgid "Color of tasks that are overdue"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+msgid "Show where events end in week and month views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+msgid "The view showing when the calendar starts"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Scríos an sceal seo"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+msgid "Whether to show week numbers in date navigator"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "lae"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A, %e %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
-msgstr "aa %d %b"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. 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/calendar-commands.c:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Priontáil an féilire seo"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
-msgstr "Feilire"
+msgstr "Féilire"
 
-# vi
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Coinne nua"
+
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Cruthaigh coinne nua"
+
+#: calendar/gui/calendar-component.c:639
 #, fuzzy
-msgid "Rename"
-msgstr "Bhítneaimis"
+msgid "New meeting"
+msgstr "Bealach Nuachtáin"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "_Cruinniú"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Personal"
-msgstr "Gnáth"
+msgid "Create a new meeting request"
+msgstr "Scríos an sceal seo"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
+#: calendar/gui/calendar-component.c:646
 #, fuzzy
-msgid "Work"
-msgstr "Ag Obair"
+msgid "New all day appointment"
+msgstr "Coinne Nua"
+
+#: calendar/gui/calendar-component.c:647
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Coinne"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Cruthaigh Coinne _Nua"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3593,7 +3845,7 @@ msgstr "Radharc Mí"
 #: calendar/gui/calendar-view-factory.c:130
 #, fuzzy
 msgid "List View"
-msgstr "Radharc Carta"
+msgstr "Sainradharc"
 
 #: calendar/gui/comp-editor-factory.c:451
 msgid "Error while opening the calendar"
@@ -3681,7 +3933,7 @@ msgstr "Post"
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
@@ -3698,6 +3950,10 @@ msgstr "uair"
 msgid "minutes"
 msgstr "noimeaíd"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3732,8 +3988,8 @@ msgstr "Post ríomhphost"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Coimriú:"
 
@@ -3743,11 +3999,11 @@ msgstr "_Roghanna..."
 
 #: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "after"
-msgstr ""
+msgstr "tar éis"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "before"
-msgstr "riomh"
+msgstr "roimh"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
@@ -3762,7 +4018,7 @@ msgstr "deireadh an coinne"
 msgid "hour(s)"
 msgstr "uair"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "noimea(i)d"
 
@@ -3772,29 +4028,28 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
-msgstr "05 noimeaíd"
+msgstr "05 noiméaid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
-msgstr "10 noimeáid"
+msgstr "10 noiméaid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "15 minutes"
-msgstr "15 noimeáid"
+msgstr "15 noiméaid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
-msgstr "30 noimeáid"
+msgstr "30 noiméaid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
-msgstr "60 noimeáid"
+msgstr "60 noiméaid"
 
 # DZ
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
-#, fuzzy
 msgid "Alerts"
-msgstr "An Ailgéir"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
@@ -3818,7 +4073,7 @@ msgstr "Lae"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Aoine"
 
@@ -3832,7 +4087,7 @@ msgstr "Noimeaíd"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Luain"
 
@@ -3843,7 +4098,7 @@ msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Sathairn"
 
@@ -3857,7 +4112,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Domhnaigh"
 
@@ -3876,7 +4131,7 @@ msgstr "Líosta _Teasc"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Deardaoin"
 
@@ -3894,7 +4149,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Mairt"
 
@@ -3904,12 +4159,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Ceádaoin"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Seachtain Oibre"
 
@@ -3946,7 +4201,7 @@ msgid "_Fri"
 msgstr "_Aoi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr ""
 
@@ -3985,80 +4240,79 @@ msgid "_Wed"
 msgstr "_Cea"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#, fuzzy
 msgid "before every appointment"
-msgstr "Scríos an sceal seo"
+msgstr "roimh gach coinne"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -4068,162 +4322,166 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr "Earraidh gan aithne: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Críochnaithe "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Críochnaithe "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 #, fuzzy
 msgid "Could not update object"
 msgstr "Teíp ag fork: %s"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Teasc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Gan coimriú"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Sánbháil le..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+msgid "Select destination source"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -4239,43 +4497,43 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr ""
 
@@ -4313,9 +4571,8 @@ msgid "F_ree"
 msgstr "_Saor"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#, fuzzy
 msgid "L_ocation:"
-msgstr "Fillteán _Nua"
+msgstr "Á_it:"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:7
@@ -4345,31 +4602,31 @@ msgid "_Start time:"
 msgstr ""
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ar Bith"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4410,21 +4667,15 @@ msgid "Member"
 msgstr "Ball"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr ""
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stádas"
@@ -4444,6 +4695,7 @@ msgid "_Invite Others..."
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4476,60 +4728,85 @@ msgid "Could not create directory for new calendar"
 msgstr "Teíp ag fork: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 msgid "A group must be selected"
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
-msgstr "eolas fheilire"
+msgstr "Eolas fhéilire"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:3
 #, fuzzy
 msgid "Add New Calendar"
-msgstr "_Oscáil Feilire"
+msgstr "_Oscáil Feilire"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:4
 #, fuzzy
 msgid "Calendar Group"
-msgstr "Feilire"
+msgstr "Féilire"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:5
 #, fuzzy
 msgid "Calendar Location"
-msgstr "eolas fheilire"
+msgstr "Eolas fhéilire"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:6
 #, fuzzy
 msgid "Calendar Name"
-msgstr "Feilire"
+msgstr "Féilire"
+
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Teíp ag fork: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+msgid "<b>Task List Options</b>"
+msgstr ""
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Líosta _Teasc"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Líosta _Teasc"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Líosta _Teasc"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 msgid "This and Prior Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr ""
 
@@ -4546,9 +4823,8 @@ msgid "on"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.c:988
-#, fuzzy
 msgid "first"
-msgstr "líosta"
+msgstr "céad"
 
 #: calendar/gui/dialogs/recurrence-page.c:989
 msgid "second"
@@ -4570,9 +4846,8 @@ msgid "last"
 msgstr "líosta"
 
 #: calendar/gui/dialogs/recurrence-page.c:1015
-#, fuzzy
 msgid "Other Date"
-msgstr "Facs Eile"
+msgstr "Dáta Eile"
 
 #: calendar/gui/dialogs/recurrence-page.c:1043
 msgid "day"
@@ -4582,10 +4857,16 @@ msgstr "lá"
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr ""
 
+#
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Dáta/Am:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "_Suimigh"
@@ -4652,42 +4933,42 @@ msgstr "Seachta(i)n"
 msgid "year(s)"
 msgstr "blia(i)n"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
-msgstr "Teachtaireacht Feilire"
+msgstr "Teachtaireacht Féilire"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 #, fuzzy
 msgid "Completed date is wrong"
-msgstr "Críochnaithe "
+msgstr "Dáta Críochnaithe "
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #, fuzzy, no-c-format
@@ -4695,43 +4976,43 @@ msgid "% _Complete"
 msgstr "% Rinneadh:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Críochnaithe"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Ard"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Bun"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Gnáth"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr ""
 
@@ -4740,7 +5021,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr ""
 
@@ -4762,21 +5043,21 @@ msgstr "_Stádas:"
 msgid "_Web Page:"
 msgstr "Seoladh leathanach greasán:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Gnáth"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr ""
 
@@ -4784,9 +5065,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Tuarascáil:"
 
@@ -4805,7 +5086,7 @@ msgstr "%d la(e)"
 
 #: calendar/gui/e-alarm-list.c:400
 msgid "1 day"
-msgstr " 1 lá"
+msgstr "1 lá"
 
 #: calendar/gui/e-alarm-list.c:405
 #, c-format
@@ -4819,11 +5100,11 @@ msgstr "1 seachtain"
 #: calendar/gui/e-alarm-list.c:413
 #, c-format
 msgid "%d hours"
-msgstr " %d uaireanta"
+msgstr "%d (h)(n-)uaire"
 
 #: calendar/gui/e-alarm-list.c:416
 msgid "1 hour"
-msgstr " 1 uair"
+msgstr "1 uair"
 
 #: calendar/gui/e-alarm-list.c:421
 #, c-format
@@ -4832,7 +5113,7 @@ msgstr " %d noimeáid"
 
 #: calendar/gui/e-alarm-list.c:424
 msgid "1 minute"
-msgstr " 1 noimeád"
+msgstr "1 noiméad"
 
 #: calendar/gui/e-alarm-list.c:429
 #, c-format
@@ -4841,7 +5122,7 @@ msgstr "%d soicínd"
 
 #: calendar/gui/e-alarm-list.c:432
 msgid "1 second"
-msgstr " 1 soicínd"
+msgstr "1 soicind"
 
 #: calendar/gui/e-alarm-list.c:469
 msgid "Send an email"
@@ -4891,26 +5172,21 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Priobhdach"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr ""
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -4923,29 +5199,26 @@ msgid "Start Date"
 msgstr ""
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Coimriú"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
-#, fuzzy
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
-msgstr " dath"
+msgstr "dath"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 #, fuzzy
 msgid "component"
 msgstr "Coinne"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Saor"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr ""
 
@@ -4957,7 +5230,7 @@ msgstr "T"
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr ""
 
@@ -4965,14 +5238,14 @@ msgstr ""
 msgid "W"
 msgstr "I"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4980,7 +5253,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Tá"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4988,17 +5261,17 @@ msgstr "Níl"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Gan Aithne"
 
@@ -5010,193 +5283,191 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Coinne Nua..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 #, fuzzy
 msgid "New Meeting"
 msgstr "Bealach Nuachtáin"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Teasc Nua"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Priontáil..."
 
 # PS
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 #, fuzzy
 msgid "_Paste"
 msgstr "_Greamaigh"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-#, fuzzy
-msgid "_Settings..."
-msgstr "Álbachtaí"
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Oscáil"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Sábháil Mar..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "G_earr"
 
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Cóip"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Ag Fanacht..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 #, fuzzy
 msgid "_Forward as iCalendar..."
-msgstr "Ag Lódáil feilire..."
+msgstr "Ag Lódáil féilire..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+#, fuzzy
+msgid "_Settings..."
+msgstr "Álbachtaí"
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Oscail Teachtaireacht"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr ""
 
 # ln
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Liongáilis"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "% Rinneadh:"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -5212,12 +5483,11 @@ msgstr "% Rinneadh:"
 # ##     in iso-639.def from glibc
 # aa 
 #: calendar/gui/e-calendar-table.etspec.h:3
-#, fuzzy
 msgid "Alarms"
-msgstr "Afáiris"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr ""
 
@@ -5246,18 +5516,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 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:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 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:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5273,7 +5543,7 @@ msgstr ""
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5286,474 +5556,458 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "rn"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "in"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:650
-#, fuzzy
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
-msgstr "Gach"
+msgstr "Gach lá"
 
-#: calendar/gui/e-itip-control.c:652
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:650
+#, c-format
 msgid "Every %d days"
-msgstr "%d la(e)"
+msgstr "Gach %d lá"
 
-#: calendar/gui/e-itip-control.c:658
-#, fuzzy
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
-msgstr "Gach"
+msgstr "Gach seachtain"
 
-#: calendar/gui/e-itip-control.c:660
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:658
+#, c-format
 msgid "Every %d weeks"
-msgstr " %d seachtain"
+msgstr "Gach %d seachtain"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:665
-#, fuzzy, c-format
+#: calendar/gui/e-itip-control.c:663
+#, c-format
 msgid "Every %d weeks on "
-msgstr " %d seachtain"
+msgstr "Gach %d seachtain dé "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:698
-#, fuzzy
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
-msgstr "Aon _mhí"
+msgstr "gach mí"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:709
-#, fuzzy
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
-msgstr "Gach"
+msgstr "Gach bliain"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
-#, fuzzy
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
-msgstr "Eolas"
+msgstr "<b>Ag Críochnú:</b> "
 
-#: calendar/gui/e-itip-control.c:786
-#, fuzzy
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
-msgstr "Críochnaithe "
+msgstr "<b>Críochnaithe:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "eolas fheilire"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 #, fuzzy
 msgid "iCalendar Error"
-msgstr "Feilire"
+msgstr "Féilire"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
-#, fuzzy
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
-msgstr "iEarraidh gan Aithne"
+msgstr "Duine anaithnid"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Ar bith</i>"
 
-#: calendar/gui/e-itip-control.c:994
-#, fuzzy
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
-msgstr "Fillteán _Nua"
+msgstr "Áit:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
-msgstr "_Stádas:"
+msgstr "Stádas:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
-msgstr "Fillteán _Nua"
+msgstr "Roghnaigh gníomh:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 #, fuzzy
 msgid "Update"
 msgstr "Data"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ceart go Leor"
 
-#: calendar/gui/e-itip-control.c:1109
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
-msgstr "Cuntas"
+msgstr "Glac Leis"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1111
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
-msgstr "Dealaigh"
+msgstr "Diúltaigh Dó"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Eolas Theasc"
 
 # FR
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
-msgstr "An Fhrainc"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1264
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
-msgstr "eolas fheilire"
+msgstr "Eolas cruinniú"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "_Dealaigh gach rud"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Álbachtaí"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1290
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
-msgstr "Freagrair"
+msgstr "Freagra Cruinniú"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Post an sceál seo"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Eolas Theasc"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 #, fuzzy
 msgid "Task Update"
 msgstr "Data"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 #, fuzzy
 msgid "Task Reply"
 msgstr "Freagrair"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Eolas Theasc"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 #, fuzzy
 msgid "Bad Task Message"
-msgstr "Teachtaireacht Feilire"
+msgstr "Teachtaireacht Féilire"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Freagrair"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Post an sceál seo"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Teíp ag fork: %s"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -5778,7 +6032,7 @@ msgstr "--do--"
 
 #: calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
-msgstr "Teachtaireacht Feilire"
+msgstr "Teachtaireacht Féilire"
 
 #: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
@@ -5792,7 +6046,7 @@ msgstr "Liongáilis"
 
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
-msgstr "Ag Lódáil feilire..."
+msgstr "Ag Lódáil féilire..."
 
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
@@ -5809,7 +6063,7 @@ msgstr ""
 # FIXME (Plural)
 #: calendar/gui/e-meeting-list-view.c:62 calendar/gui/e-meeting-model.c:77
 msgid "Chair Persons"
-msgstr "Cathlaoirlaig"
+msgstr "Cathlaoirlaigh"
 
 #: calendar/gui/e-meeting-list-view.c:63
 #: calendar/gui/e-meeting-list-view.c:456 calendar/gui/e-meeting-model.c:78
@@ -5822,9 +6076,8 @@ msgid "Optional Participants"
 msgstr ""
 
 #: calendar/gui/e-meeting-list-view.c:65 calendar/gui/e-meeting-model.c:80
-#, fuzzy
 msgid "Resources"
-msgstr "Goireas"
+msgstr "Acmhainn"
 
 # IN 
 #: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-model.c:192
@@ -5856,9 +6109,8 @@ msgstr "Seomra"
 #: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-model.c:227
 #: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:766
 #: calendar/gui/e-meeting-store.c:125 calendar/gui/e-meeting-store.c:142
-#, fuzzy
 msgid "Chair"
-msgstr "Téalainnis"
+msgstr "Cathaoir"
 
 #: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-model.c:229
 #: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:527
@@ -5922,7 +6174,7 @@ 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:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5956,7 +6208,7 @@ msgstr "_<<"
 
 #: calendar/gui/e-meeting-time-sel.c:515
 msgid "_Autopick"
-msgstr ""
+msgstr "_Uathpioc"
 
 #: calendar/gui/e-meeting-time-sel.c:530
 msgid ">_>"
@@ -5986,93 +6238,78 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 #, fuzzy
 msgid "Start Date:"
 msgstr ""
 "\n"
 "Data Breithe: "
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 #, fuzzy
 msgid "Due Date:"
 msgstr "Dáta:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 #, fuzzy
 msgid "Priority:"
 msgstr "Tosaíocht"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 #, fuzzy
 msgid "Web Page:"
 msgstr "Leathanach"
 
-#: calendar/gui/e-tasks.c:715
-#, fuzzy, c-format
-msgid "Opening tasks at %s"
-msgstr "Ag oscailt an t-eolaire %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Teíp ag fork: %s"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
-#, fuzzy, c-format
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
+#, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
-"Earraidh ag sábhháil scéalaí do: %s\n"
-" %s"
+" Earráid le %s:\n"
+"  %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr ""
 
-# tg
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Teascanna"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
-msgstr "Feilire"
+msgstr "Féilire"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -6082,12 +6319,12 @@ msgstr ""
 # ## 	The 'msgid' names and spellings for languages are those listed
 # ##     in iso-639.def from glibc
 # aa 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alairm on %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6095,7 +6332,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6104,72 +6341,19 @@ msgid ""
 msgstr ""
 
 # tr
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 #, fuzzy
 msgid "Purging"
 msgstr "Tuircis"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Teachtaireacht Feilire"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Feilire"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Teachtaireacht Feilire"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution - Cruthaigh fillteán nua"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Eagarthóir Nuachráin Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Eagarthóir Nuachráin Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Alairm Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Alairm Evolution"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aibreáin"
 
 # AT
 #: calendar/gui/goto-dialog.glade.h:2
-#, fuzzy
 msgid "August"
-msgstr "An Ostair"
+msgstr "Lúnasa"
 
 #: calendar/gui/goto-dialog.glade.h:3
 msgid "December"
@@ -6225,313 +6409,343 @@ msgstr "D. Fómhair"
 msgid "September"
 msgstr "M. Fómhair"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 #, fuzzy
 msgid "Event information"
 msgstr "eolas fheilire"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 #, fuzzy
 msgid "Task information"
 msgstr "Eolas Theasc"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Journal information"
 msgstr "Eolas Cuntais"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Eolas"
 
-#: calendar/gui/itip-utils.c:399
-#, fuzzy
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
-msgstr "eolas fheilire"
+msgstr "Eolas fhéilire"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 #, fuzzy
 msgid "Updated"
 msgstr "Data"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 #, fuzzy
 msgid "Refresh"
 msgstr "Freagrair"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Eolas"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 #, fuzzy
 msgid "iCalendar information"
 msgstr "eolas fheilire"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
-msgstr ""
+msgstr "1ú"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
-msgstr ""
+msgstr "2ú"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
-msgstr ""
+msgstr "3ú"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
-msgstr ""
+msgstr "4ú"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
-msgstr ""
+msgstr "5ú"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
-msgstr ""
+msgstr "6ú"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
-msgstr ""
+msgstr "7ú"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
-msgstr ""
+msgstr "8ú"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
-msgstr ""
+msgstr "9ú"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
-msgstr ""
+msgstr "10ú"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
-msgstr ""
+msgstr "11ú"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
-msgstr ""
+msgstr "12ú"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
-msgstr ""
+msgstr "13ú"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
-msgstr ""
+msgstr "14ú"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
-msgstr ""
+msgstr "15ú"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
-msgstr ""
+msgstr "16ú"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
-msgstr ""
+msgstr "17ú"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
-msgstr ""
+msgstr "18ú"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
-msgstr ""
+msgstr "19ú"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
-msgstr ""
+msgstr "20ú"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
-msgstr ""
+msgstr "21ú"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
-msgstr ""
+msgstr "22ú"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
-msgstr ""
+msgstr "23ú"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
-msgstr ""
+msgstr "24ú"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
-msgstr ""
+msgstr "25ú"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
-msgstr ""
+msgstr "26ú"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
-msgstr ""
+msgstr "27ú"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
-msgstr ""
+msgstr "28ú"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
-msgstr ""
+msgstr "29ú"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
-msgstr ""
+msgstr "30ú"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
-msgstr ""
+msgstr "31ú"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Ce"
 
 # th
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 #, fuzzy
 msgid "Th"
 msgstr "Téalainnis"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Ao"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr ""
 
 # tg
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 #, fuzzy
 msgid "Task"
 msgstr "Táidsícis"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "_Stádas:"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "Tosaíocht"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "Críochnaithe.`"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "URL:"
 
-#: calendar/gui/print.c:2383
-#, fuzzy, c-format
+#: calendar/gui/print.c:2382
+#, c-format
 msgid "Categories: %s"
-msgstr ""
-"\n"
-"Aicmí:"
+msgstr "Catagóire: %s"
 
-#: calendar/gui/print.c:2394
-#, fuzzy
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
-msgstr ""
-"\n"
-"Trácht:"
+msgstr "Tadhallaí: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Priontáil Reamhtaispeántais"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Socraigh Priontáil "
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Líosta _Teasc"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Teasc nua"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Teasc"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Cruthaigh teasc nua"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6539,11 +6753,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Priontáil Cartaí"
@@ -6569,31 +6783,31 @@ msgstr "Evolution "
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
 #, fuzzy
 msgid "iCalendar files (.ics)"
-msgstr "Teachtaireacht Feilire"
+msgstr "Teachtaireacht Féilire"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 #, fuzzy
 msgid "Calendar Events"
-msgstr "Teachtaireacht Feilire"
+msgstr "Teachtaireacht Féilire"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 #, fuzzy
 msgid "Gnome Calendar"
-msgstr "Feilire"
+msgstr "Féilire"
 
 #.
 #. * These are the timezone names from the Olson timezone data.
@@ -6826,9 +7040,8 @@ msgstr ""
 
 # NI 
 #: calendar/zones.h:63
-#, fuzzy
 msgid "America/Araguaina"
-msgstr "Nicaragua"
+msgstr ""
 
 #: calendar/zones.h:64
 msgid "America/Aruba"
@@ -6904,9 +7117,8 @@ msgstr ""
 
 # CR
 #: calendar/zones.h:82
-#, fuzzy
 msgid "America/Costa_Rica"
-msgstr "Cósta Rice"
+msgstr "Meiriceá/Cósta_Rice"
 
 #: calendar/zones.h:83
 msgid "America/Cuiaba"
@@ -6950,9 +7162,8 @@ msgstr ""
 
 # SV
 #: calendar/zones.h:93
-#, fuzzy
 msgid "America/El_Salvador"
-msgstr "An tSalvadóir"
+msgstr "Meiriceá/An tSalvadóir"
 
 #: calendar/zones.h:94
 msgid "America/Fortaleza"
@@ -6984,9 +7195,8 @@ msgstr ""
 
 # GT
 #: calendar/zones.h:101
-#, fuzzy
 msgid "America/Guatemala"
-msgstr "Guatamala"
+msgstr "Meiriceá/Guatamala"
 
 #: calendar/zones.h:102
 msgid "America/Guayaquil"
@@ -6994,9 +7204,8 @@ msgstr ""
 
 # GY
 #: calendar/zones.h:103
-#, fuzzy
 msgid "America/Guyana"
-msgstr "An Ghuáin"
+msgstr "Meiriceá/An Ghuáin"
 
 #: calendar/zones.h:104
 msgid "America/Halifax"
@@ -7040,9 +7249,8 @@ msgstr ""
 
 # JM
 #: calendar/zones.h:114
-#, fuzzy
 msgid "America/Jamaica"
-msgstr "Iamáice"
+msgstr "Meiriceá/Iamáice"
 
 #: calendar/zones.h:115
 msgid "America/Jujuy"
@@ -7422,9 +7630,8 @@ msgstr ""
 
 # CO
 #: calendar/zones.h:205
-#, fuzzy
 msgid "Asia/Colombo"
-msgstr "An Cholóim"
+msgstr ""
 
 #: calendar/zones.h:206
 msgid "Asia/Damascus"
@@ -7516,9 +7723,8 @@ msgstr ""
 
 # KW
 #: calendar/zones.h:228
-#, fuzzy
 msgid "Asia/Kuwait"
-msgstr "Cuáit"
+msgstr "An Áise/Cuáit"
 
 #: calendar/zones.h:229
 msgid "Asia/Macao"
@@ -7558,9 +7764,8 @@ msgstr ""
 
 # AT
 #: calendar/zones.h:238
-#, fuzzy
 msgid "Asia/Oral"
-msgstr "An Ostair"
+msgstr ""
 
 #: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
@@ -7612,9 +7817,8 @@ msgstr ""
 
 # SG
 #: calendar/zones.h:251
-#, fuzzy
 msgid "Asia/Singapore"
-msgstr "Singeapór"
+msgstr "An Áise/Singeapór"
 
 #: calendar/zones.h:252
 msgid "Asia/Taipei"
@@ -7766,15 +7970,13 @@ msgstr "An Astráil"
 
 # AU
 #: calendar/zones.h:285
-#, fuzzy
 msgid "Australia/Perth"
-msgstr "An Astráil"
+msgstr ""
 
 # AU
 #: calendar/zones.h:286
-#, fuzzy
 msgid "Australia/Sydney"
-msgstr "An Astráil"
+msgstr ""
 
 #: calendar/zones.h:287
 msgid "Europe/Amsterdam"
@@ -7785,9 +7987,8 @@ msgid "Europe/Andorra"
 msgstr ""
 
 #: calendar/zones.h:289
-#, fuzzy
 msgid "Europe/Athens"
-msgstr "Álbactaí"
+msgstr ""
 
 #: calendar/zones.h:290
 msgid "Europe/Belfast"
@@ -7863,9 +8064,8 @@ msgstr ""
 
 # LU
 #: calendar/zones.h:308
-#, fuzzy
 msgid "Europe/Luxembourg"
-msgstr "Lucsamburg"
+msgstr "An Eoraip/Lucsamburg"
 
 #: calendar/zones.h:309
 msgid "Europe/Madrid"
@@ -7881,9 +8081,8 @@ msgstr ""
 
 # MC
 #: calendar/zones.h:312
-#, fuzzy
 msgid "Europe/Monaco"
-msgstr "Monacó"
+msgstr "An Eoraip/Monacó"
 
 #: calendar/zones.h:313
 msgid "Europe/Moscow"
@@ -7898,9 +8097,8 @@ msgid "Europe/Oslo"
 msgstr ""
 
 #: calendar/zones.h:316
-#, fuzzy
 msgid "Europe/Paris"
-msgstr "Álbactaí"
+msgstr "An Eoraip/Páras"
 
 #: calendar/zones.h:317
 msgid "Europe/Prague"
@@ -8190,27 +8388,27 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr ""
 
@@ -8256,88 +8454,88 @@ msgstr "Ag oscailt an t-eolaire %s"
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 #, fuzzy
 msgid "Syncing folder"
 msgstr "ag sioncronaich filtean"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "_Post sceál"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -8365,37 +8563,36 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1321
-#, fuzzy
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
-msgstr "Post an sceál seo"
+msgstr "Ag bogadh scéaltaí"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "Post an sceál seo"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "_Post sceál"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8403,45 +8600,45 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Ceangailte."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8449,49 +8646,60 @@ msgid ""
 "%s"
 msgstr "_Post sceál"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "_Post sceál"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "_Post sceál"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "_Post sceál"
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
-msgstr "Teíp ag fork: %s"
+msgstr "Ní raibh an grúpa ar fáil: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Post an sceál seo"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "_Post sceál"
@@ -8512,9 +8720,9 @@ msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
 #: camel/camel-lock-client.c:204
-#, fuzzy, c-format
+#, c-format
 msgid "Could not lock '%s'"
-msgstr "Teíp ag fork: %s"
+msgstr "Níorbh fhéidir '%s' a glasáil"
 
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
@@ -8590,15 +8798,15 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "Earraidh Eile"
@@ -8620,7 +8828,7 @@ msgstr ""
 
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
-msgstr "Gan anim"
+msgstr "Gan ainm"
 
 #: camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
@@ -8897,85 +9105,97 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 msgid "Unverified"
 msgstr ""
 
 # SG
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
-msgstr "Singeapór"
+msgstr "Eagar síniú"
 
 # SG
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
-msgstr "Singeapór"
+msgstr "Eagar síniú"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 msgid "Signing certificate not found"
 msgstr ""
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 msgid "Signing certificate not trusted"
 msgstr ""
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
 # SG
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
-msgstr "Singeapór"
+msgstr "Eagar síniú"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Earraidh Eile"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Freastalaí: %s, Cinéal: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Teíp ag fork: %s"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Teíp ag fork: %s"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Bruscar"
+
+# GN
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "An Ghuine"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
@@ -9109,7 +9329,7 @@ msgstr ""
 
 #: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
-msgstr ""
+msgstr "OLC"
 
 #: camel/camel-tcp-stream-openssl.c:704
 #, c-format
@@ -9162,7 +9382,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -9184,22 +9404,22 @@ msgstr "Ni raibh aon sceal %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Fillteán _Nua"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Teíp ag fork: %s"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Teíp ag fork: %s"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Teíp ag fork: %s"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Teíp ag fork: %s"
@@ -9278,7 +9498,7 @@ msgstr "_Post sceál"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9290,7 +9510,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #, fuzzy
 msgid "No such message"
@@ -9329,53 +9549,70 @@ msgid "Failed to cache %s: %s"
 msgstr "Teíp ag fork: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Cumraigh do %s"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Teíp ag fork: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr ""
+"\n"
+"Trácht:"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Fillteáin"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Pasfhocal"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9620,7 +9857,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Teíp ag fork: %s"
@@ -9733,40 +9970,40 @@ msgstr "Ag Sábháil scealta"
 msgid "Storing folder"
 msgstr "Ag stoir filtean"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -9782,7 +10019,7 @@ msgstr ""
 msgid ""
 "Could not create directory `%s':\n"
 "%s"
-msgstr "Teíp ag fork: %s"
+msgstr "Teíp ag fork: %s"
 
 #: camel/providers/local/camel-mbox-store.c:178
 #, c-format
@@ -9819,19 +10056,25 @@ msgstr "Teíp ag fork: %s"
 #: camel/providers/local/camel-mbox-store.c:324
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
-msgstr "Teíp ag fork: %s"
+msgstr ""
+" Ní féidir sábháil go `%s'\n"
+"  %s"
 
 #: camel/providers/local/camel-mbox-store.c:338
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+msgid "Folder already exists"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 msgid "The new folder name is illegal."
 msgstr ""
 
@@ -9853,9 +10096,9 @@ msgstr "Teíp ag fork: %s"
 #: camel/providers/local/camel-mbox-summary.c:515
 #: camel/providers/local/camel-mbox-summary.c:606
 #: camel/providers/local/camel-spool-summary.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open file: %s: %s"
-msgstr "Teíp ag fork: %s"
+msgstr "Níorbh fhéidir an comhad %s a n-oscailt: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:527
 #: camel/providers/local/camel-spool-summary.c:162
@@ -9874,7 +10117,7 @@ msgstr ""
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
@@ -10019,9 +10262,9 @@ msgstr ""
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
 #: camel/providers/pop3/camel-pop3-folder.c:512
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot get message %s: %s"
-msgstr "Post an sceál seo"
+msgstr "Níl an scéal %s ar fáil: %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:159
 #: camel/providers/pop3/camel-pop3-folder.c:262
@@ -10035,13 +10278,13 @@ msgstr "Ceangailte"
 #: camel/providers/nntp/camel-nntp-grouplist.c:45
 #, fuzzy
 msgid "Could not get group list from server."
-msgstr "Teíp ag fork: %s"
+msgstr "Ní raibh an grúpa ar fáil: %s"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:98
 #: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
+msgstr "Teíp ag fork: %s"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:158
 #, fuzzy, c-format
@@ -10083,9 +10326,9 @@ msgid "No such folder: %s"
 msgstr "Post an sceál seo"
 
 #: camel/providers/nntp/camel-nntp-summary.c:241
-#, fuzzy, c-format
+#, c-format
 msgid "Could not get group: %s"
-msgstr "Teíp ag fork: %s"
+msgstr "Ní raibh an grúpa ar fáil: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:347
 #, c-format
@@ -10158,7 +10401,7 @@ msgstr "Scrios indiath %s la(e)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10238,7 +10481,7 @@ msgid "No such folder `%s'."
 msgstr "Níl aon eolaire `%s' ann."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10291,7 +10534,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10454,7 +10697,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 #, fuzzy
 msgid "Sending message"
 msgstr "Post an sceál seo"
@@ -10563,23 +10806,23 @@ msgid "QUIT response error"
 msgstr ""
 
 #: composer/e-msg-composer-attachment-bar.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "%.0fK"
-msgstr "%.1fK"
+msgstr "%.0fK"
 
 #: composer/e-msg-composer-attachment-bar.c:106
-#, fuzzy, c-format
+#, c-format
 msgid "%.0fM"
-msgstr "%.1fM"
+msgstr "%.0fM"
 
 #: composer/e-msg-composer-attachment-bar.c:109
-#, fuzzy, c-format
+#, c-format
 msgid "%.0fG"
-msgstr "%.1fG"
+msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
-msgstr "iatán"
+msgstr "ceangaltáin"
 
 #: composer/e-msg-composer-attachment-bar.c:445
 msgid "Remove selected items from the attachment list"
@@ -10591,13 +10834,13 @@ msgstr ""
 
 #: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
-msgstr ""
+msgstr "Ceangal comhad ar an scéal"
 
 #: composer/e-msg-composer-attachment.c:168
 #: composer/e-msg-composer-attachment.c:184
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot attach file %s: %s"
-msgstr "Teíp ag fork: %s"
+msgstr "Ní féidir an comhad %s a cheangail: %s"
 
 #: composer/e-msg-composer-attachment.c:176
 #, c-format
@@ -10605,15 +10848,13 @@ msgid "Cannot attach file %s: not a regular file"
 msgstr ""
 
 #: composer/e-msg-composer-attachment.glade.h:2
-#, fuzzy
 msgid "Attachment Properties"
-msgstr "Álbactaí"
+msgstr "Álbactaí Cheangaltáin"
 
 # vi
 #: composer/e-msg-composer-attachment.glade.h:4
-#, fuzzy
 msgid "File name:"
-msgstr "Bhítneaimis"
+msgstr "Ainm chomhaid:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
 msgid "MIME type:"
@@ -10624,11 +10865,11 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr ""
 
@@ -10639,7 +10880,7 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr ""
 
@@ -10647,38 +10888,38 @@ msgstr ""
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Ó:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
-msgstr "Abair:"
+msgstr "Ábhar:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10687,16 +10928,21 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "_Poirt:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "(Gan Tuarascail)"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Ceangal comhad ar an scéal"
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10729,42 +10975,42 @@ msgstr ""
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10773,13 +11019,13 @@ msgstr ""
 "Earraidh ag sábhháil scéalaí do: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10787,36 +11033,36 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Oscáil Comhad"
 
 # SG
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 #, fuzzy
 msgid "Signature:"
 msgstr "Singeapór"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
-msgstr ""
+msgstr "Uathcruthach"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10824,24 +11070,28 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr ""
+"Go raibh maith agat\n"
+"An Fhoireann Evolution\n"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10850,7 +11100,7 @@ msgstr "carta sheoladh"
 
 #: data/evolution.keys.in.h:2
 msgid "calendar information"
-msgstr "eolas fheilire"
+msgstr "eolas fhéilire"
 
 #: default_user/searches.xml.h:1
 msgid "Body contains"
@@ -10906,9 +11156,8 @@ msgid "<b>Out of Office Message:</b>"
 msgstr "As an Oifig"
 
 #: designs/OOA/ooa.glade.h:5
-#, fuzzy
 msgid "<b>Status:</b>"
-msgstr "_Stádas:"
+msgstr "<b>Stádas:</b>"
 
 #: designs/OOA/ooa.glade.h:6
 msgid ""
@@ -10935,22 +11184,20 @@ msgid "Out of Office Assistant"
 msgstr "As an Oifig"
 
 #: designs/OOA/ooa.glade.h:13
-#, fuzzy
 msgid "Yes, Change Status"
-msgstr "Stádas"
+msgstr "Tá, Athraigh Stádas"
 
 #: designs/read_receipts/read.glade.h:1
 msgid "      "
-msgstr ""
+msgstr "      "
 
 #: designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:3
-#, fuzzy
 msgid "<b>Sending Email:</b>"
-msgstr "Post ríomhphost"
+msgstr ""
 
 #: designs/read_receipts/read.glade.h:4
 msgid ""
@@ -11034,56 +11281,48 @@ msgstr ""
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
 #: e-util/e-time-utils.c:195
-#, fuzzy
 msgid "%a %m/%d/%Y %I %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
 #: e-util/e-time-utils.c:200
-#, fuzzy
 msgid "%a %m/%d/%Y %H"
-msgstr "%a %d/%m/%Y"
+msgstr "%a·%d/%m/%Y·%H"
 
 #. strptime format of a date and a time, in 12-hour format.
 #: e-util/e-time-utils.c:211
-#, fuzzy
 msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
+msgstr "%d/%m/%Y·%I:%M:%S·%p"
 
 #. strptime format of a date and a time, in 24-hour format.
 #: e-util/e-time-utils.c:215
-#, fuzzy
 msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
+msgstr "%d/%m/%Y·%H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
 #: e-util/e-time-utils.c:220
-#, fuzzy
 msgid "%m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
+msgstr "%d/%m/%Y·%I:%M·%p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
 #: e-util/e-time-utils.c:225
-#, fuzzy
 msgid "%m/%d/%Y %H:%M"
-msgstr "%a %d/%m/%Y %H:%M:%S"
+msgstr "%d/%m/%Y·%H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
 #: e-util/e-time-utils.c:230
-#, fuzzy
 msgid "%m/%d/%Y %I %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
+msgstr "%d/%m/%Y·%I·%p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
 #: e-util/e-time-utils.c:235
-#, fuzzy
 msgid "%m/%d/%Y %H"
-msgstr "%d/%m/%Y"
+msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
@@ -11098,13 +11337,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11114,74 +11353,68 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:65
-#, fuzzy
 msgid "1 second ago"
-msgstr " 1 soicínd"
+msgstr "1 soicind ó shin"
 
 #: filter/filter-datespec.c:65
-#, fuzzy, c-format
+#, c-format
 msgid "%d seconds ago"
-msgstr "%d soicínd"
+msgstr "%d soicind ó shin"
 
 #: filter/filter-datespec.c:66
-#, fuzzy
 msgid "1 minute ago"
-msgstr " 1 noimeád"
+msgstr "1 noiméad ó shin"
 
 #: filter/filter-datespec.c:66
-#, fuzzy, c-format
+#, c-format
 msgid "%d minutes ago"
-msgstr " %d noimeáid"
+msgstr " %d noiméaid ó shin"
 
 #: filter/filter-datespec.c:67
-#, fuzzy
 msgid "1 hour ago"
-msgstr " 1 uair"
+msgstr "1 uair ó shin"
 
 #: filter/filter-datespec.c:67
-#, fuzzy, c-format
+#, c-format
 msgid "%d hours ago"
-msgstr " %d uaireanta"
+msgstr "%d (h)(n-)uaire ó shin"
 
 #: filter/filter-datespec.c:68
-#, fuzzy
 msgid "1 day ago"
-msgstr " 1 lá"
+msgstr "1 lá ó shin"
 
 #: filter/filter-datespec.c:68
-#, fuzzy, c-format
+#, c-format
 msgid "%d days ago"
-msgstr "%d la(e)"
+msgstr "%d lá ó shin"
 
 #: filter/filter-datespec.c:69
-#, fuzzy
 msgid "1 week ago"
-msgstr "1 seachtain"
+msgstr "1 seachtain ó shin"
 
 #: filter/filter-datespec.c:69
-#, fuzzy, c-format
+#, c-format
 msgid "%d weeks ago"
-msgstr " %d seachtain"
+msgstr "%d seachtain ó shin"
 
 #: filter/filter-datespec.c:70
-#, fuzzy
 msgid "1 month ago"
-msgstr "mí"
+msgstr "1 mí ó shin"
 
 #: filter/filter-datespec.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "%d months ago"
-msgstr " %d noimeáid"
+msgstr "%d mí ó shin"
 
 #: filter/filter-datespec.c:71
 msgid "1 year ago"
-msgstr ""
+msgstr "1 bliain ó shin"
 
 # FIXME : Grammar ? 
 #: filter/filter-datespec.c:71
-#, fuzzy, c-format
+#, c-format
 msgid "%d years ago"
-msgstr "%d cartaí"
+msgstr "%d bliain ó shin"
 
 #: filter/filter-datespec.c:176
 #, fuzzy
@@ -11198,9 +11431,8 @@ msgstr "anois"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
 #: filter/filter-datespec.c:285
-#, fuzzy
 msgid "%d-%b-%Y"
-msgstr "%a %d %b %Y"
+msgstr "%d-%b-%Y"
 
 #: filter/filter-datespec.c:406
 #, fuzzy
@@ -11222,9 +11454,8 @@ msgid "File '%s' does not exist or is not a regular file."
 msgstr "Níl aon Eolaire `%s' ann."
 
 #: filter/filter-file.c:299
-#, fuzzy
 msgid "Choose a file"
-msgstr "Fillteán _Nua"
+msgstr "Roghnaigh comhad"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
@@ -11236,7 +11467,7 @@ msgstr ""
 msgid "You must specify a folder."
 msgstr "Ainm Stíl:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 #, fuzzy
 msgid "Select Folder"
@@ -11250,25 +11481,25 @@ msgid ""
 msgstr ""
 
 # IR
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 #, fuzzy
 msgid "Later"
 msgstr "Bainisteoir"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 #, fuzzy
 msgid "Test"
 msgstr "An Tibéid"
@@ -11363,7 +11594,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "soicind"
 
@@ -11385,9 +11616,8 @@ msgstr ""
 
 # el 
 #: filter/filter.glade.h:26
-#, fuzzy
 msgid "weeks"
-msgstr "seachtin"
+msgstr "seachtanna"
 
 #: filter/filter.glade.h:27
 msgid "with all active remote folders"
@@ -11420,13 +11650,12 @@ msgstr ""
 
 #: filter/libfilter-i18n.h:5
 msgid "Attachments"
-msgstr ""
+msgstr "Ceangaltáin"
 
 # BE
 #: filter/libfilter-i18n.h:6
-#, fuzzy
 msgid "Beep"
-msgstr "An Bheilg"
+msgstr ""
 
 #: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
@@ -11443,7 +11672,7 @@ msgstr ""
 
 #: filter/libfilter-i18n.h:11
 msgid "Deleted"
-msgstr "Scríoste"
+msgstr "Scrioste"
 
 #: filter/libfilter-i18n.h:12
 msgid "Do Not Exist"
@@ -11466,7 +11695,7 @@ msgid "Follow Up"
 msgstr ""
 
 # PE
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 #, fuzzy
 msgid "Label"
 msgstr "_Larger"
@@ -11541,116 +11770,122 @@ msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Sábháil"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
-msgstr "Abair"
+msgstr "Ábhar"
 
 # US
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Unset Status"
 msgstr "Stáit Aontaithe Mheiriceá"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "is before"
 msgstr "riomh"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 #, fuzzy
 msgid "returns"
 msgstr "GN"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr ""
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -11677,19 +11912,84 @@ msgstr "Bhítneaimis"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "_Fillteán"
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-rule.c:534
-#, fuzzy
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
-msgstr "Fillteáin"
+msgstr "Foinse FFillteáin"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Roghanna Féilire"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Post Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Alairm Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Alairm Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution - Cruthaigh fillteán nua"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution - Cruthaigh fillteán nua"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Cuntasaí"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Roghanna Féilire"
 
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
@@ -11713,9 +12013,8 @@ msgstr "Chumasach"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:439
-#, fuzzy
 msgid "[Default]"
-msgstr "Gnáth"
+msgstr "[Gnáth]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -11725,9 +12024,8 @@ msgid "Enabled"
 msgstr ""
 
 #: mail/em-account-prefs.c:493
-#, fuzzy
 msgid "Account name"
-msgstr "Ainm _Chuntas:"
+msgstr "Ainm chuntas"
 
 #: mail/em-account-prefs.c:495
 #, fuzzy
@@ -11735,7 +12033,7 @@ msgid "Protocol"
 msgstr "Portráid"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr ""
 
@@ -11763,243 +12061,450 @@ msgstr ""
 msgid "Signature(s)"
 msgstr "_Stádas:"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Post ar aon nós?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
 #: mail/em-folder-browser.c:128
-#, fuzzy
 msgid "Create _Virtual Folder From Search..."
-msgstr "Fillteán _Nua"
-
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Post"
+msgstr "Cruthaigh Fillteán _Fhíorúil ó Cuardach..."
 
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Cruthaigh Fillteán Nua"
+
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr ""
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
+msgstr "Ai_nm Fillteán:"
+
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:568
 #, fuzzy, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "Oscáil san %s..."
+msgid "Could not create temporary mbox store: %s"
+msgstr "Teíp ag fork: %s"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
-msgstr "Ainm Fillteán:"
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Teíp ag fork: %s"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Teíp ag fork: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Ag Lódáil..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, fuzzy, c-format
+msgid "%s"
+msgstr "s"
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Tóg Fillteán"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Cruthaigh Fillteán Nua"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Teíp ag fork: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Dealaigh Fillteán '%s'"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Dealaigh \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Álbactaí"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Álbactaí"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "Ainm _Fillteán:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Radharc"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Oscail 'san Fhuinneog Nua"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Bog"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "Fillteán _Nua"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr ""
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Roghanna..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Sábháil 'san _fillteán"
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Priontáil"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Freagrair do Líosta"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Freagrair do _Gach rud"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
-msgstr "_Sheoladh Chuig duine"
+msgstr "_Seol ar aghaidh"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Críochnaithe"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Glan"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+msgid "Mark as _Junk"
+msgstr ""
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+msgid "Mark as _Not Junk"
+msgstr ""
+
+#: mail/em-folder-view.c:706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Athdealaigh"
 
-#: mail/em-folder-view.c:685
-#, fuzzy
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
-msgstr "Sábháil 'san _fillteán"
+msgstr "_Bog go Fillteán..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Cóip do Fillteán..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Suim Leabhar Seoladh"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 #, fuzzy
 msgid "Crea_te Rule From Message"
-msgstr "Teachtaireacht Feilire"
+msgstr "Teachtaireacht Féilire"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
-msgstr "Fillteáin"
+msgstr "Foinse FFillteáin"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 msgid "Filter on Thread"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Gnáth"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sceál seo"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Treoshuíomh"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Gan Tidéal"
+
+#: mail/em-format-html-display.c:597
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+
+# SG
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Eagar síniú"
+
+#: mail/em-format-html-display.c:598
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
 msgstr ""
 
-#: mail/em-format-html-display.c:728
+# SG
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Eagar síniú"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+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:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Idirbhríste"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "Post an sceál seo"
+
+#: mail/em-format-html-display.c:607
+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:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Post an sceál seo"
+
+#: mail/em-format-html-display.c:608
+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:609 mail/em-format-html.c:576
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Post an sceál seo"
+
+#: mail/em-format-html-display.c:609
+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:779 mail/em-format-html.c:645
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr ""
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+msgid "Unsupported signature format"
+msgstr ""
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Earraidh gan aithne: %s"
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "_Méan:"
@@ -12009,342 +12514,646 @@ msgstr "_Méan:"
 msgid "Page %d of %d"
 msgstr "Post an sceál seo"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "_Post sceál"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-#, fuzzy
-msgid "No signature present"
-msgstr "Tóg Comhad"
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Téip ag tosnaithe GNOME"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-msgid "Unsupported signature format"
-msgstr ""
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
-msgstr "Post an sceál seo"
+msgstr "Ag bogadh scéaltaí"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Ó"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Freagrair-Do"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Do"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 #, fuzzy
 msgid "Mailer"
 msgstr "Post"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dáta"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format.c:1259
-msgid "Could not parse S/MIME message: Unknown error"
+#: mail/em-format.c:1185
+#, fuzzy
+msgid "Session not initialised"
+msgstr "Téip ag tosnaithe GNOME"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/em-popup.c:593
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Ag Fanacht..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Ag Oscailt '%s'"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Teíp ag fork: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Teíp ag fork: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Teíp ag fork: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
-msgstr "Sábháil le..."
+msgstr ""
+"Sábháil le..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 #, fuzzy
 msgid "Set as _Background"
-msgstr "Dúlra:"
+msgstr "Dúlra:"
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Freagrair do Líosta"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Oscail 'san Fhuinneog Nua"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "_Post sceál do Tadhall..."
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Suim Leabhar Seoladh"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Oscáil san %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr ""
 
 # Avoid; either use KR or KP
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Scór"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Fillteán"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr ""
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Am %a, %Y-%m-%d ag %H:%M, scríobh %%s:"
+msgstr "Dé %a, %Y-%m-%d ag %H:%M, scríobh %%s:"
 
-#: mail/em-utils.c:1325
-#, fuzzy, c-format
+#: mail/em-utils.c:1330
+#, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
-msgstr "Teíp ag fork: %s"
+msgstr ""
+" Ní féidir sábháil go `%s'\n"
+"  %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Sceál"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Sábháil Scéal Mar..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Seoladh"
+
+#: mail/em-utils.c:2262
 #, c-format
-msgid "Could not create temporary directory: %s"
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
 msgstr ""
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Default charset in which to compose messages"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:7
+msgid "Default charset in which to compose messages."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
+msgid "Default charset in which to display messages"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:9
+msgid "Default charset in which to display messages."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
-msgid "Composer Preferences"
-msgstr "Roghanna Feilire"
+msgid "Default forward style"
+msgstr "Sheoladh Chuig duine"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Freagrair do gach rud"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+msgid "Empty Trash folders on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:14
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+#, fuzzy
+msgid "Height of the message-list pane"
+msgstr "Post an sceál seo"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"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/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
+msgstr "Cuntasaí"
+
+#: mail/evolution-mail.schemas.in.in.h:22
+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/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+msgid "Log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
+msgid "New Mail Notify sound file"
+msgstr "Socrú Post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Socrú Post"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+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.in.h:44
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Alairm Evolution"
+msgid "Send HTML mail by default"
+msgstr " (gnáth)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Alairm Evolution"
+msgid "Send HTML mail by default."
+msgstr " (gnáth)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Tadhallaí"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+msgid "Show animated images as animations."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution - Cruthaigh fillteán nua"
+msgid "Show deleted messages in the message-list"
+msgstr "Fillteán _Nua"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:57
+msgid "Show the \"Preview\" pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+msgid "Terminal font"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution - Cruthaigh fillteán nua"
+msgid "Thread the message list."
+msgstr "Post an sceál seo"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:66
 #, fuzzy
-msgid "Mail Accounts"
-msgstr "Cuntasaí"
+msgid "Thread the message-list"
+msgstr "Post an sceál seo"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
-msgid "Mail Preferences"
-msgstr "Roghanna Feilire"
+msgid "UID string of the default account."
+msgstr "Cur síos an cheangaltáin"
 
-#: mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
 msgstr ""
 
-#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
-#: mail/importers/pine-importer.c:115
-msgid "Importing..."
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Fán le do thoil"
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "Luaineach"
 
-#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
-#: mail/importers/pine-importer.c:288
-#, c-format
-msgid "Importing %s as %s"
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
-#: mail/importers/pine-importer.c:425
-#, fuzzy, c-format
-msgid "Scanning %s"
-msgstr "Ag Oscailt '%s'"
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
 
-#: mail/importers/elm-importer.c:547
-msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+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/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12378,6 +13187,42 @@ msgstr ""
 msgid "Evolution Pine importer"
 msgstr "Eagarthóir Nuachráin Evolution"
 
+#: mail/importers/elm-importer.c:105
+msgid "Evolution is importing your old Elm mail"
+msgstr ""
+
+#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238
+#: mail/importers/pine-importer.c:115
+msgid "Importing..."
+msgstr ""
+
+#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
+#: mail/importers/pine-importer.c:117
+msgid "Please wait"
+msgstr "Fán le do thoil"
+
+#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759
+#: mail/importers/pine-importer.c:288
+#, c-format
+msgid "Importing %s as %s"
+msgstr ""
+
+#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887
+#: mail/importers/pine-importer.c:425
+#, fuzzy, c-format
+msgid "Scanning %s"
+msgstr "Ag Oscailt '%s'"
+
+#: mail/importers/elm-importer.c:547
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: mail/importers/elm-importer.c:568
+msgid "Elm"
+msgstr "Elm"
+
 #: mail/importers/netscape-importer.c:75
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
@@ -12419,12 +13264,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Bruscar"
-
 #: mail/importers/netscape-importer.c:1995
 #, fuzzy
 msgid "Scanning mail filters"
@@ -12434,7 +13273,7 @@ msgstr "Ag Oscailt '%s'"
 msgid "Scanning directory"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr ""
 
@@ -12505,61 +13344,61 @@ msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Óst:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 #, fuzzy
 msgid "User_name:"
 msgstr "Ainm _Úsaideoir"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Slí:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
 #: mail/mail-autofilter.c:74
-#, fuzzy, c-format
+#, c-format
 msgid "Mail to %s"
 msgstr "Post do %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
-msgstr "Abair is %s"
+msgstr "Tá an t-ábhar %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Scéal ó %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "líosta ríomhphost %s"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Freagrair do Líosta"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12567,145 +13406,31 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-component.c:194
-#, fuzzy
-msgid "Connecting..."
-msgstr "Ag Cealaigh..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr ""
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Teachaireacht Post Nua"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Teíp ag fork: %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Teíp ag fork: %s"
-
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Teíp ag fork: %s"
+# mt
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_Scéal Ríomhphost"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Teíp ag fork: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Cruthaigh scéal phost nua"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Fillteán _Nua"
-
-#: mail/mail-component.c:1643
-msgid "Select destination to move folder into"
-msgstr ""
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Fillteán _Nua"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr ""
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Teíp ag fork: %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Dealaigh Fillteán '%s'"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Dealaigh \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, fuzzy, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Ag oscailt an t-eolaire %s"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Ag oscailt an t-eolaire %s"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr ""
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Álbactaí"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Álbactaí"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "Ainm Fillteán:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Radharc"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Oscail 'san Fhuinneog Nua"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Bog"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "Fillteán _Nua"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr ""
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Roghanna..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr ""
 
@@ -12755,11 +13480,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12780,9 +13505,8 @@ msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:8
-#, fuzzy
 msgid "Account Editor"
-msgstr "Cuntas %d"
+msgstr "Eagarthóir Chuntas"
 
 #: mail/mail-config.glade.h:9
 msgid "Account Information"
@@ -12819,7 +13543,7 @@ msgstr ""
 
 #: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
-msgstr ""
+msgstr "Ceangaltán"
 
 #: mail/mail-config.glade.h:21
 msgid "Authentication"
@@ -12839,32 +13563,39 @@ msgid "C_haracter set:"
 msgstr "Earraidh gan aithne: %s"
 
 #: mail/mail-config.glade.h:25
-#, fuzzy
 msgid "C_olors"
-msgstr "_Dún"
+msgstr "_Dathanna"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Post ríomhphost"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
-#, fuzzy
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
-msgstr "Cruthaigh Scéal _Nua"
+msgstr "Ag Cruthach Scéaltaí"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Socrú"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12874,514 +13605,525 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Gnáth"
 
-#: mail/mail-config.glade.h:39
-#, fuzzy
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
-msgstr "Tosaíocht"
+msgstr "Iompar Loicthe"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
-#, fuzzy
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
-msgstr "_Dealaigh gach rud"
+msgstr "Ag Scrios Post"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Críochnaithe"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Gach _Fillteáin:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "_Cumasach"
 
-#: mail/mail-config.glade.h:49
-#, fuzzy
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
-msgstr "Cuntasaí"
+msgstr "Cuntasaí Rphoist"
 
-#: mail/mail-config.glade.h:50
-#, fuzzy
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
-msgstr "_Seoladh RPost:"
+msgstr "_Seoladh Rphost:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
-#, fuzzy
+#: mail/mail-config.glade.h:54
 msgid "Encry_ption certificate:"
-msgstr "Liost Tadhall"
+msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Roghanna"
+
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Font Properties"
 msgstr "Álbactaí"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
 # ie
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Sábháil agus Dún"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Loading Images"
 msgstr "Post an sceál seo"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Socrú Post"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Áit do Bosca Phoist"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Scríobhóir"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "_Post sceál"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "sceál"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Socrú Post"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Eagrú:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Eochar PGP:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Tóg dath"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Priontáil an tadhallaí seo"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Freagrair-Do"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "_Roghanna"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Gnáth"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Slándáil"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "_Post sceál filtean"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Post an sceál seo"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Ainm Stíl:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 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 ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Luaineach"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Stádas:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "Saghas _Udarú :"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Saghas _Udarú :"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
-#, fuzzy
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
-msgstr "Gnáth"
+msgstr "Síniú _gnáth:"
 
-#: mail/mail-config.glade.h:140
-#, fuzzy
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
-msgstr "Gnáth"
+msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Enable"
 msgstr "Chumasach"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-config.glade.h:146
-#, fuzzy
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
-msgstr "Ainm _Fhada:"
+msgstr "Ainm _fhada:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "i HTML post"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+# GN
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "An Ghuine"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Ainm:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Freagrair do gach rud"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Script:"
 msgstr "_Slándáil"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
-msgstr "Scríos..."
+msgstr "Tóg Gach Rud"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Post ríomhphost"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Stádas:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr ""
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Ag Oscailt '%s'"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Ag Obair"
 
@@ -13394,127 +14136,127 @@ msgstr "Fillteán _Nua"
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Teíp ag fork: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Teíp ag fork: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Post an sceál seo"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "_Post sceál"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
-msgstr "Críochnaithe.`"
+msgstr "Críochnaithe."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ag dealaigh fillteán %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Fillteán _Nua"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 #, fuzzy
 msgid "Local Folders"
 msgstr "_Fillteán"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "_Post sceál"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ag Sábháil scealta"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13523,32 +14265,36 @@ msgstr ""
 "Earraidh ag sábhháil scéalaí do: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr ""
@@ -13565,61 +14311,76 @@ msgstr "Cuardaigh:"
 msgid "Search"
 msgstr "Cuardaigh"
 
-#: mail/mail-send-recv.c:148
+# SG
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Eagar síniú"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Údarú"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Eolas Cuntais"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Ag Cealaigh..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Freastalaí: %s, Cinéal: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Slí: %s, Cinéal: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Cinéal:  %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:310
-#, fuzzy
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
-msgstr "Cealaigh gach rud"
+msgstr "Cealaigh _Gach Uile"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Ag Fanacht..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Scríos an teasc seo"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13645,9 +14406,8 @@ msgstr ""
 
 # SG
 #: mail/mail-signature-editor.c:382
-#, fuzzy
 msgid "Edit signature"
-msgstr "Singeapór"
+msgstr "Eagar síniú"
 
 #: mail/mail-signature-editor.c:422
 msgid "Enter a name for this signature."
@@ -13657,26 +14417,31 @@ msgstr ""
 msgid "Name:"
 msgstr "Ainm:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: mail/mail-vfolder.c:87
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13685,89 +14450,88 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:839
-#, fuzzy
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
-msgstr "Fillteáin"
+msgstr "fFillteáin"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Fillteán _Nua"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Inniú %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Inné %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr ""
 
@@ -13776,9 +14540,8 @@ msgid "Due By"
 msgstr ""
 
 #: mail/message-list.etspec.h:4
-#, fuzzy
 msgid "Flag Status"
-msgstr "Stádas"
+msgstr "Stádas Bhratach"
 
 #: mail/message-list.etspec.h:5
 msgid "Flagged"
@@ -13802,9 +14565,8 @@ msgid "Size"
 msgstr "Méid"
 
 #: mail/message-tag-followup.c:62
-#, fuzzy
 msgid "Call"
-msgstr "Post"
+msgstr ""
 
 #: mail/message-tag-followup.c:63
 #, fuzzy
@@ -13830,11 +14592,11 @@ msgstr "Sheoladh"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Freagrair"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Freagrair do gach rud"
 
@@ -13848,9 +14610,8 @@ msgid "Flag to Follow Up"
 msgstr ""
 
 #: mail/message-tags.glade.h:2
-#, fuzzy
 msgid "C_ompleted"
-msgstr "Críochnaithe"
+msgstr "Crí_ochnaithe"
 
 #: mail/message-tags.glade.h:4
 msgid ""
@@ -13863,9 +14624,8 @@ msgid "_Due by:"
 msgstr ""
 
 #: mail/message-tags.glade.h:7
-#, fuzzy
 msgid "_Flag:"
-msgstr "Ainm Chomad:"
+msgstr "_Bratach:"
 
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
@@ -13890,43 +14650,136 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: shell/e-folder-dnd-bridge.c:55
-#, fuzzy, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Albachtaí Phoist"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "389"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Scríos an sceal seo"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+msgid "Default width of the folder bar pane"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+msgid "Default width of the shortcut bar pane"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Tosaíocht Loicthe:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Tosaíocht Loicthe:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Socrú Post"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr "Teíp ag fork: %s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
 
-#: shell/e-folder-list.c:338
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 #, fuzzy
-msgid "Add a Folder"
-msgstr "Fillteán _Nua"
+msgid "Path to the default contacts folder"
+msgstr "Ag oscailt an t-eolaire %s"
 
-# DE
-#: shell/e-local-storage.c:179
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
-msgid "Drafts"
-msgstr "An Ghearmáin"
+msgid "Path to the default mail folder"
+msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Imbosca"
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Asbosca"
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
 
-#: shell/e-local-storage.c:182
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
 #, fuzzy
-msgid "Sent"
-msgstr "Post"
+msgid "Physical URI to the default tasks folder"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether to show the folder bar"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether to show the shortcut bar"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+# ta
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "Rpost"
 
-#: shell/e-setup.c:145
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13934,14 +14787,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13949,7 +14802,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13972,9 +14825,8 @@ msgid "Select Default Folder"
 msgstr "_Fillteáin Speisíalta"
 
 #: shell/e-shell-config-folder-settings.c:70
-#, fuzzy
 msgid "Default Folders"
-msgstr "_Fillteáin Speisíalta"
+msgstr "Fillteáin Gnáth"
 
 #: shell/e-shell-config-folder-settings.c:73
 #, fuzzy
@@ -13987,14 +14839,14 @@ msgid "Autocompletion Folders"
 msgstr "_Fillteán"
 
 #: shell/e-shell-folder-commands.c:140
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot copy folder: %s"
-msgstr "Teíp ag fork: %s"
+msgstr "Ní féidir cóip a dhéanamh don fillteán: %s"
 
 #: shell/e-shell-folder-commands.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot move folder: %s"
-msgstr "Ag oscailt an t-eolaire %s"
+msgstr "Ní féidir an fillteán a bhogadh: %s"
 
 #: shell/e-shell-folder-commands.c:188
 msgid "Cannot move a folder over itself."
@@ -14014,7 +14866,6 @@ msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
 #: shell/e-shell-folder-commands.c:323
-#, fuzzy
 msgid "Copy Folder"
 msgstr "Cóip Fillteán"
 
@@ -14024,9 +14875,8 @@ msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
 #: shell/e-shell-folder-commands.c:367
-#, fuzzy
 msgid "Move Folder"
-msgstr "Sábháil 'san _fillteán"
+msgstr "Bog Fillteán"
 
 #: shell/e-shell-folder-commands.c:391
 #, c-format
@@ -14047,9 +14897,10 @@ msgid ""
 "%s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
+msgid "The specified folder name is not valid: %s"
 msgstr ""
 
 #: shell/e-shell-folder-commands.c:584
@@ -14070,20 +14921,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
-msgid "Create New Folder"
-msgstr "Fillteán _Nua"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(gan tideál)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14092,11 +14938,11 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14104,138 +14950,117 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 #, fuzzy
 msgid "Select importer"
 msgstr "Fillteán _Nua"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
-#, fuzzy
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
-msgstr "Evolution "
+msgstr "Earráid Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
-msgstr ""
+msgstr "Uathoibríoch"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "_Filename:"
 msgstr "Ainm Chomad:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Tóg Comhad"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 #, fuzzy
 msgid "File _type:"
 msgstr "Cinéal Comhad:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Ó %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 #, fuzzy
 msgid "_Import"
 msgstr "Chló_fhoireann..."
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-offline-sync.c:163
-#, fuzzy, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Earraidh ag sábhháil scéalaí do: %s\n"
-" %s"
-
-#: shell/e-shell-offline-sync.c:232
-#, fuzzy
-msgid "Syncing Folder"
-msgstr "ag sioncronaich filtean"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr ""
-
 #: shell/e-shell-settings-dialog.c:346
 #, fuzzy
 msgid "Evolution Settings"
@@ -14272,7 +15097,7 @@ msgstr "Teíp ag fork: %s"
 msgid "Cannot find the specified shared folder."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14281,16 +15106,10 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 #, fuzzy
 msgid "Quit Assistant"
-msgstr "As an Oifig"
-
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "_Nua"
+msgstr "Cúntóir"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -14330,9 +15149,8 @@ msgid "Bug buddy could not be run."
 msgstr ""
 
 #: shell/e-shell-view-menu.c:247 shell/e-shell-window-commands.c:170
-#, fuzzy
 msgid "About Ximian Evolution"
-msgstr "Faoi Evolution..."
+msgstr "Faoi Ximian Evolution"
 
 #: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
@@ -14343,68 +15161,54 @@ msgid "Select the folder that you want to open"
 msgstr ""
 
 #: shell/e-shell-view-menu.c:617
-#, fuzzy
 msgid "Create New Shortcut"
-msgstr "Scríos an sceal seo"
+msgstr "Cruthaigh Aicearra Nua"
 
 #: shell/e-shell-view-menu.c:618
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
-msgstr "Sheoladh Chuig duine"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Ar Bith)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr ""
 
@@ -14447,9 +15251,8 @@ msgid "Show the shortcuts as large icons"
 msgstr ""
 
 #: shell/e-shortcuts-view.c:270
-#, fuzzy
 msgid "_Add Group..."
-msgstr "Grupa _Nua..."
+msgstr "_Cuir Grúpa Leis..."
 
 #: shell/e-shortcuts-view.c:271
 msgid "Create a new shortcut group"
@@ -14482,14 +15285,12 @@ msgid "Hide the shortcut bar"
 msgstr ""
 
 #: shell/e-shortcuts-view.c:288
-#, fuzzy
 msgid "Create _Default Shortcuts"
-msgstr "Scríos an sceal seo"
+msgstr "Cruthaigh Aicearraí _Loicthe"
 
 #: shell/e-shortcuts-view.c:289
-#, fuzzy
 msgid "Create Default Shortcuts"
-msgstr "Scríos an sceal seo"
+msgstr "Cruthaigh Aicearraí Loicthe"
 
 #: shell/e-shortcuts-view.c:408
 #, fuzzy
@@ -14525,77 +15326,18 @@ msgstr "_Scríos"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr ""
-
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Gan Earraidh"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr ""
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr ""
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Earraidh I/A"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr ""
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr ""
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr ""
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr ""
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr ""
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr ""
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-
-#: shell/e-storage.c:597
-#, fuzzy
-msgid "Cannot create a folder with that name"
-msgstr "Teíp ag fork: %s"
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Imbosca"
 
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
+#: shell/e-shortcuts.c:1097
+msgid "Shortcuts"
 msgstr ""
 
-# th
-#: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Checkbox"
-msgstr "Téalainnis"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14606,6 +15348,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "% Rinneadh:"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "_Nua"
+
+#: shell/evolution-folder-selector-button.c:128
+#, fuzzy, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "Oscáil san %s..."
+
 #: shell/evolution-shell-component-utils.c:124
 #, fuzzy, c-format
 msgid ""
@@ -14632,76 +15385,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Earraidh CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Idirbhríste"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Gan Úinéar"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Earraidh Intire"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Post an sceál seo"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr ""
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr ""
-
-#: shell/evolution-test-component.c:63
-#, fuzzy
-msgid "Test type"
-msgstr "Cinéal Comhad:"
-
-#: shell/evolution-test-component.c:703
-#, fuzzy
-msgid "Evolution Test Component"
-msgstr "Alairm Evolution"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -14716,16 +15399,12 @@ msgid "The following connections are currently active:"
 msgstr ""
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
-#, fuzzy
 msgid "C_alendar:"
-msgstr "Feilire"
+msgstr "Fé_ilire:"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
 msgid "_Contacts:"
-msgstr ""
-"\n"
-"Trácht:"
+msgstr "_Tadhallaí"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:3
 #, fuzzy
@@ -14738,15 +15417,9 @@ msgstr "_Post"
 msgid "_Tasks:"
 msgstr "Teascanna"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-msgid "Folder _name:"
-msgstr "Ainm Fillteán:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#, fuzzy
 msgid "Folder _type:"
-msgstr "Saghas Fillteán:"
+msgstr "_Saghas fillteán:"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
 #, fuzzy
@@ -14754,14 +15427,12 @@ msgid "Open Other User's Folder"
 msgstr "Fillteán _Nua"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-#, fuzzy
 msgid "_Account:"
-msgstr "Cuntas"
+msgstr "_Cuntas:"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-#, fuzzy
 msgid "_Folder Name:"
-msgstr "Ainm Fillteán:"
+msgstr "Ainm _Fillteán:"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
 #, fuzzy
@@ -14801,26 +15472,6 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr ""
-"Go raibh maith agat\n"
-"An Fhoireann Evolution\n"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Albachtaí Phoist"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -14856,7 +15507,7 @@ msgstr ""
 msgid "Importers"
 msgstr ""
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr ""
 
@@ -14872,16 +15523,16 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14901,7 +15552,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14909,69 +15560,104 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:389
-#, fuzzy
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
-"Go raibh maith agat\n"
-"An Fhoireann Evolution\n"
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Fillteán _Nua"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Tóg Comhad"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
-#, fuzzy
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 msgid "Purposes"
-msgstr "Dún"
+msgstr ""
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "_Seoladh RPost:"
 
+#: smime/gui/certificate-viewer.c:281
+#, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14985,9 +15671,8 @@ msgid "<b>Certificate Hierarchy</b>"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:4
-#, fuzzy
 msgid "<b>Field Value</b>"
-msgstr "Post ríomhphost"
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
@@ -15008,7 +15693,7 @@ msgstr ""
 #: smime/gui/smime-ui.glade.h:9
 #, fuzzy
 msgid "<b>Validity</b>"
-msgstr "_Stádas:"
+msgstr "<b>Stádas:</b>"
 
 #: smime/gui/smime-ui.glade.h:10
 #, fuzzy
@@ -15024,87 +15709,359 @@ msgid "Backup All"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+msgid "Certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "Tóg Comhad"
+
+#: smime/gui/smime-ui.glade.h:17
 msgid "Common Name (CN)"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
-msgstr "Liost Tadhall"
+msgstr "_Liosta Tadhaill"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "_Eagar"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 msgid "Email Signer Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 msgid "Expires On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Eagrú"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Eagrú"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Radharc"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+msgid "View Certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Chló_fhoireann..."
+msgid "Certificate already exists"
+msgstr "Tóg Comhad"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Freagra"
+
+#: smime/lib/e-cert.c:488
+msgid "Version 1"
+msgstr ""
+
+#: smime/lib/e-cert.c:491
+msgid "Version 2"
+msgstr ""
+
+#: smime/lib/e-cert.c:494
+msgid "Version 3"
+msgstr ""
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "T"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "Ceart go Leor"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "T"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "Tóg Comhad"
+
+#: smime/lib/e-cert.c:615
+msgid "Netscape Certificate Type"
+msgstr ""
+
+#: smime/lib/e-cert.c:618
+msgid "Certificate Authority Key Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "CA"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Eochair Poiblí: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Tá an t-ábhar %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+msgid "Error: Unable to process extension"
+msgstr ""
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+msgid "SSL Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:781
+msgid "Email Certificate Authority"
+msgstr ""
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Rabhadh"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Gan Eolas"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "ceangaltáin"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "Tóg Comhad"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+# PK
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "An Phacastáin"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+msgid "Not Critical"
+msgstr ""
+
+#: smime/lib/e-cert.c:907
+msgid "Extensions"
+msgstr ""
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s (%d)"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Tóg Comhad"
+
+#: smime/lib/e-cert.c:1043
+msgid "Issuer"
+msgstr ""
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Tá an t-ábhar %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Tóg Comhad"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Pasfhocal do %s, le do thoil"
+
+#: smime/lib/e-pkcs12.c:379
+msgid "Imported Certificate"
+msgstr ""
 
 #: tools/evolution-launch-composer.c:324
 #, fuzzy
@@ -15120,9 +16077,8 @@ msgid "The filename to display in the mail."
 msgstr ""
 
 #: tools/evolution-launch-composer.c:327
-#, fuzzy
 msgid "Description of the attachment."
-msgstr "_Coinne"
+msgstr "Cur síos an cheangaltáin"
 
 #: tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
@@ -15136,9 +16092,9 @@ msgstr ""
 #. * found, so just bail completely.
 #.
 #: tools/killev.c:63
-#, fuzzy, c-format
+#, c-format
 msgid "Could not execute '%s': %s\n"
-msgstr "Teíp ag fork: %s"
+msgstr "Níorbh fhéidir '%s' a chur i gcrích: %s\n"
 
 #: tools/killev.c:78
 #, c-format
@@ -15155,11 +16111,10 @@ msgid "Copy the selection"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:5
-#, fuzzy
 msgid "Copy to Folder..."
-msgstr "_Cóip do Fillteán..."
+msgstr "Cóip do Fillteán..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr ""
 
@@ -15169,16 +16124,14 @@ msgid "Delete selected contacts"
 msgstr "Scríos an tadhallaí seo"
 
 #: ui/evolution-addressbook.xml.h:11
-#, fuzzy
 msgid "Move Contact(s) to Another Folder..."
-msgstr "Fillteán _Nua"
+msgstr "Bog Tadhall(aí) go Fillteán Eile"
 
 #: ui/evolution-addressbook.xml.h:12
-#, fuzzy
 msgid "Move to Folder..."
-msgstr "Sábháil 'san _fillteán"
+msgstr "Bog go Fillteán..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr ""
 
@@ -15187,8 +16140,8 @@ msgstr ""
 msgid "Previews the contacts to be printed"
 msgstr "Post an sceál seo"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Priontáil reamh-taispeántas"
@@ -15235,15 +16188,15 @@ msgstr ""
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
-msgstr ""
+msgstr "_Gníomhartha"
 
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
@@ -15272,147 +16225,110 @@ msgstr "_Post sceál do Tadhall..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Cruthaigh Coinne _Nua"
-
-#: ui/evolution-calendar.xml.h:4
-#, fuzzy
-msgid "Create a new appointment"
-msgstr "Cruthaigh Coinne _Nua"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
-msgstr "Scríos an sceal seo"
-
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Cruthaigh Coinne _Nua"
-
-#: ui/evolution-calendar.xml.h:7
-#, fuzzy
-msgid "Create a new task"
-msgstr "Cruthaigh _Teasc Nua"
+msgstr "Cruthaigh tadhall nua"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
-msgstr "La"
+msgstr "Lá"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
-#, fuzzy
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
-msgstr "Scríos an sceal seo"
+msgstr "Scrios an coinne seo"
 
-#: ui/evolution-calendar.xml.h:12
-#, fuzzy
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
-msgstr "Scríos an líosta seo"
+msgstr "Scríos an Tarlú seo"
 
-#: ui/evolution-calendar.xml.h:13
-#, fuzzy
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
-msgstr "Scríos an líosta seo"
+msgstr "Scríos an tarlú seo"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go forward"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
-#, fuzzy
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
-msgstr "líosta"
+msgstr "Liosta"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mí"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "_Coinne Nua"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
-msgstr "Feilire"
+msgstr "Féilire"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Bealach Nuachtáin"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "_Teasc Nua"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
-msgstr "Priontáil an feilire seo"
+msgstr "Priontáil an féilire seo"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Uair"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show as list"
 msgstr "Taispéan Sonraí"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Taispeán aon la"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Taispeáin aon mhí"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Taispeán aon seachtain"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Seachtain"
 
@@ -15477,7 +16393,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Comhad"
 
@@ -15704,7 +16620,7 @@ msgstr ""
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
@@ -15764,16 +16680,6 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr "Post an sceál seo"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Dún an fhuinneog seo"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Dún"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -15945,291 +16851,313 @@ msgstr ""
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Scríos an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Scríos an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Scríos an sceal seo"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Scríos an sceal seo"
+
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Scríos an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Scríos an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Fillteán _Nua"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Bog"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Fillteán _Nua"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Ar Lean"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Post an sceál seo"
 
 # NL
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Next _Thread"
 msgstr "An Isiltir"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Scéal ar Lean"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+msgid "Not Junk"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Post an sceál seo"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Post an sceál seo"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Freagrair"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Fillteán _Nua"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Post an sceál seo"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Post an sceál seo"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Riomh"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Clodaigh teachtairecht seo"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Fillteán _Nua"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "Ag Cuardaigh..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Scríos an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Attached"
 msgstr "_Iatán"
 
-#: ui/evolution-mail-message.xml.h:102
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
-msgstr "_Fillteán"
+msgstr "_Cóip go Fillteán"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 #, fuzzy
 msgid "_Inline"
 msgstr "Sheoladh Chuig duine"
 
 # PE
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Larger"
 msgstr "_Larger"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 #, fuzzy
 msgid "_Message Display"
 msgstr "_Post sceál"
 
-#: ui/evolution-mail-message.xml.h:110
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
-msgstr "Sábháil 'san _fillteán"
+msgstr "_Bog go Fillteán"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Next Message"
 msgstr "Scéal ar Lean"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "Taispeaín _Gnáth"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Oscail Teachtaireacht"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Post an sceál seo"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 #, fuzzy
 msgid "_Quoted"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Oscáil..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Uirlisí"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Athdealaigh"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Dún an fhuinneog seo"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "_Dún"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
-msgstr ""
+msgstr "Ceangal"
 
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
-msgstr ""
+msgstr "Ceangal comhad"
 
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
@@ -16366,7 +17294,7 @@ msgstr ""
 
 #: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
-msgstr "_Iatán"
+msgstr "_Ceangaltán..."
 
 #: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
@@ -16504,7 +17432,7 @@ msgstr "Clodaigh teachtairecht seo"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
-msgstr "Faoi Evolution..."
+msgstr "Faoi Ximian Evolution..."
 
 #: ui/evolution.xml.h:2
 #, fuzzy
@@ -16512,12 +17440,13 @@ msgid "Change Evolution's settings"
 msgstr "Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Éirigh as"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Cruthaigh teasc nua"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "_Fuinneog Evolution"
+msgid "E_xit"
+msgstr "_Éirigh as"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16529,8 +17458,8 @@ msgstr ""
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "_Fuinneog Evolution"
+msgid "Open a new window"
+msgstr "Oscail 'san Fhuinneog Nua"
 
 #: ui/evolution.xml.h:11
 #, fuzzy
@@ -16538,55 +17467,68 @@ msgid "Pi_lot Settings..."
 msgstr "Albachtaí Phoist"
 
 #: ui/evolution.xml.h:12
-#, fuzzy
-msgid "Set up Pilot configuration"
-msgstr "Socrú Post"
+msgid "Send / Receive"
+msgstr ""
 
 #: ui/evolution.xml.h:13
-msgid "Show information about Ximian Evolution"
+msgid "Send queued items and retrieve new items"
 msgstr ""
 
 #: ui/evolution.xml.h:14
-msgid "Submit Bug Report"
-msgstr ""
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Socrú Post"
 
 #: ui/evolution.xml.h:15
-msgid "Submit _Bug Report"
+msgid "Show information about Ximian Evolution"
 msgstr ""
 
 #: ui/evolution.xml.h:16
-msgid "Submit a bug report using Bug Buddy"
+msgid "Submit Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:17
-msgid "Toggle"
+msgid "Submit _Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:18
+msgid "Submit a bug report using Bug Buddy"
+msgstr ""
+
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Faoi Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "C_úidiú"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "_Import..."
 msgstr "Chló_fhoireann..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Nua"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr ""
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "anois"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Coimiriú Príont"
@@ -16611,9 +17553,8 @@ msgid "By _Company"
 msgstr "_Teoranta:"
 
 #: views/addressbook/galview.xml.h:2
-#, fuzzy
 msgid "_Address Cards"
-msgstr "Cartaí Sheoladh"
+msgstr "C_artaí Sheoladh"
 
 #: views/addressbook/galview.xml.h:3
 #, fuzzy
@@ -16626,24 +17567,21 @@ msgid "W_eek View"
 msgstr "Radharc Seachtain"
 
 #: views/calendar/galview.xml.h:2
-#, fuzzy
 msgid "_Day View"
-msgstr "Radharc Lá"
+msgstr "Radharc _Lá"
 
 #: views/calendar/galview.xml.h:3
-#, fuzzy
 msgid "_Month View"
-msgstr "Radharc Mí"
+msgstr "Radharc _Mí"
 
 #: views/calendar/galview.xml.h:4
-#, fuzzy
 msgid "_Work Week View"
-msgstr "Radharc Seachtain"
+msgstr "Radharc Seachtain _Oibre"
 
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As _Sent Folder"
-msgstr "Fillteán _Nua"
+msgstr "Mar Fillteán Seolta"
 
 #: views/mail/galview.xml.h:2
 #, fuzzy
@@ -16657,7 +17595,7 @@ msgstr ""
 #: views/mail/galview.xml.h:4
 #, fuzzy
 msgid "By Su_bject"
-msgstr "Abair"
+msgstr "Ábhar"
 
 #: views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
@@ -16712,9 +17650,8 @@ msgstr ""
 
 #. bonobo displays this string so it must be in locale
 #: widgets/menus/gal-view-menus.c:349
-#, fuzzy
 msgid "Custom View"
-msgstr "Radharc Carta"
+msgstr "Sainradharc"
 
 #: widgets/menus/gal-view-menus.c:358
 #, fuzzy
@@ -16727,12 +17664,12 @@ msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "LMCDASD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16755,9 +17692,8 @@ msgstr ""
 
 # bn 
 #: widgets/misc/e-charset-picker.c:61
-#, fuzzy
 msgid "Baltic"
-msgstr "Beangálaí"
+msgstr ""
 
 #: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
@@ -16866,22 +17802,20 @@ msgid "_Edit Saved Searches..."
 msgstr "Sábháil 'san _fillteán"
 
 #: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
-#, fuzzy
 msgid "_Advanced..."
-msgstr "_Iatán"
+msgstr "_Ardmód..."
 
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
-msgstr "C_uardaigh..."
+msgstr "C_uardaigh"
 
 #: widgets/misc/e-search-bar.c:537
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:538
-#, fuzzy
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
-msgstr "Glan"
+msgstr "_Folmhaigh"
 
 #: widgets/misc/e-search-bar.c:836
 msgid "Item ID"
@@ -16896,104 +17830,16 @@ msgstr ""
 msgid "Text"
 msgstr "An Tibéid"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Glan"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Ainm Chlainn"
-
-#~ msgid "Family Name"
-#~ msgstr "Ainm Chlainn"
-
-#, fuzzy
-#~ msgid "Address List"
-#~ msgstr "_Seoladh:"
-
-#, fuzzy
-#~ msgid "Home Address Label"
-#~ msgstr "Cartaí Sheoladh"
-
-#, fuzzy
-#~ msgid "Work Address Label"
-#~ msgstr "Cartaí Sheoladh"
-
-#, fuzzy
-#~ msgid "Other Address Label"
-#~ msgstr "Cartaí Sheoladh"
-
-#, fuzzy
-#~ msgid "Email List"
-#~ msgstr "Rphost 2"
-
-#, fuzzy
-#~ msgid "Email 1"
-#~ msgstr "Rphost 3"
-
-#, fuzzy
-#~ msgid "Wants HTML Mail"
-#~ msgstr "i HTML post"
-
-#, fuzzy
-#~ msgid "Jabber Id List"
-#~ msgstr "Liost Tadhall"
-
-#, fuzzy
-#~ msgid "ICQ Id List"
-#~ msgstr "Líosta Nua"
-
-#, fuzzy
-#~ msgid "Organizational Unit"
-#~ msgstr "Eagrú"
-
-#, fuzzy
-#~ msgid "Photo"
-#~ msgstr "_Poirt:"
-
-#, fuzzy
-#~ msgid "Logo"
-#~ msgstr "Logann NT"
-
-#, fuzzy
-#~ msgid "Category List"
-#~ msgstr "_Saghas:"
-
-#~ msgid "Calendar URI"
-#~ msgstr "Feilire URI"
-
 #, fuzzy
-#~ msgid "Free/Busy URL"
-#~ msgstr "Freagrair"
-
-#, fuzzy
-#~ msgid "ICS Calendar"
-#~ msgstr "Feilire"
-
-#, fuzzy
-#~ msgid "Spouse's Name"
-#~ msgstr "Céile"
-
-#~ msgid "Birth Date"
-#~ msgstr "Data Breithe"
-
-#, fuzzy
-#~ msgid "List Show Addresses"
-#~ msgstr "Seoladh Eile"
+msgid "Find _Now"
+msgstr "Faigh"
 
 #, fuzzy
 #~ msgid "Evolution LDIF importer"
 #~ msgstr "Eagarthóir Nuachráin Evolution"
 
 #, fuzzy
-#~ msgid "Evolution LDIF importer factory"
-#~ msgstr "Eagarthóir Nuachráin Evolution"
-
-#, fuzzy
 #~ msgid "Evolution VCard Importer"
 #~ msgstr "Evolution "
 
@@ -17001,52 +17847,6 @@ msgstr ""
 #~ msgid "Evolution VCard importer"
 #~ msgstr "Evolution "
 
-#~ msgid "Loading..."
-#~ msgstr "Ag Lódáil..."
-
-#~ msgid "Searching..."
-#~ msgstr "Ag Cuardaigh..."
-
-#, fuzzy
-#~ msgid "Using Email Address"
-#~ msgstr "Seoladh Rpost:"
-
-#, fuzzy
-#~ msgid "Reconnecting to LDAP server..."
-#~ msgstr "Cumraigh do %s"
-
-#, fuzzy
-#~ msgid "Adding contact to LDAP server..."
-#~ msgstr "Cumraigh do %s"
-
-#, fuzzy
-#~ msgid "Removing contact from LDAP server..."
-#~ msgstr "Cumraigh do %s"
-
-#, fuzzy
-#~ msgid "Modifying contact from LDAP server..."
-#~ msgstr "Cumraigh do %s"
-
-#, fuzzy
-#~ msgid "No such calendar"
-#~ msgstr "Post an sceál seo"
-
-#, fuzzy
-#~ msgid "Invalid object"
-#~ msgstr "am neamhbhailí"
-
-#, fuzzy
-#~ msgid "Could not cancel operation"
-#~ msgstr "Teíp ag fork: %s"
-
-#, fuzzy
-#~ msgid "Authentication failed"
-#~ msgstr "Údarú"
-
-#, fuzzy
-#~ msgid "Evolution Addressbook local backend"
-#~ msgstr "Alairm Evolution"
-
 #~ msgid "Primary"
 #~ msgstr "Tosaíocht"
 
@@ -17054,7 +17854,7 @@ msgstr ""
 #~ msgstr "Tos."
 
 #~ msgid "Bus"
-#~ msgstr "GN"
+#~ msgstr "Gnó"
 
 #~ msgid "Company"
 #~ msgstr "Teoranta"
@@ -17066,7 +17866,7 @@ msgstr ""
 #~ msgstr "Eag."
 
 #~ msgid "Mobile"
-#~ msgstr "Gúthan Póca"
+#~ msgstr "Guthán Póca"
 
 #~ msgid "Car"
 #~ msgstr "Car"
@@ -17083,15 +17883,27 @@ msgstr ""
 #~ msgid "Home 2"
 #~ msgstr "Baile 2"
 
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
 #~ msgid "Url"
 #~ msgstr "Url"
 
+#~ msgid "Department"
+#~ msgstr "Roinn"
+
 #~ msgid "Dep"
 #~ msgstr "Ran."
 
 #~ msgid "Off"
 #~ msgstr "Oif."
 
+#~ msgid "Profession"
+#~ msgstr "Dearbhú"
+
 #~ msgid "Prof"
 #~ msgstr "Dea."
 
@@ -17104,46 +17916,53 @@ msgstr ""
 #~ msgid "Nick"
 #~ msgstr "L.ainm."
 
+#~ msgid "Calendar URI"
+#~ msgstr "Féilire URI"
+
 #~ msgid "CALUri"
 #~ msgstr "CALUri"
 
 #~ msgid "FBUrl"
 #~ msgstr "FBUrl"
 
-#, fuzzy
 #~ msgid "Default server calendar"
-#~ msgstr "Sábháil Feilire"
+#~ msgstr "Féilire freastalaí loicthe"
 
 #, fuzzy
 #~ msgid "icsCalendar"
-#~ msgstr "Feilire"
+#~ msgstr "Féilire"
+
+#~ msgid "Birth Date"
+#~ msgstr "Dáta Breithe"
 
-#, fuzzy
 #~ msgid "ECard"
-#~ msgstr "Car"
+#~ msgstr "RCarta"
 
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#, fuzzy
-#~ msgid "Phone"
-#~ msgstr "Críochnaithe"
+#~ msgid "Address Label"
+#~ msgstr "Lipéad Sheoladh"
 
-#, fuzzy
 #~ msgid "Birth date"
-#~ msgstr "Data Breithe"
+#~ msgstr "Dáta Breithe"
+
+#, fuzzy
+#~ msgid "Free/Busy URL"
+#~ msgstr "Freagrair"
+
+#~ msgid "ICS Calendar"
+#~ msgstr "Féilire ICS"
 
 #, fuzzy
 #~ msgid "Related Contacts"
 #~ msgstr "Dealaigh Tadhall?"
 
-#, fuzzy
-#~ msgid "Arbitrary"
-#~ msgstr "Tosaíocht"
+#~ msgid "Category List"
+#~ msgstr "Liosta Catagóire"
 
-#, fuzzy
-#~ msgid "ID"
-#~ msgstr "I"
+#~ msgid "Arbitrary"
+#~ msgstr "Ar Togradh"
 
 #, fuzzy
 #~ msgid "Last Use"
@@ -17154,39 +17973,44 @@ msgstr ""
 #~ msgid "Use Score"
 #~ msgstr "Scór"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Freastalaí LDAP"
+#~ msgid "Searching..."
+#~ msgstr "Ag Cuardaigh..."
+
+#~ msgid "Using Email Address"
+#~ msgstr "Le Seoladh Rpost:"
 
 #, fuzzy
+#~ msgid "Reconnecting to LDAP server..."
+#~ msgstr "Cumraigh do %s"
+
 #~ msgid "Public Contacts"
-#~ msgstr "Tadhallaí"
+#~ msgstr "Tadhallaí Phoiblí"
 
-#~ msgid "_Contact"
-#~ msgstr "_Tadhall"
+#~ msgid "Account Name"
+#~ msgstr "Ainm Chuntas"
 
-#~ msgid "New Contact List"
-#~ msgstr "Líosta Tadhall Nua"
+#~ msgid "Server Name"
+#~ msgstr "Ainm do Fhreastalaí"
 
-#, fuzzy
-#~ msgid "Create a new contact list"
-#~ msgstr "Scríos an sceal seo"
+#~ msgid "Other Contacts"
+#~ msgstr "Tadhallaí Eile"
 
 #, fuzzy
+#~ msgid "Add LDAP Server"
+#~ msgstr "Freastalaí LDAP"
+
 #~ msgid "Card"
-#~ msgstr "Car"
+#~ msgstr "Carta"
 
 #, fuzzy
 #~ msgid "Is New Card"
 #~ msgstr "_Nua"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Gan cartaí"
 
 #~ msgid "1 card"
-#~ msgstr "1 card"
+#~ msgstr "1 carta"
 
 # FIXME : Grammar ? 
 #~ msgid "%d cards"
@@ -17198,6 +18022,9 @@ msgstr ""
 #~ msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #~ msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,Mc,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
+#~ msgid "Business Address"
+#~ msgstr "Seoladh Ghnó"
+
 #~ msgid "Print cards"
 #~ msgstr "Priontáil Cartaí"
 
@@ -17206,54 +18033,24 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Public Calendar"
-#~ msgstr "Priontáil Feilire"
+#~ msgstr "Priontáil Féilire"
 
 #, fuzzy
 #~ msgid "Public Tasks"
 #~ msgstr "Priontáil Cartaí"
 
 #, fuzzy
-#~ msgid "New appointment"
-#~ msgstr "Coinne Nua"
-
-#, fuzzy
-#~ msgid "_Appointment"
-#~ msgstr "Coinne"
-
-#, fuzzy
-#~ msgid "New meeting"
-#~ msgstr "Bealach Nuachtáin"
-
-#, fuzzy
-#~ msgid "M_eeting"
-#~ msgstr "Álbachtaí"
-
-#, fuzzy
-#~ msgid "Create a new meeting request"
-#~ msgstr "Scríos an sceal seo"
-
-#, fuzzy
-#~ msgid "New task"
-#~ msgstr "Teasc Nua"
-
-#~ msgid "_Task"
-#~ msgstr "_Teasc"
-
-#, fuzzy
-#~ msgid "New All Day Appointment"
-#~ msgstr "Coinne Nua"
-
-#, fuzzy
-#~ msgid "All _Day Appointment"
-#~ msgstr "Coinne"
-
-#, fuzzy
 #~ msgid "Could not update invalid object"
 #~ msgstr "Teíp ag fork: %s"
 
-#, fuzzy
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
 #~ msgid "_Save as..."
-#~ msgstr "Sánbháil le..."
+#~ msgstr "_Sábháil mar..."
+
+#~ msgid "New _Appointment"
+#~ msgstr "_Coinne Nua"
 
 #~ msgid "Print..."
 #~ msgstr "Clódáil..."
@@ -17263,44 +18060,18 @@ msgstr ""
 #~ msgstr "Teíp ag fork: %s"
 
 #, fuzzy
-#~ msgid "Opening calendar at %s"
-#~ msgstr "Oscáil Feilire"
-
-#, fuzzy
-#~ msgid "Opening default tasks folder"
+#~ msgid "Opening tasks at %s"
 #~ msgstr "Ag oscailt an t-eolaire %s"
 
 #, fuzzy
-#~ msgid "Purging event %s"
-#~ msgstr "Ag Oscailt '%s'"
+#~ msgid "Opening calendar at %s"
+#~ msgstr "Oscáil Féilire"
 
 #, fuzzy
 #~ msgid "Failed to decode message."
 #~ msgstr "_Post sceál"
 
 #, fuzzy
-#~ msgid "Could not create a PGP signature context"
-#~ msgstr "Teíp ag fork: %s"
-
-#, fuzzy
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Socrú Post"
-
-#~ msgid "Properties..."
-#~ msgstr "Álbachtaí..."
-
-#~ msgid "New Mail Message"
-#~ msgstr "Teachaireacht Post Nua"
-
-# mt
-#~ msgid "_Mail Message"
-#~ msgstr "_Scéal Ríomhphost"
-
-#, fuzzy
-#~ msgid "Compose a new mail message"
-#~ msgstr "Cruthaigh Scéal _Nua"
-
-#, fuzzy
 #~ msgid "New Message Post"
 #~ msgstr "Sceál Nua"
 
@@ -17328,6 +18099,9 @@ msgstr ""
 #~ msgid "Getting Folder Information"
 #~ msgstr "eolas fheilire"
 
+#~ msgid "Send anyway?"
+#~ msgstr "Post ar aon nós?"
+
 #~ msgid "Save Messages As..."
 #~ msgstr "Sábháil Scéala Mar..."
 
@@ -17339,9 +18113,8 @@ msgstr ""
 #~ msgid "Downloading images"
 #~ msgstr "Post an sceál seo"
 
-#, fuzzy
-#~ msgid "by %B %d, %Y, %l:%M %P"
-#~ msgstr "%b %d %l:%M %p"
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "mar %B %d, %Y, %l:%M %p"
 
 #~ msgid "Save Image as..."
 #~ msgstr "Sábháil Iomha le..."
@@ -17378,7 +18151,7 @@ msgstr ""
 #~ msgstr "Sceál Fólamh"
 
 #~ msgid "(No subject)"
-#~ msgstr "(Gan abair)"
+#~ msgstr "(Gan ábhar)"
 
 #~ msgid "%s - Message"
 #~ msgstr "%s - Sceál"
@@ -17401,399 +18174,30 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Summary Preferences"
-#~ msgstr "Roghanna Feilire"
-
-# ##
-# ## Languages (ISO 639 code in brackets)
-# ## 	The 'msgid' names and spellings for languages are those listed
-# ##     in iso-639.def from glibc
-# aa 
-#, fuzzy
-#~ msgid "Aarhus"
-#~ msgstr "Afáiris"
-
-# AL
-#, fuzzy
-#~ msgid "Abakan"
-#~ msgstr "An Albáin"
-
-#, fuzzy
-#~ msgid "Abilene"
-#~ msgstr "Fón Phóca"
-
-# NI 
-#, fuzzy
-#~ msgid "Acarigua"
-#~ msgstr "Nicaragua"
-
-# AL
-#, fuzzy
-#~ msgid "Adana"
-#~ msgstr "An Albáin"
-
-# SE
-#, fuzzy
-#~ msgid "Aden"
-#~ msgstr "An tSualainn"
-
-#, fuzzy
-#~ msgid "Afonsos"
-#~ msgstr "Gan anim"
+#~ msgstr "Roghanna Féilire"
 
 # AQ
-#, fuzzy
 #~ msgid "Africa"
-#~ msgstr "an tAntartasch"
-
-# AU
-#, fuzzy
-#~ msgid "Aguascaliantes"
-#~ msgstr "An Astráil"
-
-# AL
-#, fuzzy
-#~ msgid "Alabama"
-#~ msgstr "An Albáin"
-
-# ##
-# ## Languages (ISO 639 code in brackets)
-# ## 	The 'msgid' names and spellings for languages are those listed
-# ##     in iso-639.def from glibc
-# aa 
-#, fuzzy
-#~ msgid "Alamosa"
-#~ msgstr "Afáiris"
-
-# ##
-# ## Languages (ISO 639 code in brackets)
-# ## 	The 'msgid' names and spellings for languages are those listed
-# ##     in iso-639.def from glibc
-# aa 
-#, fuzzy
-#~ msgid "Alaska"
-#~ msgstr "Afáiris"
-
-# AL
-#, fuzzy
-#~ msgid "Albany"
-#~ msgstr "An Albáin"
-
-# AL
-#, fuzzy
-#~ msgid "Albenga"
-#~ msgstr "An Albáin"
-
-# DZ
-#, fuzzy
-#~ msgid "Alberta"
-#~ msgstr "An Ailgéir"
-
-#, fuzzy
-#~ msgid "Alderney"
-#~ msgstr "Ainm Fillteán:"
-
-#, fuzzy
-#~ msgid "Alesund"
-#~ msgstr "Post"
-
-# AL
-#, fuzzy
-#~ msgid "Alexandria"
-#~ msgstr "An Albáin"
-
-# DZ
-#, fuzzy
-#~ msgid "Alghero"
-#~ msgstr "An Ailgéir"
-
-# AL
-#, fuzzy
-#~ msgid "Algona"
-#~ msgstr "An Albáin"
-
-# ##
-# ## Languages (ISO 639 code in brackets)
-# ## 	The 'msgid' names and spellings for languages are those listed
-# ##     in iso-639.def from glibc
-# aa 
-#, fuzzy
-#~ msgid "Alma"
-#~ msgstr "Afáiris"
-
-# DZ
-#, fuzzy
-#~ msgid "Almeria"
-#~ msgstr "An Ailgéir"
-
-# AL
-#, fuzzy
-#~ msgid "Alpena"
-#~ msgstr "An Albáin"
-
-# MT
-#, fuzzy
-#~ msgid "Alta"
-#~ msgstr "Málta"
-
-# AL
-#, fuzzy
-#~ msgid "Altamira"
-#~ msgstr "An Albáin"
-
-# ##
-# ## Languages (ISO 639 code in brackets)
-# ## 	The 'msgid' names and spellings for languages are those listed
-# ##     in iso-639.def from glibc
-# aa 
-#, fuzzy
-#~ msgid "Alturas"
-#~ msgstr "Afáiris"
-
-# ta
-#, fuzzy
-#~ msgid "Amarillo"
-#~ msgstr "Rpost"
-
-#, fuzzy
-#~ msgid "Ambler"
-#~ msgstr "Ball"
-
-# AL
-#, fuzzy
-#~ msgid "Amelia"
-#~ msgstr "An Albáin"
-
-#, fuzzy
-#~ msgid "Ames"
-#~ msgstr "míle"
-
-# AT
-#, fuzzy
-#~ msgid "Amsterdam"
-#~ msgstr "An Ostair"
-
-# JP
-#, fuzzy
-#~ msgid "Anapa"
-#~ msgstr "An tSeapáin"
-
-#, fuzzy
-#~ msgid "Ancona"
-#~ msgstr "Cuntas"
-
-#, fuzzy
-#~ msgid "Andoya"
-#~ msgstr "Ceallaigh"
-
-# IN 
-#, fuzzy
-#~ msgid "Andravida"
-#~ msgstr "Pearsanta"
-
-# AL
-#, fuzzy
-#~ msgid "Aniak"
-#~ msgstr "An Albáin"
-
-# ## 
-# ## Countries (Listed in ISO 3166-1)
-# ##
-# AF
-#, fuzzy
-#~ msgid "Anniston"
-#~ msgstr "An afganastáin"
-
-# IT
-#, fuzzy
-#~ msgid "Antalya"
-#~ msgstr "An Iodáil"
+#~ msgstr "An Afraic"
 
 # AQ
 #, fuzzy
 #~ msgid "Antartica"
 #~ msgstr "an tAntartasch"
 
-# ## 
-# ## Countries (Listed in ISO 3166-1)
-# ##
-# AF
-#, fuzzy
-#~ msgid "Antofagasta"
-#~ msgstr "An afganastáin"
-
-# ##
-# ## Languages (ISO 639 code in brackets)
-# ## 	The 'msgid' names and spellings for languages are those listed
-# ##     in iso-639.def from glibc
-# aa 
-#, fuzzy
-#~ msgid "Arar"
-#~ msgstr "Afáiris"
-
-# AQ
-#, fuzzy
-#~ msgid "Arcata"
-#~ msgstr "an tAntartasch"
-
-# AT
-#, fuzzy
-#~ msgid "Arica"
-#~ msgstr "An Ostair"
-
-#, fuzzy
-#~ msgid "Arlington"
-#~ msgstr "Treoshuíomh"
-
-# TH
-#, fuzzy
-#~ msgid "Ashland"
-#~ msgstr "An Téalainn"
-
 # AT
-#, fuzzy
 #~ msgid "Asia"
-#~ msgstr "An Ostair"
-
-#, fuzzy
-#~ msgid "Aspen"
-#~ msgstr "Oscáil"
-
-#, fuzzy
-#~ msgid "Asswan"
-#~ msgstr "Cnt."
-
-# AT
-#, fuzzy
-#~ msgid "Astoria"
-#~ msgstr "An Ostair"
-
-# AU
-#, fuzzy
-#~ msgid "Astrakhan"
-#~ msgstr "An Astráil"
-
-# AT
-#, fuzzy
-#~ msgid "Asturias"
-#~ msgstr "An Ostair"
-
-#, fuzzy
-#~ msgid "Asuncion"
-#~ msgstr "Údarú"
-
-# CH
-#, fuzzy
-#~ msgid "Athinai"
-#~ msgstr "An tSín"
-
-# AL
-#, fuzzy
-#~ msgid "Atlanta"
-#~ msgstr "An Albáin"
+#~ msgstr "An Áise"
 
 # AQ
-#, fuzzy
 #~ msgid "Atlantic"
-#~ msgstr "an tAntartasch"
-
-# IS
-#, fuzzy
-#~ msgid "Auckland"
-#~ msgstr "An Íoslainn"
-
-# AT
-#, fuzzy
-#~ msgid "Augusta"
-#~ msgstr "An Ostair"
-
-# AT
-#, fuzzy
-#~ msgid "Aurora"
-#~ msgstr "An Ostair"
-
-# AT
-#, fuzzy
-#~ msgid "Austin"
-#~ msgstr "An Ostair"
-
-# AU
-#, fuzzy
-#~ msgid "Australasia"
-#~ msgstr "An Astráil"
-
-#, fuzzy
-#~ msgid "Bage"
-#~ msgstr "Bún"
-
-# bn 
-#, fuzzy
-#~ msgid "Baltimore"
-#~ msgstr "Beangálaí"
-
-# GH
-#, fuzzy
-#~ msgid "Banak"
-#~ msgstr "Gána"
-
-#, fuzzy
-#~ msgid "Bangor"
-#~ msgstr "Bainisteoir"
-
-# BG
-#, fuzzy
-#~ msgid "Bari"
-#~ msgstr "An Bhulgáir"
-
-# BG
-#, fuzzy
-#~ msgid "Barinas"
-#~ msgstr "An Bhulgáir"
-
-#, fuzzy
-#~ msgid "Barksdale"
-#~ msgstr "Bún"
+#~ msgstr "Atlantach"
 
 # BR
 #, fuzzy
 #~ msgid "Barnaul"
 #~ msgstr "An Bhrasaíl"
 
-# EI
-#, fuzzy
-#~ msgid "Barter Island"
-#~ msgstr "Éire"
-
-#, fuzzy
-#~ msgid "Bastia"
-#~ msgstr "Gnáth"
-
-# na 
-#, fuzzy
-#~ msgid "Bauru"
-#~ msgstr "Nárúis"
-
-# bn 
-#, fuzzy
-#~ msgid "Beatrice"
-#~ msgstr "Beangálaí"
-
-#, fuzzy
-#~ msgid "Beaumont"
-#~ msgstr "mí"
-
-#, fuzzy
-#~ msgid "Beauvechain"
-#~ msgstr "Cuardaigh"
-
-#, fuzzy
-#~ msgid "Bedford"
-#~ msgstr "riomh"
-
-# BE
-#, fuzzy
-#~ msgid "Beirut"
-#~ msgstr "An Bheilg"
-
 # BE
 #, fuzzy
 #~ msgid "Belem"
@@ -17804,58 +18208,14 @@ msgstr ""
 #~ msgid "Benbecula"
 #~ msgstr "Veiniséala"
 
-# IS
-#, fuzzy
-#~ msgid "Beograd"
-#~ msgstr "An Íoslainn"
-
-# BE
-#, fuzzy
-#~ msgid "Berlin"
-#~ msgstr "An Bheilg"
-
-#, fuzzy
-#~ msgid "Bethel"
-#~ msgstr "Aimsir"
-
-#, fuzzy
-#~ msgid "Beverly"
-#~ msgstr "_gach"
-
-# PS
-#, fuzzy
-#~ msgid "Big Piney"
-#~ msgstr "Pine"
-
 #, fuzzy
 #~ msgid "Blanding"
 #~ msgstr "Rabhadh"
 
 #, fuzzy
-#~ msgid "Boise"
-#~ msgstr "Bún"
-
-# PL
-#, fuzzy
-#~ msgid "Bolzano"
-#~ msgstr "An Pholainn"
-
-#, fuzzy
-#~ msgid "Boone"
-#~ msgstr "Críochnaithe"
-
-#, fuzzy
-#~ msgid "Boston"
-#~ msgstr "Bun:"
-
-#, fuzzy
 #~ msgid "Boulmer"
 #~ msgstr "Fillteán"
 
-#, fuzzy
-#~ msgid "Bourges"
-#~ msgstr "Uair"
-
 # ko
 #, fuzzy
 #~ msgid "Bozeman"
@@ -17876,505 +18236,10 @@ msgstr ""
 #~ msgid "Bratsk"
 #~ msgstr "Táidsícis"
 
-# YE
-#, fuzzy
-#~ msgid "Bremen"
-#~ msgstr "Éimin"
-
-#, fuzzy
-#~ msgid "Brest"
-#~ msgstr "Iarthair"
-
-# BR
-#, fuzzy
-#~ msgid "Bristol"
-#~ msgstr "An Bhrasaíl"
-
-#, fuzzy
-#~ msgid "Broadus"
-#~ msgstr "GN"
-
-#, fuzzy
-#~ msgid "Brookings"
-#~ msgstr "Ag Obair"
-
-#, fuzzy
-#~ msgid "Broome"
-#~ msgstr "Bun:"
-
-#, fuzzy
-#~ msgid "Burgas"
-#~ msgstr "GN"
-
-# TR
-#, fuzzy
-#~ msgid "Burley"
-#~ msgstr "An Tuirc"
-
-# GN
-#, fuzzy
-#~ msgid "Burnet"
-#~ msgstr "An Ghuine"
-
-#, fuzzy
-#~ msgid "Burns"
-#~ msgstr "GN"
-
-#, fuzzy
-#~ msgid "Bursa"
-#~ msgstr "GN"
-
-#, fuzzy
-#~ msgid "Cagliari"
-#~ msgstr "Feilire"
-
-# th
-#, fuzzy
-#~ msgid "Cairns"
-#~ msgstr "Téalainnis"
-
-# th
-#, fuzzy
-#~ msgid "Cairo"
-#~ msgstr "Téalainnis"
-
-#, fuzzy
-#~ msgid "Calgary"
-#~ msgstr "Glan"
-
-#, fuzzy
-#~ msgid "Caliente"
-#~ msgstr "Feilire"
-
-# PY
-#, fuzzy
-#~ msgid "Camaguey"
-#~ msgstr "Paraguay"
-
 # CM
-#, fuzzy
 #~ msgid "Cameron"
 #~ msgstr "Camarún"
 
-# th
-#, fuzzy
-#~ msgid "Camiri"
-#~ msgstr "Téalainnis"
-
-# CH
-#, fuzzy
-#~ msgid "Campinas"
-#~ msgstr "An tSín"
-
-#, fuzzy
-#~ msgid "Campo"
-#~ msgstr "Teor."
-
-# CA
-#, fuzzy
-#~ msgid "Canaan"
-#~ msgstr "Ceanada"
-
-# FR
-#, fuzzy
-#~ msgid "Cancun"
-#~ msgstr "An Fhrainc"
-
-# FR
-#, fuzzy
-#~ msgid "Cantwell"
-#~ msgstr "An Fhrainc"
-
-#, fuzzy
-#~ msgid "Caravelas"
-#~ msgstr "Cealaigh Teasc"
-
-#, fuzzy
-#~ msgid "Carbondale"
-#~ msgstr "Fón Char"
-
-#, fuzzy
-#~ msgid "Cardiff"
-#~ msgstr "Radharc Carta"
-
-#, fuzzy
-#~ msgid "Caribou"
-#~ msgstr "Car"
-
-#, fuzzy
-#~ msgid "Carlisle"
-#~ msgstr "Luaineach"
-
-#, fuzzy
-#~ msgid "Carroll"
-#~ msgstr "Car"
-
-# CA
-#, fuzzy
-#~ msgid "Cascade"
-#~ msgstr "Ceanada"
-
-#, fuzzy
-#~ msgid "Casper"
-#~ msgstr "Páipéir"
-
-# CA
-#, fuzzy
-#~ msgid "Catania"
-#~ msgstr "Ceanada"
-
-#, fuzzy
-#~ msgid "Cedar City"
-#~ msgstr "Geal"
-
-# DZ
-#, fuzzy
-#~ msgid "Cervia"
-#~ msgstr "An Ailgéir"
-
-# th
-#, fuzzy
-#~ msgid "Chadron"
-#~ msgstr "Téalainnis"
-
-# th
-#, fuzzy
-#~ msgid "Challis"
-#~ msgstr "Téalainnis"
-
-# CM
-#, fuzzy
-#~ msgid "Chamberlain"
-#~ msgstr "Camarún"
-
-# CM
-#, fuzzy
-#~ msgid "Chambery"
-#~ msgstr "Camarún"
-
-#, fuzzy
-#~ msgid "Champaign"
-#~ msgstr "Teoranta"
-
-#, fuzzy
-#~ msgid "Chandalar Lake"
-#~ msgstr "Teachtaireacht Feilire"
-
-#, fuzzy
-#~ msgid "Chandler"
-#~ msgstr "Feilire"
-
-# CH
-#, fuzzy
-#~ msgid "Chania"
-#~ msgstr "An tSín"
-
-# FR
-#, fuzzy
-#~ msgid "Chanute"
-#~ msgstr "An Fhrainc"
-
-# CM
-#, fuzzy
-#~ msgid "Chariton"
-#~ msgstr "Camarún"
-
-# FIXME (Plural)
-#, fuzzy
-#~ msgid "Charleston"
-#~ msgstr "Cathlaoirlaig"
-
-# CL
-#, fuzzy
-#~ msgid "Cheju"
-#~ msgstr "An tSile"
-
-# LU
-#, fuzzy
-#~ msgid "Cherbourg"
-#~ msgstr "Lucsamburg"
-
-#, fuzzy
-#~ msgid "Cherry Point"
-#~ msgstr "Fón Eile"
-
-# CH
-#, fuzzy
-#~ msgid "Chiayi"
-#~ msgstr "An tSín"
-
-# CL
-#, fuzzy
-#~ msgid "Chiclayo"
-#~ msgstr "An tSile"
-
-# th
-#, fuzzy
-#~ msgid "Chico"
-#~ msgstr "Téalainnis"
-
-# zh
-#, fuzzy
-#~ msgid "Chievres"
-#~ msgstr "Sínis"
-
-# CH
-#, fuzzy
-#~ msgid "Chihhang"
-#~ msgstr "An tSín"
-
-# CL
-#, fuzzy
-#~ msgid "Childress"
-#~ msgstr "An tSile"
-
-# CH
-#, fuzzy
-#~ msgid "China Lake"
-#~ msgstr "An tSín"
-
-# CH
-#, fuzzy
-#~ msgid "Chinandega"
-#~ msgstr "An tSín"
-
-# CH
-#, fuzzy
-#~ msgid "Chino"
-#~ msgstr "An tSín"
-
-# CH
-#, fuzzy
-#~ msgid "Chita"
-#~ msgstr "An tSín"
-
-# CH
-#, fuzzy
-#~ msgid "Chulitna"
-#~ msgstr "An tSín"
-
-# CA
-#, fuzzy
-#~ msgid "Clarinda"
-#~ msgstr "Ceanada"
-
-#, fuzzy
-#~ msgid "Clarion"
-#~ msgstr "Glan"
-
-# GL
-#, fuzzy
-#~ msgid "Cleveland"
-#~ msgstr "An Ghraonlainn"
-
-# CO
-#, fuzzy
-#~ msgid "Cobija"
-#~ msgstr "An Cholóim"
-
-#, fuzzy
-#~ msgid "Cody"
-#~ msgstr "Cóip"
-
-#, fuzzy
-#~ msgid "Cold Bay"
-#~ msgstr "Inniú"
-
-# CO
-#, fuzzy
-#~ msgid "Colima"
-#~ msgstr "An Cholóim"
-
-# CO
-#, fuzzy
-#~ msgid "Colonia"
-#~ msgstr "An Cholóim"
-
-# CO
-#, fuzzy
-#~ msgid "Colorado"
-#~ msgstr "An Cholóim"
-
-# CO
-#, fuzzy
-#~ msgid "Columbia"
-#~ msgstr "An Cholóim"
-
-# CO
-#, fuzzy
-#~ msgid "Columbus"
-#~ msgstr "An Cholóim"
-
-# CL
-#, fuzzy
-#~ msgid "Colville"
-#~ msgstr "An tSile"
-
-#, fuzzy
-#~ msgid "Comox"
-#~ msgstr "mbox"
-
-# CG
-#, fuzzy
-#~ msgid "Concord"
-#~ msgstr "An Congó"
-
-#, fuzzy
-#~ msgid "Connecticut"
-#~ msgstr "_Tadhall"
-
-# CG
-#, fuzzy
-#~ msgid "Conroe"
-#~ msgstr "An Congó"
-
-#, fuzzy
-#~ msgid "Constantine"
-#~ msgstr "_Tadhall"
-
-# CO
-#, fuzzy
-#~ msgid "Cordoba"
-#~ msgstr "An Cholóim"
-
-# JO
-#, fuzzy
-#~ msgid "Cordova"
-#~ msgstr "An Iordáin"
-
-# CG
-#, fuzzy
-#~ msgid "Coro"
-#~ msgstr "An Congó"
-
-# CR
-#, fuzzy
-#~ msgid "Corsicana"
-#~ msgstr "Cósta Rice"
-
-#, fuzzy
-#~ msgid "Cortez"
-#~ msgstr "Nota"
-
-# CU
-#, fuzzy
-#~ msgid "Corumba"
-#~ msgstr "Cúba"
-
-#, fuzzy
-#~ msgid "Coventry"
-#~ msgstr "_Tír:"
-
-# CG
-#, fuzzy
-#~ msgid "Covington"
-#~ msgstr "An Congó"
-
-# th
-#, fuzzy
-#~ msgid "Craig"
-#~ msgstr "Téalainnis"
-
-# FR
-#, fuzzy
-#~ msgid "Cranfield"
-#~ msgstr "An Fhrainc"
-
-#, fuzzy
-#~ msgid "Creston"
-#~ msgstr "Freagra"
-
-#, fuzzy
-#~ msgid "Crestview"
-#~ msgstr "Reamhthaispeáintas"
-
-# CM
-#, fuzzy
-#~ msgid "Crotone"
-#~ msgstr "Camarún"
-
-# CU
-#, fuzzy
-#~ msgid "Cuba Awrs"
-#~ msgstr "Cúba"
-
-# CU
-#, fuzzy
-#~ msgid "Cuiaba"
-#~ msgstr "Cúba"
-
-# GY
-#, fuzzy
-#~ msgid "Cumana"
-#~ msgstr "An Ghuáin"
-
-# CU
-#, fuzzy
-#~ msgid "Curitiba"
-#~ msgstr "Cúba"
-
-#, fuzzy
-#~ msgid "Custer"
-#~ msgstr "Gearr"
-
-# ML
-#, fuzzy
-#~ msgid "Dagali"
-#~ msgstr "Mali"
-
-#, fuzzy
-#~ msgid "Dalian"
-#~ msgstr "Dealaigh"
-
-#, fuzzy
-#~ msgid "Danbury"
-#~ msgstr "Éanair"
-
-#, fuzzy
-#~ msgid "Dayton"
-#~ msgstr "La"
-
-#, fuzzy
-#~ msgid "Deelen"
-#~ msgstr "Dealaigh"
-
-#, fuzzy
-#~ msgid "Delta"
-#~ msgstr "Dealaigh"
-
-#, fuzzy
-#~ msgid "Deming"
-#~ msgstr "Dealaigh"
-
-# LB
-#, fuzzy
-#~ msgid "Denton"
-#~ msgstr "An Liobáin"
-
-#, fuzzy
-#~ msgid "Denver"
-#~ msgstr "_gach"
-
-#, fuzzy
-#~ msgid "Des Moines"
-#~ msgstr "Guthán sa Baile"
-
-#, fuzzy
-#~ msgid "Destin"
-#~ msgstr "Freagra"
-
-#, fuzzy
-#~ msgid "Dijon"
-#~ msgstr "Críochnaithe"
-
-#, fuzzy
-#~ msgid "Dillon"
-#~ msgstr "Críochnaithe"
-
-#, fuzzy
-#~ msgid "Dinard"
-#~ msgstr "Priontáil carta"
-
 #, fuzzy
 #~ msgid "Dole"
 #~ msgstr "Críochnaithe"
@@ -18383,184 +18248,18 @@ msgstr ""
 #~ msgid "Donetsk"
 #~ msgstr "Críochnaithe"
 
-#, fuzzy
-#~ msgid "Dothan"
-#~ msgstr "Críochnaithe"
-
-#, fuzzy
-#~ msgid "Dover"
-#~ msgstr "Bog"
-
-# CU
-#, fuzzy
-#~ msgid "Dubai"
-#~ msgstr "Cúba"
-
-#, fuzzy
 #~ msgid "Dublin"
-#~ msgstr "Dealaigh"
-
-#, fuzzy
-#~ msgid "Dugway"
-#~ msgstr "La"
-
-#, fuzzy
-#~ msgid "Duluth"
-#~ msgstr "Gnáth"
-
-#, fuzzy
-#~ msgid "Dundee"
-#~ msgstr "Críochnaithe"
-
-#, fuzzy
-#~ msgid "Eagle"
-#~ msgstr "Chumasach"
-
-#, fuzzy
-#~ msgid "Edmonton"
-#~ msgstr "mí"
+#~ msgstr "Baile Átha Cliath"
 
 # SV
-#, fuzzy
-#~ msgid "El Dorado"
-#~ msgstr "An tSalvadóir"
-
-#, fuzzy
-#~ msgid "Elkins"
-#~ msgstr "líosta"
-
-#, fuzzy
-#~ msgid "Elmira"
-#~ msgstr "Elm"
-
-#, fuzzy
-#~ msgid "El Monte"
-#~ msgstr "Mí"
-
-# SV
-#, fuzzy
 #~ msgid "El Salvador Int."
-#~ msgstr "An tSalvadóir"
-
-#, fuzzy
-#~ msgid "Ely"
-#~ msgstr "Elm"
-
-#, fuzzy
-#~ msgid "Enid/Woodring"
-#~ msgstr "Ag Obair"
-
-# GN
-#, fuzzy
-#~ msgid "Eugene"
-#~ msgstr "An Ghuine"
-
-#, fuzzy
-#~ msgid "Everett"
-#~ msgstr "Gach"
-
-#, fuzzy
-#~ msgid "Exeter"
-#~ msgstr "Aimsir"
-
-#, fuzzy
-#~ msgid "Fagernes"
-#~ msgstr "Pager"
-
-#, fuzzy
-#~ msgid "Fairmont"
-#~ msgstr "Chlófhoireanna"
-
-#, fuzzy
-#~ msgid "Fargo"
-#~ msgstr "Ó"
-
-#, fuzzy
-#~ msgid "Farmingdale"
-#~ msgstr "Luaineach"
-
-#, fuzzy
-#~ msgid "Farmville"
-#~ msgstr "Ainm Chlainn"
-
-#, fuzzy
-#~ msgid "Faro"
-#~ msgstr "Ó"
-
-#, fuzzy
-#~ msgid "Ferrara"
-#~ msgstr "Feabhra"
-
-# NG
-#, fuzzy
-#~ msgid "Figari"
-#~ msgstr "An Nigéir"
-
-#, fuzzy
-#~ msgid "Findlay"
-#~ msgstr "Aoine"
-
-#, fuzzy
-#~ msgid "Firenze"
-#~ msgstr "Saor"
-
-#, fuzzy
-#~ msgid "Flint"
-#~ msgstr "líosta"
-
-# PH FIXME
-#, fuzzy
-#~ msgid "Flippin"
-#~ msgstr "Na hOileáin"
-
-# FR
-#, fuzzy
-#~ msgid "Florence"
-#~ msgstr "An Fhrainc"
-
-#, fuzzy
-#~ msgid "Florennes"
-#~ msgstr "Saor"
-
-#, fuzzy
-#~ msgid "Flores"
-#~ msgstr "Sábháil Mar"
-
-#, fuzzy
-#~ msgid "Florida"
-#~ msgstr "Aoine"
-
-#, fuzzy
-#~ msgid "Floro"
-#~ msgstr "Ó"
+#~ msgstr "An tSalvadóir Idirn."
 
 # FI
 #, fuzzy
 #~ msgid "Forde/Bringeland"
 #~ msgstr "An Fhionlainn"
 
-#, fuzzy
-#~ msgid "Forli"
-#~ msgstr "_Aoi"
-
-#, fuzzy
-#~ msgid "Formosa"
-#~ msgstr "_Formáid"
-
-# NO
-#, fuzzy
-#~ msgid "Fort Leonard"
-#~ msgstr "Sheoladh"
-
-#, fuzzy
-#~ msgid "Fort Meade"
-#~ msgstr "Sheoladh Chuig duine"
-
-# NO
-#, fuzzy
-#~ msgid "Fort Stewart"
-#~ msgstr "Sheoladh"
-
 # FR
 #, fuzzy
 #~ msgid "Fort Wayne"
@@ -18575,80 +18274,18 @@ msgstr ""
 #~ msgstr "Saor"
 
 #, fuzzy
-#~ msgid "Fresno"
-#~ msgstr "Ó"
-
-#, fuzzy
-#~ msgid "Friday Harbor"
-#~ msgstr "Aoine"
-
-#, fuzzy
-#~ msgid "Frigg"
-#~ msgstr "_Aoi"
-
-#, fuzzy
-#~ msgid "Frontone"
-#~ msgstr "Chlófhoireanna"
-
-#, fuzzy
-#~ msgid "Frosinone"
-#~ msgstr "Dearbhú"
-
-#, fuzzy
 #~ msgid "Fryeburg"
 #~ msgstr "Feabhra"
 
 #, fuzzy
-#~ msgid "Gage"
-#~ msgstr "Leathanach"
-
-#, fuzzy
 #~ msgid "Gainesville"
 #~ msgstr "Ceangailte"
 
-# GH
-#, fuzzy
-#~ msgid "Galena"
-#~ msgstr "Gána"
-
-#, fuzzy
-#~ msgid "Gander"
-#~ msgstr "Bainisteoir"
-
 # GN
 #, fuzzy
 #~ msgid "Gatineau"
 #~ msgstr "An Ghuine"
 
-# tg
-#, fuzzy
-#~ msgid "Gdansk"
-#~ msgstr "Táidsícis"
-
-# GR
-#, fuzzy
-#~ msgid "Geneve"
-#~ msgstr "An Ghréig"
-
-#, fuzzy
-#~ msgid "Genova"
-#~ msgstr "Gnáth"
-
-# GH
-#, fuzzy
-#~ msgid "Ghardaia"
-#~ msgstr "Gána"
-
-# FI
-#, fuzzy
-#~ msgid "Gila Bend"
-#~ msgstr "An Fhionlainn"
-
-# GN
-#, fuzzy
-#~ msgid "Girona"
-#~ msgstr "An Ghuine"
-
 # GH
 #, fuzzy
 #~ msgid "Gizan"
@@ -18664,16 +18301,6 @@ msgstr ""
 #~ msgid "Goodland"
 #~ msgstr "An Pholainn"
 
-# CA
-#, fuzzy
-#~ msgid "Granada"
-#~ msgstr "Ceanada"
-
-# GL
-#, fuzzy
-#~ msgid "Grand Island"
-#~ msgstr "An Ghraonlainn"
-
 #, fuzzy
 #~ msgid "Grandview"
 #~ msgstr "Reamhthaispeáintas"
@@ -18919,10 +18546,6 @@ msgstr ""
 #~ msgid "Jujuy"
 #~ msgstr "Iuíl"
 
-#, fuzzy
-#~ msgid "Junction"
-#~ msgstr "Údarú"
-
 # GN
 #, fuzzy
 #~ msgid "Juneau"
@@ -19134,6 +18757,10 @@ msgstr ""
 #~ msgstr "líosta"
 
 #, fuzzy
+#~ msgid "Logan"
+#~ msgstr "Logann NT"
+
+#, fuzzy
 #~ msgid "Lompoc"
 #~ msgstr "Teor."
 
@@ -19323,207 +18950,17 @@ msgstr ""
 #~ msgid "Mazatlan"
 #~ msgstr "Málta"
 
-#, fuzzy
-#~ msgid "McAllen"
-#~ msgstr "Gach Rud"
-
-#, fuzzy
-#~ msgid "McCall"
-#~ msgstr "Post"
-
-# mr
-#, fuzzy
-#~ msgid "McCarthy"
-#~ msgstr "Marataí"
-
-# IS
-#, fuzzy
-#~ msgid "McClellan"
-#~ msgstr "An Íoslainn"
-
-#, fuzzy
-#~ msgid "McComb"
-#~ msgstr "Teor."
-
 # mr
 #, fuzzy
 #~ msgid "Meacham"
 #~ msgstr "Marataí"
 
 #, fuzzy
-#~ msgid "Medford"
-#~ msgstr "riomh"
-
-#, fuzzy
 #~ msgid "Mehamn"
 #~ msgstr "Bain."
 
-# MT
-#, fuzzy
-#~ msgid "Melfa"
-#~ msgstr "Málta"
-
-#, fuzzy
-#~ msgid "Mendoza"
-#~ msgstr "Luain"
-
-#, fuzzy
-#~ msgid "Merida"
-#~ msgstr "Aoine"
-
-# MX
-#, fuzzy
-#~ msgid "Mexicali"
-#~ msgstr "Meicsiceo"
-
-#, fuzzy
-#~ msgid "Miami"
-#~ msgstr "Post"
-
-#, fuzzy
 #~ msgid "Middle East"
-#~ msgstr "_Méan:"
-
-#, fuzzy
-#~ msgid "Middletown"
-#~ msgstr "_Méan:"
-
-# FI
-#, fuzzy
-#~ msgid "Midland"
-#~ msgstr "An Fhionlainn"
-
-#, fuzzy
-#~ msgid "Miles City"
-#~ msgstr "Cinéal Comhad:"
-
-#, fuzzy
-#~ msgid "Milton"
-#~ msgstr "Post do %s"
-
-# fr 
-#, fuzzy
-#~ msgid "Minchumina"
-#~ msgstr "Fraincis"
-
-#, fuzzy
-#~ msgid "Minnesota"
-#~ msgstr "Noimeaíd"
-
-#, fuzzy
-#~ msgid "Minot"
-#~ msgstr "Noimeaíd"
-
-#, fuzzy
-#~ msgid "Moa"
-#~ msgstr "Lu"
-
-#, fuzzy
-#~ msgid "Mobile Downtown"
-#~ msgstr "Fón Phóca"
-
-#, fuzzy
-#~ msgid "Mobridge"
-#~ msgstr "Gúthan Póca"
-
-#, fuzzy
-#~ msgid "Mojave"
-#~ msgstr "Bog"
-
-#, fuzzy
-#~ msgid "Molde"
-#~ msgstr "Gúthan Póca"
-
-#, fuzzy
-#~ msgid "Moldova"
-#~ msgstr "Luain"
-
-# MW
-#, fuzzy
-#~ msgid "Molokai"
-#~ msgstr "Malawi"
-
-# MC
-#, fuzzy
-#~ msgid "Monclova"
-#~ msgstr "Monacó"
-
-# MC
-#, fuzzy
-#~ msgid "Moncton"
-#~ msgstr "Monacó"
-
-#, fuzzy
-#~ msgid "Monida"
-#~ msgstr "Luain"
-
-# MC
-#, fuzzy
-#~ msgid "Monroe"
-#~ msgstr "Monacó"
-
-#, fuzzy
-#~ msgid "Montague"
-#~ msgstr "Bainisteoir"
-
-#, fuzzy
-#~ msgid "Montana"
-#~ msgstr "Mí"
-
-#, fuzzy
-#~ msgid "Monte Cimone"
-#~ msgstr "Radharc Mí"
-
-# MN
-#, fuzzy
-#~ msgid "Montego Bay"
-#~ msgstr "An Mhóngóil"
-
-#, fuzzy
-#~ msgid "Monterey"
-#~ msgstr "Mí"
-
-#, fuzzy
-#~ msgid "Monterrey"
-#~ msgstr "Idirbhríste"
-
-# MC
-#, fuzzy
-#~ msgid "Monticello"
-#~ msgstr "Monacó"
-
-#, fuzzy
-#~ msgid "Montpelier"
-#~ msgstr "Radharc Mí"
-
-#, fuzzy
-#~ msgid "Montrose"
-#~ msgstr "Chlófhoireanna"
-
-# MN
-#, fuzzy
-#~ msgid "Morelia"
-#~ msgstr "An Mhóngóil"
-
-#, fuzzy
-#~ msgid "Morgantown"
-#~ msgstr "Eagrú"
-
-#, fuzzy
-#~ msgid "Moriarty"
-#~ msgstr "Tosaíocht"
-
-#, fuzzy
-#~ msgid "Mosinee"
-#~ msgstr "Gúthan Póca"
-
-#, fuzzy
-#~ msgid "Mountain View"
-#~ msgstr "Radharc Mí"
-
-#, fuzzy
-#~ msgid "Mount Vernon"
-#~ msgstr "Radharc Mí"
+#~ msgstr "An Meánoirthear"
 
 #, fuzzy
 #~ msgid "Mullan"
@@ -19947,7 +19384,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Port Alexander"
-#~ msgstr "Priontáil Feilire"
+#~ msgstr "Priontáil Féilire"
 
 # PT
 #, fuzzy
@@ -19973,6 +19410,10 @@ msgstr ""
 #~ msgstr "An Pholainn"
 
 #, fuzzy
+#~ msgid "Porto"
+#~ msgstr "_Poirt:"
+
+#, fuzzy
 #~ msgid "Portoroz"
 #~ msgstr "Portráid"
 
@@ -20016,11 +19457,6 @@ msgstr ""
 #~ msgid "Preveza"
 #~ msgstr "Reamhthaispeáintas"
 
-# PK
-#, fuzzy
-#~ msgid "Pristina"
-#~ msgstr "An Phacastáin"
-
 #, fuzzy
 #~ msgid "Provincetown"
 #~ msgstr "Reamhthaispeáintas"
@@ -20054,17 +19490,13 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Punta Cana"
-#~ msgstr "Priontáil Feilire"
+#~ msgstr "Priontáil Féilire"
 
 #, fuzzy
 #~ msgid "Quantico"
 #~ msgstr "Freagra"
 
 #, fuzzy
-#~ msgid "Quebec"
-#~ msgstr "Abair"
-
-#, fuzzy
 #~ msgid "Rawlins"
 #~ msgstr "Báisteach"
 
@@ -20221,10 +19653,6 @@ msgstr ""
 #~ msgid "Saiq"
 #~ msgstr "Sa"
 
-#, fuzzy
-#~ msgid "Salem"
-#~ msgstr "Sábháil"
-
 # ML
 #, fuzzy
 #~ msgid "Salida"
@@ -20454,10 +19882,6 @@ msgstr ""
 #~ msgstr "Ag stoir filtean"
 
 #, fuzzy
-#~ msgid "Stauning"
-#~ msgstr "Rabhadh"
-
-#, fuzzy
 #~ msgid "Staverton"
 #~ msgstr "Sábháil"
 
@@ -20656,11 +20080,6 @@ msgstr ""
 #~ msgid "Turaif"
 #~ msgstr "Tuircis"
 
-# tr
-#, fuzzy
-#~ msgid "Turin"
-#~ msgstr "Tuircis"
-
 # TR
 #, fuzzy
 #~ msgid "Turku"
@@ -20707,80 +20126,19 @@ msgstr ""
 #~ msgstr "Málta"
 
 #, fuzzy
-#~ msgid "Valencia"
-#~ msgstr "Feilire"
-
-#, fuzzy
-#~ msgid "Van"
-#~ msgstr "Bain."
-
-# FR
-#, fuzzy
-#~ msgid "Vandel"
-#~ msgstr "An Fhrainc"
-
-#, fuzzy
-#~ msgid "Varadero"
-#~ msgstr "Luaineach"
-
-#, fuzzy
 #~ msgid "Varna"
 #~ msgstr "Luaineach"
 
-#, fuzzy
-#~ msgid "Vasteras"
-#~ msgstr "Greamaigh"
-
-# VE
-#, fuzzy
-#~ msgid "Venezia"
-#~ msgstr "Veiniséala"
-
-#, fuzzy
-#~ msgid "Venice"
-#~ msgstr "Uincód"
-
-#, fuzzy
-#~ msgid "Vermont"
-#~ msgstr "mí"
-
-#, fuzzy
-#~ msgid "Vernal"
-#~ msgstr "Gnáth"
-
-# VE
-#, fuzzy
-#~ msgid "Vicenza"
-#~ msgstr "Veiniséala"
-
-#, fuzzy
-#~ msgid "Vilhena"
-#~ msgstr "Ainm Chomad:"
-
 # AU
 #, fuzzy
 #~ msgid "Visalia"
 #~ msgstr "An Astráil"
 
-# EI
-#, fuzzy
-#~ msgid "Vlieland"
-#~ msgstr "Éire"
-
-# MC
-#, fuzzy
-#~ msgid "Waco"
-#~ msgstr "Monacó"
-
 #, fuzzy
 #~ msgid "Warner Robins"
 #~ msgstr "Rabhadh"
 
 #, fuzzy
-#~ msgid "Waterbury"
-#~ msgstr "Aimsir"
-
-#, fuzzy
 #~ msgid "Waterloo"
 #~ msgstr "Aimsir"
 
@@ -20793,10 +20151,6 @@ msgstr ""
 #~ msgstr "Idirlíon"
 
 #, fuzzy
-#~ msgid "Wejh"
-#~ msgstr "Ce"
-
-#, fuzzy
 #~ msgid "Wenatchee"
 #~ msgstr "Aimsir"
 
@@ -20809,84 +20163,8 @@ msgstr ""
 #~ msgid "Westfield"
 #~ msgstr "Iarthair"
 
-#, fuzzy
-#~ msgid "Wick"
-#~ msgstr "L.ainm."
-
-#, fuzzy
 #~ msgid "Wien"
-#~ msgstr "Ce"
-
-#, fuzzy
-#~ msgid "Williston"
-#~ msgstr "líosta"
-
-#, fuzzy
-#~ msgid "Winslow"
-#~ msgstr "anois"
-
-#, fuzzy
-#~ msgid "Winter Park"
-#~ msgstr "Pasfhocal, le do thoil"
-
-#, fuzzy
-#~ msgid "Wisconsin"
-#~ msgstr "soicind"
-
-#, fuzzy
-#~ msgid "Wise"
-#~ msgstr "Ce"
-
-#, fuzzy
-#~ msgid "Wooster"
-#~ msgstr "Scríobhóir"
-
-#, fuzzy
-#~ msgid "Worcester"
-#~ msgstr "Aimsir"
-
-# PL
-#, fuzzy
-#~ msgid "Worland"
-#~ msgstr "An Pholainn"
-
-#, fuzzy
-#~ msgid "Worthington"
-#~ msgstr "Ag Obair"
-
-#, fuzzy
-#~ msgid "Wyoming"
-#~ msgstr "Ag Obair"
-
-#, fuzzy
-#~ msgid "Xiamen"
-#~ msgstr "Am"
-
-#, fuzzy
-#~ msgid "Yenbo"
-#~ msgstr "Imbosca"
-
-#, fuzzy
-#~ msgid "Zadar"
-#~ msgstr "Feilire"
-
-#, fuzzy
-#~ msgid "Zagreb"
-#~ msgstr "Leathanach"
-
-#, fuzzy
-#~ msgid "Zanesville"
-#~ msgstr "Ceangailte"
-
-# PY
-#, fuzzy
-#~ msgid "Zaragoza"
-#~ msgstr "Paraguay"
-
-# tr
-#, fuzzy
-#~ msgid "Zurich"
-#~ msgstr "Tuircis"
+#~ msgstr "Vín"
 
 #~ msgid "Appointments"
 #~ msgstr "Coinní"
@@ -20900,7 +20178,7 @@ msgstr ""
 #~ msgstr "%A %d %B"
 
 #, fuzzy
-#~ msgid "%l:%M%P %d %B"
+#~ msgid "%l:%M%p %d %B"
 #~ msgstr "%l:%M %d %B"
 
 #, fuzzy
@@ -20924,9 +20202,8 @@ msgstr ""
 #~ msgid "News Feed"
 #~ msgstr "Bealach Nuachtáin"
 
-#, fuzzy
 #~ msgid "All"
-#~ msgstr "Gach Rud"
+#~ msgstr "Gach Uile"
 
 # SE
 #, fuzzy
@@ -20936,6 +20213,9 @@ msgstr ""
 #~ msgid "No tasks"
 #~ msgstr "Gan Teascanna"
 
+#~ msgid "blue"
+#~ msgstr "gorm"
+
 #~ msgid "(No Description)"
 #~ msgstr "(Gan Tuarascail)"
 
@@ -20955,13 +20235,8 @@ msgstr ""
 #~ msgid "Please wait..."
 #~ msgstr "Fán le do thoil"
 
-#, fuzzy
 #~ msgid " F"
-#~ msgstr ", "
-
-#, fuzzy
-#~ msgid " C"
-#~ msgstr ", "
+#~ msgstr " F"
 
 # MC
 #, fuzzy
@@ -21066,13 +20341,11 @@ msgstr ""
 #~ msgid "Weather Settings"
 #~ msgstr "Albachtaí Phoist"
 
-#, fuzzy
 #~ msgid "_Delete Feed"
-#~ msgstr "Scríoste"
+#~ msgstr "_Scrios Fotha"
 
-#, fuzzy
 #~ msgid "_Five days"
-#~ msgstr "Aoine"
+#~ msgstr "_Cúig lá"
 
 #, fuzzy
 #~ msgid "_New Feed"
@@ -21082,12 +20355,77 @@ msgstr ""
 #~ msgid "_Show full path for folders"
 #~ msgstr "Teíp ag fork: %s"
 
+#, fuzzy
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr "Teíp ag fork: %s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Cuir Fillteán Leis"
+
+# DE
+#, fuzzy
+#~ msgid "Drafts"
+#~ msgstr "An Ghearmáin"
+
+#~ msgid "Outbox"
+#~ msgstr "Asbosca"
+
+#, fuzzy
+#~ msgid "Sent"
+#~ msgstr "Post"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Earraidh ag sábhháil scéalaí do: %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Syncing Folder"
+#~ msgstr "ag sioncronaich filtean"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Ar Bith)"
+
+# th
+#, fuzzy
+#~ msgid "Checkbox"
+#~ msgstr "Téalainnis"
+
+#~ msgid "No error"
+#~ msgstr "Gan Earraidh"
+
+#~ msgid "I/O error"
+#~ msgstr "Earraidh I/A"
+
+#~ msgid "CORBA error"
+#~ msgstr "Earraidh CORBA"
+
+#~ msgid "No owner"
+#~ msgstr "Gan Úinéar"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Post an sceál seo"
+
+#, fuzzy
+#~ msgid "Test type"
+#~ msgstr "Cinéal Comhad:"
+
 #~ msgid "Copy this folder"
 #~ msgstr "_Fillteán"
 
-#, fuzzy
 #~ msgid "Create a new shortcut"
-#~ msgstr "Scríos an sceal seo"
+#~ msgstr "Cruthaigh aicearra nua"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "_Fuinneog Evolution"
 
 #, fuzzy
 #~ msgid "Open Other _User's Folder..."
@@ -21103,9 +20441,8 @@ msgstr ""
 #~ msgid "_Copy..."
 #~ msgstr "_Cóip..."
 
-#, fuzzy
 #~ msgid "_Folder..."
-#~ msgstr "_Fillteán"
+#~ msgstr "_Fillteán..."
 
 #~ msgid "_Move..."
 #~ msgstr "_Bog..."
@@ -21127,11 +20464,8 @@ msgstr ""
 #~ msgid "Error"
 #~ msgstr "Earraidh"
 
-#~ msgid "Question"
-#~ msgstr "Freagra"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#~ msgid "Clear"
+#~ msgstr "Glan"
 
 #~ msgid "De_lete"
 #~ msgstr "_Dealaigh"
@@ -21150,7 +20484,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Delete news feed"
-#~ msgstr "Scríoste"
+#~ msgstr "Scríoste"
 
 #~ msgid "_Mail"
 #~ msgstr "_Post"
@@ -21167,7 +20501,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "S_elect server: "
-#~ msgstr "Fillteán _Nua"
+#~ msgstr "Fillteán _Nua"
 
 #, fuzzy
 #~ msgid "Add"
@@ -21176,30 +20510,22 @@ msgstr ""
 # SG
 #, fuzzy
 #~ msgid "_Signature editor"
-#~ msgstr "Singeapór"
+#~ msgstr "Singeapór"
 
 #, fuzzy
 #~ msgid "Create _New Folder..."
-#~ msgstr "Fillteán _Nua"
+#~ msgstr "Fillteán _Nua"
 
 #~ msgid "_Contacts..."
-#~ msgstr "_Tadhallaí..."
+#~ msgstr "_Tadhallaí..."
 
 #, fuzzy
 #~ msgid "1234"
 #~ msgstr "123"
 
 #, fuzzy
-#~ msgid "380"
-#~ msgstr "389"
-
-#, fuzzy
 #~ msgid "<- _Remove"
-#~ msgstr "_Scríos"
-
-#, fuzzy
-#~ msgid "<< Fewer Options"
-#~ msgstr "Roghanna"
+#~ msgstr "_Scríos"
 
 #, fuzzy
 #~ msgid "DN Customization"
@@ -21212,19 +20538,15 @@ msgstr ""
 # CH
 #, fuzzy
 #~ msgid "Mappings"
-#~ msgstr "An tSín"
+#~ msgstr "An tSín"
 
 #, fuzzy
 #~ msgid "R_estore Defaults"
-#~ msgstr "Gnáth"
+#~ msgstr "Gnáth"
 
 #, fuzzy
 #~ msgid "Re_store Defaults"
-#~ msgstr "Gnáth"
-
-#, fuzzy
-#~ msgid "Select"
-#~ msgstr "Tóg Gach Rud"
+#~ msgstr "Gnáth"
 
 #, fuzzy
 #~ msgid "_Add ->"
@@ -21237,7 +20559,7 @@ msgstr ""
 # aa 
 #, fuzzy
 #~ msgid "_Always"
-#~ msgstr "Afáiris"
+#~ msgstr "Afáiris"
 
 #, fuzzy
 #~ msgid "_Delete Mapping"
@@ -21257,7 +20579,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "_Restore Defaults"
-#~ msgstr "Gnáth"
+#~ msgstr "Gnáth"
 
 #, fuzzy
 #~ msgid "account-druid"
@@ -21265,25 +20587,27 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "C_ontacts..."
-#~ msgstr "_Tadhallaí..."
+#~ msgstr "_Tadhallaí..."
 
 #~ msgid "Phone Types"
-#~ msgstr "Cinéal  Fóin"
+#~ msgstr ""
+#~ "Cinéal  "
+#~ "Fóin"
 
 #~ msgid "Delete Contact?"
 #~ msgstr "Dealaigh Tadhall?"
 
 #, fuzzy
 #~ msgid "Display Cards?"
-#~ msgstr "Taispeaín"
+#~ msgstr "Taispeaín"
 
 #, fuzzy
 #~ msgid "Display Cards"
-#~ msgstr "Taispeaín"
+#~ msgstr "Taispeaín"
 
 #, fuzzy
 #~ msgid "st"
-#~ msgstr "líosta"
+#~ msgstr "líosta"
 
 #, fuzzy
 #~ msgid "nd"
@@ -21295,10 +20619,10 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Could not activate Bonobo"
-#~ msgstr "Teíp ag fork: %s"
+#~ msgstr "Teíp ag fork: %s"
 
 #~ msgid "Print Calendar"
-#~ msgstr "Priontáil Feilire"
+#~ msgstr "Priontáil Feilire"
 
 #~ msgid "Warning!"
 #~ msgstr "Rabhadh!"
@@ -21312,7 +20636,8 @@ msgstr ""
 # ug
 #, fuzzy
 #~ msgid "hour"
-#~ msgstr "Úíghur"
+#~ msgstr ""
+#~ "Úíghur"
 
 #~ msgid "week"
 #~ msgstr "seachtain"
@@ -21322,7 +20647,10 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Warning: Unsent Messages"
-#~ msgstr "Ag Sábháil scealta"
+#~ msgstr ""
+#~ "Ag "
+#~ "Sábháil "
+#~ "scealta"
 
 #, fuzzy
 #~ msgid "Cannot initialize the Evolution mail component."
@@ -21330,12 +20658,12 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Go to next folder with unread messages?"
-#~ msgstr "Scríos an sceal seo"
+#~ msgstr "Scríos an sceal seo"
 
 # SG
 #, fuzzy
 #~ msgid "Add Signature"
-#~ msgstr "Singeapór"
+#~ msgstr "Singeapór"
 
 #, fuzzy
 #~ msgid "Account %d"
@@ -21346,40 +20674,40 @@ msgstr ""
 #~ msgstr "Luaineach"
 
 #~ msgid "All folders"
-#~ msgstr "Gach Fillteáin"
+#~ msgstr "Gach Fillteáin"
 
 #, fuzzy
 #~ msgid "Apri file"
-#~ msgstr "Aibreáin"
+#~ msgstr "Aibreáin"
 
 #, fuzzy
 #~ msgid "Salve file"
-#~ msgstr "Tóg Comhad"
+#~ msgstr "Tóg Comhad"
 
 #~ msgid "New..."
 #~ msgstr "Nua..."
 
 #~ msgid "Host"
-#~ msgstr "Óst"
+#~ msgstr "Óst"
 
 #~ msgid "Output File"
 #~ msgstr "Comhad Aschur"
 
 #, fuzzy
 #~ msgid "Pilot Con_duit Settings..."
-#~ msgstr "Albachtaí Phoist"
+#~ msgstr "Albachtaí Phoist"
 
 #, fuzzy
 #~ msgid "Set up Pilot conduit configuration"
-#~ msgstr "Socrú Post"
+#~ msgstr "Socrú Post"
 
 #, fuzzy
 #~ msgid "_Configure..."
-#~ msgstr "Socraigh Fillteáin..."
+#~ msgstr "Socraigh Fillteáin..."
 
 #, fuzzy
 #~ msgid "_Configure Pilot..."
-#~ msgstr "Socraigh Fillteáin..."
+#~ msgstr "Socraigh Fillteáin..."
 
 #, fuzzy
 #~ msgid "en"
@@ -21392,25 +20720,26 @@ msgstr ""
 # FIXME SP?
 #, fuzzy
 #~ msgid "Select PGP program"
-#~ msgstr "Tóg Ainmhí:"
+#~ msgstr ""
+#~ "Tóg Ainmhí:"
 
 # SG
 #, fuzzy
 #~ msgid "Signature #1"
-#~ msgstr "Singeapór"
+#~ msgstr "Singeapór"
 
 # SG
 #, fuzzy
 #~ msgid "Signature #2"
-#~ msgstr "Singeapór"
+#~ msgstr "Singeapór"
 
 #, fuzzy
 #~ msgid "Copy selected messages"
-#~ msgstr "Scríos an sceal seo"
+#~ msgstr "Scríos an sceal seo"
 
 #, fuzzy
 #~ msgid "&lt;- _Remove"
-#~ msgstr "_Scríos"
+#~ msgstr "_Scríos"
 
 #, fuzzy
 #~ msgid "_Add -&gt;"
@@ -21427,12 +20756,16 @@ msgstr ""
 #~ msgstr "Roghanna Feilire"
 
 #, fuzzy
+#~ msgid "Could not parse query string"
+#~ msgstr "Teíp ag fork: %s"
+
+#, fuzzy
 #~ msgid "Meeting begins: <b>"
 #~ msgstr "Eolas"
 
 #, fuzzy
 #~ msgid "Task begins: <b>"
-#~ msgstr "Críochnaithe.`"
+#~ msgstr "Críochnaithe.`"
 
 #, fuzzy
 #~ msgid "Free/Busy info begins: <b>"
@@ -21452,20 +20785,20 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Task Completed: <b>"
-#~ msgstr "Críochnaithe.`"
+#~ msgstr "Críochnaithe.`"
 
 #, fuzzy
 #~ msgid "Task Due: <b>"
-#~ msgstr "Críochnaithe.`"
-
-#, fuzzy
-#~ msgid "Set as default"
-#~ msgstr " (gnáth)"
+#~ msgstr "Críochnaithe.`"
 
 # SG
 #, fuzzy
 #~ msgid "Signature hint"
-#~ msgstr "Singeapór"
+#~ msgstr "Singeapór"
+
+#, fuzzy
+#~ msgid "Hide signature hint"
+#~ msgstr "Tóg Comhad"
 
 #, fuzzy
 #~ msgid "_Browse..."
@@ -21476,32 +20809,30 @@ msgstr ""
 #~ msgstr "Earraidh I/A"
 
 #~ msgid "NNTP Server:"
-#~ msgstr "Freatalaí NNTP:"
+#~ msgstr "Freatalaí NNTP:"
 
 #, fuzzy
 #~ msgid "News Servers"
-#~ msgstr "Fillteán _Nua"
+#~ msgstr "Fillteán _Nua"
 
 #, fuzzy
 #~ msgid "View messages..."
 #~ msgstr "Clodaigh teachtairecht..."
 
 #, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Post an sceál seo"
-
-#, fuzzy
 #~ msgid "_Pilot Settings..."
-#~ msgstr "Albachtaí Phoist"
+#~ msgstr "Albachtaí Phoist"
 
 #~ msgid "_End of day:"
-#~ msgstr "_Deireadh an Lá:"
+#~ msgstr "_Deireadh an Lá:"
 
 #~ msgid "%s server %s"
-#~ msgstr "%s freastalaí %s"
+#~ msgstr "%s freastalaí %s"
 
 #~ msgid "(unknown host)"
-#~ msgstr "(Žóst gan aithne)"
+#~ msgstr ""
+#~ "(Žóst gan "
+#~ "aithne)"
 
 #, fuzzy
 #~ msgid "No such message: %s"
@@ -21510,12 +20841,15 @@ msgstr ""
 #, fuzzy
 #~ msgid "Cannot append message to spool file: %s: %s"
 #~ msgstr ""
-#~ "Earraidh ag sábhháil scéalaí do: %s\n"
+#~ "Earraidh ag "
+#~ "sábhháil "
+#~ "scéalaí "
+#~ "do: %s\n"
 #~ " %s"
 
 #, fuzzy
 #~ msgid "Could not file: %s: %s"
-#~ msgstr "Teíp ag fork: %s"
+#~ msgstr "Teíp ag fork: %s"
 
 #, fuzzy
 #~ msgid "Random"
@@ -21542,15 +20876,15 @@ msgstr ""
 # BG
 #, fuzzy
 #~ msgid "Dari"
-#~ msgstr "An Bhulgáir"
+#~ msgstr "An Bhulgáir"
 
 #, fuzzy
 #~ msgid "Hulu"
-#~ msgstr "Gnáth"
+#~ msgstr "Gnáth"
 
 #, fuzzy
 #~ msgid "Same as text"
-#~ msgstr "Taispeáin"
+#~ msgstr "Taispeáin"
 
 #, fuzzy
 #~ msgid "_Language:"
@@ -21561,39 +20895,39 @@ msgstr ""
 #~ msgstr "Raidio"
 
 #~ msgid "Copying"
-#~ msgstr "Ag Cóip"
+#~ msgstr "Ag Cóip"
 
 #, fuzzy
 #~ msgid "Signature name:"
-#~ msgstr "Ainm Stíl:"
+#~ msgstr "Ainm Stíl:"
 
 #, fuzzy
 #~ msgid "Riga"
 #~ msgstr "Deis:"
 
 #~ msgid "Base"
-#~ msgstr "Bún"
+#~ msgstr "Bún"
 
 #~ msgid "_Other"
 #~ msgstr "_Eile"
 
 #, fuzzy
 #~ msgid "Could not encrypt data: invalid user key: \"%s\"."
-#~ msgstr "Teíp ag fork: %s"
+#~ msgstr "Teíp ag fork: %s"
 
 #, fuzzy
 #~ msgid "Could not encrypt: encoding failed."
-#~ msgstr "Teíp ag fork: %s"
+#~ msgstr "Teíp ag fork: %s"
 
 #, fuzzy
 #~ msgid "Send an email to %s"
-#~ msgstr "Post ríomhphost"
+#~ msgstr "Post ríomhphost"
 
 #~ msgid "Run %s"
-#~ msgstr "Deán %s"
+#~ msgstr "Deán %s"
 
 #~ msgid "Close %s"
-#~ msgstr "Dún %s"
+#~ msgstr "Dún %s"
 
 #, fuzzy
 #~ msgid "page"
@@ -21601,11 +20935,11 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "RDF Summary"
-#~ msgstr "Coimriú"
+#~ msgstr "Coimriú"
 
 #, fuzzy
 #~ msgid "Test service"
-#~ msgstr "Suimigh Seirbhís"
+#~ msgstr "Suimigh Seirbhís"
 
 #, fuzzy
 #~ msgid "Update now"
@@ -21616,13 +20950,13 @@ msgstr ""
 #~ msgstr "Data"
 
 #~ msgid "Mailbox Format"
-#~ msgstr "Formóid Boscaphoist"
+#~ msgstr "Formóid Boscaphoist"
 
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Inbosca"
 
 #~ msgid "Display"
-#~ msgstr "Taispeaín"
+#~ msgstr "Taispeaín"
 
 #~ msgid "Edit..."
 #~ msgstr "Eagar..."
@@ -21635,14 +20969,14 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "_Server type: "
-#~ msgstr "_Cineal Freastalaí:"
+#~ msgstr "_Cineal Freastalaí:"
 
 #~ msgid "seconds."
 #~ msgstr "soicind."
 
 #, fuzzy
 #~ msgid "Mail Summary"
-#~ msgstr "Coimriú phoist"
+#~ msgstr "Coimriú phoist"
 
 #~ msgid "(No name)"
 #~ msgstr "(gan ainm)"
@@ -21651,6 +20985,10 @@ msgstr ""
 #~ msgid "Create a New All Day _Event"
 #~ msgstr "Cruthaigh All Day Event nua"
 
+#, fuzzy
+#~ msgid "Create a _New Meeting"
+#~ msgstr "Cruthaigh Coinne _Nua"
+
 #~ msgid "New Appointment"
 #~ msgstr "Coinne Nua"
 
@@ -21658,7 +20996,7 @@ msgstr ""
 #~ msgstr "_Coinne..."
 
 #~ msgid "_Calendar Settings..."
-#~ msgstr "_Albachtaí Feilire..."
+#~ msgstr "_Albachtaí Feilire..."
 
 #~ msgid "_Task..."
 #~ msgstr "_Teasc..."
@@ -21702,7 +21040,7 @@ msgstr ""
 #~ "  Street:      "
 #~ msgstr ""
 #~ "\n"
-#~ "  Sráid:       "
+#~ "  Sráid:       "
 
 #~ msgid ""
 #~ "\n"
@@ -21723,28 +21061,28 @@ msgstr ""
 #~ "  Postal Code: "
 #~ msgstr ""
 #~ "\n"
-#~ "  Cód Phoist: "
+#~ "  Cód Phoist: "
 
 #~ msgid ""
 #~ "\n"
 #~ "  Country:     "
 #~ msgstr ""
 #~ "\n"
-#~ "  Tír:         "
+#~ "  Tír:         "
 
 #~ msgid ""
 #~ "\n"
 #~ "Telephones:\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Telefóin:\n"
+#~ "Telefóin:\n"
 
 #~ msgid ""
 #~ "\n"
 #~ "Telephone:"
 #~ msgstr ""
 #~ "\n"
-#~ "Telefón:"
+#~ "Telefón:"
 
 #~ msgid ""
 #~ "\n"
@@ -21758,7 +21096,7 @@ msgstr ""
 #~ "Time Zone: "
 #~ msgstr ""
 #~ "\n"
-#~ "Am Críos: "
+#~ "Am Críos: "
 
 #~ msgid ""
 #~ "\n"
@@ -21767,34 +21105,23 @@ msgstr ""
 #~ "\n"
 #~ "  Ainm:  "
 
-#~ msgid ""
-#~ "\n"
-#~ "Comment: "
-#~ msgstr ""
-#~ "\n"
-#~ "Trácht:"
-
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Eochair Poiblí: "
-
 #~ msgid "New _Contact"
 #~ msgstr "_Tadhall Nua"
 
+#~ msgid "New _Task"
+#~ msgstr "_Teasc Nua"
+
 #~ msgid "(Unknown)"
 #~ msgstr "(Gan aithne)"
 
 #~ msgid "New _Mail Message"
 #~ msgstr "Teachtaireacht _Post Nua"
 
-#~ msgid "°F"
-#~ msgstr "°F"
+#~ msgid "°F"
+#~ msgstr "°F"
 
-#~ msgid "°C"
-#~ msgstr "°C"
+#~ msgid "°C"
+#~ msgstr "°C"
 
 #, fuzzy
 #~ msgid "%s at an unknown time"
@@ -21804,12 +21131,8 @@ msgstr ""
 #~ msgstr "GnomeCard: "
 
 #, fuzzy
-#~ msgid "Encrypted message"
-#~ msgstr "Post an sceál seo"
-
-#, fuzzy
 #~ msgid "Cannot copy a folder `%s' to itself"
-#~ msgstr "Teíp ag fork: %s"
+#~ msgstr "Teíp ag fork: %s"
 
 #~ msgid "%s - Ximian Evolution %s"
 #~ msgstr "%s - Ximian Evolution %s"
@@ -21823,9 +21146,6 @@ msgstr ""
 #~ msgid "%d"
 #~ msgstr "%d"
 
-#~ msgid "%d/%m/%Y"
-#~ msgstr "%d/%m/%Y"
-
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%a %d/%m/%Y"
 
@@ -21833,7 +21153,7 @@ msgstr ""
 #~ msgstr "SASL"
 
 #~ msgid "Root DN:"
-#~ msgstr "Príomh DN:"
+#~ msgstr "Príomh DN:"
 
 #~ msgid "URI"
 #~ msgstr "URI"
@@ -21883,9 +21203,6 @@ msgstr ""
 #~ msgid "q"
 #~ msgstr "q"
 
-#~ msgid "s"
-#~ msgstr "s"
-
 #~ msgid "t"
 #~ msgstr "t"
 
@@ -21920,10 +21237,10 @@ msgstr ""
 #~ msgstr "%H:%M%n"
 
 #~ msgid "View All"
-#~ msgstr "Taidpeáin Gach Rud"
+#~ msgstr "Taidpeáin Gach Rud"
 
 #~ msgid "_Day"
-#~ msgstr "_Lá"
+#~ msgstr "_Lá"
 
 #~ msgid "About..."
 #~ msgstr "Faoi..."
@@ -21935,20 +21252,22 @@ msgstr ""
 #~ msgstr "G_lan"
 
 #~ msgid "Close this appointment"
-#~ msgstr "Dún an coinne seo"
+#~ msgstr "Dún an coinne seo"
 
 #~ msgid "Pre_vious"
 #~ msgstr "_Riomh"
 
 #~ msgid "Print S_etup..."
-#~ msgstr "Socraigh Priontáil..."
+#~ msgstr "Socraigh Priontáil..."
 
 #, fuzzy
 #~ msgid "_Mail Message (FIXME)"
-#~ msgstr "_Post sceál"
+#~ msgstr "_Post sceál"
 
 #~ msgid "_Move to Folder... (FIXME)"
-#~ msgstr "Sábháil 'san _fillteán"
+#~ msgstr ""
+#~ "Sábháil "
+#~ "'san _fillteán"
 
 #~ msgid "_Note (FIXME)"
 #~ msgstr "_Nota"
@@ -21963,7 +21282,9 @@ msgstr ""
 #~ msgstr "_Freagrair"
 
 #~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Sábháil 'san _fillteán..."
+#~ msgstr ""
+#~ "Sábháil "
+#~ "'san _fillteán..."
 
 #~ msgid "_Appointment (FIXME)"
 #~ msgstr "_Coinne"
@@ -21973,10 +21294,12 @@ msgstr ""
 #~ "Mailer: "
 #~ msgstr ""
 #~ "\n"
-#~ "Postóir:"
+#~ "Postóir:"
 
 #~ msgid "New Contact _List"
-#~ msgstr "_Líosta Tadhall Nua"
+#~ msgstr ""
+#~ "_Líosta "
+#~ "Tadhall Nua"
 
 #~ msgid "Co_ntacts:"
-#~ msgstr "Tadhallaí"
+#~ msgstr "Tadhallaí"