Update the po files to cut down on dist time

02-05-08  JP Rosevear  <jpr@ximian.com>

	* Update the po files to cut down on dist time

svn path=/trunk/; revision=16721

1 files changed, 4138 insertions, 3278 deletions

diff --git a/po/ga.po b/po/ga.po
index b3b8fae497..fc98615fc0 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: locales 0.01\n"
-"POT-Creation-Date: 2002-02-11 05:38+0100\n"
+"POT-Creation-Date: 2002-05-07 15:46-0400\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"
@@ -35,6 +35,7 @@ msgid "File As"
 msgstr "Sábháil Mar"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ainm"
 
@@ -156,7 +157,6 @@ msgstr "ISDN"
 #: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/contact-editor/e-contact-editor.c:1728
 #: addressbook/gui/contact-editor/e-contact-editor.c:1786
-#: mail/mail-config.glade.h:58
 msgid "Other"
 msgstr "Eile"
 
@@ -319,11 +319,11 @@ msgstr "Ainm Chlainn"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard do %s"
@@ -336,59 +336,56 @@ msgstr "VCard do %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:260
-#: addressbook/backend/pas/pas-backend-ldap.c:2272
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2732
 msgid "Searching..."
 msgstr "Ag Cuardaigh..."
 
-#: addressbook/backend/pas/pas-backend-file.c:262
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Ag L�ód�áil..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:271
+#: addressbook/backend/pas/pas-backend-file.c:272
 msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:486
-msgid "Connecting to LDAP server..."
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:496
-msgid "Unable to connect to LDAP server."
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:512
-msgid "Waiting for connection to LDAP server..."
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:915
+#: addressbook/backend/pas/pas-backend-ldap.c:1123
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1016
+#: addressbook/backend/pas/pas-backend-ldap.c:1226
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1462
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2217
+#: addressbook/backend/pas/pas-backend-ldap.c:2586
+msgid "Restarting search."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2678
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2222
-msgid "Restarting search."
+#: addressbook/backend/pas/pas-backend-ldap.c:2759
+msgid "Error performing search"
 msgstr ""
 
+#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Teíp ag fork: %s"
+
 #: addressbook/conduit/address-conduit.c:293
 #, fuzzy
 msgid "Default Sync Address:"
@@ -428,388 +425,826 @@ msgid "A Bonobo control for displaying an address."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-#: notes/GNOME_Evolution_Notes.oaf.in.h:1
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Addressbook Settings"
+msgstr "Leabhar Seoladh:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Configuration control for the Evolution Addressbook Storages."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Configuration control for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
+msgid "This page can be used to configure Addressbook Settings"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:72
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
-#: shell/e-shortcuts.c:1061
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Tadhallaí"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "Freastalaí LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:527
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:562
 msgid "New Contact"
 msgstr "Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:562
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Tadhall"
 
-#: addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "New Contact List"
 msgstr "L�íosta Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Contact _List"
 msgstr "Liost Tadhall"
 
-#: addressbook/gui/component/addressbook-config.c:223
-msgid "Edit Addressbook"
-msgstr "Eagar Leabhar Sheoladh"
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+msgid "Could not initialize gnome-vfs"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:516
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:525
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:530
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:538
+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:643
+#: addressbook/gui/component/addressbook.c:646
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Pasfhocal do %s, le do thoil (úsáideoir %s)"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook.c:769
+msgid "Name begins with"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:770
 #, fuzzy
-msgid "100"
+msgid "Email is"
+msgstr "Rphost 2"
+
+#: addressbook/gui/component/addressbook.c:771
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr ""
+
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:772
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+msgid "Advanced..."
+msgstr ""
+
+#. All, unmatched, separator
+#: addressbook/gui/component/addressbook.c:1001
+#: calendar/gui/cal-search-bar.c:382
+msgid "Any Category"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:1083
+msgid "The URI that the Folder Browser will display"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:474
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+msgid "Primary Email"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:587
+msgid "Select an Action"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:593
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:605
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:891
+msgid "Querying Addressbook..."
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:973
+#: addressbook/gui/component/e-address-widget.c:387
+#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:1003
+#: addressbook/gui/component/e-address-widget.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+msgid "Add to Contacts"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:1046
+msgid "Merge E-Mail Address"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Disable Queries"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:364
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:197
+msgid "Failed to connect to LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:215
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:235
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:641
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1143
+msgid "The server did not respond with a schema entry"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1163
+msgid "Could not query for schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1169
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1613
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1689
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "_Fillteán"
+
+#: addressbook/gui/component/ldap-config.glade.h:1
+msgid "  S_how Supported Bases "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:2
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Roghanna"
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "<- _Remove"
+msgstr "_Scríos"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+#, fuzzy
+msgid "1234"
+msgstr "123"
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+#, fuzzy
+msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "380"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "A_uthenticate with server using:"
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Suim Leabhar Seoladh"
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "666"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
+# ##
+# ## Languages (ISO 639 code in brackets)
+# ## 	The 'msgid' names and spellings for languages are those listed
+# ##     in iso-639.def from glibc
+# aa 
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
+#: mail/mail-config.glade.h:16
+#, fuzzy
+msgid "Always"
+msgstr "Afáiris"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Gan anim"
+
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:18
+msgid "Attribute"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "B�ún"
+#: addressbook/gui/component/ldap-config.glade.h:19
+msgid ""
+"Congratulations, you are finished setting up this LDAP server. You\n"
+"are now ready to access this directory.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Gnáth"
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Connecting"
+msgstr "_Tadhall"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "DN Customization"
+msgstr "Gan Eolas"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "De_lete"
 msgstr "_Dealaigh"
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
+#: addressbook/gui/component/ldap-config.glade.h:27
+msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
-msgid "Email address"
-msgstr "Seoladh Rpost:"
+msgid "Email Address:"
+msgstr "_Seoladh RPost:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Alairm Evolution"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr "Aon"
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "Cuardaigh:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Gnáth"
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "LDAP Attribute"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Ainm do Fhreastalaí"
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Socrú"
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
+# CH
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "An tSín"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Never"
+msgstr "_gach"
+
+#: addressbook/gui/component/ldap-config.glade.h:38
+msgid ""
+"Now, you must specify how you want to connect to the LDAP server. The SSL "
+"(Secure Sockets Layer)\n"
+"and TLS (Transport Layer Security) protocols are used by some servers to "
+"cryptographically protect\n"
+"your connection. Ask your system administrator if your LDAP server uses "
+"these protocols."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
+#: addressbook/gui/component/ldap-config.glade.h:41
+msgid "Objectclasses"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
+#: addressbook/gui/component/ldap-config.glade.h:42
+msgid "Objectclasses Used in Evolution:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid ""
-"This information is used by your ldap server to specify which nodes are used "
-"in a search. Contact your server administrator for more information."
+#: addressbook/gui/component/ldap-config.glade.h:43
+msgid "Objectclasses Used on Server:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:44
+msgid "One"
+msgstr "Aon"
+
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"Please select and Evolution attribute and an\n"
+"LDAP attribute to associate with it."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
+msgid "R_estore Defaults"
+msgstr "Gnáth"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Gnáth"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#. No time range is set, so don't start a query
+#: addressbook/gui/component/ldap-config.glade.h:50
+#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
+#: calendar/gui/e-week-view.c:1213
+msgid "Searching"
+msgstr "Cuardaigh"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Tóg Gach Rud"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Scríoste"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid ""
-"This is the maximum number of cards to download.  Setting this number too "
-"large will slow down this addressbook."
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if\n"
+"your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:55
 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."
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
+"secure."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
+#: addressbook/gui/component/ldap-config.glade.h:59
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This \n"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
+"exploits. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
+#: addressbook/gui/component/ldap-config.glade.h:62
+msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"Specifying a display name is the last required step in configuring an LDAP "
+"server."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "Ainm _Chuntas:"
+#: addressbook/gui/component/ldap-config.glade.h:65
+#, fuzzy
+msgid "Step 1: Server Information"
+msgstr "Eolas"
 
-#: addressbook/gui/component/addressbook-config.glade.h:31
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:100
-msgid "_Add"
-msgstr "_Suimigh"
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Cumraigh do %s"
 
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
+#: addressbook/gui/component/ldap-config.glade.h:67
+msgid "Step 3: Searching the Directory"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid "Step 4: Display Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:109
-#: ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:41
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
-msgid "_Edit"
-msgstr "_Eagar"
+#: addressbook/gui/component/ldap-config.glade.h:69
+msgid "Sub"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:110
-#, fuzzy
-msgid "_Email address:"
-msgstr "_Seoladh RPost:"
+#: addressbook/gui/component/ldap-config.glade.h:70
+msgid "Supported Search Bases"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Poirt:"
+#: addressbook/gui/component/ldap-config.glade.h:71
+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/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "Ainm _Freastalaí:"
+#: addressbook/gui/component/ldap-config.glade.h:73
+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 "
+"if you\n"
+"need to change these options."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-msgid "Could not initialize gnome-vfs"
+#: addressbook/gui/component/ldap-config.glade.h:76
+msgid ""
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:168
-msgid "Other Contacts"
-msgstr "Tadhallaí Eile"
+#: addressbook/gui/component/ldap-config.glade.h:78
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the \n"
+"directory tree. A search scope of \"sub\" will include all entries below "
+"your search base.\n"
+"A search scope of \"one\" will only include the entries one level beneath "
+"your base."
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:499
-msgid "Unable to open addressbook"
+#: addressbook/gui/component/ldap-config.glade.h:81
+msgid ""
+"This assistant will help you to access online directory services\n"
+"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"\n"
+"Adding a new LDAP server requires some specialized information\n"
+"about the server. Please contact your system administrator if you \n"
+"need help finding this information."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
+"This is the full name of your ldap server. For example, "
+"\"ldap.mycompany.com\"."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:513
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+"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/addressbook.c:521
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+"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/addressbook.c:655
-#: addressbook/gui/component/addressbook.c:658
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Pasfhocal do %s, le do thoil (úsáideoir %s)"
+#: addressbook/gui/component/ldap-config.glade.h:91
+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/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
+#: addressbook/gui/component/ldap-config.glade.h:93
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"\n"
+"list of standard ports has been provided. Ask your system administrator\n"
+"what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
+#: addressbook/gui/component/ldap-config.glade.h:96
+msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
+#: addressbook/gui/component/ldap-config.glade.h:97
+msgid ""
+"To add an attribute to the DN, select it from the list and click the \"Add "
+"Attribute\" button.\n"
+"Any values that you add to the DN will become required values for any new "
+"contacts\n"
+"that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:59
-msgid "Category is"
+#: addressbook/gui/component/ldap-config.glade.h:100
+msgid "U_se SSL/TLS:"
 msgstr ""
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
+#: addressbook/gui/component/ldap-config.glade.h:101
+msgid "Using distinguished name (DN)"
 msgstr ""
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1067
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+msgid "Using email address"
+msgstr "Seoladh Rpost:"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1150
-msgid "The URI that the Folder Browser will display"
+#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:139
+msgid "_Add"
+msgstr "_Suimigh"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Suimigh"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+msgid "_Add Mapping"
 msgstr ""
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(gan ainm)"
+#: addressbook/gui/component/ldap-config.glade.h:107
+msgid "_Add to DN"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
-msgid "Primary Email"
+# ##
+# ## Languages (ISO 639 code in brackets)
+# ## 	The 'msgid' names and spellings for languages are those listed
+# ##     in iso-639.def from glibc
+# aa 
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Afáiris"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Dealaigh gach rud"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Taispeaín"
+
+#: addressbook/gui/component/ldap-config.glade.h:111
+msgid "_Distinguished Name (DN):"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:587
-msgid "Select an Action"
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, c-format
-msgid "Create a new contact \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
+msgid "_Edit"
+msgstr "_Eagar"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "Eagar coinne"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Alairm Evolution"
+
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:891
-msgid "Querying Addressbook..."
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-msgid "Add to Contacts"
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:1046
-msgid "Merge E-Mail Address"
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Roghanna"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Poirt:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Gnáth"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "C_uardaigh..."
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "Ainm _Freastalaí:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Cuntas %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+msgid "account-editor"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Gan cartaí"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Cumraigh do %s"
+
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "Gnáth"
+
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "Cuardaigh"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr ""
@@ -819,9 +1254,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:830
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
-#: filter/filter-rule.c:637 shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:980
+#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
+#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Scríos"
 
@@ -850,7 +1285,11 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:581
+#: addressbook/gui/component/select-names/e-select-names.c:600
+msgid "Find contact in"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:716
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -860,7 +1299,7 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:589
+#: addressbook/gui/component/select-names/e-select-names.c:724
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "Under normal circumstances, this should never happen.\n"
@@ -868,32 +1307,41 @@ msgid ""
 "correct this problem."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:671
+#: addressbook/gui/component/select-names/e-select-names.c:806
 msgid "Select Contacts from Addressbook"
 msgstr "Tóg Tadhallaí o Leabhar Seoladh"
 
+# FIXME SP?
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr ""
+msgid "Select Names"
+msgstr "Tóg Ainmhí:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr ""
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Dealaigh Tadhall?"
 
-# FIXME SP?
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Tóg Ainmhí:"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Tadhallaí"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
+msgid ""
+"Type a name into the entry, or\n"
+"select one from the list below:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "_Browse..."
+msgstr "_Bog..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Saghas:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Fillteaín:"
 
@@ -960,10 +1408,6 @@ msgstr "Sábháil _Mar:"
 msgid "Full _Name..."
 msgstr "Ainm _Fhada..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Gnáth"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1007,10 +1451,11 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1489 mail/mail-config.glade.h:107
-#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
+#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
+#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
 msgid "_Delete"
 msgstr "_Dealaigh"
 
@@ -2509,7 +2954,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:238
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr ""
 
@@ -2518,174 +2963,115 @@ msgstr ""
 msgid "Search"
 msgstr "Cuardaigh"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Gan cartaí"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 card"
 
 # FIXME : Grammar ? 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d cartaí"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:141
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:278
-#: addressbook/gui/widgets/e-addressbook-view.c:915
-#: addressbook/gui/widgets/e-addressbook-view.c:1015
-#: addressbook/gui/widgets/e-addressbook-view.c:1635
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr "Sábháil mar VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Oscáil"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
-#: addressbook/gui/widgets/e-addressbook-view.c:1016
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
-#: addressbook/gui/widgets/e-addressbook-view.c:1017
-msgid "Send Message to Contact"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+msgid "Error getting book view"
 msgstr ""
 
-# fa 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
-#: addressbook/gui/widgets/e-addressbook-view.c:1018
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:64
-#: ui/my-evolution.xml.h:2
-msgid "Print"
-msgstr "Priontáil"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
-#: addressbook/gui/widgets/e-addressbook-view.c:1020
-msgid "Print Envelope"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
-#: addressbook/gui/widgets/e-addressbook-view.c:1022
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
-msgid "Cut"
-msgstr "Gearr"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
-#: addressbook/gui/widgets/e-addressbook-view.c:1023
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:7
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Cóip"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
-#: addressbook/gui/widgets/e-addressbook-view.c:1024
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
-msgid "Paste"
-msgstr "Greamaigh"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:1025 filter/libfilter-i18n.h:9
-#: mail/mail-accounts.c:295 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:19
-msgid "Delete"
-msgstr "Dealaigh"
-
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:33
-#: shell/evolution-shell-component.c:1020
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: shell/evolution-shell-component.c:1043
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
+#: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: camel/providers/imap/camel-imap-command.c:363
+#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
 msgid "Unknown error"
 msgstr "iEarraidh gan Aithne"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
-#: shell/evolution-shell-component.c:1048
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
+#: shell/evolution-shell-component.c:1071
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
+#: camel/camel-service.c:653 camel/camel-service.c:721
+#: camel/camel-service.c:764
 msgid "Cancelled"
 msgstr "Ceangailte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Other error"
 msgstr "Earraidh Eile"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:288
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:87
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1433
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:246
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:202
+#: addressbook/gui/widgets/e-addressbook-util.c:204
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Taispeaín"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:203
+#: addressbook/gui/widgets/e-addressbook-util.c:205
 #, fuzzy
 msgid "Display Cards"
 msgstr "Taispeaín"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2693,6 +3079,26 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-util.c:344
+#, fuzzy
+msgid "Move card to"
+msgstr "Gan cartaí"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:346
+#, fuzzy
+msgid "Copy card to"
+msgstr "Gan cartaí"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Move cards to"
+msgstr "Gan cartaí"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:351
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Gan cartaí"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr ""
@@ -2753,10 +3159,113 @@ msgstr "Fón Eile"
 msgid "Other Address"
 msgstr "Seoladh Eile"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Sábháil mar VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:875
+#, fuzzy
+msgid "New Contact..."
+msgstr "Tadhall Nua"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:876
+#, fuzzy
+msgid "New Contact List..."
+msgstr "L�íosta Tadhall Nua"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "_Cóip do Fillteán..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:880
+#, fuzzy
+msgid "Import..."
+msgstr "Chló_fhoireann..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Post sceál do Tadhall..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Leabhar Seoladh..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Albachtaí Phoist"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Send Message to Contact"
+msgstr ""
+
+# fa 
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/my-evolution.xml.h:1
+msgid "Print"
+msgstr "Priontáil"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:893
+msgid "Print Envelope"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "_Cóip do Fillteán..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+#, fuzzy
+msgid "Move to folder..."
+msgstr "Sábháil 'san _fillteán"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Gearr"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Cóip"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+msgid "Paste"
+msgstr "Greamaigh"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+msgid "Delete"
+msgstr "Dealaigh"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "Radharc Carta"
+
+#. Minicard view stuff
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:940
 msgid ",123,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 ",123,a,b,c,d,e,f,g,h,ij,k,l,m,Mc,o,p,qr,s,t,u,v,w,xyz"
 
@@ -2764,7 +3273,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,ij,k,l,m,Mc,o,p,qr,s,t,u,v,w,xyz"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:945
 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"
 
@@ -2781,15 +3290,22 @@ msgstr "agus aon card eile."
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:150
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
-"There are no items to show in this view\n"
+"There are no items to show in this view.\n"
 "\n"
 "Double-click here to create a new Contact."
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Radharc Carta"
@@ -2877,6 +3393,7 @@ msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr ""
 
@@ -2901,6 +3418,7 @@ msgid "Options"
 msgstr "Roghanna"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Treoshuíomh"
 
@@ -2921,7 +3439,9 @@ msgstr "Páipéir"
 msgid "Paper source:"
 msgstr ""
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Portráid"
 
@@ -2981,29 +3501,25 @@ msgstr "Chló_fhoireann..."
 msgid "Untitled appointment"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:635
+#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
 msgid "High"
 msgstr "Ard"
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:634
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
 msgid "Normal"
 msgstr "Gnáth"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:633
+#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
 msgid "Low"
 msgstr "Bun"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:518
+#: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:409
 msgid "Undefined"
 msgstr ""
 
@@ -3036,41 +3552,54 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Teachtaireacht Feilire"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Configuration control for the Evolution Calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution calendar executive summary component."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the Calendar Summary component."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+msgid "This page can be used to configure Calendar and Task preferences"
+msgstr ""
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr ""
@@ -3079,22 +3608,10 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-msgid "Starting:"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-msgid "Ending:"
-msgstr ""
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "am neamhbhailí"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-msgid "Evolution Alarm"
-msgstr "Alairm Evolution"
-
 # ##
 # ## Languages (ISO 639 code in brackets)
 # ## 	The 'msgid' names and spellings for languages are those listed
@@ -3135,7 +3652,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2401
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Rabhadh"
@@ -3155,7 +3672,7 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Téip ag tosnaithe GNOME"
 
@@ -3167,67 +3684,65 @@ msgstr ""
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
+#: calendar/gui/cal-search-bar.c:386
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:405
 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:460 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "aa %d %b"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:469
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:480 calendar/gui/calendar-commands.c:487
-#: calendar/gui/calendar-commands.c:493 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
 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:485
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
+#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:834
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:385
 msgid "Private"
 msgstr "Priobhdach"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424
 msgid "Public"
 msgstr ""
 
@@ -3248,32 +3763,27 @@ msgid "W"
 msgstr "I"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
 msgid "Free"
 msgstr "Saor"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
-#: calendar/gui/e-meeting-time-sel.c:432
-#: shell/evolution-shell-component.c:1042
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
+#: shell/evolution-shell-component.c:1065
 msgid "Busy"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
 msgid "Not Started"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
-#: calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
 msgid "Completed"
 msgstr "Críochnaithe"
 
@@ -3286,9 +3796,10 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1497
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:404
-#: mail/mail-config.glade.h:56
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
+#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
+#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
+#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3303,23 +3814,15 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
-#: calendar/gui/e-meeting-model.c:810
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
 msgid "Yes"
 msgstr "Tá"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:811
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
 msgid "No"
 msgstr "Níl"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-#: calendar/gui/e-week-view.c:1188
-msgid "Searching"
-msgstr "Cuardaigh"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Radharc Lá"
@@ -3336,60 +3839,80 @@ msgstr "Radharc Seachtain"
 msgid "Month View"
 msgstr "Radharc Mí"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
+#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Feilire"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr ""
 
 # tg
-#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1733
-#: my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
+#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Teascanna"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:653
-#, fuzzy
-msgid "New appointment"
-msgstr "Coinne Nua"
-
-#: calendar/gui/component-factory.c:654
-#, fuzzy
-msgid "_Appointment"
-msgstr "Coinne"
-
-#: calendar/gui/component-factory.c:659
+#: calendar/gui/component-factory.c:695
 #, fuzzy
 msgid "New meeting"
 msgstr "Bealach Nuachtáin"
 
-#: calendar/gui/component-factory.c:660
+#: calendar/gui/component-factory.c:695
 #, fuzzy
 msgid "_Meeting"
 msgstr "Álbachtaí"
 
-#: calendar/gui/component-factory.c:665
+#: calendar/gui/component-factory.c:699
 #, fuzzy
 msgid "New task"
 msgstr "Teasc Nua"
 
-#: calendar/gui/component-factory.c:666 ui/evolution-tasks.xml.h:22
+#: calendar/gui/component-factory.c:699
 msgid "_Task"
 msgstr "_Teasc"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Coinne Nua"
+
+#: calendar/gui/component-factory.c:703
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Coinne"
+
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "New appointment"
+msgstr "Coinne Nua"
+
+#: calendar/gui/component-factory.c:707
+#, fuzzy
+msgid "_Appointment"
+msgstr "Coinne"
+
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Teíp ag fork: %s"
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr ""
 
+#: calendar/gui/control-factory.c:174
+msgid "The type of view to show"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr ""
@@ -3453,9 +3976,7 @@ msgstr ""
 msgid "hours"
 msgstr "uair"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "noimeaíd"
 
@@ -3584,7 +4105,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:748 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Coimriú:"
 
@@ -3613,7 +4134,7 @@ msgstr "deireadh an coinne"
 msgid "hour(s)"
 msgstr "uair"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:131
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
 msgid "minute(s)"
 msgstr "noimea(i)d"
 
@@ -3654,170 +4175,165 @@ msgid "Color for tasks due today"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Days"
 msgstr "Lae"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Aoine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Hours"
 msgstr "Uair"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Minutes"
 msgstr "Noimeaíd"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Luain"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Sathairn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Sh_ow a default reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Show week _numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Sta_rt of day:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Su_n"
 msgstr "_Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domhnaigh"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "T_asks due today:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_hu"
 msgstr "D_ea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_ue"
 msgstr "_Mai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "Líosta _Teasc"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Thursday"
 msgstr "Deardaoin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Am"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Am _Críos:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1122
 msgid "Tuesday"
 msgstr "Mairt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Ceádaoin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Seachtain Oibre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "_12 hour (AM/PM)"
 msgstr "_12 uair (IN/RN)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "_24 hour"
 msgstr "_24 uair"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Display"
 msgstr "_Taispeaín"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_End of day:"
 msgstr "_Deireadh an Lá:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Fri"
 msgstr "_Aoi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Hide completed tasks after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Mon"
 msgstr "_Lua"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Eile"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "_Overdue tasks:"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Sat"
 msgstr "_Sat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "Líosta _Teasc"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "_Show appointment end times in week and month views"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Guthán sa Baile"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Wed"
 msgstr "_Cea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "before the start of the appointment"
 msgstr ""
 
@@ -3881,71 +4397,60 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
 msgid " (Completed "
 msgstr " (Críochnaithe "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
 msgid "Completed "
 msgstr "Críochnaithe "
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:321
+#: calendar/gui/dialogs/comp-editor.c:322
 msgid "Could not update object!"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:693
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:698
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:701
 #, c-format
 msgid "Task - %s"
 msgstr "Teasc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:704
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:718
 msgid "No summary"
 msgstr "Gan coimriú"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2201
-#: mail/mail-display.c:101
-msgid "Overwrite file?"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2208
-#: mail/mail-display.c:105
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Sábháil le..."
+#: calendar/gui/dialogs/comp-editor.c:1074
+#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+msgid "Save as..."
+msgstr "Sánbháil le..."
 
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1226
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4003,7 +4508,7 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185
 msgid "Appointment"
 msgstr "Coinne"
 
@@ -4017,13 +4522,13 @@ msgstr ""
 
 #: calendar/gui/dialogs/event-editor.c:202
 #: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:362
+#: calendar/gui/dialogs/event-editor.c:365
 msgid "Scheduling"
 msgstr ""
 
 #: calendar/gui/dialogs/event-editor.c:207
 #: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:368
 msgid "Meeting"
 msgstr ""
 
@@ -4140,7 +4645,6 @@ msgid "Member"
 msgstr "Ball"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-itip-control.c:843
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "RSVP"
 msgstr "RSVP"
@@ -4152,14 +4656,14 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
 #: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:47
-#: mail/message-list.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
+#: mail/message-list.etspec.h:11
 msgid "Status"
 msgstr "Stádas"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/mail-config.glade.h:95
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Saghas"
@@ -4174,7 +4678,7 @@ msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:453
 msgid "_Invite Others..."
 msgstr ""
 
@@ -4182,27 +4686,98 @@ msgstr ""
 msgid "_Other Organizer"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: calendar/gui/dialogs/recurrence-page.c:126
+#: calendar/gui/dialogs/recurrence-page.c:146
+#: calendar/gui/dialogs/recurrence-page.c:156
+#, fuzzy
+msgid "st"
+msgstr "líosta"
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "Post"
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "r"
+
+#: calendar/gui/dialogs/recurrence-page.c:129
+#: calendar/gui/dialogs/recurrence-page.c:130
+#: calendar/gui/dialogs/recurrence-page.c:131
+#: calendar/gui/dialogs/recurrence-page.c:132
+#: calendar/gui/dialogs/recurrence-page.c:133
+#: calendar/gui/dialogs/recurrence-page.c:134
+#: calendar/gui/dialogs/recurrence-page.c:135
+#: calendar/gui/dialogs/recurrence-page.c:136
+#: calendar/gui/dialogs/recurrence-page.c:137
+#: calendar/gui/dialogs/recurrence-page.c:138
+#: calendar/gui/dialogs/recurrence-page.c:139
+#: calendar/gui/dialogs/recurrence-page.c:140
+#: calendar/gui/dialogs/recurrence-page.c:141
+#: calendar/gui/dialogs/recurrence-page.c:142
+#: calendar/gui/dialogs/recurrence-page.c:143
+#: calendar/gui/dialogs/recurrence-page.c:144
+#: calendar/gui/dialogs/recurrence-page.c:145
+#: calendar/gui/dialogs/recurrence-page.c:149
+#: calendar/gui/dialogs/recurrence-page.c:150
+#: calendar/gui/dialogs/recurrence-page.c:151
+#: calendar/gui/dialogs/recurrence-page.c:152
+#: calendar/gui/dialogs/recurrence-page.c:153
+#: calendar/gui/dialogs/recurrence-page.c:154
+#: calendar/gui/dialogs/recurrence-page.c:155
+msgid "th"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "líosta"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "soicínd"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Eile"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Tuaisceart"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "líosta"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Facs Eile"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "lá"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr ""
 
@@ -4299,7 +4874,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:755
+#: my-evolution/e-summary-preferences.c:740
 msgid "URL:"
 msgstr "URL:"
 
@@ -4311,15 +4886,19 @@ msgstr "Tosaíocht"
 msgid "_Status:"
 msgstr "_Stádas:"
 
+#: calendar/gui/dialogs/task-editor.c:178
+msgid "Basic"
+msgstr "Gnáth"
+
 #: calendar/gui/dialogs/task-editor.c:190
 #: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:322
+#: calendar/gui/dialogs/task-editor.c:324
 msgid "Assignment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:791
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:32
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
 msgid "Description:"
 msgstr "Tuarascáil:"
 
@@ -4331,119 +4910,84 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:428
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:429
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:430
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:431
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:432
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:433
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:438
-#, c-format
-msgid "100%"
-msgstr "100%"
-
-#: calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
-#: calendar/gui/e-week-view.c:1828
+#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-week-view.c:1853
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1460
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
+#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Oscáil"
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:973
+#, fuzzy
+msgid "_Save as..."
+msgstr "Sánbháil le..."
+
+#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
+#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+msgid "_Print..."
+msgstr "_Priontáil..."
+
+#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-week-view.c:3478 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-calendar-table.c:966 calendar/gui/e-day-view.c:3557
-#: calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Cóip"
 
 # PS
-#: calendar/gui/e-calendar-table.c:968 calendar/gui/e-day-view.c:3532
-#: calendar/gui/e-day-view.c:3559 calendar/gui/e-week-view.c:3419
-#: calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:21
+#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
+#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Paste"
 msgstr "_Greamaigh"
 
-#: calendar/gui/e-calendar-table.c:973
-msgid "_Mark as Complete"
+#: calendar/gui/e-calendar-table.c:984
+msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "Scríos an teasc seo"
+# ln
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Liongáilis"
 
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:986
+msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:987
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
+msgstr "% Rinneadh:"
+
+#: calendar/gui/e-calendar-table.c:992
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
-#: calendar/gui/e-week-view.c:3929
+#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1247
+#: calendar/gui/e-calendar-table.c:1342
 msgid "Click to add a task"
 msgstr ""
 
@@ -4457,8 +5001,8 @@ msgstr ""
 msgid "Alarms"
 msgstr "Afáiris"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:924
-#: camel/camel-filter-driver.c:1026
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
+#: camel/camel-filter-driver.c:1054
 msgid "Complete"
 msgstr ""
 
@@ -4489,8 +5033,7 @@ msgstr ""
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
+#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Coimriú"
 
@@ -4529,420 +5072,171 @@ 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:284 calendar/gui/e-day-view.c:1389
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1416
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1440
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:768
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
 msgid "am"
 msgstr "rn"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:770
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
 msgid "pm"
 msgstr "in"
 
-#: calendar/gui/e-day-view.c:3525
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "_Coinne Nua"
 
-#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
-#: ui/evolution-calendar.xml.h:19
-msgid "Go to _Today"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
-msgid "_Go to Date..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-msgid "_Delete this Appointment"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
-msgid "Make this Occurrence _Movable"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
-msgid "Delete this _Occurrence"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
-msgid "Delete _All Occurrences"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:535
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:540
-msgid "Task begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:545
-#, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "Eolas"
-
-#: calendar/gui/e-itip-control.c:549
-msgid "Begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:561
-#, fuzzy
-msgid "Meeting ends: <b>"
-msgstr "Eolas"
-
-#: calendar/gui/e-itip-control.c:564
-#, fuzzy
-msgid "Free/Busy info ends: <b>"
-msgstr "Eolas"
-
-#: calendar/gui/e-itip-control.c:568
-msgid "Ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:582
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
 #, fuzzy
-msgid "Task Completed: <b>"
-msgstr "Críochnaithe.`"
-
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Due: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-#, fuzzy
-msgid "iCalendar Information"
-msgstr "eolas fheilire"
-
-#. Title
-#: calendar/gui/e-itip-control.c:644
-#, fuzzy
-msgid "iCalendar Error"
-msgstr "Feilire"
-
-#: calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-#, fuzzy
-msgid "An unknown person"
-msgstr "iEarraidh gan Aithne"
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:732
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:748
-msgid "<i>None</i>"
-msgstr "<i>Ar bith</i>"
+msgid "New Meeting"
+msgstr "Bealach Nuachtáin"
 
-#: calendar/gui/e-itip-control.c:760
-#, fuzzy
-msgid "Status:"
-msgstr "_Stádas:"
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Teasc Nua"
 
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-meeting-model.c:321
-#: calendar/gui/e-meeting-model.c:344 calendar/gui/e-meeting-model.c:824
-msgid "Accepted"
-msgstr ""
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Clódáil..."
 
-#: calendar/gui/e-itip-control.c:769
-msgid "Tentatively Accepted"
+#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: ui/evolution-calendar.xml.h:10
+msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:773 calendar/gui/e-meeting-model.c:323
-#: calendar/gui/e-meeting-model.c:346 calendar/gui/e-meeting-model.c:825
-msgid "Declined"
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777 calendar/gui/e-itip-control.c:976
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:357
-#: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-model.c:798
-#: camel/providers/smtp/camel-smtp-transport.c:171
-#: camel/providers/smtp/camel-smtp-transport.c:226
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:442
-msgid "Unknown"
-msgstr "Gan Aithne"
-
-#: calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:839
-#: calendar/gui/e-itip-control.c:855 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:881 calendar/gui/e-itip-control.c:894
-#, fuzzy
-msgid "Choose an action:"
-msgstr "Fillteán _Nua"
-
-#: calendar/gui/e-itip-control.c:824
-#, fuzzy
-msgid "Update"
-msgstr "Data"
-
-#: calendar/gui/e-itip-control.c:825 calendar/gui/e-itip-control.c:844
-#: calendar/gui/e-itip-control.c:857 calendar/gui/e-itip-control.c:870
-#: calendar/gui/e-itip-control.c:883 calendar/gui/e-itip-control.c:896
-#: shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "Ceart go Leor"
-
-#: calendar/gui/e-itip-control.c:840
-#, fuzzy
-msgid "Accept"
-msgstr "Cuntas"
-
-#: calendar/gui/e-itip-control.c:841
-msgid "Tentatively accept"
+#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: ui/evolution-calendar.xml.h:31
+msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:37
 #, fuzzy
-msgid "Decline"
-msgstr "Dealaigh"
+msgid "_Configure..."
+msgstr "Socraigh Fillteáin..."
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
 #, fuzzy
-msgid "Send Free/Busy Information"
-msgstr "Eolas"
+msgid "_Configure Pilot..."
+msgstr "Socraigh Fillteáin..."
 
-#: calendar/gui/e-itip-control.c:869
-msgid "Update respondent status"
-msgstr ""
+#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
+#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+msgid "_Save As..."
+msgstr "_Sábháil Mar..."
 
-#: calendar/gui/e-itip-control.c:882
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
 #, fuzzy
-msgid "Send Latest Information"
-msgstr "Eolas Theasc"
+msgid "_Schedule Meeting..."
+msgstr "Ag Fanacht..."
 
-# FR
-#: calendar/gui/e-itip-control.c:895 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
 #, fuzzy
-msgid "Cancel"
-msgstr "An Fhrainc"
-
-#: calendar/gui/e-itip-control.c:943
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:944
-msgid "Meeting Information"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:948
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:949
-msgid "Meeting Proposal"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:953
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:954
-msgid "Meeting Update"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:958
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:959
-msgid "Meeting Update Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:982
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:983
-msgid "Meeting Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:987
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:988
-msgid "Meeting Cancellation"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:992 calendar/gui/e-itip-control.c:1063
-#: calendar/gui/e-itip-control.c:1098
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:993
-msgid "Bad Meeting Message"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1013
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1014
-msgid "Task Information"
-msgstr "Eolas Theasc"
-
-#: calendar/gui/e-itip-control.c:1018
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1019
-msgid "Task Proposal"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1023
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1024
-msgid "Task Update"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1028
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1029
-msgid "Task Update Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1053
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1054
-msgid "Task Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1058
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1059
-msgid "Task Cancellation"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1064
-msgid "Bad Task Message"
-msgstr ""
+msgid "_Forward as iCalendar..."
+msgstr "Ag Lódáil feilire..."
 
-#: calendar/gui/e-itip-control.c:1083
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1084
-msgid "Free/Busy Information"
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1088
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1089
-msgid "Free/Busy Request"
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:609
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1093
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:617
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1094
-msgid "Free/Busy Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1099
-msgid "Bad Free/Busy Message"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1172
-msgid "The message does not appear to be properly formed"
+msgid "Error executing %s."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1191
-msgid "The message contains only unsupported requests."
-msgstr ""
+#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
+#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
+msgid "Unknown"
+msgstr "Gan Aithne"
 
-#: calendar/gui/e-itip-control.c:1219 calendar/gui/e-itip-control.c:1225
-msgid "The attachment does not contain a valid calendar message"
+#: calendar/gui/e-itip-control.c:1564
+msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1250
-msgid "The attachment has no viewable calendar items"
+#: calendar/gui/e-itip-control.c:1566
+msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1349
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1351
-msgid "Update complete\n"
+#: calendar/gui/e-itip-control.c:1613
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1396
+#: calendar/gui/e-itip-control.c:1625
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1404
+#: calendar/gui/e-itip-control.c:1638
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1640
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1408
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1436
+#: calendar/gui/e-itip-control.c:1674
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1455 calendar/gui/e-itip-control.c:1505
+#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1457 calendar/gui/e-itip-control.c:1509
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1682
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1861
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Fillteán _Nua"
+
+#: calendar/gui/e-itip-control.c:1868
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Fillteán _Nua"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -4984,201 +5278,215 @@ msgid "date-start"
 msgstr ""
 
 # FIXME (Plural)
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:81
 msgid "Chair Persons"
 msgstr "Cathlaoirlaig"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:83
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:84
 msgid "Non-Participants"
 msgstr ""
 
 # IN 
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
+#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
+#: calendar/gui/e-meeting-model.c:533
 msgid "Individual"
 msgstr "Pearsanta"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:779
+#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:780
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
 msgid "Resource"
 msgstr "Goireas"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:781
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
 msgid "Room"
 msgstr "Seomra"
 
 # th
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:794
+#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
 #, fuzzy
 msgid "Chair"
 msgstr "Téalainnis"
 
-#: calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
+#: calendar/gui/e-meeting-model.c:535
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:796
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:797
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
+#: calendar/gui/e-meeting-model.c:543
 msgid "Needs Action"
 msgstr "Freagra"
 
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+msgid "Declined"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
+#: calendar/gui/e-meeting-time-sel.c:434
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:471
-#: calendar/gui/e-meeting-time-sel.c:2102
+#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel.c:2088
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2132 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel-item.c:479
+#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479 e-util/e-time-utils.c:221
+#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:221
 #: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:433
+#: calendar/gui/e-meeting-time-sel.c:436
 msgid "Out of Office"
 msgstr "As an Oifig"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:437
 msgid "No Information"
 msgstr "Gan Eolas"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:473
 msgid "_Options"
 msgstr "_Roghanna"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:490
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:503
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:521
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:587
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:626
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:668
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:362
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: calendar/gui/e-tasks.c:367
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:379
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:629
+#: calendar/gui/e-tasks.c:543
+msgid "Completing tasks..."
+msgstr ""
+
+#: calendar/gui/e-tasks.c:566
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Scríos an sceal seo"
+
+#: calendar/gui/e-tasks.c:659
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
+#: calendar/gui/e-week-view.c:3438
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Coinne Nua..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1538
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1549
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1865
+#: calendar/gui/gnome-cal.c:1916
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Oscáil Feilire"
@@ -5247,299 +5555,225 @@ msgstr "D. Fómhair"
 msgid "September"
 msgstr "M. Fómhair"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-#, fuzzy
-msgid "Event information"
-msgstr "eolas fheilire"
-
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-#, fuzzy
-msgid "Task information"
-msgstr "Eolas Theasc"
-
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-#, fuzzy
-msgid "Journal information"
-msgstr "Eolas Cuntais"
-
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-#, fuzzy
-msgid "Free/Busy information"
-msgstr "Eolas"
-
-#: calendar/gui/itip-utils.c:321
-#, fuzzy
-msgid "Calendar information"
-msgstr "eolas fheilire"
-
-#: calendar/gui/itip-utils.c:370
-#, fuzzy, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Eolas"
-
-#: calendar/gui/itip-utils.c:382
-#, fuzzy
-msgid "iCalendar information"
-msgstr "eolas fheilire"
-
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:92
 msgid "Could not create the component editor factory"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Ce"
 
 # th
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 #, fuzzy
 msgid "Th"
 msgstr "Téalainnis"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Ao"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
+#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1852
+#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
+#: calendar/gui/print.c:1896
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr ""
 
-# tg
-#: calendar/gui/print.c:2205
-#, fuzzy
-msgid "Task"
-msgstr "Táidsícis"
-
-#: calendar/gui/print.c:2262
-#, fuzzy, c-format
-msgid "Status: %s"
-msgstr "_Stádas:"
-
-#: calendar/gui/print.c:2280
-#, fuzzy, c-format
-msgid "Priority: %s"
-msgstr "Tosaíocht"
-
-#: calendar/gui/print.c:2294
-#, fuzzy, c-format
-msgid "Percent Complete: %i"
-msgstr "Críochnaithe.`"
-
-#: calendar/gui/print.c:2306
-#, fuzzy, c-format
-msgid "URL: %s"
-msgstr "URL:"
-
-#: calendar/gui/print.c:2320
-#, fuzzy, c-format
-msgid "Categories: %s"
-msgstr ""
-"\n"
-"Aicmí:"
-
-#: calendar/gui/print.c:2331
-#, fuzzy
-msgid "Contacts: "
-msgstr ""
-"\n"
-"Trácht:"
-
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Priontáil Feilire"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2710 my-evolution/e-summary.c:605
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:65
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Priontáil Reamhtaispeántais"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Socraigh Priontáil "
 
@@ -5548,11 +5782,11 @@ msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:434
+#: calendar/gui/tasks-control.c:456
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -5560,10 +5794,16 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2415
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2622
 msgid "Do not ask me again."
 msgstr ""
 
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Priontáil Cartaí"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5608,103 +5848,119 @@ msgstr ""
 msgid "Imports vCalendar files into Evolution"
 msgstr ""
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Teachtaireacht Feilire"
+
+#: calendar/importers/icalendar-importer.c:663
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Feilire"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:317
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:324
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:356
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:388
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:691
+#: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
 msgstr ""
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:745
+#: calendar/pcs/query.c:747
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
@@ -7309,11 +7565,11 @@ msgstr ""
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:441
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Teíp ag fork: %s"
@@ -7342,53 +7598,52 @@ msgstr ""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
+#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:887
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:896
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:889
-#, c-format
+#: camel/camel-filter-driver.c:911
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:915
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
 #, fuzzy
 msgid "Syncing folder"
 msgstr "ag sioncronaich filtean"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1016
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1031
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
@@ -7403,49 +7658,45 @@ msgstr "_Post sceál"
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
+#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr ""
-
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:469
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1038
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1078
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 #, fuzzy
 msgid "Moving messages"
 msgstr "Post an sceál seo"
@@ -7555,163 +7806,118 @@ msgstr ""
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:621
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
+#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
+#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:755
+#: camel/camel-pgp-context.c:795
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:953
+#: camel/camel-pgp-context.c:987
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:959
+#: camel/camel-pgp-context.c:993
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:970
+#: camel/camel-pgp-context.c:1004
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1143
+#: camel/camel-pgp-context.c:1177
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1153
+#: camel/camel-pgp-context.c:1187
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1160
+#: camel/camel-pgp-context.c:1194
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1169
+#: camel/camel-pgp-context.c:1203
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1337
+#: camel/camel-pgp-context.c:1372
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1345
+#: camel/camel-pgp-context.c:1380
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1352
+#: camel/camel-pgp-context.c:1387
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-mime.c:310
+#: camel/camel-pgp-mime.c:354
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:213
-msgid "Error hashing password."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:329
-#, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:378
-#, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:590
-msgid "Could not encrypt: failed to create encryption context."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:620
-#, fuzzy, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Teíp ag fork: %s"
-
-#: camel/camel-pkcs7-context.c:626
-#, fuzzy
-msgid "Could not encrypt: encoding failed."
-msgstr "Teíp ag fork: %s"
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr ""
-
-#: camel/camel-provider.c:130
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s freastalaí %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:267
+#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(Žóst gan aithne)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
+#: camel/camel-remote-store.c:473
 #: camel/providers/imap/camel-imap-command.c:228
 #: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7810,7 +8016,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:496
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -7827,9 +8033,19 @@ msgstr ""
 msgid "Unknown authentication state."
 msgstr ""
 
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+#: camel/camel-sasl-ntlm.c:33
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:61
+#: camel/providers/nntp/camel-nntp-store.c:153
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Pasfhocal"
 
@@ -7873,26 +8089,39 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:617
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:648 camel/camel-service.c:759
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:673
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:675
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
+#: camel/camel-service.c:725
+#, fuzzy
+msgid "Resolving address"
+msgstr "Ag dealaigh fillteán %s"
+
+#: camel/camel-service.c:787
+msgid "Host lookup failed: host not found"
+msgstr ""
+
+#: camel/camel-service.c:790
+msgid "Host lookup failed: unknown reason"
+msgstr ""
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr ""
@@ -7901,18 +8130,23 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:346 camel/camel-session.c:415
+#: camel/camel-session.c:351 camel/camel-session.c:419
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr ""
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
@@ -7946,24 +8180,24 @@ msgstr "_Post sceál"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:222
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Teíp ag fork: %s"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:284
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Teíp ag fork: %s"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7975,7 +8209,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:438
+#: camel/camel-tcp-stream-ssl.c:491
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7984,16 +8218,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:497
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:500
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8013,27 +8247,27 @@ msgstr ""
 msgid "No such message %s in %s"
 msgstr "Ni raibh aon sceal %s i %s"
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-vee-folder.c:753
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Ni raibh sceal sinn: %s"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Teíp ag fork: %s"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Teíp ag fork: %s"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Teíp ag fork: %s"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Teíp ag fork: %s"
@@ -8066,53 +8300,53 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:218
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:284
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:466
+#: camel/providers/imap/camel-imap-folder.c:469
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Ag Sábháil scealta"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1638
+#: camel/providers/imap/camel-imap-folder.c:2114
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1867
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:1799
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2145
+#: camel/providers/imap/camel-imap-folder.c:2151
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, fuzzy, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:256
-#: camel/providers/imap/camel-imap-message-cache.c:313
-#: camel/providers/imap/camel-imap-message-cache.c:344
-#: camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/providers/imap/camel-imap-message-cache.c:257
+#: camel/providers/imap/camel-imap-message-cache.c:314
+#: camel/providers/imap/camel-imap-message-cache.c:345
+#: camel/providers/imap/camel-imap-message-cache.c:377
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr ""
@@ -8125,7 +8359,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:832
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
 msgid "Folders"
 msgstr "Fillteáin"
 
@@ -8157,28 +8391,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:519
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:393
+#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:553
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:434
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:509
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:597
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8186,57 +8420,58 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:901
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Post an sceál seo"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1276
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:65
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:94
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Scríos an sceal seo"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:82
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:83
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:80
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:101
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:91
+#: camel/providers/local/camel-local-provider.c:116
 msgid "Directory tree of mbox files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:117
 msgid ""
 "For accessing mail storedin an external tree of mbox files.\n"
 "This will allow you to directly access pine and elm folders.\n"
@@ -8244,56 +8479,62 @@ msgid ""
 "folders first."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:109
+#: camel/providers/local/camel-spoold-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:153
-#: camel/providers/local/camel-local-store.c:169
-#: camel/providers/local/camel-local-store.c:235
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:236
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:374
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Teíp ag fork: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:389
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:371
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:427
+#: camel/providers/local/camel-spool-summary.c:1167
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -8334,7 +8575,7 @@ msgstr "Post an sceál seo"
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:89
 #, c-format
 msgid ""
@@ -8342,14 +8583,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
 #: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:102
 #, c-format
 msgid ""
@@ -8357,33 +8598,55 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:131
+#: camel/providers/local/camel-maildir-store.c:132
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:126
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:332
+#: camel/providers/local/camel-spoold-store.c:253
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:405
-#: camel/providers/local/camel-maildir-summary.c:526
+#: camel/providers/local/camel-maildir-summary.c:408
+#: camel/providers/local/camel-maildir-summary.c:531
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
+#: camel/providers/local/camel-maildir-summary.c:525
+msgid "Checking folder consistency"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+msgid "Checking for new messages"
+msgstr "Ag Sábháil scealta"
+
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-mbox-summary.c:250
+#: camel/providers/local/camel-mbox-summary.c:499
+#: camel/providers/local/camel-mbox-summary.c:700
+#: camel/providers/local/camel-spool-summary.c:381
+#: camel/providers/local/camel-spool-summary.c:646
+#: camel/providers/local/camel-spool-summary.c:945
+msgid "Storing folder"
+msgstr "Ag stoir filtean"
+
 #: camel/providers/local/camel-mbox-folder.c:151
 #: camel/providers/local/camel-spool-folder.c:277
 #, c-format
@@ -8427,124 +8690,113 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:93
+#: camel/providers/local/camel-mbox-store.c:95
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:109
+#: camel/providers/local/camel-mbox-store.c:111
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:118
-#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:120
+#: camel/providers/local/camel-mbox-store.c:147
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:137
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:139
+#: camel/providers/local/camel-mbox-store.c:162
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:152
+#: camel/providers/local/camel-mbox-store.c:154
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
-#: camel/providers/local/camel-mbox-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:378
-#: camel/providers/local/camel-spool-summary.c:643
-#: camel/providers/local/camel-spool-summary.c:935
-msgid "Storing folder"
-msgstr "Ag stoir filtean"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:255
+#: camel/providers/local/camel-spool-summary.c:386
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:297
+#: camel/providers/local/camel-spool-summary.c:428
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:372
+#: camel/providers/local/camel-spool-summary.c:500
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:648
+#: camel/providers/local/camel-mbox-summary.c:504
+#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-spool-summary.c:651
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-spool-summary.c:675
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:544
-#: camel/providers/local/camel-mbox-summary.c:552
-#: camel/providers/local/camel-mbox-summary.c:741
-#: camel/providers/local/camel-mbox-summary.c:749
-#: camel/providers/local/camel-spool-summary.c:697
-#: camel/providers/local/camel-spool-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:978
-#: camel/providers/local/camel-spool-summary.c:986
+#: camel/providers/local/camel-mbox-summary.c:546
+#: camel/providers/local/camel-mbox-summary.c:554
+#: camel/providers/local/camel-mbox-summary.c:743
+#: camel/providers/local/camel-mbox-summary.c:751
+#: camel/providers/local/camel-spool-summary.c:700
+#: camel/providers/local/camel-spool-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:988
+#: camel/providers/local/camel-spool-summary.c:996
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: camel/providers/local/camel-mbox-summary.c:597
+#: camel/providers/local/camel-spool-summary.c:752
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: camel/providers/local/camel-mbox-summary.c:614
+#: camel/providers/local/camel-spool-summary.c:774
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:801
+#: camel/providers/local/camel-spool-summary.c:1046
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:641
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:652
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:873
-#: camel/providers/local/camel-spool-summary.c:544
-#: camel/providers/local/camel-spool-summary.c:1110
+#: camel/providers/local/camel-mbox-summary.c:875
+#: camel/providers/local/camel-spool-summary.c:547
+#: camel/providers/local/camel-spool-summary.c:1120
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Earraidh gan aithne: %s"
@@ -8563,7 +8815,7 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr "Níl aon Eolaire `%s' ann."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:220
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
@@ -8581,6 +8833,7 @@ msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
 #: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spoold-store.c:148
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
@@ -8590,95 +8843,55 @@ msgstr ""
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:208
+#: camel/providers/local/camel-spoold-store.c:193
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:216
+#: camel/providers/local/camel-spoold-store.c:201
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:788
-#: camel/providers/local/camel-spool-summary.c:797
-#: camel/providers/local/camel-spool-summary.c:806
+#: camel/providers/local/camel-spool-summary.c:798
+#: camel/providers/local/camel-spool-summary.c:807
+#: camel/providers/local/camel-spool-summary.c:816
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:831
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/providers/local/camel-spool-summary.c:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:861
+#: camel/providers/local/camel-spool-summary.c:879
+#: camel/providers/local/camel-spool-summary.c:891
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:940
+#: camel/providers/local/camel-spool-summary.c:950
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:153
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:439
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:502
-#: camel/providers/pop3/camel-pop3-folder.c:512
+#: camel/providers/local/camel-spoold-store.c:117
 #, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Post an sceál seo"
-
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/pop3/camel-pop3-folder.c:278
-#: camel/providers/pop3/camel-pop3-folder.c:437
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:510
-#, fuzzy
-msgid "User cancelled"
-msgstr "Ceangailte"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr ""
+msgid "Store `%s' does not exist or is not a directory"
+msgstr "Níl aon Eolaire `%s' ann."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
+#: camel/providers/local/camel-spoold-store.c:162
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
+#: camel/providers/local/camel-spoold-store.c:173
+#, fuzzy, c-format
+msgid "Mail tree %s"
+msgstr "Post do %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
@@ -8688,12 +8901,12 @@ msgstr "Nuachtain USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:148
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nuachtain USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:155
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8736,33 +8949,49 @@ msgstr "An Fhrainc"
 msgid "Operation failed: %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:280
+#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:446
+#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:522
+#, fuzzy
+msgid "User cancelled"
+msgstr "Ceangailte"
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Teíp ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:316
+#: camel/providers/pop3/camel-pop3-folder.c:325
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Scríos an sceal seo"
 
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:418
+#: camel/providers/pop3/camel-pop3-folder.c:427
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: camel/providers/pop3/camel-pop3-folder.c:448
+#: camel/providers/pop3/camel-pop3-folder.c:507
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:524
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Post an sceál seo"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
 #, fuzzy
 msgid "Unknown reason"
 msgstr "iEarraidh gan Aithne"
@@ -8780,7 +9009,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr "Scrios indiath %s la(e)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:60
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -8801,51 +9030,68 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:238
+#: camel/providers/pop3/camel-pop3-store.c:250
 #, c-format
-msgid "Could not connect to POP server on %s."
+msgid "Failed to connect to POP server %s in secure mode: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:210
+msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:213
-#: camel/providers/pop3/camel-pop3-store.c:316
+#: camel/providers/pop3/camel-pop3-store.c:251
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:348
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "Teíp ag fork: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:492
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:229
+#: camel/providers/pop3/camel-pop3-store.c:405
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:240
+#: camel/providers/pop3/camel-pop3-store.c:416
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:255
+#: camel/providers/pop3/camel-pop3-store.c:431
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "Earraidh I/A"
 
-#: camel/providers/pop3/camel-pop3-store.c:276
+#: camel/providers/pop3/camel-pop3-store.c:452
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: camel/providers/pop3/camel-pop3-store.c:327
+#: camel/providers/pop3/camel-pop3-store.c:504
+#: camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 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:82
+#: mail/mail-config.glade.h:114
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8855,54 +9101,50 @@ msgid ""
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "Teíp ag fork: %s"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not send message: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:178
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:185
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:190
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-msgid "Could not find 'From' address in message"
-msgstr ""
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-#, fuzzy
-msgid "Could not parse recipient list"
-msgstr "Teíp ag fork: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:259
+#: camel/providers/sendmail/camel-sendmail-transport.c:204
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:75
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -8910,122 +9152,141 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:300
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:383
+#: camel/providers/smtp/camel-smtp-transport.c:335
+#: camel/providers/smtp/camel-smtp-transport.c:377
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:336
+msgid "server does not appear to support SSL"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+#, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:365
+msgid "STARTTLS response error"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:458
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:421
+#: camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:442
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9033,93 +9294,89 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP freastalaí %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:644
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:591
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:598
+#: camel/providers/smtp/camel-smtp-transport.c:662
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
+#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
 #, fuzzy
 msgid "Sending message"
 msgstr "Post an sceál seo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:624
+#: camel/providers/smtp/camel-smtp-transport.c:688
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:838
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:820
+#: camel/providers/smtp/camel-smtp-transport.c:869
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:840
+#: camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:883
+#: camel/providers/smtp/camel-smtp-transport.c:937
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:904
-#: camel/providers/smtp/camel-smtp-transport.c:916
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:925
+#: camel/providers/smtp/camel-smtp-transport.c:981
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:973
+#: camel/providers/smtp/camel-smtp-transport.c:1042
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:999
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1054
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9127,35 +9384,35 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1104
+#: camel/providers/smtp/camel-smtp-transport.c:1171
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1144
-#: camel/providers/smtp/camel-smtp-transport.c:1162
+#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1229
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1176
+#: camel/providers/smtp/camel-smtp-transport.c:1243
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1199
+#: camel/providers/smtp/camel-smtp-transport.c:1266
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1280
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1236
+#: camel/providers/smtp/camel-smtp-transport.c:1303
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1317
 msgid "QUIT response error"
 msgstr ""
 
@@ -9184,7 +9441,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:135
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
 msgid "attachment"
 msgstr "iatán"
 
@@ -9226,11 +9483,11 @@ msgid "MIME type:"
 msgstr ""
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:180
+#: composer/e-msg-composer-select-file.c:156
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:333
 msgid "Click here for the address book"
 msgstr ""
 
@@ -9238,108 +9495,104 @@ msgstr ""
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:363
 msgid "From:"
 msgstr "Ó:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:380
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:394
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer-select-file.c:291
+#: composer/e-msg-composer-select-file.c:267
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer.c:697
+#: composer/e-msg-composer.c:718
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:914
-msgid "Save as..."
-msgstr "Sánbháil le..."
-
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:967
 msgid "Warning!"
 msgstr "Rabhadh!"
 
-#: composer/e-msg-composer.c:927
+#: composer/e-msg-composer.c:971
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:949
+#: composer/e-msg-composer.c:993
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:1012
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:999
+#: composer/e-msg-composer.c:1043
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1007
+#: composer/e-msg-composer.c:1051
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1014
+#: composer/e-msg-composer.c:1058
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1074
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9348,54 +9601,54 @@ msgstr ""
 "Earraidh ag sábhháil scéalaí do: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1132
+#: composer/e-msg-composer.c:1176
 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:1290
+#: composer/e-msg-composer.c:1334
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1297
+#: composer/e-msg-composer.c:1341
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1364
 msgid "Open file"
 msgstr "Oscáil Comhad"
 
-#: composer/e-msg-composer.c:1469
+#: composer/e-msg-composer.c:1513
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1855 composer/e-msg-composer.c:2447
+#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2464
+#: composer/e-msg-composer.c:2665
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2487 composer/e-msg-composer.c:2542
+#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
@@ -9448,12 +9701,19 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
 #. Remember the password?
-#: e-util/e-passwords.c:360 mail/mail-session.c:269
+#: e-util/e-passwords.c:363 mail/mail-session.c:269
 msgid "Remember this password"
 msgstr ""
 
-#: e-util/e-passwords.c:362 mail/mail-session.c:270
+#: e-util/e-passwords.c:365 mail/mail-session.c:270
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -9562,168 +9822,6 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr ""
-
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Tóg Comhad"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Post ríomhphost"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Deán %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Dún %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Socraigh Fillteáin..."
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Leathanach"
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr "Ag oscailt an t-eolaire %s"
-
-#: executive-summary/component/e-summary.c:939
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Earraidh ag sábhháil scéalaí do: %s\n"
-" %s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:61
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "Coimriú"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-#, fuzzy
-msgid "Test service"
-msgstr "Suimigh Seirbhís"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Earraidh"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-#, fuzzy
-msgid "Update now"
-msgstr "Data"
-
-#: executive-summary/test-service/rdf-summary.c:795
-#, fuzzy
-msgid "Update every "
-msgstr "Data"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "bliain"
@@ -9760,11 +9858,7 @@ msgstr "Úíghur"
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "soicínd"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
 msgid "seconds"
 msgstr "soicind"
 
@@ -9832,7 +9926,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:923
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9845,34 +9939,26 @@ msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr ""
 
-#: filter/filter-folder.c:156
+#: filter/filter-folder.c:147
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:834
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
 #, fuzzy
 msgid "Select Folder"
 msgstr "Fillteán _Nua"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr ""
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9880,7 +9966,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:488 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:47
 #, fuzzy
 msgid "Test"
 msgstr "An Tibéid"
@@ -9889,39 +9975,39 @@ msgstr "An Tibéid"
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Gan Tidéal"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:768
-msgid "if any criteria are met"
+#: filter/filter-rule.c:769
+msgid "if any criterion are met"
 msgstr ""
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr ""
 
@@ -9967,193 +10053,217 @@ msgstr ""
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "Assign Color"
+msgid "Adjust Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Color"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Attachments"
+msgid "Assign Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "contains"
+msgid "Attachments"
 msgstr ""
 
+# BE
 #: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "An Bheilg"
+
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr ""
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr ""
 
 # mt
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Scríoste"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr ""
 
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
 # IR
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "riomh"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:34
+msgid "is not Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:35
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:36
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:37
 msgid "Message Header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:38
 msgid "Move to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+# PL
+#: filter/libfilter-i18n.h:39
 #, fuzzy
-msgid "Needs Reply"
-msgstr "Freagrair"
+msgid "Play Sound"
+msgstr "An Pholainn"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:41
 msgid "Recipients"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:42
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:43
 msgid "Replied to"
 msgstr ""
 
 # Avoid; either use KR or KP
-#: filter/libfilter-i18n.h:39 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
+#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:9
 msgid "Score"
 msgstr "Scór"
 
-#: filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1546
+#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
 msgid "Sender"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:46
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:47
 msgid "Size (kB)"
 msgstr "Méid (kB)"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:48
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:49
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:50
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:53
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49 mail/mail-format.c:932
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
+#: mail/message-list.etspec.h:12
 msgid "Subject"
 msgstr "Abair"
 
@@ -10161,11 +10271,11 @@ msgstr "Abair"
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr ""
 
@@ -10186,30 +10296,30 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr ""
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Fán le do thoil"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:689
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:782
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
 #: importers/pine-importer.c:471
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Ag Oscailt '%s'"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:958
-#: importers/pine-importer.c:637 mail/component-factory.c:100
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/pine-importer.c:637 mail/component-factory.c:101
 msgid "Mail"
 msgstr "Post"
 
@@ -10233,23 +10343,74 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Tosaíocht"
+
+#: importers/netscape-importer.c:653
+msgid ""
+"Some of your Netscape email filters are based on\n"
+"email priorities, which are not used in Evolution.\n"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
+
+#: importers/netscape-importer.c:677
+msgid ""
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
+msgstr ""
+
+#: importers/netscape-importer.c:694
+msgid ""
+"Some of your Netscape email filters test the\n"
+"body of emails for (in)equality to a given string,\n"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+msgstr ""
+
+#: importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:1865
+msgid "Trash"
+msgstr "Bruscar"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Ag Oscailt '%s'"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Álbachtaí"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "_Fillteán"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10270,44 +10431,92 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Roghanna Feilire"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Configuration control for the Evolution Mailer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Configuration control for the Evolution Message Composer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Roghanna Feilire"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Cuntasaí"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Roghanna Feilire"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+msgid "This Page can be used to configure the Fonts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+msgid "This page can be used to configure E-Mail Accounts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19
+msgid "This page can be used to configure Mailer preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
+msgid "This page can be used to configure the Composer"
 msgstr ""
 
 #: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
+msgid "Folder containing mail"
 msgstr ""
 
 #: mail/component-factory.c:102
@@ -10318,35 +10527,34 @@ msgstr ""
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:129
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Teíp ag fork: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:118
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Properties..."
 msgstr "Álbachtaí..."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:403
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:766
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:969
+#: mail/component-factory.c:925
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/component-factory.c:967
 msgid "New Mail Message"
 msgstr "Teachaireacht Post Nua"
 
 # mt
-#: mail/component-factory.c:969 ui/evolution-mail-global.xml.h:20
+#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Scéal Ríomhphost"
 
@@ -10362,207 +10570,211 @@ msgstr ""
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 
-#: mail/component-factory.c:1225
+#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#, fuzzy
+msgid "Connecting..."
+msgstr "Ag Cealaigh..."
+
+#: mail/component-factory.c:1250
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:322
+#: mail/folder-browser-ui.c:342
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Albachtaí do \"%s\""
 
-#: mail/folder-browser-ui.c:324
+#: mail/folder-browser-ui.c:344
 msgid "Properties"
 msgstr "Álbactaí"
 
-#: mail/folder-browser.c:298 mail/mail-display.c:298
+#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:752
+#: mail/folder-browser.c:760
 #, c-format
 msgid "%d new"
 msgstr "%d nua"
 
-#: mail/folder-browser.c:755 mail/folder-browser.c:763
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:763 mail/folder-browser.c:771
+#: mail/folder-browser.c:774
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:757
+#: mail/folder-browser.c:765
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:767
 #, c-format
 msgid "%d visible"
 msgstr ""
 
 # c-format
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:772
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:777
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:779
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d total"
 msgstr "%d íomlán"
 
-#: mail/folder-browser.c:1060
-msgid "Create vFolder from Search"
-msgstr ""
+#: mail/folder-browser.c:1088
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Fillteán _Nua"
 
-#: mail/folder-browser.c:1443
+#: mail/folder-browser.c:1581
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1444
+#: mail/folder-browser.c:1582
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1583
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1584
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1588
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1451
+#: mail/folder-browser.c:1589
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1452
+#: mail/folder-browser.c:1590
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1453
+#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1461 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Sábháil 'san _fillteán"
 
-#: mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:107
-msgid "_Save As..."
-msgstr "_Sábháil Mar..."
-
-#: mail/folder-browser.c:1463
+#: mail/folder-browser.c:1611
 msgid "_Print"
 msgstr "_Priontáil"
 
-#: mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Freagrair do Líosta"
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Freagrair do _Gach rud"
 
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1618
 msgid "_Forward"
 msgstr "_Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:1474
-msgid "Flag for Follow-up"
+#: mail/folder-browser.c:1622
+msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1623
 #, fuzzy
-msgid "Flag Completed"
+msgid "Fla_g Completed"
 msgstr "Críochnaithe"
 
-#: mail/folder-browser.c:1476
+#: mail/folder-browser.c:1624
 #, fuzzy
-msgid "Clear Flag"
+msgid "Cl_ear Flag"
 msgstr "Glan"
 
 #. separator here?
-#: mail/folder-browser.c:1480 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1481 ui/evolution-mail-message.xml.h:42
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1629
+msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1482
+#: mail/folder-browser.c:1630
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1483
-msgid "Mark as Unim_portant"
+#: mail/folder-browser.c:1631
+msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1487
-msgid "_Move to Folder..."
-msgstr ""
+#: mail/folder-browser.c:1636
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Athdealaigh"
+
+#: mail/folder-browser.c:1640
+#, fuzzy
+msgid "Mo_ve to Folder..."
+msgstr "Sábháil 'san _fillteán"
 
-#: mail/folder-browser.c:1488
+#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Cóip do Fillteán..."
 
-#: mail/folder-browser.c:1490 ui/evolution-mail-message.xml.h:109
-msgid "_Undelete"
-msgstr "_Athdealaigh"
-
-#: mail/folder-browser.c:1494 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
-msgstr ""
+# PE
+#: mail/folder-browser.c:1645
+#, fuzzy
+msgid "Label"
+msgstr "_Larger"
 
-#: mail/folder-browser.c:1497
-msgid "Apply Filters"
-msgstr ""
+#: mail/folder-browser.c:1649
+#, fuzzy
+msgid "Add Sender to Address_book"
+msgstr "Suim Leabhar Seoladh"
 
-#: mail/folder-browser.c:1499
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1653
+msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1676
-msgid "Filter on Mailing List"
-msgstr ""
+#: mail/folder-browser.c:1657
+#, fuzzy
+msgid "Crea_te Rule From Message"
+msgstr "Teachtaireacht Feilire"
 
-#: mail/folder-browser.c:1677
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1936
+msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1938
 #, c-format
-msgid "Filter on Mailing List (%s)"
+msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1680
+#: mail/folder-browser.c:1939
 #, c-format
-msgid "VFolder on Mailing List (%s)"
+msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Gnáth"
-
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -10585,26 +10797,18 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
+msgid "Current store format:"
 msgstr ""
 
 #: mail/local-config.glade.h:2
-msgid "Current store format:"
+msgid "Index body contents"
 msgstr ""
 
 #: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr ""
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Formóid Boscaphoist"
-
-#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr ""
 
-#: mail/local-config.glade.h:6
+#: mail/local-config.glade.h:4
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -10612,15 +10816,15 @@ msgid ""
 msgstr ""
 
 # so
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:10
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:11
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
@@ -10638,84 +10842,79 @@ msgstr "Eagarthóir Nuachráin Evolution"
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:959
+#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+msgid "_Host:"
+msgstr "_Óst:"
+
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
 #, fuzzy
-msgid "Could not save signature file."
-msgstr "Teíp ag fork: %s"
+msgid "User_name:"
+msgstr "Ainm _Úsaideoir"
 
-#: mail/mail-account-gui.c:1036
-msgid "Save signature"
-msgstr ""
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+msgid "_Path:"
+msgstr "_Slí:"
+
+#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
+#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
+#: mail/mail-config.glade.h:94
+#, fuzzy
+msgid "Random"
+msgstr "Raidio"
 
-#: mail/mail-account-gui.c:1042
+#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
 
-#: mail/mail-account-gui.c:1666
+#: mail/mail-account-gui.c:1985
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (gnáth)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Míchumasach"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Chumasach"
-
-#: mail/mail-accounts.c:292
+#: mail/mail-accounts.c:212
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:296
+#: mail/mail-accounts.c:216
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:299
+#: mail/mail-accounts.c:219
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.c:535
-msgid "Are you sure you want to delete this news account?"
-msgstr ""
+#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+msgid "Disable"
+msgstr "Míchumasach"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:50
-msgid "Mail Settings"
-msgstr "Albachtaí Phoist"
+#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+msgid "Enable"
+msgstr "Chumasach"
 
-#: mail/mail-autofilter.c:72
-#, c-format
-msgid "Mail to %s"
-msgstr "Post do %s"
+#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+msgid "Are you sure you want to delete this news account?"
+msgstr ""
 
-#: mail/mail-autofilter.c:217
-#, c-format
-msgid "Subject is %s"
-msgstr "Abair is %s"
+#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+msgid "Enabled"
+msgstr ""
 
-#: mail/mail-autofilter.c:233
-#, c-format
-msgid "Mail from %s"
-msgstr "Scéal ó %s"
+#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Ainm _Chuntas:"
 
-#: mail/mail-autofilter.c:289
-#, c-format
-msgid "%s mailing list"
-msgstr "líosta ríomhphost %s"
+#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Portráid"
 
 #: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10723,121 +10922,132 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:145
+#: mail/mail-callbacks.c:142
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:156
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:189
-msgid "You have not set a mail transport method"
-msgstr ""
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:194
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:239
+#: mail/mail-callbacks.c:209
 msgid "Send anyway?"
 msgstr "Post ar aon nós?"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:251
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:325
+#: mail/mail-callbacks.c:295
 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/mail-callbacks.c:329
+#: mail/mail-callbacks.c:299
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:333
+#: mail/mail-callbacks.c:303
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:438
+#: mail/mail-callbacks.c:408
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:527
+#: mail/mail-callbacks.c:497
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:646
+#: mail/mail-callbacks.c:623
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:971
+#: mail/mail-callbacks.c:977
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:975
+#: mail/mail-callbacks.c:981
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Am %a, %Y-%m-%d ag %H:%M, scríobh %%s:"
 
-#: mail/mail-callbacks.c:1423 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1425 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2052
+#: mail/mail-callbacks.c:2091
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2116
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2155
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2130
+#: mail/mail-callbacks.c:2169
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2156
+#: mail/mail-callbacks.c:2195
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2255
+#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2294
 msgid "Save Message As..."
 msgstr "Sábháil Scéal Mar..."
 
-#: mail/mail-callbacks.c:2257
+#: mail/mail-callbacks.c:2296
 msgid "Save Messages As..."
 msgstr "Sábháil Scéala Mar..."
 
-#: mail/mail-callbacks.c:2408
+#: mail/mail-callbacks.c:2366
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Scríos an sceal seo"
+
+#: mail/mail-callbacks.c:2373
+msgid ""
+"There are no more new messages in this folder.\n"
+"Would you like to go to the next folder?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2615
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10845,36 +11055,36 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2518
+#: mail/mail-callbacks.c:2728
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2530
+#: mail/mail-callbacks.c:2740
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2603
+#: mail/mail-callbacks.c:2783
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Post an sceál seo"
 
-#: mail/mail-callbacks.c:2655
+#: mail/mail-callbacks.c:2836
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sceál seo"
 
-#: mail/mail-callbacks.c:2682
+#: mail/mail-callbacks.c:2863
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2717
+#: mail/mail-callbacks.c:2901
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2883
+#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -10916,16 +11126,34 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:354
-#, c-format
-msgid "Account %d"
-msgstr "Cuntas %d"
+#. red
+#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Work"
+msgstr "Ag Obair"
+
+#. orange
+#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Personal"
+msgstr "Gnáth"
 
-#: mail/mail-config.c:1995
+#. forest green
+#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+msgid "To Do"
+msgstr ""
+
+#. blue
+#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "Bainisteoir"
+
+#: mail/mail-config.c:2458
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -10933,108 +11161,153 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2006
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Inbosca"
-
-#: mail/mail-config.c:2256
+#: mail/mail-config.c:2719
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2334 mail/mail-config.c:2338
+#: mail/mail-config.c:2797 mail/mail-config.c:2801
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
-msgid " _Check for supported types "
+#: mail/mail-config.c:2999
+msgid "Unnamed"
+msgstr ""
+
+#: mail/mail-config.c:3177
+msgid "Cannot execute signature script"
 msgstr ""
 
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " "
+msgstr ", "
+
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " dath"
+#, fuzzy
+msgid " Edit "
+msgstr "_Eagar"
 
 #: mail/mail-config.glade.h:3
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr ""
+#, fuzzy
+msgid " New "
+msgstr "_Nua"
 
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of evolution)"
+msgid " _Check for supported types "
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "A_lways encrypt to myself when sending encrypted mail"
+msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
-msgid "Account"
-msgstr "Cuntas"
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
 
 #: mail/mail-config.glade.h:7
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:8
+#, fuzzy
+msgid "Account Editor"
+msgstr "Cuntas %d"
+
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Eolas Cuntais"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Bainisteoireacht Chuntas"
 
-#: mail/mail-config.glade.h:9
-msgid "Accounts"
-msgstr "Cuntasaí"
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Advanced Options"
+msgstr "Roghanna"
+
+# AQ
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Afrikaans"
+msgstr "an tAntartasch"
+
+#: mail/mail-config.glade.h:13
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+# DZ
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Alerts"
+msgstr "An Ailgéir"
+
+#: mail/mail-config.glade.h:15
+msgid "Alwa_ys sign outgoing messages when using this account"
+msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr ""
+# AT
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Arabic"
+msgstr "An Ostair"
 
-#: mail/mail-config.glade.h:13
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:20
+msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:14 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Údarú"
 
-#: mail/mail-config.glade.h:16
-msgid "Beep when new mail arrives"
+#: mail/mail-config.glade.h:23
+msgid "Automatically _detect links"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
-msgid "Checking for New Mail"
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
-msgid "Composer"
-msgstr "Scríobhóir"
+#: mail/mail-config.glade.h:25
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Earraidh gan aithne: %s"
+
+#: mail/mail-config.glade.h:27
+#, fuzzy
+msgid "C_olors"
+msgstr "_Dún"
+
+#: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Cruthaigh Scéal _Nua"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:30
 msgid "Configuration"
 msgstr "Socrú"
 
-#: mail/mail-config.glade.h:21
-msgid "Confirm when Expunging a folder"
-msgstr ""
-
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:31
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11044,386 +11317,569 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+# BG
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Dari"
+msgstr "An Bhulgáir"
+
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Gnáth"
 
-#: mail/mail-config.glade.h:29
-msgid "Default Forward style is: "
-msgstr ""
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Tosaíocht"
 
-#: mail/mail-config.glade.h:30
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:40
+msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:41
 #, fuzzy
-msgid "Defaults"
-msgstr "Gnáth"
+msgid "Deleting Mail"
+msgstr "_Dealaigh gach rud"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:43
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:34
-msgid "Display"
-msgstr "Taispeaín"
-
-#: mail/mail-config.glade.h:35
-msgid "Do not notify me when new mail arrives"
+#: mail/mail-config.glade.h:44
+msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:36 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Críochnaithe"
 
-#: mail/mail-config.glade.h:37 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr ""
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Gach _Fillteáin:"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
 msgid "E_nable"
 msgstr "_Cumasach"
 
-#: mail/mail-config.glade.h:39 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Eagar..."
+#: mail/mail-config.glade.h:48
+msgid "E_nable advanced options"
+msgstr ""
 
-#: mail/mail-config.glade.h:40
-msgid "Enabled"
+# ta
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Rpost"
+
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Cuntasaí"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "_Seoladh RPost:"
+
+#: mail/mail-config.glade.h:52
+msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:53
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:54
+msgid "Fi_xed -width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Font Properties"
+msgstr "Álbactaí"
+
+#: mail/mail-config.glade.h:56
+msgid "Format messages in _HTML"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:43
-msgid "HTML signature file:"
+#: mail/mail-config.glade.h:58
+msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Hulu"
+msgstr "Gnáth"
+
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
-msgid "In HTML mail"
-msgstr "i HTML post"
-
 # ie
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Sábháil agus Dún"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Post an sceál seo"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Socrú Post"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Áit do Bosca Phoist"
 
-#: mail/mail-config.glade.h:52
-msgid "Make this my _default account"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Scríobhóir"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_Post sceál"
+
+#: mail/mail-config.glade.h:74
+msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "Freatalaí NNTP:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Socrú Post"
 
-#: mail/mail-config.glade.h:55
-msgid "News"
-msgstr "Nuacht"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "News Servers"
+msgstr "Fillteán _Nua"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:82
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "_Eagrú:"
+
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Eochar PGP:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Tóg dath"
 
-#: mail/mail-config.glade.h:63
-msgid "Play sound file when new mail arrives"
+#: mail/mail-config.glade.h:88
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Priontáil an tadhallaí seo"
 
-#: mail/mail-config.glade.h:66
-msgid "Prompt when sending messages with an _empty subject"
+#: mail/mail-config.glade.h:91
+msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:67
-msgid "Prompt when sending messages with only _Bcc recipients defined"
+#: mail/mail-config.glade.h:92
+msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Qmail maildir "
+#: mail/mail-config.glade.h:93
+msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Quoted"
+#: mail/mail-config.glade.h:95
+msgid "Randomized"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Freagrair-Do"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
-msgid "Receiving Mail"
-msgstr ""
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
+msgstr "_Roghanna"
 
-#: mail/mail-config.glade.h:73
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:100
+msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+msgstr "Slándáil"
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "Same as text"
+msgstr "Taispeáin"
+
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME"
 
-#: mail/mail-config.glade.h:77
-msgid "Security"
-msgstr "Slándáil"
-
-#: mail/mail-config.glade.h:78
-msgid "Select Filter Log file..."
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:107
+msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
-msgid "Sending Mail"
+#: mail/mail-config.glade.h:109
+msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:83 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
+# FIXME SP?
+#: mail/mail-config.glade.h:110
+#, fuzzy
+msgid "Select PGP program"
+msgstr "Tóg Ainmhí:"
+
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Select a signature file"
+msgstr "Tóg Comhad"
+
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Select a signature script"
+msgstr "Tóg Comhad"
+
+#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "_Post sceál filtean"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Post an sceál seo"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:117
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:118
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:119
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:89
-msgid "Signature file:"
+#: mail/mail-config.glade.h:120
+msgid "Shortcuts _type:"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+# SG
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Signature"
+msgstr "Singeapór"
+
+#: mail/mail-config.glade.h:122
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:123
 msgid "Source Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
-msgid "Sources"
-msgstr ""
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:124
 #, fuzzy
-msgid "Specify filename:"
+msgid "Specify _filename:"
 msgstr "Ainm Stíl:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:125
+msgid "Spell Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:126
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
-msgid "Use s_ecure connection (SSL)"
+#: mail/mail-config.glade.h:128
+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:97
+#: mail/mail-config.glade.h:130
+msgid "Use _HTML for this signature"
+msgstr ""
+
+#: mail/mail-config.glade.h:132
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Luaineach"
+
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:138
+msgid "XEmacs"
+msgstr ""
+
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "Saghas _Udarú :"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Saghas _Udarú :"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:145
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
-msgid "_Drafts folder:"
+#: mail/mail-config.glade.h:147
+msgid "_Color for misspelled words: "
 msgstr ""
 
-#: mail/mail-config.glade.h:111
-msgid "_Empty trash folders on exit"
+#: mail/mail-config.glade.h:148
+msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Defaults"
+msgstr "Gnáth"
+
+#: mail/mail-config.glade.h:151
+msgid "_Do not notify me when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:153
+msgid "_Enable spell checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:154
+#, fuzzy
+msgid "_Filename:"
+msgstr "Ainm Chomad:"
+
+#: mail/mail-config.glade.h:155
+msgid "_Fixed-width:"
+msgstr ""
+
+#: mail/mail-config.glade.h:156
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Sheoladh Chuig duine"
+
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Full name:"
 msgstr "Ainm _Fhada:"
 
-#: mail/mail-config.glade.h:113
-msgid "_HTML signature:"
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "i HTML post"
+
+#: mail/mail-config.glade.h:160
+msgid "_HTML Signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
-msgid "_Highlight citations with"
+#: mail/mail-config.glade.h:162
+msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
-msgid "_Host:"
-msgstr "_Óst:"
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Language:"
+msgstr "Teanga"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:164
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
-msgid "_Log filter actions to:"
+#: mail/mail-config.glade.h:165
+msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:166
+msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:167
 msgid "_Name:"
 msgstr "_Ainm:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:168
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
-msgid "_Organization:"
-msgstr "_Buidheann"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:169
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
-msgid "_Path:"
-msgstr "_Slí:"
+#: mail/mail-config.glade.h:171
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:124
-msgid "_Remember this password"
+#: mail/mail-config.glade.h:172
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
-msgid "_Send mail in HTML format by default."
+#: mail/mail-config.glade.h:173
+msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:174
 #, fuzzy
-msgid "_Server type: "
-msgstr "_Cineal Freastalaí:"
+msgid "_Random"
+msgstr "Raidio"
 
-#: mail/mail-config.glade.h:127
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:175
+msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:128
-msgid "_Username:"
-msgstr "Ainm _Úsaideoir"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Freagrair do gach rud"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Slándáil"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Slándáil"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Post ríomhphost"
+
+#: mail/mail-config.glade.h:181
+msgid "_Show animated images"
+msgstr ""
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
+msgstr "_Stádas:"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:183
+msgid "_Text Signature:"
+msgstr ""
+
+#: mail/mail-config.glade.h:184
+msgid "_Use secure connection (SSL):"
+msgstr ""
+
+#: mail/mail-config.glade.h:185
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Luaineach"
+
+#: mail/mail-config.glade.h:186
 msgid "_every"
 msgstr "_gach"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:187
+#, fuzzy
+msgid "color"
+msgstr " dath"
+
+#: mail/mail-config.glade.h:188
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:190
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
-msgid "placeholder"
-msgstr ""
-
-#: mail/mail-config.glade.h:134
-msgid "seconds."
-msgstr "soicind."
-
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr ""
@@ -11460,182 +11916,175 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Teíp ag fork: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Oscáil san %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1162
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1657
+#: mail/mail-display.c:1832
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1659
+#: mail/mail-display.c:1833
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1662
+#: mail/mail-display.c:1835
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1665
+#: mail/mail-display.c:1837
 msgid "Save Image as..."
 msgstr "Sábháil Iomha le..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:601
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:647
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:730 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dáta"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:822
 msgid "Bad Address"
 msgstr "Droch Seoladh"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:3
+#: mail/mail-format.c:865 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Ó"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:869
 msgid "Reply-To"
 msgstr "Freagrair-Do"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:10
+#: mail/mail-format.c:874 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Do"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:879
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:884
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1767
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-
-#: mail/mail-format.c:1790
-msgid "Evolution does not recognize this type of signed message."
-msgstr ""
-
-#: mail/mail-format.c:1798
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/mail-format.c:1806
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
+#: mail/mail-format.c:915
+#, fuzzy
+msgid "Mailer"
+msgstr "Post"
 
-#: mail/mail-format.c:2021
+#: mail/mail-format.c:2106
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2035
+#: mail/mail-format.c:2120
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2040
+#: mail/mail-format.c:2125
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2069
+#: mail/mail-format.c:2154
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2077
+#: mail/mail-format.c:2162
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2167
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:625
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:706
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:762
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Teíp ag fork: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:814
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1294
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1316
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1405
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
 # c-format
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1414
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
@@ -11658,127 +12107,122 @@ msgstr ""
 msgid "Working"
 msgstr "Ag Obair"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Fillteán _Nua"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:534 mail/mail-ops.c:563
+#: mail/mail-ops.c:538 mail/mail-ops.c:567
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:723
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Post an sceál seo"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:742
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "_Post sceál"
 
-#: mail/mail-ops.c:740 mail/mail-send-recv.c:545
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "Críochnaithe.`"
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:837
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
 # mo 
-#: mail/mail-ops.c:940
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Ag Cóip"
 
-#: mail/mail-ops.c:1053
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1103 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Bruscar"
-
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1279
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1420
+#: mail/mail-ops.c:1424
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ag dealaigh fillteán %s"
 
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1518
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1569
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Fillteán _Nua"
 
-#: mail/mail-ops.c:1601
+#: mail/mail-ops.c:1605
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1721
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "_Post sceál"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1807
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ag Sábháil scealta"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1919
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1947
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11787,38 +12231,38 @@ msgstr ""
 "Earraidh ag sábhháil scéalaí do: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2021
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2037
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
 
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2237
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
 msgid "_Search"
 msgstr "C_uardaigh..."
 
@@ -11855,42 +12299,42 @@ msgstr "Cuardaigh:"
 msgid "Matches:"
 msgstr ""
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Ag Cealaigh..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Freastalaí: %s, Cinéal: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Slí: %s, Cinéal: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Cinéal:  %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Cealaigh gach rud"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
+#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
 msgid "Waiting..."
 msgstr "Ag Fanacht..."
 
-#: mail/mail-send-recv.c:541
+#: mail/mail-send-recv.c:534
 msgid "Cancelled."
 msgstr "Ceangailte."
 
@@ -11907,25 +12351,37 @@ msgstr "Pasfhocal do %s, le do thoil"
 msgid "Enter Password"
 msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
+#: mail/mail-signature-editor.c:79
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Teíp ag fork: %s"
+
+#: mail/mail-signature-editor.c:172
+msgid "Save signature"
 msgstr ""
 
-#: mail/mail-summary.c:467
+#: mail/mail-signature-editor.c:178
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: mail/mail-signature-editor.c:357
 #, fuzzy
-msgid "Mail Summary"
-msgstr "Coimriú phoist"
+msgid "Signature name:"
+msgstr "Ainm Stíl:"
 
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr ""
 
@@ -11948,10 +12404,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr ""
-
 #: mail/mail-vfolder.c:785
 #, fuzzy
 msgid "vFolders"
@@ -11970,87 +12422,146 @@ msgstr ""
 msgid "New VFolder"
 msgstr "Fillteán _Nua"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Gan abair)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Sceál"
 
-#: mail/message-list.c:623
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:624
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:625
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:626
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:627
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:631
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:632
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:636
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:637
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:887
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:894
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "Inniú %l:%M %p"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "Inné %l:%M %p"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2292
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr ""
 
-#: mail/message-list.etspec.h:2
-msgid "Flagged"
+#: mail/message-list.etspec.h:3
+msgid "Due By"
 msgstr ""
 
 #: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Stádas"
+
+#: mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Méid"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "Post"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Sheoladh Chuig duine"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Gan Eolas"
+
+# NO
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward"
+msgstr "Sheoladh"
+
+#: mail/message-tag-followup.c:62
+msgid "No Response Necessary"
+msgstr ""
+
+#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr "Freagrair"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Freagrair do gach rud"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Reamhthaispeáintas"
+
+#: mail/message-tag-followup.c:315
+msgid "Flag to Follow Up"
+msgstr ""
+
 #: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -12072,7 +12583,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Fillteán"
 
@@ -12116,6 +12627,32 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Configuration control for the Evolution Summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Alairm Evolution"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+msgid "Factory for Evolution Summary's configuration control."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+msgid "Factory for the Evolution Summary component."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Roghanna Feilire"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+msgid "This page can be used to customize the appearance of the Summary page."
+msgstr ""
+
 # ##
 # ## Languages (ISO 639 code in brackets)
 # ## 	The 'msgid' names and spellings for languages are those listed
@@ -23089,14 +23626,10 @@ msgstr ""
 msgid "Zurich"
 msgstr "Tuircis"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr ""
-
 #: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "Coinní"
@@ -23119,44 +23652,51 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "(Gan Tuarascail)"
 
-#: my-evolution/e-summary-mail.c:120
+#: my-evolution/e-summary-mail.c:151
 msgid "Mail summary"
 msgstr "Coimriú phoist"
 
+#. Make this static, saves having to recompute it each time
+#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
+msgid "VFolders"
+msgstr ""
+
+#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
+#: my-evolution/e-summary-mail.c:761
+#, fuzzy
+msgid "Local Folders"
+msgstr "_Fillteán"
+
 #. translators: Put a list of codes for locations you want to see in
 #. My Evolution by default here. You can find the list of all
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:82
+#: my-evolution/e-summary-preferences.c:92
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:453
+#: my-evolution/e-summary-preferences.c:471
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Focal do Lae"
 
-#: my-evolution/e-summary-preferences.c:474
+#: my-evolution/e-summary-preferences.c:492
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:735
+#: my-evolution/e-summary-preferences.c:720
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:743
+#: my-evolution/e-summary-preferences.c:728
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:747
+#: my-evolution/e-summary-preferences.c:732
 msgid "Name:"
 msgstr "Ainm:"
 
-#: my-evolution/e-summary-preferences.c:1225
-msgid "Summary Settings"
-msgstr ""
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr ""
@@ -23165,11 +23705,34 @@ msgstr ""
 msgid "News Feed"
 msgstr "Bealach Nuachtáin"
 
-#: my-evolution/e-summary-tasks.c:241
+#: my-evolution/e-summary-shown.c:463
+#, fuzzy
+msgid "All"
+msgstr "Gach Rud"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:472
+#, fuzzy
+msgid "Add ->"
+msgstr "_Suimigh"
+
+#. Fixme: Ditto
+#: my-evolution/e-summary-shown.c:479
+#, fuzzy
+msgid "<- Remove"
+msgstr "_Scríos"
+
+# SE
+#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "An tSualainn"
+
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Gan Teascanna"
 
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(Gan Tuarascail)"
 
@@ -23185,20 +23748,20 @@ msgstr ""
 msgid "Weather"
 msgstr "Aimsir"
 
-#: my-evolution/e-summary.c:190
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:488
 #, fuzzy
 msgid "Please wait..."
 msgstr "Fán le do thoil"
 
-#: my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Coimiriú Príont"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr ""
 
@@ -23206,38 +23769,6 @@ msgstr ""
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
-#: my-evolution/metar.c:29
-msgid " F"
-msgstr ""
-
-#: my-evolution/metar.c:29
-msgid " C"
-msgstr ""
-
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr ""
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "kph"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "inHg"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "mmHg"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "míle"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "km"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Geal"
@@ -24477,61 +25008,53 @@ msgstr ""
 msgid "_Weather"
 msgstr "_Aimsir"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution default folders."
 msgstr ""
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr ""
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Default Folders"
+msgstr "_Fillteáin Speisíalta"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 #, fuzzy
 msgid "The Evolution shell."
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure default folders"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Taispéan Sonraí"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Imbosca"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Asbosca"
-
-#: shell/e-local-storage.c:636
-#, fuzzy
-msgid "Local Folders"
-msgstr "_Fillteán"
-
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:128
+#: shell/e-setup.c:130
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24539,14 +25062,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, fuzzy, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -24554,7 +25077,7 @@ msgid ""
 "%s"
 msgstr "Teíp ag fork: %s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -24562,7 +25085,7 @@ msgid ""
 "readable and executable and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -24570,7 +25093,7 @@ msgid ""
 "Please remove this file and restart Evolution."
 msgstr ""
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -24578,7 +25101,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -24587,7 +25110,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -24595,84 +25118,86 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-about-box.c:40
-msgid "Evolution "
-msgstr "Evolution "
-
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Cóipcheart 1999, 2000, 2001 Ximian, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Teíp ag fork: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:206
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:307
+#: shell/e-shell-folder-commands.c:321
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Cóip Fillteán"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Dealaigh \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: shell/e-shell-folder-commands.c:425
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:502
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:549
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:556
 #, fuzzy
 msgid "Rename folder"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:566
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24685,7 +25210,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:304
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Cruthaigh fillteán nua"
 
@@ -24699,7 +25224,7 @@ msgstr ""
 msgid "New..."
 msgstr "Nua..."
 
-#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
+#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr "(gan tideál)"
 
@@ -24853,8 +25378,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 
-#: shell/e-shell-user-creatable-items-handler.c:495
-#: shell/e-shell-user-creatable-items-handler.c:540
+#: shell/e-shell-user-creatable-items-handler.c:506
+#: shell/e-shell-user-creatable-items-handler.c:551
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "_Nua"
@@ -24875,90 +25400,89 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:168
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:176
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:218
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Faoi Evolution..."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:444
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:445
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:565
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Scríos an sceal seo"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:566
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:577
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:585
-#, c-format
-msgid "Error executing %s."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:732
 msgid "_Work Online"
 msgstr "Sheoladh Chuig duine"
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:215
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1598
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1600
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(Ar Bith)"
 
-#: shell/e-shell-view.c:1647
+#: shell/e-shell-view.c:1867
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1654
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1660
+#: shell/e-shell-view.c:1880
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:169
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:764
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1660
+#: shell/e-shell.c:1832
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24966,19 +25490,23 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1887
+#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Ceart go Leor"
+
+#: shell/e-shell.c:2135
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1889
+#: shell/e-shell.c:2137
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1891
+#: shell/e-shell.c:2139
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1893 shell/e-storage.c:500
+#: shell/e-shell.c:2141 shell/e-storage.c:487
 msgid "Generic error"
 msgstr ""
 
@@ -25096,74 +25624,73 @@ msgstr "_Scríos"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-storage-set-view.c:658
-#, fuzzy, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr "Teíp ag fork: %s"
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Imbosca"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(gan ainm)"
+# th
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Téalainnis"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Gan Earraidh"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "Earraidh I/A"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Teíp ag fork: %s"
@@ -25174,10 +25701,14 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, fuzzy, c-format
+#, fuzzy
 msgid "%s (%d%% complete)"
 msgstr "% Rinneadh:"
 
+#: shell/evolution-folder-selector-button.c:84
+msgid "<click here to select a folder>"
+msgstr ""
+
 #: shell/evolution-shell-component-utils.c:124
 #, fuzzy, c-format
 msgid ""
@@ -25204,67 +25735,67 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1045
 msgid "CORBA error"
 msgstr "Earraidh CORBA"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1047
 msgid "Interrupted"
 msgstr "Idirbhríste"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1049
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1051
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1053
 msgid "No owner"
 msgstr "Gan Úinéar"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1055
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1057
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1059
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1061
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1063
 msgid "Internal error"
 msgstr "Earraidh Intire"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1067
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1069
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1073
 msgid "Has subfolders"
 msgstr "Post an sceál seo"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1075
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1077
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:47
 #, fuzzy
 msgid "Test type"
 msgstr "Cinéal Comhad:"
@@ -25381,35 +25912,50 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:83
+#: shell/main.c:89
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:89
+#: shell/main.c:95
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:210
+#: shell/main.c:227
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:219
+#: shell/main.c:236
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:289
+#: shell/main.c:317
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:290
+#: shell/main.c:318
+msgid "Start in offline mode"
+msgstr ""
+
+#: shell/main.c:319
+msgid "Start in online mode"
+msgstr ""
+
+#: shell/main.c:320
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:332
+#: shell/main.c:338
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:368
 msgid "Cannot initialize the Bonobo component system."
 msgstr ""
 
@@ -25433,268 +25979,212 @@ msgstr "Comhad Aschur"
 msgid "No filename provided."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Fillteán _Nua"
+
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "_Cóip do Fillteán..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:12
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Delete selected contacts"
 msgstr "Scríos an tadhallaí seo"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Líosta Nua"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Fillteán _Nua"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Sábháil 'san _fillteán"
+
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Post an sceál seo"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Priontáil an tadhallaí seo"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Sábháil an tadhallaí seo mar VCard."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Tóg Gach Rud"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Tóg Gach tadhallaí"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#, fuzzy
-msgid "Send _Message to Contact..."
-msgstr "_Post sceál do Tadhall..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "_Post sceál"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Post sceál do tadhall"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Post tadhallaí seo do perseanta eile."
 
 # st
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Stad"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:30
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:16
+#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
+#: ui/evolution.xml.h:35
 msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Addressbook Sources..."
-msgstr ""
-
 #: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "Liost Tadhall"
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:44
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "_Priontáil..."
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "_Sábháil Mar VCard"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Tóg Gach Rud"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:4
-#, fuzzy
-msgid "Create a New All Day _Event"
-msgstr "Cruthaigh All Day Event nua"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "Cruthaigh _Teasc Nua"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Cruthaigh Coinne _Nua"
-
-#: ui/evolution-calendar.xml.h:7
-#, fuzzy
-msgid "Create a _New Meeting"
-msgstr "Cruthaigh Coinne _Nua"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-addressbook.xml.h:45
 #, fuzzy
-msgid "Create a new meeting request"
-msgstr "Scríos an sceal seo"
-
-#: ui/evolution-calendar.xml.h:10 ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create an event for the whole day"
-msgstr ""
+msgid "_Send Message to Contact..."
+msgstr "_Post sceál do Tadhall..."
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "La"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
 msgid "Delete the appointment"
 msgstr "Scríos an sceal seo"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:37
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Go forward"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Mí"
 
-#: ui/evolution-calendar.xml.h:23
-msgid "New Appointment"
-msgstr "Coinne Nua"
-
-#: ui/evolution-calendar.xml.h:24 ui/evolution-tasks.xml.h:12
-msgid "New Task"
-msgstr "Teasc Nua"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "Priontáil reamh-taispeántas"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Priontáil an feilire seo"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Taispeán aon la"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Taispeáin aon mhí"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Taispeán aon seachtain"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Seachtain"
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment..."
-msgstr "_Coinne..."
-
-#: ui/evolution-calendar.xml.h:38
-msgid "_Calendar Settings..."
-msgstr "_Albachtaí Feilire..."
-
-#: ui/evolution-calendar.xml.h:42
-#, fuzzy
-msgid "_Meeting..."
-msgstr "Ag Fanacht..."
-
-#: ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:46
-msgid "_Task..."
-msgstr "_Teasc..."
-
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -25724,18 +26214,18 @@ msgstr ""
 msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Clódáil..."
-
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Sábháil"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Sábháil le..."
+
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Sábháil agus Dún"
 
@@ -25751,8 +26241,8 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:36
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:40
 msgid "_File"
 msgstr "_Comhad"
 
@@ -25770,10 +26260,15 @@ msgstr "Sábháil _Mar..."
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
+#: ui/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Send _Message to Contact..."
+msgstr "_Post sceál do Tadhall..."
+
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Save"
 msgstr "_Sábháil"
 
@@ -25833,6 +26328,12 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr ""
 
+# FR
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "An Fhrainc"
+
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr ""
@@ -25842,78 +26343,54 @@ msgid "Compose _New Message"
 msgstr "Cruthaigh Scéal _Nua"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Folamh _Buscar"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Sceál Nua"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "Sábháil 'san _fillteán"
@@ -26013,11 +26490,11 @@ msgstr ""
 msgid "Threaded Message list"
 msgstr "Post an sceál seo"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:20
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
 msgid "_Folder"
 msgstr "_Fillteán"
 
@@ -26034,346 +26511,355 @@ msgstr "_Roghanna..."
 msgid "_Threaded Message List"
 msgstr "Post an sceál seo"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "Add Sender to Address _Book"
+msgid "A_dd Sender to Addressbook"
 msgstr "Suim Leabhar Seoladh"
 
+#: ui/evolution-mail-message.xml.h:2
+msgid "A_pply Filters"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:3
 #, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Suim Leabhar Seoladh"
+
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
 msgid "Apply filter rules to the selected messages"
 msgstr "Scríos an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 #, fuzzy
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Scríos an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:9
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "Fillteán _Nua"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Display the next message"
 msgstr "Scríos an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Scríos an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Scríos an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:27
+# NO
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Sheoladh"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:31
-msgid "Force images in HTML mail to be loaded"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Fillteán _Nua"
 
-# NO
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
-msgid "Forward"
-msgstr "Sheoladh"
+msgid "Follow _Up..."
+msgstr "Ainm _Fhada..."
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Fillteán _Nua"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Fillteán _Nua"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:41
-msgid "Mark as I_mportant"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:43
-msgid "Mark as Unimp_ortant"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:44
-msgid "Mark the selected messages as having been read"
+msgid "Mark as I_mportant"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:45
-#, fuzzy
-msgid "Mark the selected messages as important"
-msgstr "Scríos an sceal seo"
+msgid "Mark as U_nread"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:46
-msgid "Mark the selected messages as not having been read"
+msgid "Mark as Unimp_ortant"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-msgid "Mark the selected messages as unimportant"
+msgid "Mark the selected message(s) as having been read"
 msgstr "Scríos an sceal seo"
 
 #: ui/evolution-mail-message.xml.h:48
 #, fuzzy
-msgid "Mark the selected messages for deletion"
-msgstr "Fillteán _Nua"
+msgid "Mark the selected message(s) as important"
+msgstr "Scríos an sceal seo"
 
 #: ui/evolution-mail-message.xml.h:49
-msgid "Move"
-msgstr "Bog"
+#, fuzzy
+msgid "Mark the selected message(s) as not having been read"
+msgstr "Scríos an sceal seo"
 
 #: ui/evolution-mail-message.xml.h:50
 #, fuzzy
-msgid "Move selected messages to another folder"
-msgstr "Fillteán _Nua"
+msgid "Mark the selected message(s) as unimportant"
+msgstr "Scríos an sceal seo"
 
 #: ui/evolution-mail-message.xml.h:51
-msgid "Next"
-msgstr "Ar Lean"
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Fillteán _Nua"
 
 #: ui/evolution-mail-message.xml.h:52
-msgid "Next Important Message"
-msgstr ""
+msgid "Move"
+msgstr "Bog"
 
 #: ui/evolution-mail-message.xml.h:53
-msgid "Next Message"
-msgstr "Scéal ar Lean"
+#, fuzzy
+msgid "Move selected message(s) to another folder"
+msgstr "Fillteán _Nua"
 
 #: ui/evolution-mail-message.xml.h:54
-msgid "Next Thread"
-msgstr ""
+msgid "Next"
+msgstr "Ar Lean"
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Unread Message"
-msgstr ""
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "Post an sceál seo"
 
+# NL
 #: ui/evolution-mail-message.xml.h:56
-msgid "Open the selected message in a new window"
-msgstr "Post an sceál seo"
+#, fuzzy
+msgid "Next _Thread"
+msgstr "An Isiltir"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Open the selected message in the composer to re-send it"
-msgstr ""
+#, fuzzy
+msgid "Next _Unread Message"
+msgstr "Scéal ar Lean"
 
 #: ui/evolution-mail-message.xml.h:58
-msgid "Original Si_ze"
-msgstr ""
+msgid "Open the selected message in a new window"
+msgstr "Post an sceál seo"
 
 #: ui/evolution-mail-message.xml.h:59
-#, fuzzy
-msgid "Preview the message to be printed"
-msgstr "Post an sceál seo"
+msgid "Open the selected message in the composer to re-send it"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:60
-msgid "Previous"
-msgstr "Riomh"
+msgid "Original Si_ze"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-msgid "Previous Important Message"
+msgid "P_revious Unread Message"
 msgstr "Post an sceál seo"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous Message"
-msgstr ""
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Post an sceál seo"
 
 #: ui/evolution-mail-message.xml.h:63
 #, fuzzy
-msgid "Previous Unread Message"
+msgid "Preview the message to be printed"
 msgstr "Post an sceál seo"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:64
+msgid "Previous"
+msgstr "Riomh"
+
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Clodaigh teachtairecht seo"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:68
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Fillteán _Nua"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "Freagrair"
-
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "Freagrair do gach rud"
-
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:78
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Scríos an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Attached"
@@ -26394,57 +26880,74 @@ msgid "_Forward Message"
 msgstr "Sheoladh Chuig duine"
 
 #: ui/evolution-mail-message.xml.h:98
+msgid "_Go To"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Inline"
 msgstr "Sheoladh Chuig duine"
 
 # PE
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Larger"
 msgstr "_Larger"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Message Display"
 msgstr "_Post sceál"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Sábháil 'san _fillteán"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Scéal ar Lean"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "Taispeaín _Gnáth"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_Oscail Teachtaireacht"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Post an sceál seo"
+
+#: ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Quoted"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail-message.xml.h:108 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
 msgid "_Tools"
 msgstr "_Uirlisí"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "_Athdealaigh"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Dún an fhuinneog seo"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:33
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:36
 msgid "_Close"
 msgstr "_Dún"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
 msgid "_View"
 msgstr "_Radharc"
 
@@ -26468,11 +26971,11 @@ msgstr ""
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "_Formáid"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
 
@@ -26488,6 +26991,10 @@ msgstr ""
 msgid "Insert text file..."
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Oscáil"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr ""
@@ -26522,7 +27029,7 @@ msgid "Save in folder..."
 msgstr "Sábháil 'san _fillteán"
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr ""
 
@@ -26547,6 +27054,7 @@ msgid "Send _later"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Post an sceál seo i HTML"
 
@@ -26620,7 +27128,7 @@ msgid "_From Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr ""
 
@@ -26632,11 +27140,7 @@ msgstr "_Oscáil..."
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Slándáil"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
 msgid "_Help"
 msgstr "C_úidiú"
 
@@ -26692,39 +27196,41 @@ msgstr ""
 msgid "Re_fresh Task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr ""
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 #, fuzzy
 msgid "Delete completed tasks"
 msgstr "Scríos an sceal seo"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "Mar_k as Complete"
 msgstr "% Rinneadh:"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:15
-msgid "Tasks Settings..."
-msgstr ""
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Post an sceál seo"
+
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "Clodaigh teachtairecht seo"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -26792,117 +27298,121 @@ msgid "Open this folder in an other window"
 msgstr "Post an sceál seo"
 
 #: ui/evolution.xml.h:21
-msgid "Show information about Ximian Evolution"
+msgid "Send / Receive"
 msgstr ""
 
 #: ui/evolution.xml.h:22
-msgid "Submit Bug Report"
+msgid "Send queued items and retrieve new items"
 msgstr ""
 
 #: ui/evolution.xml.h:23
-msgid "Submit _Bug Report"
+msgid "Show information about Ximian Evolution"
 msgstr ""
 
 #: ui/evolution.xml.h:24
-msgid "Submit a bug report using Bug Buddy"
+msgid "Submit Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:25
-msgid "Toggle"
+msgid "Submit _Bug Report"
 msgstr ""
 
 #: ui/evolution.xml.h:26
-msgid "Toggle whether to show the folder bar"
+msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
 #: ui/evolution.xml.h:27
-msgid "Toggle whether to show the shortcut bar"
+msgid "Toggle"
 msgstr ""
 
 #: ui/evolution.xml.h:28
-msgid "Toggle whether we are working offline."
+msgid "Toggle whether to show the folder bar"
 msgstr ""
 
 #: ui/evolution.xml.h:29
-msgid "View the selected folder"
+msgid "Toggle whether to show the shortcut bar"
+msgstr ""
+
+#: ui/evolution.xml.h:30
+msgid "Toggle whether we are working offline."
 msgstr ""
 
 #: ui/evolution.xml.h:31
+msgid "View the selected folder"
+msgstr ""
+
+#: ui/evolution.xml.h:33
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_About Ximian Evolution..."
 msgstr "_Faoi Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:38
 msgid "_Copy..."
 msgstr "_Cóip..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:42
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:43
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Import..."
 msgstr "Chló_fhoireann..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:46
 msgid "_Move..."
 msgstr "_Bog..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:47
 msgid "_New"
 msgstr "_Nua"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_New Folder"
 msgstr "Fillteán _Nua"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "Albachtaí Phoist"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:50
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:47
-msgid "_Shortcut"
+#: ui/evolution.xml.h:52
+msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:48
-msgid "_Shortcut Bar"
+#: ui/evolution.xml.h:53
+msgid "_Shortcut"
 msgstr ""
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
+#: ui/evolution.xml.h:54
+msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr ""
 
 # IS
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 #, fuzzy
 msgid "Reload"
 msgstr "An Íoslainn"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr ""
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr ""
-
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "Address Cards"
@@ -26922,19 +27432,23 @@ msgid "As Sent Folder"
 msgstr "Fillteán _Nua"
 
 #: views/mail/galview.xml.h:2
-msgid "By Sender"
+msgid "By Follow Up Flag"
 msgstr ""
 
 #: views/mail/galview.xml.h:3
-msgid "By Status"
+msgid "By Sender"
 msgstr ""
 
 #: views/mail/galview.xml.h:4
+msgid "By Status"
+msgstr ""
+
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr ""
 
 # as 
-#: views/mail/galview.xml.h:5
+#: views/mail/galview.xml.h:6
 #, fuzzy
 msgid "Messages"
 msgstr "Asaimis"
@@ -27087,20 +27601,20 @@ msgstr "Úcráinis"
 msgid "Visual"
 msgstr "Míchumasach"
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, fuzzy, c-format
 msgid "Unknown character set: %s"
 msgstr "Earraidh gan aithne: %s"
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Eile..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr ""
 
@@ -27108,30 +27622,32 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr ""
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Glan"
+#: widgets/misc/e-filter-bar.h:97
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Sánbháil le..."
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Taispeán gach Rud"
+#: widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Sábháil 'san _fillteán"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Eolas"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Earraidh"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Freagra"
@@ -27145,11 +27661,20 @@ msgstr "Sceál"
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "_Cuardaigh"
+#: widgets/misc/e-search-bar.c:477
+msgid "_Find Now"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:478
+#, fuzzy
+msgid "_Clear"
+msgstr "Glan"
+
+#: widgets/misc/e-search-bar.c:835
+msgid "Clear"
+msgstr "Glan"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:837
 msgid "Find Now"
 msgstr ""
 
@@ -27175,386 +27700,721 @@ msgstr ""
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
-msgid "Card: "
-msgstr "Carta: "
+#~ msgid "Edit Addressbook"
+#~ msgstr "Eagar Leabhar Sheoladh"
 
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"Ainm: "
+#~ msgid "Add Addressbook"
+#~ msgstr "Suim Leabhar Seoladh"
 
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-" Clann:       "
+#~ msgid "Base"
+#~ msgstr "B�ún"
 
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"Data Breithe: "
+#~ msgid "Server Name"
+#~ msgstr "Ainm do Fhreastalaí"
 
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"Seoladh:"
+#~ msgid "Other Contacts"
+#~ msgstr "Tadhallaí Eile"
 
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-" Bosca Phoist: "
+#~ msgid "(none)"
+#~ msgstr "(gan ainm)"
 
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  Sráid:       "
+#~ msgid "_Other"
+#~ msgstr "_Eile"
 
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  Cathair:     "
+#~ msgid "0%"
+#~ msgstr "0%"
 
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  Cuige:      "
+#~ msgid "10%"
+#~ msgstr "10%"
 
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  Cód Phoist: "
+#~ msgid "20%"
+#~ msgstr "20%"
 
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  Tír:         "
+#~ msgid "30%"
+#~ msgstr "30%"
 
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"Telefóin:\n"
+#~ msgid "40%"
+#~ msgstr "40%"
 
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"Telefón:"
+#~ msgid "50%"
+#~ msgstr "50%"
 
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"R-phost:\n"
+#~ msgid "60%"
+#~ msgstr "60%"
 
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"R-phost:"
+#~ msgid "70%"
+#~ msgstr "70%"
 
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"Am Críos: "
+#~ msgid "80%"
+#~ msgstr "80%"
 
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  Ainm:  "
+#~ msgid "90%"
+#~ msgstr "90%"
 
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"Trácht:"
+#~ msgid "100%"
+#~ msgstr "100%"
 
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"Eochair Poiblí: "
+#~ msgid "_Delete this Task"
+#~ msgstr "Scríos an teasc seo"
 
-msgid "New _Contact"
-msgstr "_Tadhall Nua"
+#, fuzzy
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Eolas"
 
-msgid "B_usiness"
-msgstr "_Gnó"
+#, fuzzy
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Eolas"
 
-msgid "_Business"
-msgstr "_Gnó"
+#, fuzzy
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Eolas"
 
-msgid "_Home"
-msgstr "_Baile"
+#, fuzzy
+#~ msgid "Task Completed: <b>"
+#~ msgstr "Críochnaithe.`"
 
-msgid "New _Task"
-msgstr "_Teasc Nua"
+#, fuzzy
+#~ msgid "iCalendar Information"
+#~ msgstr "eolas fheilire"
 
-msgid "(Unknown)"
-msgstr "(Gan aithne)"
+#, fuzzy
+#~ msgid "iCalendar Error"
+#~ msgstr "Feilire"
 
-msgid "New _Mail Message"
-msgstr "Teachtaireacht _Post Nua"
+#, fuzzy
+#~ msgid "An unknown person"
+#~ msgstr "iEarraidh gan Aithne"
 
-msgid "Special Folders"
-msgstr "_Fillteáin Speisíalta"
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ar bith</i>"
 
-msgid "°F"
-msgstr "°F"
+#, fuzzy
+#~ msgid "Status:"
+#~ msgstr "_Stádas:"
 
-msgid "°C"
-msgstr "°C"
+#, fuzzy
+#~ msgid "Choose an action:"
+#~ msgstr "Fillteán _Nua"
 
-msgid " _Remove"
-msgstr "_Scríos"
+#, fuzzy
+#~ msgid "Update"
+#~ msgstr "Data"
 
-msgid "All _folders:"
-msgstr "Gach _Fillteáin:"
+#, fuzzy
+#~ msgid "Accept"
+#~ msgstr "Cuntas"
 
 #, fuzzy
-msgid "%s at an unknown time"
-msgstr "iEarraidh gan Aithne"
+#~ msgid "Decline"
+#~ msgstr "Dealaigh"
+
+#, fuzzy
+#~ msgid "Send Latest Information"
+#~ msgstr "Eolas Theasc"
 
-msgid "GnomeCard:"
-msgstr "GnomeCard: "
+#~ msgid "Task Information"
+#~ msgstr "Eolas Theasc"
 
 #, fuzzy
-msgid "Encrypted message"
-msgstr "Post an sceál seo"
+#~ msgid "Event information"
+#~ msgstr "eolas fheilire"
 
 #, fuzzy
-msgid "Cannot copy a folder `%s' to itself"
-msgstr "Teíp ag fork: %s"
+#~ msgid "Task information"
+#~ msgstr "Eolas Theasc"
 
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Ximian Evolution %s"
+#, fuzzy
+#~ msgid "Journal information"
+#~ msgstr "Eolas Cuntais"
 
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Ximian Evolution %s [%s]"
+#, fuzzy
+#~ msgid "Free/Busy information"
+#~ msgstr "Eolas"
 
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Go raibh maith agat\n"
-"An Fhoireann Evolution\n"
+#, fuzzy
+#~ msgid "Calendar information"
+#~ msgstr "eolas fheilire"
 
-msgid "Password:"
-msgstr "Pasfhocal:"
+#, fuzzy
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "Eolas"
 
 #, fuzzy
-msgid "Evolution Shortcuts"
-msgstr "Evolution"
+#~ msgid "iCalendar information"
+#~ msgstr "eolas fheilire"
 
-msgid "Delete folder '%s'"
-msgstr "Dealaigh Fillteán '%s'"
+# tg
+#, fuzzy
+#~ msgid "Task"
+#~ msgstr "Táidsícis"
 
-msgid "%d"
-msgstr "%d"
+#, fuzzy
+#~ msgid "Status: %s"
+#~ msgstr "_Stádas:"
 
-msgid "%d/%m/%Y"
-msgstr "%d/%m/%Y"
+#, fuzzy
+#~ msgid "Percent Complete: %i"
+#~ msgstr "Críochnaithe.`"
 
-msgid "%Y/%m/%d"
-msgstr "%a %d/%m/%Y"
+#, fuzzy
+#~ msgid "URL: %s"
+#~ msgstr "URL:"
 
-msgid "_Company:"
-msgstr "_Teoranta:"
+#, fuzzy
+#~ msgid "Categories: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Aicmí:"
 
-msgid "SASL"
-msgstr "SASL"
+#, fuzzy
+#~ msgid "Contacts: "
+#~ msgstr ""
+#~ "\n"
+#~ "Trácht:"
 
-msgid "Root DN:"
-msgstr "Príomh DN:"
+#, fuzzy
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Teíp ag fork: %s"
 
-msgid "URI"
-msgstr "URI"
+#, fuzzy
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "Teíp ag fork: %s"
 
-msgid "123"
-msgstr "123"
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "Post ríomhphost"
 
-msgid "a"
-msgstr "a"
+#~ msgid "Run %s"
+#~ msgstr "Deán %s"
 
-msgid "b"
-msgstr "b"
+#~ msgid "Close %s"
+#~ msgstr "Dún %s"
 
-msgid "c"
-msgstr "c"
+#, fuzzy
+#~ msgid "page"
+#~ msgstr "Leathanach"
 
-msgid "e"
-msgstr "e"
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr "Ag oscailt an t-eolaire %s"
 
-msgid "f"
-msgstr "f"
+#, fuzzy
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Earraidh ag sábhháil scéalaí do: %s\n"
+#~ " %s"
 
-msgid "g"
-msgstr "g"
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Coimriú"
 
-msgid "h"
-msgstr "h"
+#, fuzzy
+#~ msgid "Test service"
+#~ msgstr "Suimigh Seirbhís"
 
-msgid "i"
-msgstr "i"
+#, fuzzy
+#~ msgid "Update now"
+#~ msgstr "Data"
+
+#, fuzzy
+#~ msgid "Update every "
+#~ msgstr "Data"
 
-msgid "j"
-msgstr "j"
+#, fuzzy
+#~ msgid "Needs Reply"
+#~ msgstr "Freagrair"
 
-msgid "k"
-msgstr "k"
+#~ msgid "Default"
+#~ msgstr "Gnáth"
 
-msgid "l"
-msgstr "l"
+#~ msgid "Mailbox Format"
+#~ msgstr "Formóid Boscaphoist"
 
-msgid "m"
-msgstr "m"
+#~ msgid " (default)"
+#~ msgstr " (gnáth)"
 
-msgid "n"
-msgstr "n"
+#~ msgid "Mail Settings"
+#~ msgstr "Albachtaí Phoist"
 
-msgid "o"
-msgstr "o"
+#~ msgid "Subject is %s"
+#~ msgstr "Abair is %s"
 
-msgid "p"
-msgstr "p"
+#~ msgid "Mail from %s"
+#~ msgstr "Scéal ó %s"
 
-msgid "q"
-msgstr "q"
+#~ msgid "%s mailing list"
+#~ msgstr "líosta ríomhphost %s"
 
-msgid "r"
-msgstr "r"
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: Inbosca"
+
+#~ msgid "Account"
+#~ msgstr "Cuntas"
 
-msgid "s"
-msgstr "s"
+#~ msgid "Display"
+#~ msgstr "Taispeaín"
 
-msgid "t"
-msgstr "t"
+#~ msgid "Edit..."
+#~ msgstr "Eagar..."
 
-msgid "u"
-msgstr "u"
+#~ msgid "News"
+#~ msgstr "Nuacht"
 
-msgid "v"
-msgstr "v"
+#~ msgid "_Organization:"
+#~ msgstr "_Buidheann"
 
-msgid "w"
-msgstr "w"
+#, fuzzy
+#~ msgid "_Server type: "
+#~ msgstr "_Cineal Freastalaí:"
 
-msgid "y"
-msgstr "y"
+#~ msgid "seconds."
+#~ msgstr "soicind."
 
-msgid "z"
-msgstr "z"
+#, fuzzy
+#~ msgid "Mail Summary"
+#~ msgstr "Coimriú phoist"
 
-msgid "Save calendar"
-msgstr "Sábháil Feilire"
+#~ msgid "kph"
+#~ msgstr "kph"
 
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#~ msgid "inHg"
+#~ msgstr "inHg"
 
-msgid "Calendar Preferences"
-msgstr "Roghanna Feilire"
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
+
+#~ msgid "miles"
+#~ msgstr "míle"
+
+#~ msgid "kilometers"
+#~ msgstr "km"
+
+#~ msgid "Outbox"
+#~ msgstr "Asbosca"
+
+#~ msgid "Evolution "
+#~ msgstr "Evolution "
+
+#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+#~ msgstr "Cóipcheart 1999, 2000, 2001 Ximian, Inc."
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr "Teíp ag fork: %s"
+
+#~ msgid "(No name)"
+#~ msgstr "(gan ainm)"
+
+#~ msgid "New List"
+#~ msgstr "Líosta Nua"
+
+#, fuzzy
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Cruthaigh All Day Event nua"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Cruthaigh _Teasc Nua"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Cruthaigh Coinne _Nua"
+
+#, fuzzy
+#~ msgid "Create a _New Meeting"
+#~ msgstr "Cruthaigh Coinne _Nua"
+
+#, fuzzy
+#~ msgid "Create a new meeting request"
+#~ msgstr "Scríos an sceal seo"
+
+#~ msgid "New Appointment"
+#~ msgstr "Coinne Nua"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Coinne..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Albachtaí Feilire..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Teasc..."
+
+#~ msgid "New Message"
+#~ msgstr "Sceál Nua"
+
+#~ msgid "Show All"
+#~ msgstr "Taispeán gach Rud"
+
+#~ msgid "Sear_ch"
+#~ msgstr "_Cuardaigh"
+
+#~ msgid "Card: "
+#~ msgstr "Carta: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Ainm: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ " Clann:       "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Data Breithe: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Seoladh:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ " Bosca Phoist: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Sráid:       "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Cathair:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Cuige:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Cód Phoist: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Tír:         "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefóin:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Telefón:"
 
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "R-phost:\n"
 
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "R-phost:"
 
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Am Críos: "
 
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Ainm:  "
 
-msgid "Background:"
-msgstr "Dúlra:"
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Trácht:"
 
-msgid "View All"
-msgstr "Taidpeáin Gach Rud"
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Eochair Poiblí: "
 
-msgid "_Day"
-msgstr "_Lá"
+#~ msgid "New _Contact"
+#~ msgstr "_Tadhall Nua"
 
-msgid "_Open Calendar"
-msgstr "_Oscáil Feilire"
+#~ msgid "B_usiness"
+#~ msgstr "_Gnó"
 
-msgid "About..."
-msgstr "Faoi..."
+#~ msgid "_Business"
+#~ msgstr "_Gnó"
 
-msgid "Address _Book... (FIXME)"
-msgstr "Leabhair Sheolaidh"
+#~ msgid "_Home"
+#~ msgstr "_Baile"
 
-msgid "C_lear"
-msgstr "G_lan"
+#~ msgid "New _Task"
+#~ msgstr "_Teasc Nua"
 
-msgid "Close this appointment"
-msgstr "Dún an coinne seo"
+#~ msgid "(Unknown)"
+#~ msgstr "(Gan aithne)"
 
-msgid "Pre_vious"
-msgstr "_Riomh"
+#~ msgid "New _Mail Message"
+#~ msgstr "Teachtaireacht _Post Nua"
 
-msgid "Print S_etup..."
-msgstr "Socraigh Priontáil..."
+#~ msgid "°F"
+#~ msgstr "°F"
 
-msgid "_About..."
-msgstr "_Faoi..."
+#~ msgid "°C"
+#~ msgstr "°C"
 
 #, fuzzy
-msgid "_Mail Message (FIXME)"
-msgstr "_Post sceál"
+#~ msgid "%s at an unknown time"
+#~ msgstr "iEarraidh gan Aithne"
 
-msgid "_Move to Folder... (FIXME)"
-msgstr "Sábháil 'san _fillteán"
+#~ msgid "GnomeCard:"
+#~ msgstr "GnomeCard: "
 
-msgid "_Note (FIXME)"
-msgstr "_Nota"
+#, fuzzy
+#~ msgid "Encrypted message"
+#~ msgstr "Post an sceál seo"
 
-msgid "_Task (FIXME)"
-msgstr "_Teasc"
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr "Teíp ag fork: %s"
+
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Ximian Evolution %s"
 
-msgid "Print message..."
-msgstr "Clodaigh teachtairecht..."
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Ximian Evolution %s [%s]"
 
-msgid "Reply to all"
-msgstr "Freagrair do Gach rud"
+#~ msgid ""
+#~ "Thanks\n"
+#~ "The Ximian Evolution Team\n"
+#~ msgstr ""
+#~ "Go raibh maith agat\n"
+#~ "An Fhoireann Evolution\n"
 
-msgid "_Reply"
-msgstr "_Freagrair"
+#~ msgid "Password:"
+#~ msgstr "Pasfhocal:"
 
-msgid "Save in _folder... (FIXME)"
-msgstr "Sábháil 'san _fillteán..."
+#, fuzzy
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "Evolution"
 
-msgid "_Appointment (FIXME)"
-msgstr "_Coinne"
+#~ msgid "Delete folder '%s'"
+#~ msgstr "Dealaigh Fillteán '%s'"
+
+#~ msgid "%d"
+#~ msgstr "%d"
+
+#~ msgid "%d/%m/%Y"
+#~ msgstr "%d/%m/%Y"
+
+#~ msgid "%Y/%m/%d"
+#~ msgstr "%a %d/%m/%Y"
+
+#~ msgid "_Company:"
+#~ msgstr "_Teoranta:"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Root DN:"
+#~ msgstr "Príomh DN:"
+
+#~ msgid "URI"
+#~ msgstr "URI"
+
+#~ msgid "a"
+#~ msgstr "a"
+
+#~ msgid "b"
+#~ msgstr "b"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "e"
+#~ msgstr "e"
+
+#~ msgid "f"
+#~ msgstr "f"
+
+#~ msgid "g"
+#~ msgstr "g"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "i"
+#~ msgstr "i"
+
+#~ msgid "j"
+#~ msgstr "j"
+
+#~ msgid "k"
+#~ msgstr "k"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "m"
+#~ msgstr "m"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "o"
+#~ msgstr "o"
+
+#~ msgid "p"
+#~ msgstr "p"
+
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "u"
+#~ msgstr "u"
+
+#~ msgid "v"
+#~ msgstr "v"
+
+#~ msgid "w"
+#~ msgstr "w"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "z"
+#~ msgstr "z"
+
+#~ msgid "Save calendar"
+#~ msgstr "Sábháil Feilire"
+
+#~ msgid "%I:%M%p"
+#~ msgstr "%I:%M%p"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid "Background:"
+#~ msgstr "Dúlra:"
+
+#~ msgid "View All"
+#~ msgstr "Taidpeáin Gach Rud"
+
+#~ msgid "_Day"
+#~ msgstr "_Lá"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Oscáil Feilire"
+
+#~ msgid "About..."
+#~ msgstr "Faoi..."
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "Leabhair Sheolaidh"
+
+#~ msgid "C_lear"
+#~ msgstr "G_lan"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Dún an coinne seo"
+
+#~ msgid "Pre_vious"
+#~ msgstr "_Riomh"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Socraigh Priontáil..."
+
+#~ msgid "_About..."
+#~ msgstr "_Faoi..."
+
+#, fuzzy
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Post sceál"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "Sábháil 'san _fillteán"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Nota"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Teasc"
+
+#~ msgid "Print message..."
+#~ msgstr "Clodaigh teachtairecht..."
+
+#~ msgid "Reply to all"
+#~ msgstr "Freagrair do Gach rud"
+
+#~ msgid "_Reply"
+#~ msgstr "_Freagrair"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Sábháil 'san _fillteán..."
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Coinne"
 
 #~ msgid ""
 #~ "\n"