updated Irish file

svn path=/trunk/; revision=12728

2 files changed, 2423 insertions, 2300 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index f58bb4d3ac..63f4520d12 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-10  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* ga.po: Updated Irish file
+
 2001-09-10  Yukihiro Nakai <nakai@gnome.gr.jp>
 
 	* ja.po: Update Japanese translation.
diff --git a/po/ga.po b/po/ga.po
index 38483c0be1..f18dfc5641 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,15 +1,14 @@
-# Irish language translation of evolution
+# Gaeillge (Irish) language translation of evolution
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Alastair McKinstry, <mckinstry@computer.org>, 2000.
+# Alastair McKinstry, <mckinstry@computer.org <mailto:mckinstry@computer.org>>, 2000.
 #
-#: mail/component-factory.c:97 mail/component-factory.c:98
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution CVS\n"
-"POT-Creation-Date: 2001-08-22 18:50-0400\n"
+"Project-Id-Version: evolution 0.13.99\n"
+"POT-Creation-Date: 2001-09-10 14:39+0200\n"
 "PO-Revision-Date: 2000-08-02 13:00:00-0000\n"
-"Last-Translator: Alastair McKinstry, <mckinstry@computer.org>\n"
-"Language-Team: Irish <ga@li.org>\n"
+"Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
+"Language-Team: Irish <ga@li.org <mailto:ga@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,197 +21,509 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3595
-msgid "Card: "
+#: addressbook/backend/ebook/e-card-simple.c:58
+#: addressbook/gui/widgets/e-addressbook-view.c:868
+msgid "File As"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:59
+msgid "Name"
+msgstr "Ainm"
+
+#: addressbook/backend/ebook/e-card-simple.c:60
+#, fuzzy
+msgid "Family Name"
+msgstr "Ainm Chomad:"
+
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/widgets/e-addressbook-view.c:870
+msgid "Email"
+msgstr "R-Post"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/contact-editor/e-contact-editor.c:1581
+#, fuzzy
+msgid "Primary"
+msgstr "Tosaíocht"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+#, fuzzy
+msgid "Prim"
+msgstr "Tosaíocht"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+msgid "Assistant"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
+#: addressbook/gui/contact-editor/e-contact-editor.c:1634
+msgid "Business"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+msgid "Bus"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+msgid "Callback"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
+msgid "Company"
+msgstr "Teoranta"
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#, fuzzy
+msgid "Comp"
+msgstr "Greamaigh"
+
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1635
+msgid "Home"
+msgstr "Baile"
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/gui/widgets/e-addressbook-view.c:877
+msgid "Organization"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+msgid "Org"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+msgid "Mobile"
+msgstr "Guthán Póca"
+
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+msgid "Car"
+msgstr "Car"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+msgid "Business Fax"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+msgid "Bus Fax"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+msgid "Home Fax"
+msgstr "Facs Bhaile"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+msgid "Business 2"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+msgid "Bus 2"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+msgid "Home 2"
+msgstr "Baile 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
+#: addressbook/gui/widgets/e-addressbook-view.c:886
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: mail/mail-config.glade.h:51
+msgid "Other"
+msgstr "Eile"
+
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+msgid "Other Fax"
+msgstr "Facs Eile"
+
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1580
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+msgid "Pager"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1582
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Radio"
+msgstr "Raidio"
+
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1583
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/widgets/e-addressbook-view.c:892
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/gui/widgets/e-addressbook-view.c:894
+msgid "Email 2"
+msgstr "Rphost 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+msgid "Email 3"
+msgstr "Rphost 3"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/widgets/e-addressbook-view.c:896
+msgid "Web Site"
+msgstr "Idirlíon"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+msgid "Url"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Department"
+msgstr "Roinn"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+msgid "Dep"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Office"
+msgstr "Oifig"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+#, fuzzy
+msgid "Off"
+msgstr "Oifig"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+msgid "Title"
+msgstr "Tidéal"
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:900
+msgid "Profession"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+msgid "Prof"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+msgid "Manager"
+msgstr "Bainisteoir"
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+#, fuzzy
+msgid "Man"
+msgstr "Bealtaine"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+msgid "Ass"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+msgid "Nickname"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+msgid "Nick"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+msgid "Spouse"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:905
+msgid "Note"
+msgstr "Nota"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:906
+msgid "Free-busy URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3597
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Anniversary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Anniv"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+#, fuzzy
+msgid "Birth Date"
+msgstr ""
+"\n"
+"Data Breithe: "
+
+#: addressbook/backend/ebook/e-card-simple.c:102
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3684
+msgid "Card: "
+msgstr "Carta: "
+
+#: addressbook/backend/ebook/e-card.c:3686
 msgid ""
 "\n"
 "Name: "
 msgstr ""
+"\n"
+"Ainm: "
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3687
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3688
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3689
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3690
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3691
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3616
+#: addressbook/backend/ebook/e-card.c:3705
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
+"\n"
+"Data Breithe: "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "Address:"
 msgstr ""
+"\n"
+"Seoladh:"
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
+"\n"
+" Bosca Phoist: "
 
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3720
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
+"\n"
+"  Sráid:       "
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3721
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
+"\n"
+"  Cathair:     "
 
-#: addressbook/backend/ebook/e-card.c:3633
+#: addressbook/backend/ebook/e-card.c:3722
+#, fuzzy
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
+"\n"
+"  Contae:      "
 
-#: addressbook/backend/ebook/e-card.c:3634
+#: addressbook/backend/ebook/e-card.c:3723
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
+"\n"
+"  Cód Phoist: "
 
-#: addressbook/backend/ebook/e-card.c:3635
+#: addressbook/backend/ebook/e-card.c:3724
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
+"\n"
+"  Tír:         "
 
-#: addressbook/backend/ebook/e-card.c:3648
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
+"\n"
+"Gutháin:\n"
 
-#: addressbook/backend/ebook/e-card.c:3663
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
+"\n"
+"Guthán:"
 
-#: addressbook/backend/ebook/e-card.c:3687
+#: addressbook/backend/ebook/e-card.c:3776
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
+"\n"
+"R-phost:\n"
 
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3779
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
+"\n"
+"R-phost:"
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3798
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3804
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3723
+#: addressbook/backend/ebook/e-card.c:3812
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
+"\n"
+"Áitiúl: "
 
-#: addressbook/backend/ebook/e-card.c:3727
+#: addressbook/backend/ebook/e-card.c:3816
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3739
+#: addressbook/backend/ebook/e-card.c:3828
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3740
+#: addressbook/backend/ebook/e-card.c:3829
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
+"\n"
+"  Ainm:  "
 
-#: addressbook/backend/ebook/e-card.c:3741
+#: addressbook/backend/ebook/e-card.c:3830
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3742
+#: addressbook/backend/ebook/e-card.c:3831
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3743
+#: addressbook/backend/ebook/e-card.c:3832
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3833
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3837
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3838
 msgid ""
 "\n"
 "Comment: "
@@ -228,27 +539,29 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3762
+#: addressbook/backend/ebook/e-card.c:3851
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3765
+#: addressbook/backend/ebook/e-card.c:3854
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
+"\n"
+"Eochair Poiblí: "
 
-#: addressbook/backend/ebook/e-card.c:4037
+#: addressbook/backend/ebook/e-card.c:4204
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "Post an sceál seo"
 
-#: addressbook/backend/ebook/e-card.c:4045
-#, c-format
+#: addressbook/backend/ebook/e-card.c:4212
+#, fuzzy, c-format
 msgid "VCard for %s"
-msgstr ""
+msgstr "Teíp ag fork: %s"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
@@ -258,7 +571,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-factory.c:48
 #: calendar/conduits/calendar/calendar-conduit.c:1204
 #: calendar/conduits/todo/todo-conduit.c:1018
-#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr ""
 
@@ -324,45 +637,47 @@ msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:66
 #: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
-#: shell/e-shortcuts.c:1048
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1063
 #, fuzzy
 msgid "Contacts"
-msgstr "_Coinne"
+msgstr "CHlófhoireanna"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:66
 msgid "Folder containing contact information"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-component.c:68
+msgid "LDAP Server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:68
+msgid "LDAP server containing contact information"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-component.c:386
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
-msgstr "_Coinne"
+msgstr "Scríos an sceal seo"
 
 #: addressbook/gui/component/addressbook-component.c:386
 #, fuzzy
 msgid "New _Contact"
-msgstr "_Coinne"
+msgstr "Scríos an sceal seo"
 
 #: addressbook/gui/component/addressbook-component.c:387
-#, fuzzy
 msgid "New Contact List"
-msgstr "_Coinne"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:387
-#, fuzzy
 msgid "New Contact _List"
-msgstr "_Coinne"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:144
 msgid "Edit Addressbook"
@@ -373,9 +688,8 @@ msgid "389"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:2
-#, fuzzy
 msgid "Account Name"
-msgstr "_Oscáil"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
 msgid "Add Addressbook"
@@ -386,9 +700,8 @@ msgid "Addressbook Sources"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#, fuzzy
 msgid "Advanced"
-msgstr "_Fillteán"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:6
 msgid "Base"
@@ -411,22 +724,21 @@ msgstr ""
 #: addressbook/gui/component/addressbook-config.glade.h:10
 #, fuzzy
 msgid "Search _base:"
-msgstr "Post"
+msgstr "Cuardaigh"
 
 #: addressbook/gui/component/addressbook-config.glade.h:11
-#, fuzzy
 msgid "Search s_cope: "
-msgstr "Post"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:12
 #, fuzzy
 msgid "Server Name"
-msgstr "Fillteán _Nua"
+msgstr "Post"
 
 #: addressbook/gui/component/addressbook-config.glade.h:13
 #, fuzzy
 msgid "Sub"
-msgstr "Abair"
+msgstr "Do"
 
 #: addressbook/gui/component/addressbook-config.glade.h:14
 msgid "The information below is required in order to add an addressbook.  "
@@ -465,24 +777,25 @@ msgstr ""
 #: addressbook/gui/component/addressbook-config.glade.h:21
 #, fuzzy
 msgid "_Account name:"
-msgstr "_Oscáil"
+msgstr "Ainm Grupa:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
-msgstr ""
+msgstr "_Suimigh"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
 #: filter/filter.glade.h:9 mail/mail-config.glade.h:95
-#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:36
+#: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
-msgstr ""
+msgstr "_Eagar"
 
 #: addressbook/gui/component/addressbook-config.glade.h:24
 msgid "_My server requires authentication"
@@ -498,39 +811,40 @@ msgstr "Tosaíocht"
 msgid "_Server name:"
 msgstr "Post"
 
-#: addressbook/gui/component/addressbook-storage.c:138
+#: addressbook/gui/component/addressbook-storage.c:163
 msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:393
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:394
+#: addressbook/gui/component/addressbook.c:401
 msgid "LDAP Authentication"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:405
+#: addressbook/gui/component/addressbook.c:412
 msgid "Email Address:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:418
+#: addressbook/gui/component/addressbook.c:425
+#, fuzzy
 msgid "Password:"
-msgstr ""
+msgstr "Pasfhocal"
 
-#: addressbook/gui/component/addressbook.c:481
+#: addressbook/gui/component/addressbook.c:488
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:495
 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:493
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -538,45 +852,43 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:508
 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:642
+#: addressbook/gui/component/addressbook.c:649
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:650
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:651
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:645
+#: addressbook/gui/component/addressbook.c:652
 #: calendar/gui/cal-search-bar.c:59
-#, fuzzy
 msgid "Category is"
-msgstr "Abair"
+msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:874
+#: addressbook/gui/component/addressbook.c:883
 #: calendar/gui/cal-search-bar.c:412
-#, fuzzy
 msgid "Any Category"
-msgstr "Tosaíocht"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:912
+#: addressbook/gui/component/addressbook.c:925
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -588,26 +900,14 @@ msgstr ""
 #: addressbook/gui/component/e-address-popup.c:178
 #, fuzzy
 msgid "(none)"
-msgstr "_Nota"
+msgstr "(gan ainm)"
 
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
+#: addressbook/gui/contact-editor/e-contact-editor.c:1608
 msgid "Primary Email"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:860
-msgid "Email 2"
-msgstr ""
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
-#: addressbook/gui/widgets/e-addressbook-view.c:861
-msgid "Email 3"
-msgstr ""
-
 #: addressbook/gui/component/e-address-popup.c:579
 #, fuzzy
 msgid "Select an Action"
@@ -629,19 +929,20 @@ msgstr ""
 
 #: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:310
+#: addressbook/gui/component/select-names/e-select-names-popup.c:332
 msgid "Edit Contact Info"
 msgstr ""
 
 #: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:383
+#: addressbook/gui/component/select-names/e-select-names-popup.c:504
 msgid "Add to Contacts"
 msgstr ""
 
 #: addressbook/gui/component/e-address-popup.c:1006
+#, fuzzy
 msgid "Merge E-Mail Address"
-msgstr ""
+msgstr "Seoladh Eile"
 
 #: addressbook/gui/component/e-address-widget.c:365
 msgid "Disable Queries"
@@ -659,34 +960,45 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:729
+#: addressbook/gui/component/select-names/e-select-names-popup.c:164
+#: addressbook/gui/component/select-names/e-select-names.c:755
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
-#: shell/e-shortcuts-view.c:385
+#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:181
 msgid "Remove"
 msgstr "Scríos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
-#, fuzzy
+#: addressbook/gui/component/select-names/e-select-names-popup.c:179
 msgid "Remove All"
-msgstr "Scríos"
+msgstr "Scríos Gach Rud"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#: addressbook/gui/component/select-names/e-select-names-popup.c:203
 #, fuzzy
 msgid "Send HTML Mail?"
 msgstr "Post"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:368
+#: addressbook/gui/component/select-names/e-select-names-popup.c:418
+#, c-format
+msgid "(%d not shown)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:432
+msgid "Edit Contact List"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:453
+msgid "Unnamed Contact List"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:527
 #, fuzzy
 msgid "Unnamed Contact"
-msgstr "_Coinne"
+msgstr "Scríos an sceal seo"
 
-#: addressbook/gui/component/select-names/e-select-names.c:487
+#: addressbook/gui/component/select-names/e-select-names.c:521
 msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:594
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -695,19 +1007,16 @@ msgid "C_ontaining:"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-#, fuzzy
 msgid "Co_ntacts:"
-msgstr "_Coinne"
+msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-#, fuzzy
 msgid "F_ind"
-msgstr "Priontáil"
+msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-#, fuzzy
 msgid "Select Names"
-msgstr "Fillteán _Nua"
+msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show contacts matching the following criteria:"
@@ -716,7 +1025,7 @@ msgstr ""
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "_Category:"
-msgstr "Tosaíocht"
+msgstr "_Cathair:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
@@ -724,9 +1033,8 @@ msgid "_Folder:"
 msgstr "_Fillteán"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:8
-#, fuzzy
 msgid "_Message Recipients:"
-msgstr "_Post sceál"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
@@ -734,7 +1042,7 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
-msgstr ""
+msgstr "_Gnó"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
@@ -746,7 +1054,9 @@ msgstr ""
 msgid "Ca_tegories..."
 msgstr ""
 
+#. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor.c:1213
 msgid "Contact Editor"
 msgstr ""
 
@@ -758,24 +1068,24 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
 #, fuzzy
 msgid "File A_s:"
-msgstr "_Fillteán"
+msgstr "Comhad"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "General"
-msgstr ""
+msgstr "Gnáth"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#, fuzzy
 msgid "No_tes:"
-msgstr "_Nota"
+msgstr "_Notaí:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
 msgid "Organi_zation:"
-msgstr ""
+msgstr "Treshuíomh"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
@@ -787,7 +1097,7 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "_Address..."
-msgstr ""
+msgstr "S_eoladh..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Assistant's name:"
@@ -795,11 +1105,11 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Birthday:"
-msgstr ""
+msgstr "_Breithlá:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Business"
-msgstr ""
+msgstr "_Gnó"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: calendar/gui/dialogs/event-page.glade.h:12
@@ -809,13 +1119,12 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
-#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: calendar/gui/dialogs/meeting-page.c:1483 filter/filter.glade.h:8
+#: mail/folder-browser.c:1318 mail/mail-config.glade.h:94
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
-#, fuzzy
 msgid "_Delete"
-msgstr "Scríos"
+msgstr "_Scríos"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Department:"
@@ -826,9 +1135,8 @@ msgid "_Full Name..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
-#, fuzzy
 msgid "_Home"
-msgstr "_Nota"
+msgstr "_Baile"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Job title:"
@@ -840,7 +1148,7 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Mobile"
-msgstr ""
+msgstr "_Guthán Póca"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Nickname:"
@@ -848,7 +1156,7 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Office:"
-msgstr ""
+msgstr "_Oifig:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Profession:"
@@ -871,123 +1179,35 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Scríos an sceal seo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:730
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
-#: addressbook/gui/widgets/e-addressbook-view.c:868
-msgid "Assistant"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
-msgid "Business"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
-msgid "Business 2"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: addressbook/gui/widgets/e-addressbook-view.c:848
-msgid "Business Fax"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1565
-msgid "Callback"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1566
-msgid "Car"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1567
-#, fuzzy
-msgid "Company"
-msgstr "Greamaigh"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1568
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-msgid "Home"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1569
-msgid "Home 2"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1570
-#: addressbook/gui/widgets/e-addressbook-view.c:849
-msgid "Home Fax"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1571
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-msgid "ISDN"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1572
-msgid "Mobile"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1573
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: mail/mail-config.glade.h:51
-msgid "Other"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1574
-#: addressbook/gui/widgets/e-addressbook-view.c:854
-msgid "Other Fax"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
-#: addressbook/gui/widgets/e-addressbook-view.c:855
-msgid "Pager"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1576
-#, fuzzy
-msgid "Primary"
-msgstr "Tosaíocht"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1577
-#: addressbook/gui/widgets/e-addressbook-view.c:856
-msgid "Radio"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1578
-#: addressbook/gui/widgets/e-addressbook-view.c:857
-msgid "Telex"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1579
+#: addressbook/gui/contact-editor/e-contact-editor.c:1584
 msgid "TTY/TDD"
-msgstr ""
+msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2198
-#, fuzzy, c-format
+#: addressbook/gui/contact-editor/e-contact-editor.c:2203
+#, c-format
 msgid "Could not find widget for a field: `%s'"
-msgstr "Post an sceál seo"
+msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
 msgid "Edit Full"
-msgstr "_Fillteán"
+msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#: addressbook/gui/widgets/e-addressbook-view.c:835
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
 msgid "E-mail"
-msgstr "Post"
+msgstr "R-phost"
 
 #: addressbook/gui/contact-editor/e-contact-save-as.c:137
 #, c-format
@@ -998,7 +1218,7 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
-msgstr ""
+msgstr "Seolash _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Afghanistan"
@@ -1037,8 +1257,9 @@ msgid "Antigua And Barbuda"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#, fuzzy
 msgid "Argentina"
-msgstr ""
+msgstr "Treshuíomh"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:12
 msgid "Armenia"
@@ -1053,8 +1274,9 @@ msgid "Australia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#, fuzzy
 msgid "Austria"
-msgstr ""
+msgstr "Lúnasa"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:16
 msgid "Azerbaijan"
@@ -1090,9 +1312,8 @@ msgid "Belize"
 msgstr "Méid"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:24
-#, fuzzy
 msgid "Benin"
-msgstr "Post"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:25
 msgid "Bermuda"
@@ -1119,9 +1340,8 @@ msgid "Bouvet Island"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:31
-#, fuzzy
 msgid "Brazil"
-msgstr "Post"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:32
 msgid "British Indian Ocean Territory"
@@ -1157,7 +1377,7 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:40
 msgid "Canada"
-msgstr ""
+msgstr "Ceanada"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:41
 msgid "Cape Verde"
@@ -1172,8 +1392,9 @@ msgid "Central African Republic"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#, fuzzy
 msgid "Chad"
-msgstr ""
+msgstr "Cahtaoirleach"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:45
 msgid "Check Address"
@@ -1182,11 +1403,12 @@ msgstr ""
 #: addressbook/gui/contact-editor/fulladdr.glade.h:46
 #, fuzzy
 msgid "Chile"
-msgstr "_Fillteán"
+msgstr "Comhad"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#, fuzzy
 msgid "China"
-msgstr ""
+msgstr "Cahtaoirleach"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:48
 msgid "Christmas Island"
@@ -1203,12 +1425,11 @@ msgstr ""
 #: addressbook/gui/contact-editor/fulladdr.glade.h:51
 #, fuzzy
 msgid "Comoros"
-msgstr "_Nota"
+msgstr "Dathanna"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:52
-#, fuzzy
 msgid "Congo"
-msgstr "Greamaigh"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:53
 msgid "Cook Islands"
@@ -1224,7 +1445,7 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:56
 msgid "Countr_y:"
-msgstr ""
+msgstr "_Tír:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:57
 msgid "Croatia"
@@ -1355,24 +1576,27 @@ msgid "Greenland"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#, fuzzy
 msgid "Grenada"
-msgstr ""
+msgstr "Ceanada"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:90
 msgid "Guadeloupe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#, fuzzy
 msgid "Guam"
-msgstr ""
+msgstr "rn"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:92
 msgid "Guatemala"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#, fuzzy
 msgid "Guinea"
-msgstr ""
+msgstr "Gnáth"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:94
 msgid "Guinea-bissau"
@@ -1383,9 +1607,8 @@ msgid "Guyana"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:96
-#, fuzzy
 msgid "Haiti"
-msgstr "Post"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:97
 msgid "Heard And McDonald Islands"
@@ -1406,7 +1629,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fulladdr.glade.h:101
 #, fuzzy
 msgid "Hungary"
-msgstr "Post"
+msgstr "Domhnaigh"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:102
 msgid "Iceland"
@@ -1497,8 +1720,9 @@ msgid "Luxembourg"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#, fuzzy
 msgid "Macau"
-msgstr ""
+msgstr "Marta"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:125
 msgid "Macedonia"
@@ -1509,9 +1733,8 @@ msgid "Madagascar"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:127
-#, fuzzy
 msgid "Malawi"
-msgstr "Post"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:128
 msgid "Malaysia"
@@ -1522,14 +1745,12 @@ msgid "Maldives"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:130
-#, fuzzy
 msgid "Mali"
-msgstr "Post"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:131
-#, fuzzy
 msgid "Malta"
-msgstr "Post"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:132
 msgid "Marshall Islands"
@@ -1548,8 +1769,9 @@ msgid "Mauritius"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#, fuzzy
 msgid "Mayotte"
-msgstr ""
+msgstr "Bealtaine"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:137
 msgid "Mexico"
@@ -1560,8 +1782,9 @@ msgid "Micronesia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#, fuzzy
 msgid "Monaco"
-msgstr ""
+msgstr "Luain"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:140
 msgid "Mongolia"
@@ -1576,12 +1799,14 @@ msgid "Morocco"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#, fuzzy
 msgid "Mozambique"
-msgstr ""
+msgstr "Guthán Póca"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#, fuzzy
 msgid "Myanmar"
-msgstr ""
+msgstr "Bainisteoir"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:145
 msgid "Namibia"
@@ -1594,25 +1819,24 @@ msgstr ""
 #: addressbook/gui/contact-editor/fulladdr.glade.h:147
 #, fuzzy
 msgid "Nepal"
-msgstr "Freagrair"
+msgstr "Post Nua"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:148
-#, fuzzy
 msgid "Netherlands"
-msgstr "_Nota"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:149
 msgid "Netherlands Antilles"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:150
-#, fuzzy
 msgid "New Caledonia"
-msgstr "_Coinne"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#, fuzzy
 msgid "New Zealand"
-msgstr ""
+msgstr "Post Nua"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:152
 msgid "Nicaragua"
@@ -1641,24 +1865,24 @@ msgstr ""
 #: addressbook/gui/contact-editor/fulladdr.glade.h:158
 #, fuzzy
 msgid "Norway"
-msgstr "Sheoladh Chuig duine"
+msgstr "Anois"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:159
 msgid "Oman"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:160
-#, fuzzy
 msgid "Pakistan"
-msgstr "Priontáil"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:161
 msgid "Palau"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#, fuzzy
 msgid "Panama"
-msgstr ""
+msgstr "Ceanada"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:163
 msgid "Papua New Guinea"
@@ -1669,8 +1893,9 @@ msgid "Paraguay"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#, fuzzy
 msgid "Peru"
-msgstr ""
+msgstr "Paipéir"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:166
 msgid "Philippines"
@@ -1681,14 +1906,12 @@ msgid "Pitcairn"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:168
-#, fuzzy
 msgid "Poland"
-msgstr "Post"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:169
-#, fuzzy
 msgid "Portugal"
-msgstr "Tosaíocht"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:170
 msgid "Puerto Rico"
@@ -1707,9 +1930,8 @@ msgid "Republic Of Moldova"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:174
-#, fuzzy
 msgid "Reunion"
-msgstr "Post"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:175
 msgid "Romania"
@@ -1722,7 +1944,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fulladdr.glade.h:177
 #, fuzzy
 msgid "Rwanda"
-msgstr "Post"
+msgstr "Ceanada"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:178
 msgid "Saint Kitts And Nevis"
@@ -1755,7 +1977,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fulladdr.glade.h:185
 #, fuzzy
 msgid "Senegal"
-msgstr "Post"
+msgstr "Gnáth"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:186
 msgid "Seychelles"
@@ -1784,7 +2006,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fulladdr.glade.h:192
 #, fuzzy
 msgid "Somalia"
-msgstr "Sheoladh Chuig duine"
+msgstr "Gnáth"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:193
 msgid "South Africa"
@@ -1795,9 +2017,8 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:195
-#, fuzzy
 msgid "Spain"
-msgstr "Post"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:196
 msgid "Sri Lanka"
@@ -1814,7 +2035,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fulladdr.glade.h:199
 #, fuzzy
 msgid "Sudan"
-msgstr "Post"
+msgstr "Dom"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:200
 msgid "Suriname"
@@ -1825,9 +2046,8 @@ msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:202
-#, fuzzy
 msgid "Swaziland"
-msgstr "Post"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:203
 #, fuzzy
@@ -1843,9 +2063,8 @@ msgid "Taiwan"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:206
-#, fuzzy
 msgid "Tajikistan"
-msgstr "_Teacs"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:207
 msgid "Thailand"
@@ -1861,8 +2080,9 @@ msgid "Tokelau"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#, fuzzy
 msgid "Tonga"
-msgstr ""
+msgstr "Inniú"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:211
 msgid "Trinidad And Tobago"
@@ -1875,12 +2095,11 @@ msgstr ""
 #: addressbook/gui/contact-editor/fulladdr.glade.h:213
 #, fuzzy
 msgid "Turkey"
-msgstr "_Teacs"
+msgstr "Mai"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:214
-#, fuzzy
 msgid "Turkmenistan"
-msgstr "_Teacs"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:215
 msgid "Turks And Caicos Islands"
@@ -1897,7 +2116,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fulladdr.glade.h:218
 #, fuzzy
 msgid "Uganda"
-msgstr "Leasú"
+msgstr "Ceanada"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:219
 msgid "Ukraine"
@@ -1916,9 +2135,8 @@ msgid "United Republic Of Tanzania"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:223
-#, fuzzy
 msgid "United States"
-msgstr "Post an sceál seo"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:224
 msgid "United States Minor Outlying Islands"
@@ -1941,9 +2159,8 @@ msgid "Venezuela"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:229
-#, fuzzy
 msgid "Viet Nam"
-msgstr "Fillteán _Nua"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:230
 msgid "Wallis And Futuna Islands"
@@ -1954,9 +2171,8 @@ msgid "Western Sahara"
 msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:232
-#, fuzzy
 msgid "Yemen"
-msgstr "Post"
+msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:233
 msgid "Yugoslavia"
@@ -1972,16 +2188,15 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:236
 msgid "_Address:"
-msgstr ""
+msgstr "_Seoladh:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:237
-#, fuzzy
 msgid "_City:"
-msgstr "Tosaíocht"
+msgstr "_Cathair:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:238
 msgid "_PO Box:"
-msgstr ""
+msgstr "Bosca _Phoist:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:239
 msgid "_State/Province:"
@@ -1989,7 +2204,7 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:240
 msgid "_ZIP Code:"
-msgstr ""
+msgstr "Cód _ZIP:"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
@@ -1997,7 +2212,7 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
-msgstr ""
+msgstr "Dr."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
@@ -2005,15 +2220,15 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
-msgstr ""
+msgstr "I"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
-msgstr ""
+msgstr "II"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
-msgstr ""
+msgstr "III"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
@@ -2057,17 +2272,17 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
-msgstr ""
+msgstr "_Tidéal:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #, fuzzy
 msgid "List _name:"
-msgstr "Fillteán _Nua"
+msgstr "Ainm Stíl:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 #, fuzzy
 msgid "Members"
-msgstr "Post"
+msgstr "Samhain"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Type an email address or drag a contact into the list below:"
@@ -2104,7 +2319,7 @@ msgstr ""
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 #, fuzzy
 msgid "New Contact:"
-msgstr "_Coinne"
+msgstr "Scríos an sceal seo"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 msgid "Original Contact:"
@@ -2140,165 +2355,66 @@ msgid "Advanced Search"
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:260
+#: mail/mail-search.c:264
 msgid "Search"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#, fuzzy
-msgid "o"
-msgstr "Do"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-#, fuzzy
-msgid "r"
-msgstr "Ó:"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr ""
+msgstr "Cuardaigh"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
+#: addressbook/gui/widgets/e-addressbook-model.c:121
+msgid "No cards"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
+#: addressbook/gui/widgets/e-addressbook-model.c:124
+msgid "1 card"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-model.c:127
+#, fuzzy, c-format
+msgid "%d cards"
+msgstr "Post"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
-#: addressbook/gui/widgets/e-addressbook-view.c:655
-#: addressbook/gui/widgets/e-addressbook-view.c:717
-#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:138
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:691
+#: addressbook/gui/widgets/e-addressbook-view.c:753
+#: addressbook/gui/widgets/e-addressbook-view.c:1373
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
-#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
-msgstr "_Oscáil"
+msgstr "Oscáil"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:754
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Sheoladh Chuig duine"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:755
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "_Post sceál"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:756
 #: 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:63
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Priontáil"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:722
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
+#: addressbook/gui/widgets/e-addressbook-view.c:758
 msgid "Print Envelope"
-msgstr "Post an sceál seo"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
+#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:8
+#: mail/mail-accounts.c:282 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:16
 #: ui/evolution-tasks.xml.h:8
@@ -2307,7 +2423,7 @@ msgstr "Scríos"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
 #: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:451
+#: addressbook/gui/widgets/e-minicard.c:452
 msgid "Error modifying card"
 msgstr ""
 
@@ -2316,10 +2432,10 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1654
 #: shell/e-storage.c:515
 msgid "Unknown error"
-msgstr ""
+msgstr "iEarraidh gan Aithne"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 msgid "Repository offline"
@@ -2344,14 +2460,15 @@ msgstr ""
 #: addressbook/gui/widgets/e-addressbook-util.c:41
 #: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
-#: camel/camel-service.c:581
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
 msgid "Other error"
-msgstr ""
+msgstr "Earraigh I/A"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:59
 msgid "Error adding list"
@@ -2370,140 +2487,84 @@ msgid "Error removing list"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1218
+#: addressbook/gui/widgets/e-addressbook-view.c:1248
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-msgid "* Click here to add a contact *"
+#. 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:399
+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 ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:834
-#, fuzzy
-msgid "File As"
-msgstr "_Fillteán"
+#. Translators: put here a list of characters that correspond to buttons
+#. 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:404
+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 ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:836
-#, fuzzy
-msgid "Email"
-msgstr "Post"
+#: addressbook/gui/widgets/e-addressbook-view.c:867
+msgid "* Click here to add a contact *"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:837
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Primary Phone"
-msgstr "Tosaíocht"
+msgstr "Príomh Guthán"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:839
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:840
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:841
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Company Phone"
-msgstr "Greamaigh"
+msgstr "Guthán sa Gnó"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:842
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Home Phone"
-msgstr ""
+msgstr "Guthán sa Baile"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:843
-msgid "Organization"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:844
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:845
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Home Address"
-msgstr ""
+msgstr "Seoladh Bhaile"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:846
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Mobile Phone"
-msgstr ""
+msgstr "Guthán Póca"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:847
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Car Phone"
-msgstr ""
+msgstr "Guthán Ghluasteáin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Home Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Other Phone"
-msgstr ""
+msgstr "Guthán Eile"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
-msgid "TTY"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Other Address"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:862
-msgid "Web Site"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:863
-msgid "Department"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:864
-msgid "Office"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:865
-#, fuzzy
-msgid "Title"
-msgstr "_Fillteán"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:866
-msgid "Profession"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:867
-msgid "Manager"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:869
-msgid "Nickname"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:870
-msgid "Spouse"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:871
-#, fuzzy
-msgid "Note"
-msgstr "_Nota"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:872
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1215
-#, fuzzy
-msgid "Done."
-msgstr "_Nota"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1247
-msgid "Removing cards..."
-msgstr ""
+msgstr "Seoladh Eile"
 
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
@@ -2520,15 +2581,15 @@ msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
-msgstr ""
+msgstr "Radharc Carta"
 
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
-msgstr ""
+msgstr "Tahoma 10pt."
 
 #: addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
-msgstr ""
+msgstr "Tahoma 8pt."
 
 #: addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
@@ -2540,7 +2601,7 @@ msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
-msgstr ""
+msgstr "Bun:"
 
 #: addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
@@ -2549,26 +2610,23 @@ msgstr ""
 #: addressbook/printing/e-contact-print.glade.h:7
 #, fuzzy
 msgid "F_ont..."
-msgstr "Priontáil"
+msgstr "Chlófhoireann..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
-msgstr ""
+msgstr "CHlófhoireanna"
 
 #: addressbook/printing/e-contact-print.glade.h:9
-#, fuzzy
 msgid "Footer:"
-msgstr "_Fillteán"
+msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:10
-#, fuzzy
 msgid "Format"
-msgstr "Sheoladh Chuig duine"
+msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:11
-#, fuzzy
 msgid "Header"
-msgstr "Post"
+msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
@@ -2584,7 +2642,7 @@ msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
-msgstr ""
+msgstr "Airde:"
 
 #: addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
@@ -2600,7 +2658,7 @@ msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
-msgstr ""
+msgstr "Clé:"
 
 #: addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
@@ -2615,35 +2673,32 @@ msgid "Number of columns:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:23
-#, fuzzy
 msgid "Options"
-msgstr "_Oscáil"
+msgstr "Roghanna"
 
 #: addressbook/printing/e-contact-print.glade.h:24
 msgid "Orientation"
-msgstr ""
+msgstr "Treshuíomh"
 
 #: addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
-msgstr ""
+msgstr "Leathanach"
 
 #: addressbook/printing/e-contact-print.glade.h:26
-#, fuzzy
 msgid "Page Setup:"
-msgstr "Priontáil"
+msgstr "Socraigh Leathanach:"
 
 #: addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
-msgstr ""
+msgstr "Paipéir"
 
 #: addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:29
-#, fuzzy
 msgid "Portrait"
-msgstr "Tosaíocht"
+msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
@@ -2659,7 +2714,7 @@ msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
-msgstr ""
+msgstr "Deis:"
 
 #: addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
@@ -2670,45 +2725,41 @@ msgid "Shading"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:36
-#, fuzzy
 msgid "Size:"
-msgstr "Méid"
+msgstr "Méid:"
 
 #: addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:38
-#, fuzzy
 msgid "Style name:"
-msgstr "Fillteán _Nua"
+msgstr "Ainm Stíl:"
 
 #: addressbook/printing/e-contact-print.glade.h:39
-#, fuzzy
 msgid "Top:"
-msgstr "Do:"
+msgstr "Thar:"
 
 #: addressbook/printing/e-contact-print.glade.h:40
-#, fuzzy
 msgid "Type:"
-msgstr "Do:"
+msgstr "Saghas:"
 
 #: addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
-msgstr ""
+msgstr "Leitheid:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
 #, fuzzy
 msgid "_Font..."
-msgstr "Priontáil"
+msgstr "Chlófhoireann..."
 
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1092
 #, fuzzy
 msgid "Print cards"
 msgstr "Priontáil"
 
-#: addressbook/printing/e-contact-print.c:1111
-#: addressbook/printing/e-contact-print.c:1133
+#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1134
 #, fuzzy
 msgid "Print card"
 msgstr "Priontáil"
@@ -2717,7 +2768,7 @@ msgstr "Priontáil"
 #: addressbook/printing/e-contact-print-envelope.c:237
 #, fuzzy
 msgid "Print envelope"
-msgstr "Post an sceál seo"
+msgstr "Socraigh Priontáil "
 
 #: calendar/conduits/calendar/calendar-conduit.c:735
 #: calendar/conduits/todo/todo-conduit.c:548
@@ -2755,19 +2806,19 @@ msgid "Factory for the Calendar Summary component."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
+msgid "Factory for the calendar iTip view control"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
+msgid "Factory for the sample Calendar control"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
+msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory to centralize calendar component editor dialogs"
+msgid "Factory to create a component editor factory"
 msgstr ""
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
@@ -2825,12 +2876,11 @@ msgstr ""
 #: ui/evolution-comp-editor.xml.h:1
 #, fuzzy
 msgid "C_lose"
-msgstr "_Fillteán"
+msgstr "Dún"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#, fuzzy
 msgid "Snoo_ze"
-msgstr "Méid"
+msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
@@ -2839,28 +2889,27 @@ msgstr ""
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #, fuzzy
 msgid "_Edit appointment"
-msgstr "_Coinne"
+msgstr "Eagar coinne"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:487
+#: calendar/gui/alarm-notify/alarm-queue.c:606
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:700
-#: calendar/gui/alarm-notify/alarm-queue.c:999
-#: calendar/gui/alarm-notify/alarm-queue.c:1055
+#: calendar/gui/alarm-notify/alarm-queue.c:825
+#: calendar/gui/alarm-notify/alarm-queue.c:1124
+#: calendar/gui/alarm-notify/alarm-queue.c:1180
 msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:991
-#, fuzzy
+#: calendar/gui/alarm-notify/alarm-queue.c:1116
 msgid "Snooze"
-msgstr "Méid"
+msgstr ""
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:1004
-#: calendar/gui/alarm-notify/alarm-queue.c:1059
+#: calendar/gui/alarm-notify/alarm-queue.c:1129
+#: calendar/gui/alarm-notify/alarm-queue.c:1184
 msgid "Ok"
-msgstr ""
+msgstr "Ceart go Leor"
 
 #: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
@@ -2869,11 +2918,11 @@ msgid ""
 "know."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:106
 msgid "Could not initialize gnome-vfs"
 msgstr ""
 
@@ -2881,51 +2930,52 @@ msgstr ""
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:426
+#, fuzzy
 msgid "%A %d %B %Y"
-msgstr ""
+msgstr "i%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:417 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:429 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
-msgstr ""
+msgstr "aa %d %b"
 
-#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
-#: calendar/gui/calendar-commands.c:426
+#: calendar/gui/calendar-commands.c:431 calendar/gui/calendar-commands.c:436
+#: calendar/gui/calendar-commands.c:438
+#, fuzzy
 msgid "%a %d %b %Y"
-msgstr ""
+msgstr "%a %d %Y"
 
-#: calendar/gui/calendar-commands.c:435
-#, c-format
+#: calendar/gui/calendar-commands.c:447
+#, fuzzy, c-format
 msgid "%d"
-msgstr ""
+msgstr "d"
 
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
-#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#: calendar/gui/calendar-commands.c:449 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:464
+#, fuzzy
 msgid "%d %B %Y"
-msgstr ""
+msgstr "%d %B"
 
 #. 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:442
+#: calendar/gui/calendar-commands.c:454
 #: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
-#: my-evolution/e-summary-calendar.c:240
 msgid "%d %B"
-msgstr ""
+msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:604
+#: calendar/gui/calendar-commands.c:664
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
 #: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
 #: calendar/gui/e-calendar-table.c:307
-#, fuzzy
 msgid "Private"
-msgstr "Priontáil"
+msgstr "Priobhádach"
 
 #: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
 #: calendar/gui/e-calendar-table.c:308
@@ -2938,11 +2988,11 @@ msgstr ""
 
 #: calendar/gui/calendar-model.c:454
 msgid "N"
-msgstr ""
+msgstr "T"
 
 #: calendar/gui/calendar-model.c:454
 msgid "S"
-msgstr ""
+msgstr "D"
 
 #: calendar/gui/calendar-model.c:456
 msgid "E"
@@ -2950,25 +3000,24 @@ msgstr ""
 
 #: calendar/gui/calendar-model.c:456
 msgid "W"
-msgstr ""
+msgstr "I"
 
 #: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
 msgid "High"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
 #: calendar/gui/calendar-model.c:1624
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
 msgid "Normal"
-msgstr "Sheoladh Chuig duine"
+msgstr "Gnáth"
 
 #: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
 msgid "Low"
 msgstr ""
 
@@ -2976,7 +3025,7 @@ msgstr ""
 #: calendar/gui/e-calendar-table.c:380
 #, fuzzy
 msgid "Free"
-msgstr "Ó:"
+msgstr "Ao"
 
 #: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
@@ -2996,22 +3045,22 @@ msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
-#: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:403
 msgid "Completed"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:323
 msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr ""
+msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:332
 msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr ""
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
 #: calendar/gui/calendar-model.c:847
 #, c-format
@@ -3044,16 +3093,15 @@ msgid "Undefined"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
-#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
-#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:360
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1430
+#: mail/mail-accounts.c:144 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:49
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
 #: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
 #: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
-#, fuzzy
 msgid "None"
-msgstr "_Nota"
+msgstr "Ar Bith"
 
 #: calendar/gui/calendar-model.c:1626
 msgid "Recurring"
@@ -3063,31 +3111,31 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:1187
-#: calendar/gui/dialogs/meeting-page.c:1283
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:637
+#: calendar/gui/dialogs/meeting-page.c:647
+#: calendar/gui/dialogs/meeting-page.c:1179
+#: calendar/gui/dialogs/meeting-page.c:1286
 msgid "Yes"
-msgstr ""
+msgstr "Tá"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1284
-#, fuzzy
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:649
+#: calendar/gui/dialogs/meeting-page.c:1287
 msgid "No"
-msgstr "_Nota"
+msgstr "Níl"
 
 #: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
 #, fuzzy
 msgid "Day View"
-msgstr "_Nua"
+msgstr "Radharc Carta"
 
 #: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr ""
 
 #: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
 msgid "Week View"
-msgstr ""
+msgstr "Seachtain"
 
 #: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
 #, fuzzy
@@ -3095,66 +3143,61 @@ msgid "Month View"
 msgstr "Priontáil"
 
 #: calendar/gui/cal-search-bar.c:56
-#, fuzzy
 msgid "Summary contains"
-msgstr "Abair"
+msgstr ""
 
 #: calendar/gui/cal-search-bar.c:57
 msgid "Description contains"
 msgstr ""
 
 #: calendar/gui/cal-search-bar.c:58
-#, fuzzy
 msgid "Comment contains"
-msgstr "Abair"
+msgstr ""
 
 #: calendar/gui/cal-search-bar.c:416
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
-#, fuzzy
+#: calendar/gui/component-factory.c:61 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1057
 msgid "Calendar"
-msgstr "_Fillteán"
+msgstr "Feilire"
 
-#: calendar/gui/component-factory.c:55
+#: calendar/gui/component-factory.c:62
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: calendar/gui/component-factory.c:66 calendar/gui/print.c:1707
 #: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
-#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1060
 #: views/tasks/galview.xml.h:1
-#, fuzzy
 msgid "Tasks"
-msgstr "_Teacs"
+msgstr ""
 
-#: calendar/gui/component-factory.c:56
-#, fuzzy
+#: calendar/gui/component-factory.c:67
 msgid "Folder containing to-do items"
-msgstr "Abair"
+msgstr ""
 
-#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:512 ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#: calendar/gui/component-factory.c:513 calendar/gui/e-day-view.c:3420
 #, fuzzy
 msgid "New _Appointment"
-msgstr "_Coinne"
+msgstr "Coinne Nua"
 
-#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:518 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Create a new task"
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/component-factory.c:409
+#: calendar/gui/component-factory.c:519
 #, fuzzy
 msgid "New _Task"
-msgstr "_Teacs"
+msgstr "_Teasc Nua"
 
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
@@ -3169,8 +3212,9 @@ msgid "Message Alarm Options"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.c:375
+#, fuzzy
 msgid "Mail Alarm Options"
-msgstr ""
+msgstr "Scéal ó %s"
 
 #: calendar/gui/dialogs/alarm-options.c:384
 msgid "Program Alarm Options"
@@ -3225,101 +3269,105 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:332
-#, c-format
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
 msgid "%d days"
-msgstr ""
+msgstr "la(e)"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
 msgid "1 day"
-msgstr ""
+msgstr " 1 lae"
 
-#: calendar/gui/dialogs/alarm-page.c:337
-#, c-format
+#: calendar/gui/dialogs/alarm-page.c:309
+#, fuzzy, c-format
 msgid "%d weeks"
-msgstr ""
+msgstr " %d seachtain"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:311
+#, fuzzy
 msgid "1 week"
-msgstr ""
+msgstr " seachtain"
 
-#: calendar/gui/dialogs/alarm-page.c:342
-#, c-format
+#: calendar/gui/dialogs/alarm-page.c:314
+#, fuzzy, c-format
 msgid "%d hours"
-msgstr ""
+msgstr " %d uaireanta"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:316
+#, fuzzy
 msgid "1 hour"
-msgstr ""
+msgstr " 1 uair"
 
-#: calendar/gui/dialogs/alarm-page.c:347
-#, c-format
+#: calendar/gui/dialogs/alarm-page.c:319
+#, fuzzy, c-format
 msgid "%d minutes"
-msgstr ""
+msgstr " %d noimeáid"
 
-#: calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:321
+#, fuzzy
 msgid "1 minute"
-msgstr ""
+msgstr " 1 noimeád"
 
-#: calendar/gui/dialogs/alarm-page.c:352
+#: calendar/gui/dialogs/alarm-page.c:324
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "Post"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:326
 #, fuzzy
 msgid "1 second"
-msgstr "Post"
+msgstr " 1 soicínd"
 
-#: calendar/gui/dialogs/alarm-page.c:379
+#: calendar/gui/dialogs/alarm-page.c:351
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.c:355
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "_Post sceál"
 
-#: calendar/gui/dialogs/alarm-page.c:387
+#: calendar/gui/dialogs/alarm-page.c:359
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #, fuzzy
 msgid "Send an email"
 msgstr "Post"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:363
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
-#: calendar/gui/dialogs/meeting-page.c:601
-#: calendar/gui/dialogs/meeting-page.c:636
-#: calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:1255
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/alarm-page.c:369 calendar/gui/dialogs/alarm-page.c:405
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:693
+#: calendar/gui/dialogs/meeting-page.c:1258
+#: calendar/gui/dialogs/meeting-page.c:1274
 #: camel/providers/smtp/camel-smtp-transport.c:224
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
-msgstr ""
+msgstr "Gan Aithne"
 
-#: calendar/gui/dialogs/alarm-page.c:409
+#: calendar/gui/dialogs/alarm-page.c:381
 #, fuzzy
 msgid "before start of appointment"
-msgstr "Scríos an sceal seo"
+msgstr "_Coinne"
 
-#: calendar/gui/dialogs/alarm-page.c:412
+#: calendar/gui/dialogs/alarm-page.c:384
 #, fuzzy
 msgid "after start of appointment"
-msgstr "Scríos an sceal seo"
+msgstr "_Coinne"
 
-#: calendar/gui/dialogs/alarm-page.c:422
+#: calendar/gui/dialogs/alarm-page.c:394
 #, fuzzy
 msgid "before end of appointment"
-msgstr "Scríos an sceal seo"
+msgstr "_Coinne"
 
-#: calendar/gui/dialogs/alarm-page.c:425
+#: calendar/gui/dialogs/alarm-page.c:397
 #, fuzzy
 msgid "after end of appointment"
 msgstr "_Coinne"
@@ -3333,24 +3381,22 @@ msgstr ""
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
 msgid "Date/Time:"
-msgstr "Scríos"
+msgstr "Dáta:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5
-#, fuzzy
 msgid "Reminders"
-msgstr "Post"
+msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-itip-control.glade.h:11
-#, fuzzy
 msgid "Summary:"
-msgstr "Post"
+msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:11
 #, fuzzy
 msgid "_Options..."
-msgstr "_Oscáil"
+msgstr "_Roghanna"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
 msgid "after"
@@ -3358,55 +3404,52 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
 msgid "before"
-msgstr ""
+msgstr "riomh"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
-msgstr ""
+msgstr "la(e)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:15
-#, fuzzy
 msgid "end of appointment"
-msgstr "_Coinne"
+msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
-msgstr ""
+msgstr "uair"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:116
 msgid "minute(s)"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:18
-#, fuzzy
 msgid "start of appointment"
 msgstr "_Coinne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
-msgstr ""
+msgstr "05 noimeaíd"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
-msgstr ""
+msgstr "10 noimeáid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "15 minutes"
-msgstr ""
+msgstr "15 noimeáid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
-msgstr ""
+msgstr "30 noimeáid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
-msgstr ""
+msgstr "60 noimeáid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-#, fuzzy
 msgid "Calendar and Tasks Settings"
-msgstr "Post"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Color for overdue tasks"
@@ -3424,84 +3467,87 @@ msgstr "Scríos an sceal seo"
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #, fuzzy
 msgid "Days"
-msgstr "Scríos"
+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:969
+#: calendar/gui/dialogs/recurrence-page.c:950
 msgid "Friday"
-msgstr ""
+msgstr "Aoine"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#, fuzzy
 msgid "Hours"
-msgstr ""
+msgstr "uair"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#, fuzzy
 msgid "Minutes"
-msgstr ""
+msgstr "05 noimeaíd"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/recurrence-page.c:946
 msgid "Monday"
-msgstr ""
+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:970
+#: calendar/gui/dialogs/recurrence-page.c:951
 msgid "Saturday"
-msgstr ""
+msgstr "Sathairn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, fuzzy
 msgid "Show appointment _end times in week and month views"
-msgstr "_Coinne"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
 msgid "Sta_rt of day:"
-msgstr ""
+msgstr "Deireadh an Lá:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "Su_n"
-msgstr "Post"
+msgstr "Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:971
-#, fuzzy
+#: calendar/gui/dialogs/recurrence-page.c:952
 msgid "Sunday"
-msgstr "Post"
+msgstr "Domhnaigh"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
 msgid "T_hu"
-msgstr ""
+msgstr "Dea"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#, fuzzy
 msgid "T_ue"
-msgstr ""
+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:26
-#: calendar/gui/dialogs/recurrence-page.c:968
+#: calendar/gui/dialogs/recurrence-page.c:949
 msgid "Thursday"
-msgstr ""
+msgstr "Deardaoin"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 #, fuzzy
 msgid "Time"
-msgstr "_Fillteán"
+msgstr "Tidéal"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Time _zone:"
@@ -3516,27 +3562,30 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:966
+#: calendar/gui/dialogs/recurrence-page.c:947
 msgid "Tuesday"
-msgstr ""
+msgstr "Mairt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:967
+#: calendar/gui/dialogs/recurrence-page.c:948
 msgid "Wednesday"
-msgstr ""
+msgstr "Ceád"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ui/evolution-calendar.xml.h:33
+#, fuzzy
 msgid "Work Week"
-msgstr ""
+msgstr "Seachtain"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#, fuzzy
 msgid "_12 hour (AM/PM)"
-msgstr ""
+msgstr "12 uair (in/rn)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#, fuzzy
 msgid "_24 hour"
-msgstr ""
+msgstr "25 uair"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Ask for confirmation when deleting items"
@@ -3549,20 +3598,22 @@ msgstr ""
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #, fuzzy
 msgid "_Display"
-msgstr "_Post sceál"
+msgstr "Taispeaín"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#, fuzzy
 msgid "_End of day:"
-msgstr ""
+msgstr "Deireadh an Lá:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Fri"
-msgstr "_Fillteán"
+msgstr "Aoi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
 msgid "_General"
-msgstr ""
+msgstr "Gnáth"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
@@ -3572,31 +3623,32 @@ msgstr "Scríos an sceal seo"
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Mon"
-msgstr "Priontáil"
+msgstr "Lua"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #, fuzzy
 msgid "_Other"
-msgstr "_Oscáil"
+msgstr "Eile"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Sat"
-msgstr "Sábháil 'san _fillteán"
+msgstr "Sat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Task List"
-msgstr "_Teacs"
+msgstr "_Teasc"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
 msgid "_Wed"
-msgstr ""
+msgstr "Cea"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
 msgid "before the start of the appointment"
-msgstr "Scríos an sceal seo"
+msgstr "_Coinne"
 
 #: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
@@ -3665,12 +3717,12 @@ msgstr ""
 #: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
 #, fuzzy
 msgid " (Completed "
-msgstr "_Nota"
+msgstr "Críochnaithe.`"
 
 #: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
 #, fuzzy
 msgid "Completed "
-msgstr "_Nota"
+msgstr "Críochnaithe.`"
 
 #: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
 msgid " (Due "
@@ -3680,48 +3732,47 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:462
-#, fuzzy
+#: calendar/gui/dialogs/comp-editor.c:469
 msgid "Edit Appointment"
-msgstr "_Coinne"
+msgstr "Eagar Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:467
-#, fuzzy, c-format
+#: calendar/gui/dialogs/comp-editor.c:474
+#, c-format
 msgid "Appointment - %s"
-msgstr "_Coinne"
+msgstr "Coinne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:470
+#: calendar/gui/dialogs/comp-editor.c:477
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:473
+#: calendar/gui/dialogs/comp-editor.c:480
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:487
+#: calendar/gui/dialogs/comp-editor.c:494
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
-#: mail/mail-display.c:99
+#: calendar/gui/dialogs/comp-editor.c:860 mail/mail-callbacks.c:1646
+#: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
-#: mail/mail-display.c:103
+#: calendar/gui/dialogs/comp-editor.c:864 mail/mail-callbacks.c:1652
+#: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:927 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
-msgstr ""
+msgstr "Sábháil le..."
 
-#: calendar/gui/dialogs/comp-editor.c:1077
+#: calendar/gui/dialogs/comp-editor.c:1080
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -3770,7 +3821,7 @@ msgstr ""
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
 msgid "Addressbook..."
-msgstr "Sábháil 'san _fillteán"
+msgstr "S_eoladh..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
@@ -3783,14 +3834,12 @@ msgid "Enter Delegate"
 msgstr "Scríos"
 
 #: calendar/gui/dialogs/event-editor.c:156
-#, fuzzy
 msgid "Appointment"
-msgstr "_Coinne"
+msgstr "Coinne"
 
 #: calendar/gui/dialogs/event-editor.c:161
-#, fuzzy
 msgid "Reminder"
-msgstr "Post"
+msgstr ""
 
 #: calendar/gui/dialogs/event-editor.c:166
 msgid "Recurrence"
@@ -3825,8 +3874,9 @@ msgid "Date & Time"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:7
+#, fuzzy
 msgid "F_ree"
-msgstr ""
+msgstr "_Seachtain"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -3841,8 +3891,9 @@ msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
 msgid "Show Time As"
-msgstr ""
+msgstr "Taispeáin coinní"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:8
@@ -3858,130 +3909,131 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1183
-#: calendar/gui/dialogs/meeting-page.c:1251
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:585
+#: calendar/gui/dialogs/meeting-page.c:1175
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:578
-#: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1252
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:587
+#: calendar/gui/dialogs/meeting-page.c:1255
+#, fuzzy
 msgid "Group"
-msgstr ""
+msgstr "Ainm Grupa:"
 
-#: calendar/gui/dialogs/meeting-page.c:580
-#: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1253
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:589
+#: calendar/gui/dialogs/meeting-page.c:1256
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:582
-#: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1254
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:591
+#: calendar/gui/dialogs/meeting-page.c:1257
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1267
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:1270
 msgid "Chair"
-msgstr ""
+msgstr "Cahtaoirleach"
 
-#: calendar/gui/dialogs/meeting-page.c:613
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1185
-#: calendar/gui/dialogs/meeting-page.c:1268
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:622
+#: calendar/gui/dialogs/meeting-page.c:1177
+#: calendar/gui/dialogs/meeting-page.c:1271
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:615
-#: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:624
+#: calendar/gui/dialogs/meeting-page.c:1272
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:617
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1270
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:1273
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1193
-#: calendar/gui/dialogs/meeting-page.c:1296
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:678
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1299
 #, fuzzy
 msgid "Needs Action"
-msgstr "Scríos"
+msgstr "Freagra"
 
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1297
+#: calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:680
+#: calendar/gui/dialogs/meeting-page.c:1300
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1298
-#, fuzzy
+#: calendar/gui/dialogs/meeting-page.c:659
+#: calendar/gui/dialogs/meeting-page.c:682
+#: calendar/gui/dialogs/meeting-page.c:1301
 msgid "Declined"
-msgstr "Scríos"
+msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1299
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:684
+#: calendar/gui/dialogs/meeting-page.c:1302
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1300
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1303
 #, fuzzy
 msgid "Delegated"
 msgstr "Scríos"
 
-#: calendar/gui/dialogs/meeting-page.c:675
-#: calendar/gui/dialogs/meeting-page.c:698
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
 msgid "In Process"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:737
+#: calendar/gui/dialogs/meeting-page.c:729
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:780
+#: calendar/gui/dialogs/meeting-page.c:834
+#, fuzzy
 msgid "Chair Persons"
-msgstr ""
+msgstr "Guthán Ghluasteáin"
 
-#: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:842
-#: calendar/gui/dialogs/meeting-page.c:962
+#: calendar/gui/dialogs/meeting-page.c:782
+#: calendar/gui/dialogs/meeting-page.c:834
+#: calendar/gui/dialogs/meeting-page.c:954
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:784
+#: calendar/gui/dialogs/meeting-page.c:834
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:786
+#: calendar/gui/dialogs/meeting-page.c:834
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:920
+#: calendar/gui/dialogs/meeting-page.c:912
 #, fuzzy
 msgid "Sent By:"
 msgstr "Post"
 
-#: calendar/gui/dialogs/meeting-page.c:1471
+#: calendar/gui/dialogs/meeting-page.c:1478
 #, fuzzy
 msgid "_Delegate To..."
-msgstr "Scríos"
+msgstr "Scríos..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 msgid "Attendee"
@@ -4002,21 +4054,22 @@ msgid "Delegated To"
 msgstr "Scríos"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
 msgid "Language"
-msgstr ""
+msgstr "Bainisteoir"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
 msgid "Member"
-msgstr ""
+msgstr "Nollag"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 msgid "RSVP"
-msgstr ""
+msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#, fuzzy
 msgid "Role"
-msgstr "Scríos"
+msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
 #: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
@@ -4028,7 +4081,7 @@ msgstr ""
 #: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
-msgstr ""
+msgstr "Saghas"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
@@ -4047,47 +4100,47 @@ msgstr ""
 msgid "_Other Organizer"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:417 calendar/gui/print.c:1839
 #: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
-msgstr ""
+msgstr "%a %b %d %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:584
+#: calendar/gui/dialogs/recurrence-page.c:565
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:938
+#: calendar/gui/dialogs/recurrence-page.c:919
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:945 filter/filter-datespec.c:83
 msgid "day"
-msgstr ""
+msgstr "lá"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1075
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1083
 msgid "th"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1275
+#: calendar/gui/dialogs/recurrence-page.c:1256
 msgid "occurrences"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
 msgid "A_dd"
-msgstr ""
+msgstr "Suimigh"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
-msgstr ""
+msgstr "Gach"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-#, fuzzy
 msgid "Exceptions"
-msgstr "_Oscáil"
+msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Preview"
@@ -4102,8 +4155,9 @@ msgid "_Custom recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:10
+#, fuzzy
 msgid "_Modify"
-msgstr ""
+msgstr "Luain"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "_No recurrence"
@@ -4157,7 +4211,7 @@ msgstr ""
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, fuzzy, no-c-format
 msgid "% Complete"
-msgstr "_Nota"
+msgstr "% Rinneadh:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 msgid "Date Completed:"
@@ -4168,9 +4222,9 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:897
+#: my-evolution/e-summary-preferences.c:896
 msgid "URL:"
-msgstr ""
+msgstr "URL:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:14
 #, fuzzy
@@ -4185,7 +4239,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-editor.c:239
 #, fuzzy
 msgid "Assignment"
-msgstr "_Coinne"
+msgstr "Coinne"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
@@ -4208,87 +4262,85 @@ msgstr ""
 #: calendar/gui/e-calendar-table.c:350
 #, c-format
 msgid "0%"
-msgstr ""
+msgstr "0%"
 
 #: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "10%"
-msgstr ""
+msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "20%"
-msgstr ""
+msgstr "20%"
 
 #: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "30%"
-msgstr ""
+msgstr "30%"
 
 #: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "40%"
-msgstr ""
+msgstr "40%"
 
 #: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "50%"
-msgstr ""
+msgstr "50%"
 
 #: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "60%"
-msgstr ""
+msgstr "60%"
 
 #: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "70%"
-msgstr ""
+msgstr "70%"
 
 #: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "80%"
-msgstr ""
+msgstr "80%"
 
 #: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "90%"
-msgstr ""
+msgstr "90%"
 
 #: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "100%"
-msgstr ""
+msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
-#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
+#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1283
+#: shell/e-shortcuts-view.c:385
 #, fuzzy
 msgid "_Open"
-msgstr "_Oscáil"
+msgstr "Oscáil"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
+#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
-#, fuzzy
 msgid "C_ut"
-msgstr "Gearr"
+msgstr "_Gearr"
 
-#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
-#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
-#, fuzzy
 msgid "_Copy"
-msgstr "Greamaigh"
+msgstr "_Cóip"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
-#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
-#: ui/evolution-tasks.xml.h:16
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
+#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
+#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
-msgstr "Priontáil"
+msgstr "_Greamaigh"
 
 #: calendar/gui/e-calendar-table.c:863
 #, fuzzy
@@ -4318,15 +4370,10 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr ""
-
 #: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
 #: camel/camel-filter-driver.c:815
-#, fuzzy
 msgid "Complete"
-msgstr "_Nota"
+msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
@@ -4355,20 +4402,18 @@ 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:30 shell/e-shortcuts.c:1044
-#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
-#, fuzzy
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1051
+#: shell/e-storage-set-view.c:1418 shell/e-summary-storage.c:80
 msgid "Summary"
-msgstr "Post"
+msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#, fuzzy
 msgid "Task sort"
-msgstr "_Teacs"
+msgstr ""
 
 #: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: calendar/gui/e-day-view-time-item.c:519
 #, c-format
@@ -4377,64 +4422,84 @@ 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:285 calendar/gui/e-day-view.c:1354
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1374
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
-msgstr ""
+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:293 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1401
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
-msgstr ""
+msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
 #: calendar/gui/print.c:759
 msgid "am"
-msgstr ""
+msgstr "rn"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
 #: calendar/gui/print.c:761
 msgid "pm"
-msgstr ""
+msgstr "in"
 
-#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
+#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
 #, fuzzy
 msgid "_Go to Date..."
-msgstr "Sábháil 'san _fillteán"
+msgstr "_Fillteán"
 
-#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
+#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
+#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
-#, fuzzy
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
 msgid "Delete _All Occurrences"
-msgstr "Scríos an sceal seo"
+msgstr ""
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:556
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+#, c-format
+msgid "<b>Summary:</b> %s<br><br>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:571
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:581
+#, c-format
+msgid "<b>Description:</b> %s"
+msgstr ""
 
 #: calendar/gui/e-itip-control.c:617
 #, c-format
@@ -4442,8 +4507,9 @@ msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:618
+#, fuzzy
 msgid "Meeting Information"
-msgstr ""
+msgstr "Eolas"
 
 #: calendar/gui/e-itip-control.c:622
 #, c-format
@@ -4474,7 +4540,7 @@ msgstr ""
 
 #: calendar/gui/e-itip-control.c:637
 #, c-format
-msgid "<b>%s</b> has replyed to a meeting request."
+msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:638
@@ -4487,9 +4553,8 @@ msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:643
-#, fuzzy
 msgid "Meeting Cancellation"
-msgstr "Fillteán _Nua"
+msgstr ""
 
 #: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
 #: calendar/gui/e-itip-control.c:728
@@ -4500,7 +4565,7 @@ msgstr ""
 #: calendar/gui/e-itip-control.c:648
 #, fuzzy
 msgid "Bad Meeting Message"
-msgstr "_Post sceál"
+msgstr "Post an sceál seo"
 
 #: calendar/gui/e-itip-control.c:665
 #, c-format
@@ -4510,7 +4575,7 @@ msgstr ""
 #: calendar/gui/e-itip-control.c:666
 #, fuzzy
 msgid "Task Information"
-msgstr "_Teacs"
+msgstr "Eolas"
 
 #: calendar/gui/e-itip-control.c:670
 #, c-format
@@ -4518,9 +4583,8 @@ msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:671
-#, fuzzy
 msgid "Task Proposal"
-msgstr "_Teacs"
+msgstr ""
 
 #: calendar/gui/e-itip-control.c:675
 #, c-format
@@ -4528,9 +4592,8 @@ msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:676
-#, fuzzy
 msgid "Task Update"
-msgstr "_Teacs"
+msgstr ""
 
 #: calendar/gui/e-itip-control.c:680
 #, c-format
@@ -4543,7 +4606,7 @@ msgstr ""
 
 #: calendar/gui/e-itip-control.c:685
 #, c-format
-msgid "<b>%s</b> has replyed to a task assignment."
+msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:686
@@ -4563,7 +4626,7 @@ msgstr ""
 #: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "Bad Task Message"
-msgstr "Post an sceál seo"
+msgstr "_Post sceál"
 
 #: calendar/gui/e-itip-control.c:713
 #, c-format
@@ -4571,8 +4634,9 @@ msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:714
+#, fuzzy
 msgid "Free/Busy Information"
-msgstr ""
+msgstr "Eolas"
 
 #: calendar/gui/e-itip-control.c:718
 #, c-format
@@ -4585,7 +4649,7 @@ msgstr ""
 
 #: calendar/gui/e-itip-control.c:723
 #, c-format
-msgid "<b>%s</b> has replyed to a free/busy request."
+msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:724
@@ -4593,18 +4657,16 @@ msgid "Free/Busy Reply"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:729
-#, fuzzy
 msgid "Bad Free/Busy Message"
-msgstr "Post an sceál seo"
+msgstr ""
 
 #: calendar/gui/e-itip-control.c:940
 msgid "I couldn't update your calendar file!\n"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:942
-#, fuzzy
 msgid "Update complete\n"
-msgstr "_Nota"
+msgstr ""
 
 #: calendar/gui/e-itip-control.c:967
 msgid "I couldn't remove the item from your calendar file!\n"
@@ -4613,7 +4675,7 @@ msgstr ""
 #: calendar/gui/e-itip-control.c:969
 #, fuzzy
 msgid "Removal Complete"
-msgstr "_Nota"
+msgstr "% Rinneadh:"
 
 #: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
 msgid "Item sent!\n"
@@ -4626,34 +4688,31 @@ msgstr ""
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
-msgstr ""
+msgstr "%P %%"
 
 #: calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
-msgstr ""
+msgstr "--do--"
 
 #: calendar/gui/e-itip-control.glade.h:4
-#, fuzzy
 msgid "Calendar Message"
-msgstr "Post an sceál seo"
+msgstr ""
 
 #: calendar/gui/e-itip-control.glade.h:5
-#, fuzzy
 msgid "Date:"
-msgstr "Scríos"
+msgstr "Dáta:"
 
 #: calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
-msgstr ""
+msgstr "Ag Lódáil Feilire"
 
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
-msgstr ""
+msgstr "Ag Lódáil feilire..."
 
 #: calendar/gui/e-itip-control.glade.h:10
-#, fuzzy
 msgid "Server Message:"
-msgstr "Post"
+msgstr ""
 
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
@@ -4673,82 +4732,90 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
 #, fuzzy
 msgid "New _Appointment..."
-msgstr "_Coinne"
+msgstr "Coinne Nua..."
 
-#: calendar/gui/gnome-cal.c:1260
+#: calendar/gui/gnome-cal.c:1318
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1271
+#: calendar/gui/gnome-cal.c:1329
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
-msgstr ""
+msgstr "Aibreáin"
 
 #: calendar/gui/goto-dialog.glade.h:2
 msgid "August"
-msgstr ""
+msgstr "Lúnasa"
 
 #: calendar/gui/goto-dialog.glade.h:3
 msgid "December"
-msgstr ""
+msgstr "Nollag"
 
 #: calendar/gui/goto-dialog.glade.h:4
 msgid "February"
-msgstr ""
+msgstr "Feabhra"
 
 #: calendar/gui/goto-dialog.glade.h:5
 msgid "Go To Date"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
 msgid "Go To Today"
-msgstr "Sábháil 'san _fillteán"
+msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
-msgstr ""
+msgstr "Éanair"
 
 #: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
-msgstr ""
+msgstr "Iuíl"
 
 #: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
-msgstr ""
+msgstr "Meitheamh"
 
 #: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
-msgstr ""
+msgstr "Marta"
 
 #: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
-msgstr ""
+msgstr "Bealtaine"
 
 #: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
-msgstr ""
+msgstr "Samhain"
 
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
-msgstr ""
+msgstr "D. Fómhair"
 
 #: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
-msgstr ""
+msgstr "M. Fómhair"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:254
 msgid "An organizer must be set."
 msgstr ""
 
+#: calendar/gui/itip-utils.c:300
+#, fuzzy
+msgid "Calendar attachment"
+msgstr "_Coinne"
+
+#: calendar/gui/main.c:92
+msgid "Could not create the component editor factory"
+msgstr ""
+
 #: calendar/gui/print.c:422
 msgid "1st"
 msgstr ""
@@ -4875,32 +4942,31 @@ msgstr ""
 
 #: calendar/gui/print.c:490
 msgid "Su"
-msgstr ""
+msgstr "Do"
 
 #: calendar/gui/print.c:490
 msgid "Mo"
-msgstr ""
+msgstr "Lu"
 
 #: calendar/gui/print.c:490
 msgid "Tu"
-msgstr ""
+msgstr "Ma"
 
 #: calendar/gui/print.c:490
 msgid "We"
-msgstr ""
+msgstr "Ce"
 
 #: calendar/gui/print.c:491
 msgid "Th"
-msgstr ""
+msgstr "De"
 
 #: calendar/gui/print.c:491
-#, fuzzy
 msgid "Fr"
-msgstr "Ó:"
+msgstr "Ao"
 
 #: calendar/gui/print.c:491
 msgid "Sa"
-msgstr ""
+msgstr "Sa"
 
 #. Day
 #: calendar/gui/print.c:1815
@@ -4909,11 +4975,11 @@ msgstr ""
 
 #: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
-msgstr ""
+msgstr "%a %b %d"
 
 #: calendar/gui/print.c:1835
 msgid "%a %d %Y"
-msgstr ""
+msgstr "%a %d %Y"
 
 #: calendar/gui/print.c:1846
 #, c-format
@@ -4935,7 +5001,7 @@ msgid "Print Calendar"
 msgstr ""
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: mail/mail-callbacks.c:2055 my-evolution/e-summary.c:511
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr ""
@@ -4946,9 +5012,8 @@ msgid "Print Item"
 msgstr "Scríos an sceal seo"
 
 #: calendar/gui/print.c:2398
-#, fuzzy
 msgid "Print Setup"
-msgstr "Priontáil"
+msgstr "Socraigh Priontáil "
 
 #: calendar/gui/tasks-control.c:127
 msgid "The URI of the tasks folder to display"
@@ -4984,101 +5049,101 @@ msgstr ""
 
 #: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
-msgstr ""
+msgstr "LMCDASD"
 
-#: calendar/pcs/query.c:218
+#: calendar/pcs/query.c:230
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:242
+#: calendar/pcs/query.c:254
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:247
+#: calendar/pcs/query.c:259
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:267
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:296
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:289
+#: calendar/pcs/query.c:301
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:296
+#: calendar/pcs/query.c:308
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:323
+#: calendar/pcs/query.c:335
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:328
+#: calendar/pcs/query.c:340
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:355
+#: calendar/pcs/query.c:367
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:372
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:396
+#: calendar/pcs/query.c:408
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:492
+#: calendar/pcs/query.c:504
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:497
+#: calendar/pcs/query.c:509
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:504
+#: calendar/pcs/query.c:516
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:634
+#: calendar/pcs/query.c:646
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:639
+#: calendar/pcs/query.c:651
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:646
+#: calendar/pcs/query.c:658
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:675
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:705
+#: calendar/pcs/query.c:717
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:717
+#: calendar/pcs/query.c:729
 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:805
+#: calendar/pcs/query.c:817
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:1008
+#: calendar/pcs/query.c:1085
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5127,9 +5192,8 @@ msgid "You must be working online to complete this operation"
 msgstr ""
 
 #: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
-#, fuzzy
 msgid "Syncing folders"
-msgstr "Fillteán _Nua"
+msgstr ""
 
 #: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
@@ -5140,9 +5204,9 @@ msgid "Unable to process spool folder"
 msgstr ""
 
 #: camel/camel-filter-driver.c:667
-#, fuzzy, c-format
+#, c-format
 msgid "Getting message %d (%d%%)"
-msgstr "_Post sceál"
+msgstr ""
 
 #: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
@@ -5150,24 +5214,22 @@ msgid "Failed on message %d"
 msgstr "_Post sceál"
 
 #: camel/camel-filter-driver.c:672
-#, fuzzy
 msgid "Cannot open message"
-msgstr "_Post sceál"
+msgstr ""
 
 #: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
-#, fuzzy
 msgid "Syncing folder"
-msgstr "Fillteán _Nua"
+msgstr ""
 
 #: camel/camel-filter-driver.c:766
-#, fuzzy, c-format
+#, c-format
 msgid "Getting message %d of %d"
-msgstr "_Post sceál"
+msgstr ""
 
 #: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
-#, fuzzy, c-format
+#, c-format
 msgid "Failed at message %d of %d"
-msgstr "Post an sceál seo"
+msgstr ""
 
 #: camel/camel-filter-driver.c:892
 #, c-format
@@ -5227,9 +5289,9 @@ msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
 #: camel/camel-lock-client.c:212
-#, c-format
+#, fuzzy, c-format
 msgid "Could not lock '%s'"
-msgstr ""
+msgstr "Teíp ag fork: %s"
 
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:92 camel/camel-lock.c:111
@@ -5280,7 +5342,7 @@ msgstr ""
 #: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
-msgstr ""
+msgstr "Teíp ag fork: %s"
 
 #: camel/camel-movemail.c:239
 #, c-format
@@ -5289,7 +5351,7 @@ msgstr ""
 
 #: camel/camel-movemail.c:240
 msgid "(Unknown error)"
-msgstr ""
+msgstr "(Earraidh gan aithne)"
 
 #: camel/camel-movemail.c:263
 #, c-format
@@ -5321,13 +5383,13 @@ msgid "No plaintext to sign."
 msgstr ""
 
 #: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
+#: camel/camel-pgp-context.c:1079 camel/camel-pgp-context.c:1266
 msgid "No password provided."
 msgstr ""
 
 #: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
-#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
-#: camel/camel-pgp-context.c:1302
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1273
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -5345,15 +5407,15 @@ msgstr ""
 msgid "Couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1070
+#: camel/camel-pgp-context.c:1069
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1096
+#: camel/camel-pgp-context.c:1095
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1287
+#: camel/camel-pgp-context.c:1258
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -5372,38 +5434,39 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:207
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:252
+#: camel/camel-remote-store.c:264
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:255
+#: camel/camel-remote-store.c:267
 #: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:256
+#: camel/camel-remote-store.c:268
 msgid "(unknown host)"
-msgstr ""
+msgstr "(óst gan aithne)"
 
-#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
+#: camel/camel-remote-store.c:486
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/camel-remote-store.c:489
-msgid "Server unexpectedly disconnected"
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
 #: camel/camel-sasl-anonymous.c:33
@@ -5441,7 +5504,7 @@ msgstr ""
 
 #: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
-msgstr ""
+msgstr "CRAM-MD5"
 
 #: camel/camel-sasl-cram-md5.c:37
 msgid ""
@@ -5451,7 +5514,7 @@ msgstr ""
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
-msgstr ""
+msgstr "DIGEST-MD5"
 
 #: camel/camel-sasl-digest-md5.c:45
 msgid ""
@@ -5485,7 +5548,7 @@ msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
-msgstr ""
+msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
@@ -5499,7 +5562,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:485
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -5517,9 +5580,9 @@ msgstr ""
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
 msgid "Password"
-msgstr ""
+msgstr "Pasfhocal"
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -5546,37 +5609,37 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:163
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:171
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:549
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:576
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:601
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:603
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -5620,34 +5683,34 @@ msgstr ""
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr ""
 
-#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
-#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr ""
 
-#: camel/camel-smime-context.c:545
+#: camel/camel-smime-context.c:556
 msgid "Failed to find a common bulk algorithm."
 msgstr ""
 
-#: camel/camel-smime-context.c:799
+#: camel/camel-smime-context.c:810
 #, fuzzy
 msgid "Failed to decode message."
 msgstr "_Post sceál"
 
-#: camel/camel-smime-context.c:844
+#: camel/camel-smime-context.c:855
 msgid "Failed to verify certificates."
 msgstr ""
 
 #: camel/camel-tcp-stream-openssl.c:463
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Issuer: %s\n"
 "Subject: %s"
-msgstr "Abair"
+msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5657,7 +5720,7 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-ssl.c:353
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -5730,10 +5793,10 @@ msgstr ""
 #: camel/providers/imap/camel-imap-folder.c:435
 #, fuzzy
 msgid "Scanning for changed messages"
-msgstr "_Post sceál"
+msgstr "Ag Sábháil scealta"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1915
+#: camel/providers/imap/camel-imap-folder.c:1968
 msgid "This message is not currently available"
 msgstr ""
 
@@ -5745,30 +5808,28 @@ msgstr ""
 #: camel/providers/imap/camel-imap-folder.c:1640
 #, fuzzy
 msgid "Scanning for new messages"
-msgstr "_Post sceál"
+msgstr "Ag Sábháil scealta"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:2001
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
 #: camel/providers/imap/camel-imap-message-cache.c:155
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open cache directory: %s"
-msgstr ""
+msgstr "Teíp ag fork: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
 msgid "Checking for new mail"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:45
-#, fuzzy
 msgid "Check for new messages in all folders"
-msgstr "Fillteán _Nua"
+msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
-#, fuzzy
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:750
 msgid "Folders"
-msgstr "_Fillteán"
+msgstr "Fillteáin"
 
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Show only subscribed folders"
@@ -5779,17 +5840,17 @@ msgid "Override server-supplied folder namespace"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:54
-#, fuzzy
 msgid "Namespace"
-msgstr "Freagrair"
+msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:63
-msgid "IMAPv4"
-msgstr ""
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
 
 #: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
@@ -5799,28 +5860,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:463
+#: camel/providers/imap/camel-imap-store.c:508
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/imap/camel-imap-store.c:518
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:497
+#: camel/providers/imap/camel-imap-store.c:542
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:538
+#: camel/providers/imap/camel-imap-store.c:583
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -5828,12 +5889,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:837
+#: camel/providers/imap/camel-imap-store.c:882
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Post an sceál seo"
 
-#: camel/providers/imap/camel-imap-store.c:1038
+#: camel/providers/imap/camel-imap-store.c:1083
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -5842,15 +5903,15 @@ msgid "MH-format mail directories"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:41
-msgid "For storing local mail in MH-like mail directories"
+msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:50
-msgid "Standard Unix mailbox file"
+msgid "Local delivery"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:51
-msgid "For storing local mail in standard mbox format"
+msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:60
@@ -5858,15 +5919,15 @@ msgid "Qmail maildir-format mail files"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:61
-msgid "For storing local mail in qmail maildir directories"
+msgid "For storing local mail in qmail maildir directories."
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:70
-msgid "Unix mbox spool-format mail files"
+msgid "Standard Unix mbox spools"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:71
-msgid "For storing local mail in standard Unix spool directories"
+msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:127
@@ -5987,9 +6048,9 @@ msgid "not a maildir directory"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:276
-#, c-format
+#, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
-msgstr ""
+msgstr "Teíp ag fork: %s"
 
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
@@ -6072,13 +6133,11 @@ 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:249
-#: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
 msgid "Summarizing folder"
 msgstr "Fillteán _Nua"
 
 #: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarizing from position %ld: %s"
 msgstr ""
@@ -6099,14 +6158,15 @@ msgstr ""
 #: camel/providers/local/camel-spool-summary.c:644
 #: camel/providers/local/camel-spool-summary.c:931
 #, fuzzy
-msgid "Synchronizing folder"
+msgid "Storing folder"
 msgstr "Fillteán _Nua"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
 #, fuzzy, c-format
-msgid "Could not open folder to summarize: %s: %s"
-msgstr "Post an sceál seo"
+msgid "Could not open file: %s: %s"
+msgstr "Teíp ag fork: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
 #: camel/providers/local/camel-spool-summary.c:673
@@ -6159,7 +6219,7 @@ msgstr ""
 #: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
-msgstr ""
+msgstr "Earraidh gan aithne: %s"
 
 #: camel/providers/local/camel-mh-folder.c:172
 #, c-format
@@ -6169,7 +6229,7 @@ msgstr ""
 #: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
-msgstr ""
+msgstr "Níl aon Eolaire `%s' ann."
 
 #: camel/providers/local/camel-mh-summary.c:218
 #, c-format
@@ -6177,9 +6237,11 @@ msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-spool-folder.c:465
-#, c-format
+#, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr ""
+"Earraidh ag sábhháil scéalaí do: %s\n"
+" %s"
 
 #: camel/providers/local/camel-spool-store.c:132
 #, c-format
@@ -6191,45 +6253,46 @@ msgstr ""
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:176
-msgid "Spool stores do not have an inbox"
-msgstr ""
-
-#: camel/providers/local/camel-spool-store.c:186
+#: camel/providers/local/camel-spool-store.c:184
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:220
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:230
+#: camel/providers/local/camel-spool-store.c:228
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:498
+#. 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-spool-summary.c:379
+msgid "Summarising folder"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
-msgid "Cannot summarise folder: %s: %s"
+msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:649
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
-msgid "Could not open folder to summarise: %s: %s"
+msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
-#, c-format
+#, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
-msgstr ""
+msgstr "Teíp ag fork: %s"
 
 #: camel/providers/local/camel-spool-summary.c:817
-#, c-format
+#, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
-msgstr ""
+msgstr "Teíp ag fork: %s"
 
 #: camel/providers/local/camel-spool-summary.c:847
 #: camel/providers/local/camel-spool-summary.c:865
@@ -6240,6 +6303,11 @@ msgid ""
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
+#: camel/providers/local/camel-spool-summary.c:936
+#, fuzzy, c-format
+msgid "Could not file: %s: %s"
+msgstr "Teíp ag fork: %s"
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -6279,7 +6347,7 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
-msgstr ""
+msgstr "Nuachtain USENET"
 
 #: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
@@ -6293,7 +6361,7 @@ msgstr ""
 #: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
-msgstr ""
+msgstr "Nuachtain USENET via %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
@@ -6308,9 +6376,8 @@ msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-folder.c:189
-#, fuzzy
 msgid "Retrieving POP summary"
-msgstr "_Post sceál"
+msgstr ""
 
 #: camel/providers/pop3/camel-pop3-folder.c:195
 #, c-format
@@ -6321,65 +6388,66 @@ msgstr ""
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
+#: camel/providers/pop3/camel-pop3-folder.c:259
+#, fuzzy
+msgid "Expunging deleted messages"
+msgstr "Scríos an sceal seo"
+
+#: camel/providers/pop3/camel-pop3-folder.c:335
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "Post an sceál seo"
 
-#: camel/providers/pop3/camel-pop3-folder.c:344
+#: camel/providers/pop3/camel-pop3-folder.c:351
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:367
+#: camel/providers/pop3/camel-pop3-folder.c:374
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:371
-#, fuzzy, c-format
+#: camel/providers/pop3/camel-pop3-folder.c:378
+#, c-format
 msgid "Retrieving POP message %d"
-msgstr "_Post sceál"
+msgstr ""
 
 #: camel/providers/pop3/camel-pop3-provider.c:37
-#, fuzzy
 msgid "Message storage"
-msgstr "_Post sceál"
+msgstr ""
 
 #: camel/providers/pop3/camel-pop3-provider.c:39
-#, fuzzy
 msgid "Leave messages on server"
-msgstr "_Post sceál"
+msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:41
-#, fuzzy, c-format
+#: camel/providers/pop3/camel-pop3-provider.c:42
+#, c-format
 msgid "Delete after %s day(s)"
-msgstr "Scríos an sceal seo"
+msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
 msgid "POP"
-msgstr ""
+msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:50
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
+#: camel/providers/pop3/camel-pop3-provider.c:53
+msgid "For connecting to and downloading mail from POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:69
+#: camel/providers/pop3/camel-pop3-provider.c:70
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:79
+#: camel/providers/pop3/camel-pop3-provider.c:80
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:91
+#: camel/providers/pop3/camel-pop3-provider.c:92
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
@@ -6390,9 +6458,9 @@ msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:215
-#, c-format
+#, fuzzy, c-format
 msgid "Could not connect to server: %s"
-msgstr ""
+msgstr "Teíp ag fork: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
@@ -6414,7 +6482,7 @@ msgstr ""
 #: camel/providers/pop3/camel-pop3-store.c:382
 #: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
-msgstr ""
+msgstr "(Gan aithne)"
 
 #: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
@@ -6432,13 +6500,17 @@ msgstr ""
 #: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
+msgstr "Níl aon eolaire `%s' ann."
+
+#: camel/providers/pop3/camel-pop3-store.c:567
+#, c-format
+msgid "Unexpected response from POP server: %s"
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
 #: mail/mail-config.glade.h:72
-#, fuzzy
 msgid "Sendmail"
-msgstr "Post"
+msgstr "Sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
@@ -6482,7 +6554,7 @@ msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
-msgstr ""
+msgstr "sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
@@ -6490,7 +6562,7 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
-msgstr ""
+msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
@@ -6517,14 +6589,12 @@ msgid "System status, or system help reply"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:181
-#, fuzzy
 msgid "Help message"
-msgstr "Post an sceál seo"
+msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:183
-#, fuzzy
 msgid "Service ready"
-msgstr "Post"
+msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Service closing transmission channel"
@@ -6639,7 +6709,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:602
 #, fuzzy
 msgid "Sending message"
 msgstr "Post an sceál seo"
@@ -6714,33 +6784,33 @@ msgstr ""
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1008
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1069
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1086
+#: camel/providers/smtp/camel-smtp-transport.c:1088
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1111
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1130
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -6770,7 +6840,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:134
 msgid "attachment"
 msgstr ""
 
@@ -6803,54 +6873,52 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:326
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
-#, fuzzy
+#: composer/e-msg-composer-hdrs.c:357
 msgid "From:"
 msgstr "Ó:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
-#, fuzzy
+#: composer/e-msg-composer-hdrs.c:363
 msgid "Reply-To:"
-msgstr "Freagrair"
+msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:374
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:388
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:392
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:396
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -6861,139 +6929,143 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer.c:670
-#, c-format
+#: composer/e-msg-composer.c:669
+#, fuzzy, c-format
 msgid ""
 "Could not open file %s:\n"
 "%s"
-msgstr ""
+msgstr "Teíp ag fork: %s"
 
-#: composer/e-msg-composer.c:683
+#: composer/e-msg-composer.c:682
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:865
+#: composer/e-msg-composer.c:864
 msgid "Save as..."
-msgstr ""
+msgstr "Sánbháil le..."
 
-#: composer/e-msg-composer.c:874
+#: composer/e-msg-composer.c:873
+#, fuzzy
 msgid "Warning!"
-msgstr ""
+msgstr "Rabhadh"
 
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:877
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:900
+#: composer/e-msg-composer.c:899
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:918
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:989
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1042
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1050
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1056
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1062
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1071
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
-msgstr "_Post sceál"
+msgstr ""
+"Earraidh ag sábhháil scéalaí do: %s\n"
+" %s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1171
 msgid ""
-"Evolution has found unsaved files from a previous session.\n"
+"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:1320
+#: composer/e-msg-composer.c:1319
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:217
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1326
+msgid "Warning: Modified Message"
+msgstr ""
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1349
 msgid "Open file"
-msgstr ""
+msgstr "Oscáil Comhad"
 
-#: composer/e-msg-composer.c:1499
+#: composer/e-msg-composer.c:1498
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
-#, fuzzy
+#: composer/e-msg-composer.c:1874 composer/e-msg-composer.c:2315
 msgid "Compose a message"
-msgstr "Post an sceál seo"
+msgstr ""
 
-#: composer/e-msg-composer.c:2406
+#: composer/e-msg-composer.c:2405
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:359
+#: composer/evolution-composer.c:348
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:374
+#: composer/evolution-composer.c:363
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
+#: data/evolution.desktop.in.h:1
+msgid "Evolution"
+msgstr "Evolution"
+
 #: data/evolution.desktop.in.h:2
 msgid "The Evolution groupware suite"
 msgstr ""
 
 #: data/evolution.keys.in.h:1
 msgid "address card"
-msgstr ""
+msgstr "carta sheoladh"
 
 #: data/evolution.keys.in.h:2
 msgid "calendar information"
-msgstr ""
+msgstr "eolas fheilire"
 
 #: default_user/searches.xml.h:1
-#, fuzzy
 msgid "Body contains"
-msgstr "Abair"
+msgstr ""
 
 #: default_user/searches.xml.h:2
 msgid "Body does not contain"
@@ -7013,94 +7085,101 @@ msgid "Recipients contain"
 msgstr ""
 
 #: default_user/searches.xml.h:6
-#, fuzzy
 msgid "Sender contains"
-msgstr "Abair"
+msgstr ""
 
 #: default_user/searches.xml.h:7
 #, fuzzy
 msgid "Subject contains"
-msgstr "Abair"
+msgstr "Abair is %s"
 
 #: default_user/searches.xml.h:8
 msgid "Subject does not contain"
 msgstr ""
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
-#: e-util/e-time-utils.c:240
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:131
+#: e-util/e-time-utils.c:243
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
 #: widgets/misc/e-dateedit.c:1531
 msgid "%m/%d/%Y"
-msgstr ""
+msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
-#: e-util/e-time-utils.c:362
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:368
 msgid "%I:%M:%S %p"
-msgstr ""
+msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
-#: e-util/e-time-utils.c:354
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:280
+#: e-util/e-time-utils.c:360
 msgid "%H:%M:%S"
-msgstr ""
+msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
-#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:365 widgets/misc/e-dateedit.c:1339
 #: widgets/misc/e-dateedit.c:1566
 msgid "%I:%M %p"
-msgstr ""
+msgstr "%I:%M %p"
+
+#. strptime format for hour and AM/PM
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:287
+#, fuzzy
+msgid "%I %p"
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
-#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: e-util/e-time-utils.c:111 e-util/e-time-utils.c:290
+#: e-util/e-time-utils.c:357 widgets/misc/e-dateedit.c:1336
 #: widgets/misc/e-dateedit.c:1563
 msgid "%H:%M"
-msgstr ""
+msgstr "%H:%M"
 
 #. This is the second-choice date format for the locale, which we use
 #. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:244
+#: e-util/e-time-utils.c:247
+#, fuzzy
 msgid "%d/%m/%Y"
-msgstr ""
+msgstr "%d/%m/%Y"
 
 #. This is the third-choice date format for the locale, which we use
 #. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:248
+#: e-util/e-time-utils.c:251
+#, fuzzy
 msgid "%Y/%m/%d"
-msgstr ""
+msgstr "%a %d/%m/%Y"
 
 #. This is the final-choice date format for the locale, which we use
 #. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:252
-#, c-format
+#: e-util/e-time-utils.c:255
+#, fuzzy, c-format
 msgid "%x"
-msgstr ""
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:308
+#: e-util/e-time-utils.c:314
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
-msgstr ""
+msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:313
+#: e-util/e-time-utils.c:319
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:322
+#: e-util/e-time-utils.c:328
 msgid "%a %m/%d/%Y %I:%M %p"
-msgstr ""
+msgstr "%a %d/%m/%Y %I:%M %p"
 
 #: filter/filter-datespec.c:80
 msgid "year"
-msgstr ""
+msgstr "bliain"
 
 #: filter/filter-datespec.c:80
 msgid "years"
@@ -7131,9 +7210,8 @@ msgid "minute"
 msgstr ""
 
 #: filter/filter-datespec.c:86
-#, fuzzy
 msgid "second"
-msgstr "Post"
+msgstr "soicínd"
 
 #: filter/filter-datespec.c:86
 msgid "seconds"
@@ -7197,9 +7275,9 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:936
+#: filter/filter-datespec.c:711 mail/message-list.c:940
 msgid "%b %d %l:%M %p"
-msgstr ""
+msgstr "%b %d %l:%M %p"
 
 #: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
@@ -7225,7 +7303,7 @@ msgid ""
 msgstr ""
 
 #: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:809
+#: mail/mail-account-gui.c:820
 #, fuzzy
 msgid "Select Folder"
 msgstr "Fillteán _Nua"
@@ -7255,7 +7333,7 @@ msgstr ""
 
 #: filter/filter-rule.c:630
 msgid "Untitled"
-msgstr ""
+msgstr "Gan Tidéal"
 
 #: filter/filter-rule.c:647
 msgid "If"
@@ -7290,9 +7368,8 @@ msgid "Edit Filters"
 msgstr ""
 
 #: filter/filter.glade.h:2
-#, fuzzy
 msgid "Edit VFolders"
-msgstr "_Fillteán"
+msgstr ""
 
 #: filter/filter.glade.h:4
 msgid "Incoming"
@@ -7303,9 +7380,8 @@ msgid "Outgoing"
 msgstr ""
 
 #: filter/filter.glade.h:6 filter/vfolder-editor.c:130
-#, fuzzy
 msgid "Virtual Folders"
-msgstr "_Fillteán"
+msgstr ""
 
 #: filter/filter.glade.h:11
 msgid "specific folders only"
@@ -7354,18 +7430,16 @@ msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-#, fuzzy
 msgid "Deleted"
-msgstr "Scríos"
+msgstr ""
 
 #: filter/libfilter-i18n.h:10
 msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:11
-#, fuzzy
 msgid "Draft"
-msgstr "Scríos"
+msgstr ""
 
 #: filter/libfilter-i18n.h:12
 msgid "Exist"
@@ -7400,14 +7474,12 @@ msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-#, fuzzy
 msgid "Move to Folder"
-msgstr "Fillteán _Nua"
+msgstr ""
 
 #: filter/libfilter-i18n.h:21
-#, fuzzy
 msgid "Read"
-msgstr "Scríos"
+msgstr ""
 
 #: filter/libfilter-i18n.h:22
 msgid "Recipients"
@@ -7424,9 +7496,9 @@ msgstr ""
 #: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
-msgstr ""
+msgstr "Scór"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
+#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1231
 #, fuzzy
 msgid "Sender"
 msgstr "Post"
@@ -7530,9 +7602,8 @@ msgid "was before"
 msgstr ""
 
 #: filter/rule-editor.c:147
-#, fuzzy
 msgid "Rules"
-msgstr "Scríos"
+msgstr ""
 
 #: filter/rule-editor.c:240
 msgid "Add Rule"
@@ -7541,7 +7612,7 @@ msgstr ""
 #: filter/rule-editor.c:299
 #, fuzzy
 msgid "Edit Rule"
-msgstr "_Fillteán"
+msgstr "Eagar"
 
 #: filter/score-editor.c:130
 msgid "Score Rules"
@@ -7551,60 +7622,101 @@ msgstr ""
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
-#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:816 importers/pine-importer.c:627
-#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
-msgid "Import"
+#: importers/elm-importer.c:96
+msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:821
-#: importers/pine-importer.c:632 mail/component-factory.c:96
+#: importers/elm-importer.c:97 importers/netscape-importer.c:108
+#: importers/pine-importer.c:101
+#, fuzzy
+msgid "Importing..."
+msgstr "Sábháil 'san _fillteán"
+
+#: importers/elm-importer.c:99 importers/netscape-importer.c:110
+#: importers/pine-importer.c:103
+msgid "Please wait"
+msgstr ""
+
+#: importers/elm-importer.c:171 importers/netscape-importer.c:687
+#: importers/pine-importer.c:438
+#, c-format
+msgid "Importing %s as %s"
+msgstr ""
+
+#: importers/elm-importer.c:377 importers/netscape-importer.c:780
+#: importers/pine-importer.c:576
+#, fuzzy, c-format
+msgid "Scanning %s"
+msgstr "Ag Oscailt '%s'"
+
+#: importers/elm-importer.c:528 importers/netscape-importer.c:953
+#: importers/pine-importer.c:739 mail/component-factory.c:95
 #, fuzzy
 msgid "Mail"
-msgstr "Post"
+msgstr "Post Nua"
 
-#: importers/elm-importer.c:498
+#: importers/elm-importer.c:548
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:527
+#: importers/elm-importer.c:577
+msgid "Elm"
+msgstr ""
+
+#: importers/evolution-gnomecard-importer.c:230
 #, fuzzy
-msgid "Elm mail"
-msgstr "Post"
+msgid "GnomeCard:"
+msgstr "Carta: "
 
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:744
+#, fuzzy
 msgid "Addressbook"
-msgstr ""
+msgstr "_Seoladh:"
 
-#: importers/evolution-gnomecard-importer.c:253
+#: importers/evolution-gnomecard-importer.c:250
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:826
-#, fuzzy
+#: importers/netscape-importer.c:107
+msgid "Evolution is importing your old Netscape data"
+msgstr ""
+
+#: importers/netscape-importer.c:883 importers/pine-importer.c:672
+msgid "Scanning directory"
+msgstr ""
+
+#: importers/netscape-importer.c:892
+msgid "Starting import"
+msgstr ""
+
+#: importers/netscape-importer.c:958
 msgid "Settings"
-msgstr "Post"
+msgstr ""
 
-#: importers/netscape-importer.c:851
+#: importers/netscape-importer.c:979
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:100
+msgid "Evolution is importing your old Pine data"
+msgstr ""
+
+#: importers/pine-importer.c:765
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:793
 #, fuzzy
-msgid "Pine mail"
-msgstr "Post"
+msgid "Pine"
+msgstr "Priontáil"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
@@ -7631,50 +7743,57 @@ msgid "Factory for the Evolution composer."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
+msgid "Factory for the Mail Summary component."
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
+msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Mail configuration interface"
+#: mail/component-factory.c:95
+msgid "Folder containing mail"
 msgstr ""
 
 #: mail/component-factory.c:96
-#, fuzzy
-msgid "Folder containing mail"
-msgstr "Abair"
+msgid "Mail storage folder (internal)"
+msgstr ""
+
+#: mail/component-factory.c:97
+msgid "Virtual Trash"
+msgstr ""
 
-#: mail/component-factory.c:114
+#: mail/component-factory.c:97
+msgid "Virtual Trash folder"
+msgstr ""
+
+#: mail/component-factory.c:113
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:341
+#: mail/component-factory.c:344
 #, fuzzy
 msgid "Properties..."
-msgstr "Priontáil"
+msgstr "_Roghanna..."
 
-#: mail/component-factory.c:341
+#: mail/component-factory.c:344
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:757
+#: mail/component-factory.c:766
 #, fuzzy
 msgid "New Mail Message"
 msgstr "_Post sceál"
 
-#: mail/component-factory.c:757
+#: mail/component-factory.c:766
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "_Post sceál"
 
-#: mail/component-factory.c:789
+#: mail/component-factory.c:797
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:928
+#: mail/component-factory.c:974
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -7687,153 +7806,147 @@ msgstr ""
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:236 mail/mail-display.c:281
+#: mail/folder-browser.c:229 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:909
-#, fuzzy
+#: mail/folder-browser.c:905
 msgid "Create vFolder from Search"
-msgstr "Post an sceál seo"
+msgstr ""
 
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1250
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Abair"
 
-#: mail/folder-browser.c:1257
+#: mail/folder-browser.c:1253
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1256
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1263
+#: mail/folder-browser.c:1259
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Abair"
 
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1265
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Abair"
 
-#: mail/folder-browser.c:1272
-#, fuzzy
+#: mail/folder-browser.c:1268
 msgid "Filter on Sen_der"
-msgstr "Abair"
+msgstr ""
 
-#: mail/folder-browser.c:1275
-#, fuzzy
+#: mail/folder-browser.c:1271
 msgid "Filter on Re_cipients"
-msgstr "Abair"
+msgstr ""
 
-#: mail/folder-browser.c:1278
+#: mail/folder-browser.c:1274
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1285 ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Edit as New Message..."
-msgstr "Post an sceál seo"
+msgstr "Sábháil 'san _fillteán"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
-#, fuzzy
+#: mail/folder-browser.c:1287 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
-msgstr "Sábháil 'san _fillteán"
+msgstr "_Sábháil le..."
 
-#: mail/folder-browser.c:1293
-#, fuzzy
+#: mail/folder-browser.c:1289
 msgid "_Print"
-msgstr "Priontáil"
+msgstr "_Priontáil"
 
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1294 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Freagrair"
 
-#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1296 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Freagrair"
 
-#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Freagrair"
 
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1300
 #, fuzzy
 msgid "_Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1303 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1305 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1311
+#: mail/folder-browser.c:1307
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1309
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1314
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Sábháil 'san _fillteán"
 
-#: mail/folder-browser.c:1320
+#: mail/folder-browser.c:1316
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Fillteán"
 
-#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
-#, fuzzy
+#: mail/folder-browser.c:1320 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
-msgstr "Scríos"
+msgstr ""
 
-#: mail/folder-browser.c:1329
+#: mail/folder-browser.c:1325
 msgid "Add Sender to Address Book"
 msgstr ""
 
-#: mail/folder-browser.c:1334
+#: mail/folder-browser.c:1330
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1338
-#, fuzzy
+#: mail/folder-browser.c:1334
 msgid "Create Ru_le From Message"
-msgstr "Post an sceál seo"
+msgstr ""
 
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1492
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1497
+#: mail/folder-browser.c:1493
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1499
+#: mail/folder-browser.c:1495
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1500
+#: mail/folder-browser.c:1496
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
 #: mail/folder-info.c:64
+#, fuzzy
 msgid "Getting Folder Information"
-msgstr ""
+msgstr "eolas fheilire"
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
@@ -7872,17 +7985,16 @@ msgid ""
 msgstr ""
 
 #: mail/local-config.glade.h:7
-#, fuzzy
 msgid "maildir"
-msgstr "Post"
+msgstr "maildir"
 
 #: mail/local-config.glade.h:8
 msgid "mbox"
-msgstr ""
+msgstr "mbox"
 
 #: mail/local-config.glade.h:9
 msgid "mh"
-msgstr ""
+msgstr "mh"
 
 #: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
@@ -7899,26 +8011,24 @@ msgstr "Evolution"
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:999
-#, fuzzy
+#: mail/mail-account-gui.c:1010
 msgid "Save signature"
-msgstr "Fillteán _Nua"
+msgstr ""
 
-#: mail/mail-account-gui.c:1005
+#: mail/mail-account-gui.c:1016
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-account-gui.c:1585
+#: mail/mail-account-gui.c:1597
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
 #: mail/mail-accounts.c:145
-#, fuzzy
 msgid " (default)"
-msgstr "Scríos"
+msgstr ""
 
 #: mail/mail-accounts.c:190
 msgid "Disable"
@@ -7928,43 +8038,43 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:284
+#: mail/mail-accounts.c:283
 #, fuzzy
 msgid "Don't delete"
 msgstr "Scríos"
 
-#: mail/mail-accounts.c:287
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:758 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Mail Settings"
-msgstr "Post"
+msgstr "Post do %s"
 
 #: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
-msgstr ""
+msgstr "Post do %s"
 
 #: mail/mail-autofilter.c:213
-#, fuzzy, c-format
+#, c-format
 msgid "Subject is %s"
-msgstr "Abair"
+msgstr "Abair is %s"
 
 #: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
-msgstr ""
+msgstr "Scéal ó %s"
 
 #: mail/mail-autofilter.c:285
 #, c-format
@@ -7999,83 +8109,109 @@ msgstr ""
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:218
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:216
+msgid ""
+"You are sending an HTML-formatted mail, but the following recipients' "
+"contact records do not indicate that they want to receive such messages:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:226
+#, fuzzy
+msgid "Send anyway?"
+msgstr "Post"
+
+#: mail/mail-callbacks.c:268
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:312
+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:316
+msgid "This message contains only Bcc recipients."
+msgstr ""
+
+#: mail/mail-callbacks.c:320
 msgid ""
-"This message contains only Bcc recipients.\n"
 "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:339
+#: mail/mail-callbacks.c:413
+msgid "This message contains invalid recipients:"
+msgstr ""
+
+#: mail/mail-callbacks.c:445
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:390
+#: mail/mail-callbacks.c:543
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:632
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr ""
+#: mail/mail-callbacks.c:772
+#, fuzzy
+msgid "an unknown sender"
+msgstr "iEarraidh gan Aithne"
 
-#: mail/mail-callbacks.c:895
-msgid "Forwarded message:\n"
+#: mail/mail-callbacks.c:777
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:995
+#: mail/mail-callbacks.c:1151
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:997
+#: mail/mail-callbacks.c:1153
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1366
+#: mail/mail-callbacks.c:1522
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1388
+#: mail/mail-callbacks.c:1544
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1422
+#: mail/mail-callbacks.c:1578
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1434
+#: mail/mail-callbacks.c:1590
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1455
+#: mail/mail-callbacks.c:1611
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1540
+#: mail/mail-callbacks.c:1696
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1542
+#: mail/mail-callbacks.c:1698
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1843 widgets/misc/e-messagebox.c:159
 msgid "Warning"
-msgstr ""
+msgstr "Rabhadh"
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1848
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8083,33 +8219,32 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1721
-#, fuzzy
+#: mail/mail-callbacks.c:1855
 msgid "Do not ask me again."
-msgstr "Post an sceál seo"
+msgstr ""
 
-#: mail/mail-callbacks.c:1826
+#: mail/mail-callbacks.c:1960
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1836
+#: mail/mail-callbacks.c:1970
 #, fuzzy
 msgid "Filters"
-msgstr "_Fillteán"
+msgstr "Comhad"
 
-#: mail/mail-callbacks.c:1882
+#: mail/mail-callbacks.c:2016
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sceál seo"
 
-#: mail/mail-callbacks.c:1928
+#: mail/mail-callbacks.c:2062
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2012
+#: mail/mail-callbacks.c:2146
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8151,7 +8286,7 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:558
+#: mail/mail-config-druid.c:570
 msgid "Evolution Account Assistant"
 msgstr ""
 
@@ -8160,23 +8295,22 @@ msgstr ""
 #. * name. I don't think this will work with maildir. How can we figure out
 #. * what shortcut to insert?
 #.
-#: mail/mail-config.c:1579
+#: mail/mail-config.c:1608
 #, c-format
 msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.c:1809
+#: mail/mail-config.c:1850
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1880 mail/mail-config.c:1883
+#: mail/mail-config.c:1921 mail/mail-config.c:1924
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
 msgid " color"
-msgstr "_Fillteán"
+msgstr " dath"
 
 #: mail/mail-config.glade.h:2
 msgid "(SSL is not supported in this build of evolution)"
@@ -8190,14 +8324,13 @@ msgstr ""
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
-#, fuzzy
 msgid "Accounts"
-msgstr "_Oscáil"
+msgstr ""
 
 #: mail/mail-config.glade.h:7
 msgid "Always encrypt to myself when sending encrypted mail"
@@ -8230,7 +8363,7 @@ msgstr ""
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Composer"
-msgstr "_Nota"
+msgstr "Dún"
 
 #: mail/mail-config.glade.h:16
 msgid ""
@@ -8243,9 +8376,8 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config.glade.h:22
-#, fuzzy
 msgid "De_fault"
-msgstr "Scríos"
+msgstr "_Gnáth"
 
 #: mail/mail-config.glade.h:23
 msgid "Default Forward style is: "
@@ -8261,17 +8393,15 @@ msgstr ""
 
 #: mail/mail-config.glade.h:26
 msgid "Display"
-msgstr ""
+msgstr "Taispeaín"
 
-#: mail/mail-config.glade.h:27
-#, fuzzy
+#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
-msgstr "_Nota"
+msgstr "Críochnaithe"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
-#, fuzzy
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
 msgid "Drafts"
-msgstr "Scríos"
+msgstr ""
 
 #: mail/mail-config.glade.h:29
 msgid "Drafts folder:"
@@ -8289,7 +8419,7 @@ msgstr ""
 #: widgets/misc/e-filter-bar.h:103
 #, fuzzy
 msgid "Edit..."
-msgstr "Priontáil"
+msgstr "Eagar"
 
 #: mail/mail-config.glade.h:33
 msgid "Enabled"
@@ -8305,9 +8435,9 @@ msgstr ""
 
 #: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
-msgstr ""
+msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
@@ -8320,9 +8450,8 @@ msgid "Inline"
 msgstr ""
 
 #: mail/mail-config.glade.h:40
-#, fuzzy
 msgid "Kerberos "
-msgstr "Post"
+msgstr "Kerberos "
 
 #: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
@@ -8350,9 +8479,8 @@ msgid "NNTP Server:"
 msgstr ""
 
 #: mail/mail-config.glade.h:48
-#, fuzzy
 msgid "News"
-msgstr "_Nua"
+msgstr "_Nuacht"
 
 #: mail/mail-config.glade.h:50
 msgid "Optional Information"
@@ -8364,7 +8492,7 @@ msgstr ""
 
 #: mail/mail-config.glade.h:55
 msgid "Pick a color"
-msgstr ""
+msgstr "Tóg dath"
 
 #: mail/mail-config.glade.h:56
 msgid "Pretty Good Privacy"
@@ -8379,16 +8507,15 @@ msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
 #: mail/mail-config.glade.h:59
-#, fuzzy
 msgid "Qmail maildir "
-msgstr "Post"
+msgstr ""
 
 #: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Quoted"
-msgstr "_Nota"
+msgstr "Nota"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
@@ -8409,8 +8536,9 @@ msgid "Secure MIME"
 msgstr ""
 
 #: mail/mail-config.glade.h:67
+#, fuzzy
 msgid "Security"
-msgstr ""
+msgstr "_Slándáil"
 
 #: mail/mail-config.glade.h:68
 #, fuzzy
@@ -8421,7 +8549,7 @@ msgstr "Fillteán _Nua"
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Post"
@@ -8432,7 +8560,7 @@ msgid "Sending Mail"
 msgstr "Post"
 
 #: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:179
+#: shell/e-local-storage.c:177
 #, fuzzy
 msgid "Sent"
 msgstr "Post"
@@ -8465,12 +8593,14 @@ msgid "Signature file:"
 msgstr ""
 
 #: mail/mail-config.glade.h:80
+#, fuzzy
 msgid "Source"
-msgstr ""
+msgstr "Scór"
 
 #: mail/mail-config.glade.h:81
+#, fuzzy
 msgid "Source Information"
-msgstr ""
+msgstr "Eolas"
 
 #: mail/mail-config.glade.h:82
 msgid "Sources"
@@ -8509,8 +8639,9 @@ msgid "_Check for supported types"
 msgstr ""
 
 #: mail/mail-config.glade.h:96
+#, fuzzy
 msgid "_Email Address:"
-msgstr ""
+msgstr "_Seoladh:"
 
 #: mail/mail-config.glade.h:97
 msgid "_Empty trash folders on exit"
@@ -8519,20 +8650,20 @@ msgstr ""
 #: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "_Full Name:"
-msgstr "_Fillteán"
+msgstr "Ainm:"
 
 #: mail/mail-config.glade.h:99
-#, fuzzy
 msgid "_HTML Signature:"
-msgstr "Fillteán _Nua"
+msgstr ""
 
 #: mail/mail-config.glade.h:100
 msgid "_Highlight citations with"
 msgstr ""
 
 #: mail/mail-config.glade.h:101
+#, fuzzy
 msgid "_Host:"
-msgstr ""
+msgstr "Óst:"
 
 #: mail/mail-config.glade.h:102
 msgid "_Load images if sender is in addressbook"
@@ -8550,15 +8681,16 @@ msgstr "Fillteán _Nua"
 #: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "_Name:"
-msgstr "_Nua"
+msgstr "Ainm:"
 
 #: mail/mail-config.glade.h:106
 msgid "_Never load images off the net"
 msgstr ""
 
 #: mail/mail-config.glade.h:107
+#, fuzzy
 msgid "_Organization:"
-msgstr ""
+msgstr "Treshuíomh"
 
 #: mail/mail-config.glade.h:108
 msgid "_PGP binary path:"
@@ -8567,43 +8699,45 @@ msgstr ""
 #: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "_Path:"
-msgstr "Priontáil"
+msgstr "Slí"
 
 #: mail/mail-config.glade.h:110
 msgid "_Remember PGP Passphrase until exit"
 msgstr ""
 
 #: mail/mail-config.glade.h:111
-#, fuzzy
 msgid "_Remember this password"
-msgstr "Scríos an sceal seo"
+msgstr ""
 
 #: mail/mail-config.glade.h:112
 msgid "_Send mail in HTML format by default."
 msgstr ""
 
 #: mail/mail-config.glade.h:113
-#, fuzzy
 msgid "_Signature file:"
-msgstr "Fillteán _Nua"
+msgstr ""
 
 #: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "_Username:"
-msgstr "_Fillteán"
+msgstr "Ainm Úsaideoir"
+
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "description"
+msgstr "Freagra"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
-#, fuzzy
+#: mail/mail-config.glade.h:119
 msgid "seconds."
-msgstr "Post"
+msgstr "soicind."
 
 #: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
@@ -8641,86 +8775,88 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:222
+#: mail/mail-display.c:223
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:327
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:343
+#: mail/mail-display.c:329
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:345
+#: mail/mail-display.c:331
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:406
+#: mail/mail-display.c:392
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:410
+#: mail/mail-display.c:396
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:431
+#: mail/mail-display.c:417
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1055
+#: mail/mail-display.c:1053
 #, fuzzy
 msgid "Loading message content"
 msgstr "Post an sceál seo"
 
-#: mail/mail-display.c:1411
+#: mail/mail-display.c:1512
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1413
+#: mail/mail-display.c:1514
 #, fuzzy
 msgid "Copy Link Location"
-msgstr "_Coinne"
+msgstr ""
+"\n"
+"Áitiúl: "
 
-#: mail/mail-display.c:1415
+#: mail/mail-display.c:1516
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Post sceál"
 
-#: mail/mail-display.c:1417
+#: mail/mail-display.c:1518
 #, fuzzy
 msgid "Save Image as..."
-msgstr "Sábháil 'san _fillteán"
+msgstr "Sánbháil le..."
 
-#: mail/mail-folder-cache.c:147
+#: mail/mail-folder-cache.c:151
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
-#: mail/mail-folder-cache.c:167
+#: mail/mail-folder-cache.c:157 mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:171
 msgid ", "
 msgstr ""
 
-#: mail/mail-folder-cache.c:154
+#: mail/mail-folder-cache.c:158
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-folder-cache.c:161
+#: mail/mail-folder-cache.c:165
 #, fuzzy, c-format
 msgid "%d selected"
-msgstr "Scríos"
+msgstr "Post"
 
-#: mail/mail-folder-cache.c:170
+#: mail/mail-folder-cache.c:174
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "Post"
 
-#: mail/mail-folder-cache.c:172
+#: mail/mail-folder-cache.c:176
 #, c-format
 msgid "%d total"
 msgstr ""
@@ -8735,16 +8871,15 @@ msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
 #: mail/mail-format.c:760
-#, fuzzy
 msgid "Date"
-msgstr "Scríos"
+msgstr "Data"
 
 #: mail/mail-format.c:856
+#, fuzzy
 msgid "Bad Address"
-msgstr ""
+msgstr "_Seoladh:"
 
 #: mail/mail-format.c:878 mail/message-list.etspec.h:3
-#, fuzzy
 msgid "From"
 msgstr "Ó:"
 
@@ -8754,7 +8889,6 @@ msgid "Reply-To"
 msgstr "Freagrair"
 
 #: mail/mail-format.c:884 mail/message-list.etspec.h:10
-#, fuzzy
 msgid "To"
 msgstr "Do:"
 
@@ -8763,57 +8897,57 @@ msgstr "Do:"
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1306
+#: mail/mail-format.c:1307
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1322
+#: mail/mail-format.c:1323
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1333
+#: mail/mail-format.c:1334
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Post an sceál seo"
 
-#: mail/mail-format.c:1334
+#: mail/mail-format.c:1335
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1392
+#: mail/mail-format.c:1390
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1403
+#: mail/mail-format.c:1401
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2061
+#: mail/mail-format.c:2076
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2075
+#: mail/mail-format.c:2090
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2080
+#: mail/mail-format.c:2095
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2109
+#: mail/mail-format.c:2124
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2117
+#: mail/mail-format.c:2132
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2122
+#: mail/mail-format.c:2137
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -8823,36 +8957,36 @@ msgid "No such folder /%s"
 msgstr "Post an sceál seo"
 
 #: mail/mail-local.c:460
-#, c-format
+#, fuzzy, c-format
 msgid "Registering '%s'"
-msgstr ""
+msgstr "Ag Oscailt '%s'"
 
-#: mail/mail-local.c:748
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:869
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:909
+#: mail/mail-local.c:908
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1002
+#: mail/mail-local.c:1001
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1013
+#: mail/mail-local.c:1012
 #, fuzzy, c-format
 msgid "Reconfigure %s"
-msgstr "Fillteán _Nua"
+msgstr "Cumraigh %s"
 
 #: mail/mail-mt.c:187
 #, c-format
@@ -8877,219 +9011,218 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:84
+#: mail/mail-ops.c:85
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Fillteán _Nua"
 
-#: mail/mail-ops.c:227
+#: mail/mail-ops.c:228
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Post"
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:598
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:709
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Post an sceál seo"
 
-#: mail/mail-ops.c:728
+#: mail/mail-ops.c:736
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "_Post sceál"
 
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
+#: mail/mail-ops.c:738 mail/mail-send-recv.c:500
 msgid "Complete."
-msgstr ""
+msgstr "Críochnaithe.`"
 
-#: mail/mail-ops.c:823
-#, fuzzy
+#: mail/mail-ops.c:831
 msgid "Saving message to folder"
-msgstr "_Post sceál"
+msgstr ""
 
-#: mail/mail-ops.c:902
-#, fuzzy, c-format
+#: mail/mail-ops.c:910
+#, c-format
 msgid "Moving messages to %s"
-msgstr "_Post sceál"
+msgstr ""
 
-#: mail/mail-ops.c:902
-#, fuzzy, c-format
+#: mail/mail-ops.c:910
+#, c-format
 msgid "Copying messages to %s"
-msgstr "_Post sceál"
+msgstr ""
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:927
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:922
-#, fuzzy
+#: mail/mail-ops.c:930
 msgid "Copying"
-msgstr "Greamaigh"
+msgstr ""
 
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
-#, fuzzy
+#: mail/mail-ops.c:1082 mail/mail-ops.c:1083 shell/e-local-storage.c:179
 msgid "Trash"
-msgstr "_Teacs"
+msgstr "Bruscar"
 
-#: mail/mail-ops.c:1211
+#: mail/mail-ops.c:1219
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1253
+#: mail/mail-ops.c:1261
 #, c-format
 msgid "Opening folder %s"
-msgstr ""
+msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1322
+#: mail/mail-ops.c:1330
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1395
+#: mail/mail-ops.c:1403
 #, fuzzy, c-format
 msgid "Creating folder %s"
-msgstr "Fillteán _Nua"
+msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1465
+#: mail/mail-ops.c:1473
 #, fuzzy, c-format
 msgid "Removing folder %s"
-msgstr "Fillteán _Nua"
+msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1552
-#, c-format
-msgid "Synchronizing '%s'"
-msgstr ""
+#: mail/mail-ops.c:1569
+#, fuzzy, c-format
+msgid "Storing folder '%s'"
+msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1620
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Fillteán _Nua"
 
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1656
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1688
-#, fuzzy, c-format
+#: mail/mail-ops.c:1705
+#, c-format
 msgid "Retrieving message %s"
-msgstr "_Post sceál"
+msgstr ""
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1772
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "_Post sceál"
 
-#: mail/mail-ops.c:1841
+#: mail/mail-ops.c:1858
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
-msgstr "_Post sceál"
+msgstr "Ag Sábháil scealta"
 
-#: mail/mail-ops.c:1921
+#: mail/mail-ops.c:1938
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1964
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
+"Earraidh ag sábhháil scéalaí do: %s\n"
+" %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:2038
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2054
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2085
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2154
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
 #: mail/mail-search-dialogue.c:113
-#, fuzzy
 msgid "_Search"
-msgstr "_Fillteán"
+msgstr "C_uardaigh..."
 
 #: mail/mail-search.c:138
 #, fuzzy
 msgid "(Untitled Message)"
-msgstr "Post an sceál seo"
+msgstr "(gan tideál)"
 
-#: mail/mail-search.c:237
+#: mail/mail-search.c:241
 #, fuzzy
 msgid "Untitled Message"
 msgstr "Post an sceál seo"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:245
 #, fuzzy
 msgid "Empty Message"
-msgstr "_Post sceál"
+msgstr "Sceál"
 
-#: mail/mail-search.c:288
+#: mail/mail-search.c:292
 #, fuzzy
 msgid "Find in Message"
-msgstr "_Post sceál"
+msgstr "Post an sceál seo"
 
-#: mail/mail-search.c:318
+#: mail/mail-search.c:322
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:320
+#: mail/mail-search.c:324
 #, fuzzy
 msgid "Search Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-search.c:340
-#, fuzzy
+#: mail/mail-search.c:344
 msgid "Find:"
-msgstr "Priontáil"
+msgstr ""
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:347
 #, fuzzy
 msgid "Matches:"
-msgstr "Scríos"
+msgstr "Slí"
 
 #: mail/mail-send-recv.c:138
+#, fuzzy
 msgid "Cancelling..."
-msgstr ""
+msgstr "Ag Cealaigh..."
 
-#: mail/mail-send-recv.c:257
-msgid "Send & Receive mail"
-msgstr ""
+#: mail/mail-send-recv.c:258
+#, fuzzy
+msgid "Send & Receive Mail"
+msgstr "Post"
 
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:312
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
+#: mail/mail-send-recv.c:313 mail/mail-send-recv.c:366
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:494
+#: mail/mail-send-recv.c:496
 msgid "Cancelled."
 msgstr ""
 
@@ -9102,103 +9235,100 @@ msgstr ""
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:241
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:294
 #, fuzzy
 msgid "Forwarded message"
-msgstr "_Post sceál"
+msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-tools.c:471
+#: mail/mail-tools.c:442
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Post an sceál seo"
 
-#: mail/mail-vfolder.c:278
-#, fuzzy
+#: mail/mail-vfolder.c:280
 msgid "VFolders"
-msgstr "_Fillteán"
+msgstr ""
 
-#: mail/mail-vfolder.c:498
-#, fuzzy
+#: mail/mail-vfolder.c:500
 msgid "New VFolder"
 msgstr "Fillteán _Nua"
 
-#: mail/message-browser.c:125
+#: mail/message-browser.c:121
 #, fuzzy
 msgid "(No subject)"
 msgstr "Abair"
 
-#: mail/message-browser.c:127
+#: mail/message-browser.c:123
 #, fuzzy, c-format
 msgid "%s - Message"
-msgstr "_Post sceál"
+msgstr "Sceál"
 
-#: mail/message-list.c:636
+#: mail/message-list.c:640
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:637
-#, fuzzy
+#: mail/message-list.c:641
 msgid "Seen"
-msgstr "Post"
+msgstr ""
 
-#: mail/message-list.c:638
+#: mail/message-list.c:642
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:639
+#: mail/message-list.c:643
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:640
+#: mail/message-list.c:644
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Post an sceál seo"
 
-#: mail/message-list.c:644
+#: mail/message-list.c:648
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:645
+#: mail/message-list.c:649
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:649
+#: mail/message-list.c:653
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:650
+#: mail/message-list.c:654
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "?"
-msgstr ""
+msgstr "?"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:911
 msgid "Today %l:%M %p"
-msgstr ""
+msgstr "Inniú %l:%M %p"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:920
 msgid "Yesterday %l:%M %p"
-msgstr ""
+msgstr "Inné %l:%M %p"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:932
 msgid "%a %l:%M %p"
-msgstr ""
+msgstr "%a %l:%M %"
 
-#: mail/message-list.c:938
+#: mail/message-list.c:942
 msgid "%b %d %Y"
-msgstr ""
+msgstr "%b %d %Y"
 
-#: mail/message-list.c:2312
+#: mail/message-list.c:2316
 #, fuzzy
 msgid "Generating message list"
-msgstr "_Post sceál"
+msgstr "Post an sceál seo"
 
 #: mail/message-list.etspec.h:2
 msgid "Flagged"
@@ -9209,14 +9339,13 @@ msgid "Received"
 msgstr ""
 
 #: mail/message-list.etspec.h:7
-#, fuzzy
 msgid "Size"
 msgstr "Méid"
 
 #: mail/subscribe-dialog.c:174
-#, fuzzy, c-format
+#, c-format
 msgid "Scanning folders under %s on \"%s\""
-msgstr "_Post sceál"
+msgstr ""
 
 #: mail/subscribe-dialog.c:176
 #, c-format
@@ -9235,9 +9364,8 @@ msgstr ""
 
 #: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
 msgid "Folder"
-msgstr "_Fillteán"
+msgstr "Eolaire"
 
 #: mail/subscribe-dialog.c:1490
 msgid "No server has been selected"
@@ -9254,7 +9382,7 @@ msgstr ""
 #: mail/subscribe-dialog.glade.h:2
 #, fuzzy
 msgid "All folders"
-msgstr "_Fillteán"
+msgstr "Fillteáin"
 
 #: mail/subscribe-dialog.glade.h:3
 msgid "Display options"
@@ -9284,10 +9412,6 @@ msgstr ""
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr ""
-
 #: my-evolution/component-factory.c:30
 msgid "Folder containing the Evolution Summary"
 msgstr ""
@@ -9296,28 +9420,29 @@ msgstr ""
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
+#: my-evolution/e-summary-calendar.c:188 my-evolution/e-summary-calendar.c:206
 #, fuzzy
 msgid "Appointments"
-msgstr "_Coinne"
+msgstr "Coinne"
 
-#: my-evolution/e-summary-calendar.c:183
+#: my-evolution/e-summary-calendar.c:189
 #, fuzzy
 msgid "No appointments"
-msgstr "_Coinne"
-
-#: my-evolution/e-summary-calendar.c:236
-msgid "%l:%M%p"
-msgstr ""
+msgstr "Taispeáin coinní"
 
 #: my-evolution/e-summary-calendar.c:238
-msgid "%a %l:%M%p"
-msgstr ""
+#, fuzzy
+msgid "%k%M %d %B"
+msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:111
+#: my-evolution/e-summary-calendar.c:240
 #, fuzzy
+msgid "%l:%M %d %B"
+msgstr "%A %d %B"
+
+#: my-evolution/e-summary-mail.c:113
 msgid "Mail summary"
-msgstr "Post"
+msgstr ""
 
 #. translators: Put here a list of codes for locations you want to
 #. see in My Evolution by default. You can find the list of all
@@ -9328,30 +9453,29 @@ msgstr "Post"
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:428
+#: my-evolution/e-summary-preferences.c:427
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:450
+#: my-evolution/e-summary-preferences.c:448
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:876
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:885
+#: my-evolution/e-summary-preferences.c:884
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:888
 msgid "Name:"
-msgstr ""
+msgstr "Ainm:"
 
-#: my-evolution/e-summary-preferences.c:1421
-#, fuzzy
+#: my-evolution/e-summary-preferences.c:1423
 msgid "Summary Settings"
-msgstr "Post"
+msgstr ""
 
 #: my-evolution/e-summary-rdf.c:281
 msgid "There was an error downloading news feed"
@@ -9364,12 +9488,12 @@ msgstr ""
 #: my-evolution/e-summary-rdf.c:479
 #, fuzzy
 msgid "News Feed"
-msgstr "Fillteán _Nua"
+msgstr "_Nuacht"
 
 #: my-evolution/e-summary-tasks.c:213
 #, fuzzy
 msgid "No tasks"
-msgstr "_Teacs"
+msgstr "_Teasc Nua"
 
 #: my-evolution/e-summary-weather.c:57
 msgid "My Weather"
@@ -9382,21 +9506,21 @@ msgstr ""
 #: my-evolution/e-summary-weather.c:512
 #, fuzzy
 msgid "Weather"
-msgstr "Post"
+msgstr "Eile"
 
 #: my-evolution/e-summary-weather.c:664
-#, fuzzy
 msgid "Regions"
-msgstr "Post"
+msgstr ""
 
 #: my-evolution/e-summary.c:145
+#, fuzzy
 msgid "%A, %B %e %Y"
-msgstr ""
+msgstr "%A, %d %B %Y"
 
 #: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
-msgstr "Post"
+msgstr "Tosaíocht"
 
 #: my-evolution/e-summary.c:518
 msgid "Printing of Summary failed"
@@ -9415,8 +9539,9 @@ msgid "°C"
 msgstr ""
 
 #: my-evolution/metar.c:33
+#, fuzzy
 msgid "knots"
-msgstr ""
+msgstr "CHlófhoireanna"
 
 #: my-evolution/metar.c:33
 msgid "kph"
@@ -9433,17 +9558,16 @@ msgstr ""
 #: my-evolution/metar.c:41
 #, fuzzy
 msgid "miles"
-msgstr "_Fillteán"
+msgstr "Comhad"
 
 #: my-evolution/metar.c:41
-#, fuzzy
 msgid "kilometers"
-msgstr "_Fillteán"
+msgstr ""
 
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
-msgstr "_Fillteán"
+msgstr "Glan"
 
 #: my-evolution/metar.c:45
 msgid "Broken clouds"
@@ -9472,7 +9596,7 @@ msgstr ""
 #: my-evolution/metar.c:64
 #, fuzzy
 msgid "North"
-msgstr "_Nota"
+msgstr "Nota"
 
 #: my-evolution/metar.c:64
 msgid "North - NorthEast"
@@ -9481,7 +9605,7 @@ msgstr ""
 #: my-evolution/metar.c:64
 #, fuzzy
 msgid "Northeast"
-msgstr "_Nota"
+msgstr "_Notaí:"
 
 #: my-evolution/metar.c:64
 msgid "East - NorthEast"
@@ -9490,7 +9614,7 @@ msgstr ""
 #: my-evolution/metar.c:65
 #, fuzzy
 msgid "East"
-msgstr "Priontáil"
+msgstr "_Greamaigh"
 
 #: my-evolution/metar.c:65
 msgid "East - Southeast"
@@ -9505,9 +9629,8 @@ msgid "South - Southeast"
 msgstr ""
 
 #: my-evolution/metar.c:66
-#, fuzzy
 msgid "South"
-msgstr "Priontáil"
+msgstr ""
 
 #: my-evolution/metar.c:66
 msgid "South - Southwest"
@@ -9522,8 +9645,9 @@ msgid "West - Southwest"
 msgstr ""
 
 #: my-evolution/metar.c:67
+#, fuzzy
 msgid "West"
-msgstr ""
+msgstr "Ce"
 
 #: my-evolution/metar.c:67
 msgid "West - Northwest"
@@ -9532,7 +9656,7 @@ msgstr ""
 #: my-evolution/metar.c:67
 #, fuzzy
 msgid "Northwest"
-msgstr "_Nota"
+msgstr "_Notaí:"
 
 #: my-evolution/metar.c:67
 msgid "North - Northwest"
@@ -9583,8 +9707,9 @@ msgid "Windy drizzle"
 msgstr ""
 
 #: my-evolution/metar.c:100
+#, fuzzy
 msgid "Showers"
-msgstr ""
+msgstr "Taispeáin"
 
 #: my-evolution/metar.c:100
 msgid "Drifting drizzle"
@@ -9596,8 +9721,9 @@ msgstr ""
 
 #. RAIN
 #: my-evolution/metar.c:101
+#, fuzzy
 msgid "Rain"
-msgstr ""
+msgstr "Raidio"
 
 #: my-evolution/metar.c:101
 msgid "Rain in the vicinity"
@@ -9647,7 +9773,7 @@ msgstr ""
 #: my-evolution/metar.c:102
 #, fuzzy
 msgid "Snow"
-msgstr "Méid"
+msgstr "Taispeáin"
 
 #: my-evolution/metar.c:102
 msgid "Snow in the vicinity"
@@ -9852,7 +9978,7 @@ msgstr ""
 #: my-evolution/metar.c:106
 #, fuzzy
 msgid "Hail"
-msgstr "Post"
+msgstr "R-Post"
 
 #: my-evolution/metar.c:106
 msgid "Hail in the vicinity"
@@ -9871,8 +9997,9 @@ msgid "Heavy hail"
 msgstr ""
 
 #: my-evolution/metar.c:106
+#, fuzzy
 msgid "Shallow hail"
-msgstr ""
+msgstr "Taispeán gach Rud"
 
 #: my-evolution/metar.c:106
 msgid "Patches of hail"
@@ -9986,8 +10113,9 @@ msgid "Partial precipitation"
 msgstr ""
 
 #: my-evolution/metar.c:108
+#, fuzzy
 msgid "Unknown thunderstorm"
-msgstr ""
+msgstr "iEarraidh gan Aithne"
 
 #: my-evolution/metar.c:108
 msgid "Blowing precipitation"
@@ -10035,9 +10163,8 @@ msgid "Patches of mist"
 msgstr ""
 
 #: my-evolution/metar.c:109
-#, fuzzy
 msgid "Partial mist"
-msgstr "Tosaíocht"
+msgstr ""
 
 #: my-evolution/metar.c:109
 msgid "Mist with wind"
@@ -10085,8 +10212,9 @@ msgid "Partial fog"
 msgstr ""
 
 #: my-evolution/metar.c:110
+#, fuzzy
 msgid "Fog with wind"
-msgstr ""
+msgstr "Dún an fhuinneog seo"
 
 #: my-evolution/metar.c:110
 msgid "Drifting fog"
@@ -10098,8 +10226,9 @@ msgstr ""
 
 #. SMOKE
 #: my-evolution/metar.c:111
+#, fuzzy
 msgid "Smoke"
-msgstr ""
+msgstr "Scór"
 
 #: my-evolution/metar.c:111
 msgid "Smoke in the vicinity"
@@ -10134,8 +10263,9 @@ msgid "Smoke w/ thunders"
 msgstr ""
 
 #: my-evolution/metar.c:111
+#, fuzzy
 msgid "Smoke with wind"
-msgstr ""
+msgstr "Dún an fhuinneog seo"
 
 #: my-evolution/metar.c:111
 msgid "Drifting smoke"
@@ -10194,7 +10324,7 @@ msgstr ""
 #: my-evolution/metar.c:113
 #, fuzzy
 msgid "Sand"
-msgstr "Post"
+msgstr "Sa"
 
 #: my-evolution/metar.c:113
 msgid "Sand in the vicinity"
@@ -10230,9 +10360,8 @@ msgstr ""
 
 #. HAZE
 #: my-evolution/metar.c:114
-#, fuzzy
 msgid "Haze"
-msgstr "Post"
+msgstr ""
 
 #: my-evolution/metar.c:114
 msgid "Haze in the vicinity"
@@ -10321,8 +10450,9 @@ msgstr ""
 
 #. DUST
 #: my-evolution/metar.c:116
+#, fuzzy
 msgid "Dust"
-msgstr ""
+msgstr "Lúnasa"
 
 #: my-evolution/metar.c:116
 msgid "Dust in the vicinity"
@@ -10641,86 +10771,83 @@ msgid "One mont_h"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:11
+#, fuzzy
 msgid "One w_eek"
-msgstr ""
+msgstr " seachtain"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Refresh _time (seconds):"
+msgid "R_efresh time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
+msgid "Refresh _time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "S_how full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
 #, fuzzy
 msgid "Show _all tasks"
 msgstr "Post an sceál seo"
 
-#: my-evolution/my-evolution.glade.h:14
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:16
 msgid "Show _today's tasks"
-msgstr "Post an sceál seo"
+msgstr ""
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:17
 #, fuzzy
 msgid "Tasks "
-msgstr "_Teacs"
+msgstr "_Teasc"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:18
 msgid "Units: "
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:19
 msgid "Weather settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:19
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:21
 msgid "_Display folders:"
-msgstr "_Fillteán"
+msgstr ""
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Display stations:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Displayed feeds:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:24
 #, fuzzy
 msgid "_Five days"
-msgstr "_Fillteán"
+msgstr "Aoine"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:25
 #, fuzzy
 msgid "_Mail"
-msgstr "Post"
+msgstr "_Guthán Póca"
 
-#: my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:26
 #, fuzzy
 msgid "_News Feeds"
 msgstr "Fillteán _Nua"
 
-#: my-evolution/my-evolution.glade.h:25
-#, fuzzy
+#: my-evolution/my-evolution.glade.h:27
 msgid "_One day"
-msgstr "Post"
-
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Refresh time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:28
 msgid "_Schedule"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:28
-#, fuzzy
-msgid "_Show full path for folders"
-msgstr "_Fillteán"
-
 #: my-evolution/my-evolution.glade.h:29
 #, fuzzy
 msgid "_Weather"
-msgstr "Post"
+msgstr "Eile"
 
 #: my-evolution/my-evolution.glade.h:30
 msgid "_imperial"
@@ -10737,28 +10864,31 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/e-activity-handler.c:198
+#: shell/e-activity-handler.c:199
+#, fuzzy
 msgid "Show Details"
-msgstr ""
+msgstr "Taispeán gach Rud"
 
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:201
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1054
+#, fuzzy
 msgid "Inbox"
-msgstr ""
+msgstr "mbox"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:176
+#, fuzzy
 msgid "Outbox"
-msgstr ""
+msgstr "mbox"
 
-#: shell/e-local-storage.c:593
+#: shell/e-local-storage.c:624
 #, fuzzy
 msgid "Local Folders"
 msgstr "_Fillteán"
 
-#: shell/e-setup.c:125 shell/e-setup.c:196
+#: shell/e-setup.c:125
 msgid "Evolution installation"
 msgstr ""
 
@@ -10776,15 +10906,7 @@ msgstr ""
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:200
-msgid "This seems to be the first time you are running Evolution."
-msgstr ""
-
-#: shell/e-setup.c:201
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-
-#: shell/e-setup.c:220
+#: shell/e-setup.c:193
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -10792,14 +10914,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:235
+#: shell/e-setup.c:208
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:309
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -10807,7 +10929,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:323
+#: shell/e-setup.c:296
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -10816,7 +10938,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:348
+#: shell/e-setup.c:321
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -10836,62 +10958,61 @@ msgstr ""
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:285
+#: shell/e-shell-folder-commands.c:290
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:290
+#: shell/e-shell-folder-commands.c:295
 #, fuzzy
 msgid "Copy folder"
 msgstr "_Fillteán"
 
-#: shell/e-shell-folder-commands.c:328
+#: shell/e-shell-folder-commands.c:333
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:333
+#: shell/e-shell-folder-commands.c:338
 #, fuzzy
 msgid "Move folder"
-msgstr "Fillteán _Nua"
+msgstr "Sábháil 'san _eolaire"
 
-#: shell/e-shell-folder-commands.c:358
-#, fuzzy, c-format
+#: shell/e-shell-folder-commands.c:363
+#, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
-msgstr "Scríos an sceal seo"
+msgstr ""
 
-#: shell/e-shell-folder-commands.c:374
+#: shell/e-shell-folder-commands.c:379
 #, fuzzy, c-format
 msgid "Delete folder '%s'"
-msgstr "Scríos an sceal seo"
+msgstr "Fillteán _Nua"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:384
+#: shell/e-shell-folder-commands.c:389
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr ""
 
 #. Popup a dialog asking what the user would like to rename
 #. the folder to
-#: shell/e-shell-folder-commands.c:459
-#, c-format
+#: shell/e-shell-folder-commands.c:464
+#, fuzzy, c-format
 msgid "Rename folder '%s'"
-msgstr ""
+msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:468
 #, fuzzy
 msgid "Rename"
-msgstr "Scríos"
+msgstr "Ainm Chomad:"
 
 #. Make, pack the label
-#: shell/e-shell-folder-commands.c:471
+#: shell/e-shell-folder-commands.c:476
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#, fuzzy
 msgid "Folder name:"
-msgstr "_Fillteán"
+msgstr "Ainm Fillteán:"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -10900,11 +11021,28 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:168
-msgid "The specified folder name is not valid."
+#: shell/e-shell-folder-creation-dialog.c:126
+msgid "No folder name specified."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:132
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:137
+msgid "Folder cannot contain the directory separator."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:142
+msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:180
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:300
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -10915,15 +11053,14 @@ msgid ""
 msgstr ""
 
 #: shell/e-shell-folder-selection-dialog.c:348
-#, fuzzy
 msgid "New..."
-msgstr "_Nua"
+msgstr "Nua..."
 
-#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
+#: shell/e-shell-folder-title-bar.c:583 shell/e-shell-folder-title-bar.c:584
 msgid "(Untitled)"
-msgstr ""
+msgstr "(gan tideál)"
 
-#: shell/e-shell-importer.c:97
+#: shell/e-shell-importer.c:101
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -10934,7 +11071,7 @@ msgstr ""
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:192
+#: shell/e-shell-importer.c:196
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -10942,100 +11079,119 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#: shell/e-shell-importer.c:216 shell/e-shell-importer.c:247
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:350
+#: shell/e-shell-importer.c:349
+#, c-format
+msgid "File %s does not exist"
+msgstr ""
+
+#: shell/e-shell-importer.c:366
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:362
+#: shell/e-shell-importer.c:378
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:370
+#: shell/e-shell-importer.c:386
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:383
+#: shell/e-shell-importer.c:399
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:402
+#: shell/e-shell-importer.c:418
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:417
+#: shell/e-shell-importer.c:435
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:488
+#: shell/e-shell-importer.c:506
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:538
-#, fuzzy
+#: shell/e-shell-importer.c:557
 msgid "Filename:"
-msgstr "_Fillteán"
+msgstr "Ainm Chomad:"
 
-#: shell/e-shell-importer.c:543
+#: shell/e-shell-importer.c:562
 #, fuzzy
 msgid "Select a file"
 msgstr "Fillteán _Nua"
 
-#: shell/e-shell-importer.c:553
+#: shell/e-shell-importer.c:572
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:643
 #, fuzzy
 msgid "Select folder"
 msgstr "Fillteán _Nua"
 
-#: shell/e-shell-importer.c:624
+#: shell/e-shell-importer.c:644
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
+#: shell/e-shell-importer.c:705 shell/importer/intelligent.c:194
+msgid "Import"
+msgstr ""
+
 #: shell/e-shell-offline-handler.c:564
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:144
+#: shell/e-shell-startup-wizard.c:161
 #, c-format
 msgid ""
 "Could not start the Evolution Mailer Wizard interface\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:153
+#: shell/e-shell-startup-wizard.c:170
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:558
+#: shell/e-shell-startup-wizard.c:584
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:561
+#: shell/e-shell-startup-wizard.c:587
 msgid "Starting Intelligent Importers"
 msgstr ""
 
+#: shell/e-shell-startup-wizard.c:705
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "Ó:"
+
+#: shell/e-shell-startup-wizard.c:747
+msgid ""
+"Please select the information\n"
+"that you would like to import"
+msgstr ""
+
 #: shell/e-shell-view-menu.c:183
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
@@ -11044,21 +11200,25 @@ msgstr ""
 msgid "Bug buddy could not be run."
 msgstr ""
 
+#: shell/e-shell-view-menu.c:217
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Evolution"
+
 #: shell/e-shell-view-menu.c:219
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr ""
+msgstr "Cóipcheart 1999, 2000, 2001 Ximian, Inc."
 
 #: shell/e-shell-view-menu.c:221
 msgid ""
-"Evolution is a suite of groupware applications\n"
+"Ximian Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
 #: shell/e-shell-view-menu.c:423
-#, fuzzy
 msgid "Go to folder..."
-msgstr "Sábháil 'san _fillteán"
+msgstr ""
 
 #: shell/e-shell-view-menu.c:424
 msgid "Select the folder that you want to open"
@@ -11079,34 +11239,46 @@ msgid "Work Online"
 msgstr "Sheoladh Chuig duine"
 
 #: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:184
+#: shell/e-shell-view.c:214
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1459
+#: shell/e-shell-view.c:1497
+#, c-format
+msgid "%s (%d)"
+msgstr ""
+
+#: shell/e-shell-view.c:1499
+#, fuzzy
+msgid "(None)"
+msgstr "Ar Bith"
+
+#: shell/e-shell-view.c:1504
 #, fuzzy, c-format
-msgid "%s - Evolution %s"
-msgstr "Evolution"
+msgid "%s - Ximian Evolution %s"
+msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1461
+#: shell/e-shell-view.c:1506
 #, fuzzy, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "Evolution"
+msgid "%s - Ximian Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1499
-msgid "Evolution is currently online.  Click on this button to work offline."
+#: shell/e-shell-view.c:1546
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1506
-msgid "Evolution is in the process of going offline."
+#: shell/e-shell-view.c:1553
+msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1512
-msgid "Evolution is currently offline.  Click on this button to work online."
+#: shell/e-shell-view.c:1559
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
 #: shell/e-shell.c:509
@@ -11114,152 +11286,164 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1438
+#: shell/e-shell.c:1440
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1644 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
-msgstr ""
+msgstr "Ceart go Leor"
 
-#: shell/e-shell.c:1644
+#: shell/e-shell.c:1646
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1646
+#: shell/e-shell.c:1648
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1648
+#: shell/e-shell.c:1650
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1650 shell/e-storage.c:491
+#: shell/e-shell.c:1652 shell/e-storage.c:491
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:72
+#: shell/e-shortcuts-view.c:75
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:73
+#: shell/e-shortcuts-view.c:76
 msgid "Group name:"
-msgstr ""
+msgstr "Ainm Grupa:"
 
-#: shell/e-shortcuts-view.c:171
+#: shell/e-shortcuts-view.c:176
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:181
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:204
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:205
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:218
+#: shell/e-shortcuts-view.c:225
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:219
+#: shell/e-shortcuts-view.c:226
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:221
+#: shell/e-shortcuts-view.c:228
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:222
+#: shell/e-shortcuts-view.c:229
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:240
 msgid "_New Group..."
-msgstr ""
+msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:241
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:243
+#, fuzzy
 msgid "_Remove this Group..."
-msgstr ""
+msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:237
+#: shell/e-shortcuts-view.c:244
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:246
+#, fuzzy
 msgid "Re_name this Group..."
-msgstr ""
+msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:247
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:253
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:365
+#: shell/e-shortcuts-view.c:372
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:366
+#: shell/e-shortcuts-view.c:373
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:378
+#: shell/e-shortcuts-view.c:385
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
-msgid "Open in New Window"
+#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:387
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Post an sceál seo"
 
-#: shell/e-shortcuts-view.c:383
+#: shell/e-shortcuts-view.c:390
+#, fuzzy
+msgid "_Rename"
+msgstr "Ainm Úsaideoir"
+
+#: shell/e-shortcuts-view.c:390
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:392
+#, fuzzy
+msgid "Re_move"
+msgstr "Scríos"
+
+#: shell/e-shortcuts-view.c:392
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:642
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1040
+#: shell/e-shortcuts.c:1045
 msgid "Shortcuts"
 msgstr ""
 
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
-msgstr ""
+msgstr "(gan ainm)"
 
 #: shell/e-storage.c:489
 msgid "No error"
-msgstr ""
+msgstr "Gan Earraidh"
 
 #: shell/e-storage.c:493
 msgid "A folder with the same name already exists"
@@ -11271,7 +11455,7 @@ msgstr ""
 
 #: shell/e-storage.c:497
 msgid "I/O error"
-msgstr ""
+msgstr "Earraigh I/A"
 
 #: shell/e-storage.c:499
 msgid "Not enough space to create the folder"
@@ -11307,9 +11491,9 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:175
-#, c-format
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
-msgstr ""
+msgstr "% Rinneadh:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -11320,8 +11504,9 @@ msgid "Click OK to close these connections and go offline"
 msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
 msgid "Host"
-msgstr ""
+msgstr "Óst:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:4
 msgid "The following connections are currently active:"
@@ -11336,17 +11521,46 @@ msgstr "_Fillteán"
 msgid "Specify where to create the folder:"
 msgstr ""
 
+#: shell/glade/evolution-startup-wizard.glade.h:3
+msgid "First Run Setup Assistant"
+msgstr ""
+
+#: shell/glade/evolution-startup-wizard.glade.h:5
+msgid "Importing Data"
+msgstr ""
+
+#: shell/glade/evolution-startup-wizard.glade.h:8
+msgid "Setup Assistant"
+msgstr ""
+
+#: shell/glade/evolution-startup-wizard.glade.h:9
+msgid "Timezone "
+msgstr ""
+
+#: shell/glade/evolution-startup-wizard.glade.h:10
+msgid ""
+"Welcome to the Evolution first run setup assistant\n"
+"\n"
+"This assistant will help you get started"
+msgstr ""
+
+#: shell/glade/evolution-startup-wizard.glade.h:13
+msgid "Your configuration is complete."
+msgstr ""
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
 
 #: shell/importer/import.glade.h:2
+#, fuzzy
 msgid "Evolution Import Assistant"
-msgstr ""
+msgstr "Evolution"
 
 #: shell/importer/import.glade.h:3
+#, fuzzy
 msgid "Evolution Importer Assistant"
-msgstr ""
+msgstr "Evolution"
 
 #: shell/importer/import.glade.h:4
 msgid "Import File (Step 2 of 2)"
@@ -11373,9 +11587,8 @@ msgid "Don't import"
 msgstr ""
 
 #: shell/importer/intelligent.c:199
-#, fuzzy
 msgid "Don't ask me again"
-msgstr "Post an sceál seo"
+msgstr ""
 
 #: shell/importer/intelligent.c:209
 msgid "Evolution can import data from the following files:"
@@ -11385,9 +11598,9 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
+"of the Ximian Evolution groupware suite.\n"
 "\n"
-"Evolution is not yet complete. It's getting close, but there are\n"
+"Ximian Evolution is not yet complete. It's getting close, but there are\n"
 "places where features are either missing or only half working. \n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
@@ -11399,26 +11612,25 @@ msgid ""
 msgstr ""
 
 #: shell/main.c:116
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Evolution Team\n"
+"The Ximian Evolution Team\n"
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
 #: shell/main.c:173
 #, fuzzy
-msgid "Cannot access the Evolution shell."
+msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
 #: shell/main.c:184
-#, fuzzy, c-format
-msgid "Cannot initialize the Evolution shell: %s"
+#, c-format
+msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
-"Go raibh maith agat\n"
-"An Fhoireann Evolution\n"
 
 #: shell/main.c:228
 msgid "Disable splash screen"
@@ -11466,12 +11678,11 @@ msgstr "Scríos an sceal seo"
 #: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "New List"
-msgstr "_Nua"
+msgstr "_Nuacht"
 
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-#, fuzzy
 msgid "Paste"
-msgstr "Priontáil"
+msgstr ""
 
 #: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 msgid "Paste the clipboard"
@@ -11488,14 +11699,12 @@ msgid "Print selected contacts"
 msgstr "Scríos an sceal seo"
 
 #: ui/evolution-addressbook.xml.h:20
-#, fuzzy
 msgid "Save selected contacts as a VCard."
-msgstr "Scríos an sceal seo"
+msgstr ""
 
 #: ui/evolution-addressbook.xml.h:21
-#, fuzzy
 msgid "Select All"
-msgstr "Fillteán _Nua"
+msgstr "Tóg Gach Rud"
 
 #: ui/evolution-addressbook.xml.h:22
 #, fuzzy
@@ -11510,12 +11719,11 @@ msgstr "_Post sceál"
 #: ui/evolution-addressbook.xml.h:24
 #, fuzzy
 msgid "Send a mess to the selected contacts."
-msgstr "Scríos an sceal seo"
+msgstr "_Post sceál"
 
 #: ui/evolution-addressbook.xml.h:25
-#, fuzzy
 msgid "Send message to contact"
-msgstr "_Post sceál"
+msgstr ""
 
 #: ui/evolution-addressbook.xml.h:26
 #, fuzzy
@@ -11524,7 +11732,7 @@ msgstr "Fillteán _Nua"
 
 #: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
@@ -11536,9 +11744,8 @@ msgstr ""
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
 #: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
-#, fuzzy
 msgid "_Actions"
-msgstr "_Oscáil"
+msgstr ""
 
 #: ui/evolution-addressbook.xml.h:30
 msgid "_Addressbook Sources..."
@@ -11549,39 +11756,34 @@ msgid "_Contact"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:32
-#, fuzzy
 msgid "_Contact List"
-msgstr "_Coinne"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
-#, fuzzy
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
-msgstr "Sheoladh Chuig duine"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
 #: ui/my-evolution.xml.h:7
-#, fuzzy
 msgid "_Print..."
-msgstr "Priontáil"
+msgstr "_Priontáil..."
 
-#: ui/evolution-addressbook.xml.h:37
+#: ui/evolution-addressbook.xml.h:38
 msgid "_Save as VCard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:38
-#, fuzzy
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Search for Contacts"
-msgstr "Scríos an sceal seo"
+msgstr ""
 
-#: ui/evolution-addressbook.xml.h:39
-#, fuzzy
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Select All"
-msgstr "Fillteán _Nua"
+msgstr "_Tóg Gach Rud"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
 #: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "_Uirlisí"
@@ -11611,7 +11813,7 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:11
 msgid "Day"
-msgstr ""
+msgstr "Lae"
 
 #: ui/evolution-calendar.xml.h:12
 #, fuzzy
@@ -11640,24 +11842,20 @@ msgid "Go to a specific date"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:19
-#, fuzzy
 msgid "Go to today"
-msgstr "Sábháil 'san _fillteán"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:20
-#, fuzzy
 msgid "Month"
-msgstr "Priontáil"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:21
-#, fuzzy
 msgid "New Appointment"
-msgstr "_Coinne"
+msgstr "Coinne Nua"
 
 #: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-#, fuzzy
 msgid "New Task"
-msgstr "_Teacs"
+msgstr "_Teasc Nua"
 
 #: ui/evolution-calendar.xml.h:24
 #, fuzzy
@@ -11678,17 +11876,18 @@ msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:28
-#, fuzzy
 msgid "Show one day"
-msgstr "Post"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:29
+#, fuzzy
 msgid "Show one month"
-msgstr ""
+msgstr "Taispeáin coinní"
 
 #: ui/evolution-calendar.xml.h:30
+#, fuzzy
 msgid "Show one week"
-msgstr ""
+msgstr " seachtain"
 
 #: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
@@ -11696,7 +11895,7 @@ msgstr ""
 
 #: ui/evolution-calendar.xml.h:32
 msgid "Week"
-msgstr ""
+msgstr "Seachtain"
 
 #: ui/evolution-calendar.xml.h:35
 #, fuzzy
@@ -11707,14 +11906,14 @@ msgstr "_Coinne"
 msgid "_Calendar Settings..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:42
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:43
 #, fuzzy
 msgid "_Task..."
-msgstr "_Teacs"
+msgstr "_Teasc"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -11722,7 +11921,7 @@ msgstr "_Teacs"
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:4
 msgid "Close"
-msgstr ""
+msgstr "Dún"
 
 #: ui/evolution-comp-editor.xml.h:3
 #, fuzzy
@@ -11735,7 +11934,7 @@ msgid "Delete this item"
 msgstr "Scríos an sceal seo"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr ""
 
@@ -11750,20 +11949,18 @@ msgid "Print this item"
 msgstr "Scríos an sceal seo"
 
 #: ui/evolution-comp-editor.xml.h:11
-#, fuzzy
 msgid "Print..."
-msgstr "Priontáil"
+msgstr "Clódáil..."
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:19
 #: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
 msgid "Save"
-msgstr ""
+msgstr "Sábháil"
 
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 msgid "Save and Close"
-msgstr ""
+msgstr "Sábháil agus Dún"
 
 #: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
@@ -11778,22 +11975,19 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:37
-#, fuzzy
+#: ui/evolution.xml.h:36
 msgid "_File"
-msgstr "_Fillteán"
+msgstr "_Comhad"
 
 #: ui/evolution-contact-editor.xml.h:5
-#, fuzzy
 msgid "Print En_velope..."
-msgstr "Post an sceál seo"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
-#, fuzzy
 msgid "Save _As..."
-msgstr "Sábháil 'san _fillteán"
+msgstr "Sábháil _Le..."
 
 #: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
@@ -11803,9 +11997,8 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
-#, fuzzy
 msgid "_Save"
-msgstr "Sábháil 'san _fillteán"
+msgstr "_Sábháil"
 
 #: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
@@ -11813,9 +12006,8 @@ msgid "Delete this list"
 msgstr "Scríos an sceal seo"
 
 #: ui/evolution-contact-list-editor.xml.h:4
-#, fuzzy
 msgid "Delete..."
-msgstr "Scríos"
+msgstr "Scríos..."
 
 #: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
@@ -11832,8 +12024,9 @@ msgid "Send _message to list..."
 msgstr "_Post sceál"
 
 #: ui/evolution-event-editor.xml.h:1
+#, fuzzy
 msgid "Cancel Mee_ting"
-msgstr ""
+msgstr "Ag Cealaigh..."
 
 #: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
@@ -11842,7 +12035,7 @@ msgstr ""
 #: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward as i_Calendar"
-msgstr "Sheoladh Chuig duine"
+msgstr "Ag Lódáil Feilire"
 
 #: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
@@ -11867,11 +12060,12 @@ msgstr ""
 #: ui/evolution-executive-summary.xml.h:1
 #, fuzzy
 msgid "Customise My Evolution"
-msgstr "Evolution"
+msgstr "%s - Evolution %s"
 
 #: ui/evolution-mail-global.xml.h:1
+#, fuzzy
 msgid "Cancel"
-msgstr ""
+msgstr "Ag Cealaigh..."
 
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -11909,7 +12103,7 @@ msgstr ""
 #: ui/evolution-mail-global.xml.h:10
 #, fuzzy
 msgid "New Message"
-msgstr "_Post sceál"
+msgstr "Sceál"
 
 #: ui/evolution-mail-global.xml.h:11
 msgid "Open a window for composing a mail message"
@@ -11941,9 +12135,8 @@ msgid "Virtual Folder _Editor..."
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:19
-#, fuzzy
 msgid "_Filters..."
-msgstr "_Fillteán"
+msgstr ""
 
 #: ui/evolution-mail-global.xml.h:20
 #, fuzzy
@@ -12024,9 +12217,8 @@ msgid "Permanently remove all deleted messages from this folder"
 msgstr "Fillteán _Nua"
 
 #: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
-#, fuzzy
 msgid "Select _All"
-msgstr "Fillteán _Nua"
+msgstr "Tóg _Gach rud"
 
 #: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
@@ -12048,7 +12240,7 @@ msgstr "Scríos an sceal seo"
 #: ui/evolution-mail-list.xml.h:18
 #, fuzzy
 msgid "Sh_ow Hidden Messages"
-msgstr "Post an sceál seo"
+msgstr "_Post sceál"
 
 #: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
@@ -12068,24 +12260,23 @@ msgstr "Scríos an sceal seo"
 msgid "Threaded Message list"
 msgstr "Post an sceál seo"
 
-#: ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-list.xml.h:26
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 msgid "_Folder"
 msgstr "_Fillteán"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:29
-#, fuzzy
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
-msgstr "Priontáil"
+msgstr "_Roghanna..."
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:31
 #, fuzzy
 msgid "_Threaded Message List"
 msgstr "Post an sceál seo"
@@ -12185,14 +12376,12 @@ msgid "Filter on Mailing _List..."
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:25
-#, fuzzy
 msgid "Filter on Se_nder..."
-msgstr "Abair"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:26
-#, fuzzy
 msgid "Filter on _Recipients..."
-msgstr "Abair"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:27
 #, fuzzy
@@ -12281,9 +12470,8 @@ msgid "Mark the selected messages for deletion"
 msgstr "Fillteán _Nua"
 
 #: ui/evolution-mail-message.xml.h:49
-#, fuzzy
 msgid "Move"
-msgstr "Scríos"
+msgstr ""
 
 #: ui/evolution-mail-message.xml.h:50
 #, fuzzy
@@ -12292,7 +12480,7 @@ msgstr "Fillteán _Nua"
 
 #: ui/evolution-mail-message.xml.h:51
 msgid "Next"
-msgstr ""
+msgstr "Eile"
 
 #: ui/evolution-mail-message.xml.h:52
 #, fuzzy
@@ -12302,7 +12490,7 @@ msgstr "Post an sceál seo"
 #: ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Next Message"
-msgstr "_Post sceál"
+msgstr "Sceál"
 
 #: ui/evolution-mail-message.xml.h:54
 msgid "Next Thread"
@@ -12329,7 +12517,7 @@ msgstr "Post an sceál seo"
 
 #: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
-msgstr ""
+msgstr "Riomh"
 
 #: ui/evolution-mail-message.xml.h:60
 #, fuzzy
@@ -12361,8 +12549,8 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:70
 #, fuzzy
-msgid "S_earch Message"
-msgstr "Post"
+msgid "S_earch Message..."
+msgstr "Sábháil 'san _fillteán"
 
 #: ui/evolution-mail-message.xml.h:71
 #, fuzzy
@@ -12449,11 +12637,12 @@ msgstr "_Post sceál"
 #: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Move to Folder"
-msgstr "Fillteán _Nua"
+msgstr "Sábháil 'san _fillteán"
 
 #: ui/evolution-mail-message.xml.h:93
+#, fuzzy
 msgid "_Normal Display"
-msgstr ""
+msgstr "Taispeaín"
 
 #: ui/evolution-mail-message.xml.h:94
 #, fuzzy
@@ -12462,20 +12651,19 @@ msgstr "_Post sceál"
 
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
-msgstr ""
+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:5 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
-msgstr ""
+msgstr "_Dún"
 
 #: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
-#, fuzzy
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
 msgid "_View"
-msgstr "_Nua"
+msgstr "_Radharc"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -12488,7 +12676,7 @@ msgstr ""
 #: ui/evolution-message-composer.xml.h:5
 #, fuzzy
 msgid "Delete all but signature"
-msgstr "Fillteán _Nua"
+msgstr "Scríos an sceal seo"
 
 #: ui/evolution-message-composer.xml.h:6
 #, fuzzy
@@ -12505,7 +12693,7 @@ msgstr ""
 
 #: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
-msgstr ""
+msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
 msgid "Inline Text _File..."
@@ -12540,9 +12728,8 @@ msgid "S/MIME Sign"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:20
-#, fuzzy
 msgid "Save As"
-msgstr "Sábháil 'san _fillteán"
+msgstr "Sábháil mar"
 
 #: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
@@ -12569,12 +12756,11 @@ msgstr "Post an sceál seo"
 
 #: ui/evolution-message-composer.xml.h:27
 msgid "Send"
-msgstr "Post"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:28
-#, fuzzy
 msgid "Send _Later"
-msgstr "Post"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:29
 #, fuzzy
@@ -12657,7 +12843,7 @@ msgstr ""
 #: ui/evolution-message-composer.xml.h:47
 #, fuzzy
 msgid "_Delete all"
-msgstr "Scríos"
+msgstr "_Scríos"
 
 #: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
@@ -12669,9 +12855,8 @@ msgid "_Insert"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:52
-#, fuzzy
 msgid "_Open..."
-msgstr "_Oscáil"
+msgstr "_Oscáil..."
 
 #: ui/evolution-message-composer.xml.h:53
 #, fuzzy
@@ -12680,19 +12865,17 @@ msgstr "Freagrair"
 
 #: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
-msgstr ""
+msgstr "_Slándáil"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
-#, fuzzy
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Help"
-msgstr "_Nota"
+msgstr "C_úidiú"
 
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
 #: ui/evolution-subscribe.xml.h:2
-#, fuzzy
 msgid "F_older"
 msgstr "_Fillteán"
 
@@ -12727,12 +12910,11 @@ msgstr ""
 #: ui/evolution-task-editor.xml.h:3
 #, fuzzy
 msgid "Cancel Task"
-msgstr "_Teacs"
+msgstr "_Teasc Nua"
 
 #: ui/evolution-task-editor.xml.h:4
-#, fuzzy
 msgid "Cancel this task"
-msgstr "_Teacs"
+msgstr ""
 
 #: ui/evolution-task-editor.xml.h:7
 msgid "Obtain the latest task information"
@@ -12752,9 +12934,8 @@ msgid "Copy selected task"
 msgstr "Scríos an sceal seo"
 
 #: ui/evolution-tasks.xml.h:7
-#, fuzzy
 msgid "Cut selected task"
-msgstr "Scríos an sceal seo"
+msgstr ""
 
 #: ui/evolution-tasks.xml.h:9
 #, fuzzy
@@ -12766,19 +12947,17 @@ msgid "Paste task from the clipboard"
 msgstr ""
 
 #: ui/evolution-tasks.xml.h:13
-#, fuzzy
 msgid "Tasks Settings..."
-msgstr "Post"
+msgstr ""
 
-#: ui/evolution-tasks.xml.h:17
-#, fuzzy
+#: ui/evolution-tasks.xml.h:18
 msgid "_Task"
-msgstr "_Teacs"
+msgstr "_Teasc"
 
 #: ui/evolution.xml.h:1
 #, fuzzy
-msgid "About Evolution..."
-msgstr "Evolution"
+msgid "About Ximian Evolution..."
+msgstr "Faoi Evolution..."
 
 #: ui/evolution.xml.h:2
 msgid "Add to _Shortcut Bar"
@@ -12818,130 +12997,128 @@ msgstr ""
 
 #: ui/evolution.xml.h:12
 msgid "E_xit"
-msgstr ""
+msgstr "_Éirigh"
 
 #: ui/evolution.xml.h:13
 #, fuzzy
-msgid "Evolution _FAQ"
-msgstr "Evolution"
-
-#: ui/evolution.xml.h:14
-#, fuzzy
 msgid "Evolution _Window"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Fillteán _Nua"
 
-#: ui/evolution.xml.h:20
-msgid "Open in New _Window"
+#: ui/evolution.xml.h:18
+msgid "Open in New Window"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "Post an sceál seo"
 
-#: ui/evolution.xml.h:22
-msgid "Show information about Evolution"
+#: ui/evolution.xml.h:21
+msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:26
-#, fuzzy
+#: ui/evolution.xml.h:25
 msgid "Toggle"
-msgstr "Scríos"
+msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:31
 #, fuzzy
-msgid "_About Evolution..."
+msgid "Ximian Evolution _FAQ"
 msgstr "Evolution"
 
+#: ui/evolution.xml.h:32
+#, fuzzy
+msgid "_About Ximian Evolution..."
+msgstr "_Faoi Evolution..."
+
 #: ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Copy..."
-msgstr "Greamaigh"
+msgstr "_Cóip"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Fillteán"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "_Fillteán"
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "_Import File..."
 msgstr "Sábháil 'san _fillteán"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:42
 #, fuzzy
 msgid "_Move..."
-msgstr "Scríos"
+msgstr "_Sábháil le..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:43
 msgid "_New"
 msgstr "_Nua"
 
-#: ui/evolution.xml.h:45
-#, fuzzy
+#: ui/evolution.xml.h:44
 msgid "_New Folder"
 msgstr "Fillteán _Nua"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Rename..."
-msgstr "_Oscáil"
+msgstr "_Oscáil..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:46
 msgid "_Shortcut"
 msgstr ""
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:47
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:49
 msgid "_Work Offline"
 msgstr ""
 
@@ -12952,49 +13129,45 @@ msgstr ""
 #: ui/my-evolution.xml.h:4
 #, fuzzy
 msgid "Print summary"
-msgstr "Post"
+msgstr "Tosaíocht"
 
 #: ui/my-evolution.xml.h:5
 #, fuzzy
 msgid "Reload"
-msgstr "Scríos"
+msgstr "Freagrair"
 
 #: ui/my-evolution.xml.h:6
-#, fuzzy
 msgid "Reload the view"
-msgstr "_Post sceál"
+msgstr ""
 
 #: ui/my-evolution.xml.h:8
-#, fuzzy
 msgid "_Summary Settings..."
-msgstr "Evolution"
+msgstr ""
 
 #: views/addressbook/galview.xml.h:1
+#, fuzzy
 msgid "Address Cards"
-msgstr ""
+msgstr "Cartaí Sheoladh"
 
 #: views/addressbook/galview.xml.h:2
-#, fuzzy
 msgid "By Company"
-msgstr "Greamaigh"
+msgstr ""
 
 #: views/addressbook/galview.xml.h:3
 msgid "Phone List"
 msgstr ""
 
 #: views/mail/galview.xml.h:1
-#, fuzzy
 msgid "By Sender"
-msgstr "Post"
+msgstr ""
 
 #: views/mail/galview.xml.h:2
 msgid "By Status"
 msgstr ""
 
 #: views/mail/galview.xml.h:3
-#, fuzzy
 msgid "By Subject"
-msgstr "Abair"
+msgstr ""
 
 #: views/mail/galview.xml.h:4
 #, fuzzy
@@ -13016,8 +13189,9 @@ msgid "Selection:"
 msgstr "Fillteán _Nua"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
 msgid "Time Zones"
-msgstr ""
+msgstr "Guthán sa Baile"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid ""
@@ -13031,7 +13205,7 @@ msgstr ""
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
-msgstr ""
+msgstr "%A, %d %B %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
@@ -13046,9 +13220,8 @@ msgid "_Invite Others..."
 msgstr ""
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:431
-#, fuzzy
 msgid "_Options"
-msgstr "_Oscáil"
+msgstr "_Roghanna"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
@@ -13064,7 +13237,7 @@ msgstr ""
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
-msgstr ""
+msgstr "_<<"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
@@ -13072,7 +13245,7 @@ msgstr ""
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
-msgstr ""
+msgstr ">_>"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
@@ -13114,20 +13287,20 @@ msgstr ""
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
-msgstr ""
+msgstr "LMCDASD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1071
 msgid "%B %Y"
-msgstr ""
+msgstr "%B &Y"
 
 #: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
 msgid "Now"
-msgstr ""
+msgstr "Anois"
 
 #: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
 msgid "Today"
-msgstr ""
+msgstr "Inniú"
 
 #: widgets/misc/e-cell-date-edit.c:732
 #, c-format
@@ -13151,8 +13324,9 @@ msgid "Cyrillic"
 msgstr ""
 
 #: widgets/misc/e-charset-picker.c:63
+#, fuzzy
 msgid "Greek"
-msgstr ""
+msgstr "Seachtain"
 
 #: widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
@@ -13165,7 +13339,7 @@ msgstr ""
 #: widgets/misc/e-charset-picker.c:66
 #, fuzzy
 msgid "Turkish"
-msgstr "_Teacs"
+msgstr "Bruscar"
 
 #: widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
@@ -13176,9 +13350,8 @@ msgid "Western European"
 msgstr ""
 
 #: widgets/misc/e-charset-picker.c:85
-#, fuzzy
 msgid "Traditional"
-msgstr "_Oscáil"
+msgstr ""
 
 #: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
 msgid "Simplified"
@@ -13194,9 +13367,9 @@ msgid "New"
 msgstr "_Nua"
 
 #: widgets/misc/e-charset-picker.c:160
-#, c-format
+#, fuzzy, c-format
 msgid "Unknown character set: %s"
-msgstr ""
+msgstr "Earraidh gan aithne: %s"
 
 #: widgets/misc/e-charset-picker.c:202
 msgid "Enter the character set to use"
@@ -13205,7 +13378,7 @@ msgstr ""
 #: widgets/misc/e-charset-picker.c:277
 #, fuzzy
 msgid "Other..."
-msgstr "_Oscáil"
+msgstr "Eile"
 
 #: widgets/misc/e-charset-picker.c:394
 msgid "Character Encoding"
@@ -13213,12 +13386,12 @@ msgstr ""
 
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: widgets/misc/e-filter-bar.c:158
 #, fuzzy
 msgid "Search Editor"
-msgstr "_Fillteán"
+msgstr "Cuardaigh"
 
 #: widgets/misc/e-filter-bar.c:174
 msgid "Save Search"
@@ -13229,45 +13402,41 @@ msgid "Add to Saved Searches"
 msgstr ""
 
 #: widgets/misc/e-filter-bar.h:95
-#, fuzzy
 msgid "Clear"
-msgstr "_Fillteán"
+msgstr "Glan"
 
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
-msgstr ""
+msgstr "Taispeán gach Rud"
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
-msgstr ""
+msgstr "Eolas"
 
 #: widgets/misc/e-messagebox.c:166
 msgid "Error"
-msgstr ""
+msgstr "Earraidh"
 
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
-msgstr ""
+msgstr "Freagra"
 
 #: widgets/misc/e-messagebox.c:180
-#, fuzzy
 msgid "Message"
-msgstr "_Post sceál"
+msgstr "Sceál"
 
 #. Add the "Don't show this message again." checkbox
 #: widgets/misc/e-messagebox.c:224
-#, fuzzy
 msgid "Don't show this message again."
-msgstr "Post an sceál seo"
+msgstr ""
 
 #: widgets/misc/e-search-bar.c:334
 msgid "Sear_ch"
 msgstr ""
 
 #: widgets/misc/e-search-bar.c:460
-#, fuzzy
 msgid "Find Now"
-msgstr "Priontáil"
+msgstr ""
 
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 msgid "The Personal Addressbook Server"
@@ -13289,161 +13458,168 @@ msgstr ""
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
-#, fuzzy
-#~ msgid "RDF Summary"
-#~ msgstr "Post"
+#~ msgid "_Company:"
+#~ msgstr "_Teoranta:"
 
-#, fuzzy
-#~ msgid "Select name from _folder:"
-#~ msgstr "Fillteán _Nua"
+#~ msgid "SASL"
+#~ msgstr "SASL"
 
-#, fuzzy
-#~ msgid "Defaults"
-#~ msgstr "Scríos"
+#~ msgid "Root DN:"
+#~ msgstr "Príomh DN:"
 
-#, fuzzy
-#~ msgid "Remind me of all appointments"
-#~ msgstr "_Coinne"
+#~ msgid "URI"
+#~ msgstr "URI"
 
-#, fuzzy
-#~ msgid "Delegated From:"
-#~ msgstr "Scríos"
+#~ msgid "123"
+#~ msgstr "123"
 
-#, fuzzy
-#~ msgid "No one"
-#~ msgstr "_Nota"
+#~ msgid "a"
+#~ msgstr "a"
 
-#, fuzzy
-#~ msgid "Task"
-#~ msgstr "_Teacs"
+#~ msgid "b"
+#~ msgstr "b"
 
-#, fuzzy
-#~ msgid "Store search as vFolder"
-#~ msgstr "Fillteán _Nua"
+#~ msgid "c"
+#~ msgstr "c"
 
-#, fuzzy
-#~ msgid "Resend"
-#~ msgstr "Post"
+#~ msgid "e"
+#~ msgstr "e"
 
-#, fuzzy
-#~ msgid "My Evolution Settings"
-#~ msgstr "Evolution"
+#~ msgid "f"
+#~ msgstr "f"
 
-#, fuzzy
-#~ msgid "Print My Evolution"
-#~ msgstr "Evolution"
+#~ msgid "g"
+#~ msgstr "g"
 
-#, fuzzy
-#~ msgid "My Evolution"
-#~ msgstr "Evolution"
+#~ msgid "h"
+#~ msgstr "h"
 
-#, fuzzy
-#~ msgid "New contact"
-#~ msgstr "_Coinne"
+#~ msgid "i"
+#~ msgstr "i"
 
-#, fuzzy
-#~ msgid "_Contact Group"
-#~ msgstr "_Coinne"
+#~ msgid "j"
+#~ msgstr "j"
 
-#, fuzzy
-#~ msgid "Close this appointment"
-#~ msgstr "Scríos an sceal seo"
+#~ msgid "k"
+#~ msgstr "k"
 
-#, fuzzy
-#~ msgid "Print S_etup"
-#~ msgstr "Priontáil"
+#~ msgid "l"
+#~ msgstr "l"
 
-#, fuzzy
-#~ msgid "_Action"
-#~ msgstr "_Oscáil"
+#~ msgid "m"
+#~ msgstr "m"
 
-#, fuzzy
-#~ msgid "Show _All"
-#~ msgstr "Post an sceál seo"
+#~ msgid "n"
+#~ msgstr "n"
 
-#, fuzzy
-#~ msgid "Print Preview..."
-#~ msgstr "Post an sceál seo"
+#~ msgid "o"
+#~ msgstr "o"
 
-#, fuzzy
-#~ msgid "_Re-send Message"
-#~ msgstr "_Post sceál"
+#~ msgid "p"
+#~ msgstr "p"
 
-#, fuzzy
-#~ msgid "Delegate Task"
-#~ msgstr "Scríos an sceal seo"
+#~ msgid "q"
+#~ msgstr "q"
 
-#, fuzzy
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Coinne"
+#~ msgid "r"
+#~ msgstr "r"
 
-#, fuzzy
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_Coinne"
+#~ msgid "s"
+#~ msgstr "s"
 
-#, fuzzy
-#~ msgid "_Mail message"
-#~ msgstr "_Post sceál"
+#~ msgid "t"
+#~ msgstr "t"
 
-#, fuzzy
-#~ msgid "_Task (FIXME)"
-#~ msgstr "_Post sceál"
+#~ msgid "u"
+#~ msgstr "u"
 
-#, fuzzy
-#~ msgid "_Company:"
-#~ msgstr "Greamaigh"
+#~ msgid "v"
+#~ msgstr "v"
 
-#, fuzzy
-#~ msgid "Edit the task"
-#~ msgstr "Scríos an sceal seo"
+#~ msgid "w"
+#~ msgstr "w"
 
-#, fuzzy
-#~ msgid "Delete all Occurrences"
-#~ msgstr "Scríos an sceal seo"
+#~ msgid "y"
+#~ msgstr "y"
 
-#, fuzzy
-#~ msgid "Appointment Basics"
-#~ msgstr "_Coinne"
+#~ msgid "z"
+#~ msgstr "z"
 
-#, fuzzy
-#~ msgid "Scanning IMAP folder"
-#~ msgstr "Fillteán _Nua"
+#~ msgid "Open calendar"
+#~ msgstr "Oscáil Feilire"
 
-#, fuzzy
-#~ msgid "Send as:"
-#~ msgstr "Post"
+#~ msgid "Save calendar"
+#~ msgstr "Sábháil Feilire"
 
-#, fuzzy
-#~ msgid "Send an email to %s"
-#~ msgstr "Post"
+#~ msgid "%I:%M%p"
+#~ msgstr "%I:%M%p"
+
+#~ msgid "Calendar Preferences"
+#~ msgstr "Roghanna Feilire"
+
+#~ msgid "All"
+#~ msgstr "Gach Rud"
+
+#~ 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 "Run %s"
+#~ msgstr "Deán %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Dún %s"
 
 #, fuzzy
 #~ msgid "Move %s to the left"
 #~ msgstr "Fillteán _Nua"
 
-#, fuzzy
-#~ msgid "Is Not"
-#~ msgstr "_Nota"
+#~ msgid "Background:"
+#~ msgstr "Dúlra:"
 
 #, fuzzy
-#~ msgid "Move to Folder..."
-#~ msgstr "Sábháil 'san _fillteán"
+#~ msgid "Store search as vFolder"
+#~ msgstr "Fillteán _Nua"
+
+#~ msgid "Resend"
+#~ msgstr "Post"
 
 #, fuzzy
 #~ msgid "Copying messages"
 #~ msgstr "_Post sceál"
 
-#, fuzzy
 #~ msgid "View All"
-#~ msgstr "_Nua"
+#~ msgstr "Taidpeáin Gach Rud"
 
-#, fuzzy
-#~ msgid "Chec_k Names (FIXME)"
-#~ msgstr "_Post sceál"
+#~ msgid "_Day"
+#~ msgstr "_Lá"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Oscáil Feilire"
+
+#~ msgid "Help"
+#~ msgstr "Cúidiú"
+
+#~ msgid "About..."
+#~ msgstr "Faoi..."
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "Leabhair Sheolaidh"
+
+#~ msgid "C_lear"
+#~ msgstr "G_lan"
 
 #, fuzzy
-#~ msgid "Cop_y to Folder... (FIXME)"
-#~ msgstr "Sábháil 'san _fillteán"
+#~ msgid "Close this appointment"
+#~ msgstr "Scríos an sceal seo"
 
 #, fuzzy
 #~ msgid "Fi_rst Item in Folder (FIXME)"
@@ -13453,25 +13629,15 @@ msgstr ""
 #~ msgid "For_ward (FIXME)"
 #~ msgstr "Sheoladh Chuig duine"
 
+#~ msgid "Pre_vious"
+#~ msgstr "_Riomh"
+
 #, fuzzy
 #~ msgid "Print S_etup..."
 #~ msgstr "Priontáil"
 
-#, fuzzy
-#~ msgid "Select everything"
-#~ msgstr "Fillteán _Nua"
-
-#, fuzzy
 #~ msgid "_About..."
-#~ msgstr "Evolution"
-
-#, fuzzy
-#~ msgid "_Item (FIXME)"
-#~ msgstr "_Coinne"
-
-#, fuzzy
-#~ msgid "_Journal Entry (FIXME)"
-#~ msgstr "_Coinne"
+#~ msgstr "_Faoi..."
 
 #, fuzzy
 #~ msgid "_Last Item in Folder (FIXME)"
@@ -13485,23 +13651,30 @@ msgstr ""
 #~ msgid "_Move to Folder... (FIXME)"
 #~ msgstr "Sábháil 'san _fillteán"
 
-#, fuzzy
 #~ msgid "_Note (FIXME)"
 #~ msgstr "_Coinne"
 
-#, fuzzy
-#~ msgid "_Unread Item (FIXME)"
-#~ msgstr "_Coinne"
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Teasc"
+
+#~ msgid "Add Service"
+#~ msgstr "Suimigh Seirbhís"
 
 #, fuzzy
 #~ msgid "Configure Folder..."
 #~ msgstr "Sábháil 'san _fillteán"
 
 #, fuzzy
-#~ msgid "Reply to all"
-#~ msgstr "Freagrair"
+#~ msgid "Print Preview of message..."
+#~ msgstr "Post an sceál seo"
 
 #, fuzzy
+#~ msgid "Print message..."
+#~ msgstr "Post an sceál seo"
+
+#~ msgid "Reply to all"
+#~ msgstr "Freagrair do Gach rud"
+
 #~ msgid "_Reply"
 #~ msgstr "Freagrair"
 
@@ -13514,68 +13687,14 @@ msgstr ""
 #~ msgstr "Post an sceál seo"
 
 #, fuzzy
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "Sábháil 'san _fillteán"
-
-#, fuzzy
-#~ msgid "Redo"
-#~ msgstr "Scríos"
-
-#, fuzzy
-#~ msgid "Redo the undone action"
-#~ msgstr "Scríos"
-
-#, fuzzy
-#~ msgid "Replace"
-#~ msgstr "Freagrair"
-
-#, fuzzy
 #~ msgid "Replace a string"
 #~ msgstr "Freagrair"
 
-#, fuzzy
-#~ msgid "Save changes to message..."
-#~ msgstr "Post an sceál seo"
-
-#, fuzzy
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "_Coinne"
-
-#, fuzzy
-#~ msgid "_Object"
-#~ msgstr "Abair"
-
-#, fuzzy
-#~ msgid "FIXME: __Formatting"
-#~ msgstr "Sheoladh Chuig duine"
-
-#, fuzzy
-#~ msgid "_Toolbars"
-#~ msgstr "_Uirlisí"
-
-#, fuzzy
-#~ msgid "_Forms"
-#~ msgstr "_Fillteán"
-
-#, fuzzy
-#~ msgid "FIXME: _Display Map of Address"
-#~ msgstr "_Post sceál"
-
-#, fuzzy
-#~ msgid "FIXME: _Open Web Page"
-#~ msgstr "_Post sceál"
-
-#, fuzzy
-#~ msgid "FIXME: For_ward"
-#~ msgstr "Sheoladh Chuig duine"
-
-#, fuzzy
-#~ msgid "_Undo"
+#~ msgid "Undo"
 #~ msgstr "Leasú"
 
-#, fuzzy
-#~ msgid "_Print Message"
-#~ msgstr "_Post sceál"
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Coinne"
 
-#~ msgid "Clos_e All Items"
-#~ msgstr "_Dún gach rud"
+#~ msgid "_Index"
+#~ msgstr "_Inneacs"