Updated Irish translation

author: Seán de Búrca <leftmostcat@gmail.com> 2009-08-07 18:28:59 +0800
committer: Matthew Barnes <mbarnes@redhat.com> 2009-08-11 04:42:06 +0800
commit: aa543334cbe0f91380bff2ef98818d0743c312ca (patch)
tree: 7df41d25f9e14075cd715ba0539be638b3a28c83
parent: 8a430c7ff07ff836dd771ac7cbf98a67193059cf (diff)
download: gsoc2013-evolution-aa543334cbe0f91380bff2ef98818d0743c312ca.tar
gsoc2013-evolution-aa543334cbe0f91380bff2ef98818d0743c312ca.tar.gz
gsoc2013-evolution-aa543334cbe0f91380bff2ef98818d0743c312ca.tar.bz2
gsoc2013-evolution-aa543334cbe0f91380bff2ef98818d0743c312ca.tar.lz
gsoc2013-evolution-aa543334cbe0f91380bff2ef98818d0743c312ca.tar.xz
gsoc2013-evolution-aa543334cbe0f91380bff2ef98818d0743c312ca.tar.zst
gsoc2013-evolution-aa543334cbe0f91380bff2ef98818d0743c312ca.zip
1 files changed, 8171 insertions, 8401 deletions
diff --git a/po/ga.po b/po/ga.po
index c519510e90..1a73c4c61b 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,15 +1,16 @@
 # Irish translations for evolution package.
-# Copyright (C) 2001-2007 Free Software Foundation, Inc.
+# Copyright (C) 2001-2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the evolution package.
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
 # David O'Callaghan <david.ocallaghan@cs.tcd.ie>, 2003.
-# Seán de Búrca <leftmostcat@gmail.com>, 2007.
+# Seán de Búrca <leftmostcat@gmail.com>, 2007-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution HEAD\n"
+"Project-Id-Version: evolution.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-27 23:59-0700\n"
-"PO-Revision-Date: 2007-12-27 23:59-0700\n"
+"POT-Creation-Date: 2009-08-07 03:05-0600\n"
+"PO-Revision-Date: 2009-08-07 04:23-0600\n"
 "Last-Translator: Seán de Búrca <leftmostcat@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -20,29 +21,28 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
-msgid "evolution addressbook"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
 msgstr "leabhar seoltaí evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "Teagmháil Nua"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "Liosta Teagmhálacha Nua"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
-#, fuzzy, c-format
+#: ../a11y/addressbook/ea-minicard-view.c:161
+#, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "Sábháil san leabhar seoladh"
-msgstr[1] "Sábháil san leabhar seoladh"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Oscail"
 
@@ -55,110 +55,104 @@ msgid "Contact: "
 msgstr "Teagmháil: "
 
 #: ../a11y/addressbook/ea-minicard.c:168
-#, fuzzy
 msgid "evolution minicard"
-msgstr "Name=Evolution"
+msgstr "mion-charta evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "Tá aláraim aige."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
-msgstr "Leis na ceadanna seo:"
+msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
-msgstr "Is leatsa an imirt!"
+msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-cal-view-event.c:275
+#, c-format
 msgid "Calendar Event: Summary is %s."
-msgstr "Is príobháideach é an t-imeacht seo."
+msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
-msgstr "Amharc Imeacht <Foclach>:"
+msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
-msgstr "Glac le &fócas"
+msgstr ""
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "Coinne Nua"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Teagmhas an Lá ar Fad Nua"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Cruinniú Nua"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Téigh go Inniu"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Téigh go Dáta"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:303
-#: ../a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr ""
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:150
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
+#, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
-msgstr[0] "Leis na ceadanna seo:"
+msgstr[0] ""
 msgstr[1] ""
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "Níl aon teagmhas aige."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:162
+#: ../a11y/calendar/ea-day-view.c:159
 #, c-format
 msgid "Work Week View: %s. %s"
-msgstr "Amharc Sheachtain Oibre; %s. %s"
+msgstr "Amharc Seachtaine Oibre; %s. %s"
 
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Amharc Lae: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
-#, fuzzy
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
-msgstr "eolas fhéilire"
+msgstr ""
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr ""
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -168,32 +162,30 @@ msgstr "%A %d %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:1358
-#: ../calendar/gui/e-day-view.c:2158
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../a11y/calendar/ea-gnome-calendar.c:189
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:217
-#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c:215
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -202,592 +194,613 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:1362
-#: ../calendar/gui/e-day-view.c:2174
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../a11y/calendar/ea-gnome-calendar.c:219
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "Féilire Gnome"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "barra cuardaigh"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
-msgstr "Name=Breiseán Barra Cuardaigh"
+msgstr ""
 
-#: ../a11y/calendar/ea-jump-button.c:149
-#, fuzzy
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
-msgstr "Cúlra na gCnaipí"
+msgstr ""
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr ""
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Amharc Míosa: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Amharc Seachtaine: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
-#, fuzzy
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
-msgstr "%2 %1"
+msgstr ""
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
-#, fuzzy
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
-msgstr "Preabfhuinneog:"
+msgstr ""
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
-#, fuzzy
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
 msgid "popup a child"
-msgstr "Mac Nua"
+msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "eagar"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "scoránaigh"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
-#, fuzzy
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
-msgstr "Roinn Cill"
+msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
 msgid "expand"
 msgstr "leathnaigh"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
 msgid "expands the row in the ETree containing this cell"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
-#, fuzzy
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
 msgid "collapse"
-msgstr "Laghdaigh"
+msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
 msgid "collapses the row in the ETree containing this cell"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
-#, fuzzy
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 msgid "Table Cell"
-msgstr "Cill Tábla"
+msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:581
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "cliceáil chun cur leis"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "cliceáil"
 
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
 msgid "sort"
 msgstr "sórtáil"
 
-#: ../a11y/widgets/ea-calendar-item.c:298
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:295
+#: ../a11y/widgets/ea-calendar-item.c:301
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../a11y/widgets/ea-calendar-item.c:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Féilire: ó %s go %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
-#, fuzzy
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
-msgstr "Formáid na n-iontrálacha roghchláir:"
+msgstr ""
 
-#: ../a11y/widgets/ea-combo-button.c:40
-#, fuzzy
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
-msgstr "Cúlra na gCnaipí"
+msgstr ""
 
-#: ../a11y/widgets/ea-combo-button.c:50
-#, fuzzy
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
-msgstr "freastalaí réamhshocraithe"
+msgstr ""
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Preabroghchlár"
 
-#: ../a11y/widgets/ea-expander.c:40
-#, fuzzy
-msgid "Toggle Attachment Bar"
-msgstr "Scoránaigh Pána na nIatán"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "gníomhachtaigh"
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:2
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:1
+#: ../addressbook/addressbook.error.xml.h:3
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:2
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
-msgstr "Tá an iontráil seo ann cheana"
+msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Cannot add new contact"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
 msgstr "Ní féidir teagmháil a bhogadh."
 
-#: ../addressbook/addressbook.error.xml.h:4
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
-msgstr "Níl an fillteán baile le fáil."
+msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
 "your caps lock might be on."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:7
-#, fuzzy
-msgid "Could not remove addressbook."
-msgstr "Ní féidir an fillteán %1 a bhaint."
+#: ../addressbook/addressbook.error.xml.h:10
+msgid "Could not remove address book."
+msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:11
 msgid ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:9
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
-msgstr "Scrios Leabhar Seoltaí"
+msgstr "Scrios leabhar seoltaí '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:10
-msgid "Error loading addressbook."
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "Error loading address book."
 msgstr "Earráid agus leabhar seoltaí á luchtú."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Earráid agus {0} á shábháil go {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:12
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
-msgstr "Teip ag cruthaigh fillteán %s: %s"
+msgstr ""
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1705
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
 msgid "Failed to delete contact"
-msgstr "Theip ar scriosadh comhaid \"%1\"."
+msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:14
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
-msgstr "&Cuir leis an leabhar seoltaí"
+msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:16
-msgid "Permission Denied."
-msgstr "Diúltaíodh Cead."
-
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:54
 msgid "Server Version"
 msgstr "Leagan Freastalaí"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:19
-#, fuzzy
-msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "Tá scoirthe gan choinne ag réad painéil"
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "The Evolution address book has quit unexpectedly."
+msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "This address book will be removed permanently."
-msgstr ""
-
-#: ../addressbook/addressbook.error.xml.h:23
-#, fuzzy
-msgid "This addressbook could not be opened."
-msgstr "Ní féidir an gléas %1 a oscailt: %2"
-
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This addressbook server does not have any suggested search bases."
+msgid "This address book could not be opened."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
+msgid "This address book server does not have any suggested search bases."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:26
-msgid "This server does not support LDAPv3 schema information."
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:27
-#, fuzzy
-msgid "Unable to open addressbook"
-msgstr "Ní féidir an leabhar seoltaí a oscailt."
+msgid "This address book will be removed permanently."
+msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:28
-#, fuzzy
-msgid "Unable to perform search."
-msgstr "Ní féidir an soláthraí cuardaigh a aimsiú."
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open address book"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:30
+msgid "Unable to perform search."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "Ní féidir {0} a shábháil."
 
-#: ../addressbook/addressbook.error.xml.h:30
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
-msgstr "Ar mhaith leat an chluiche seo a shábháil?"
+msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
-"You are attempting to move a contact from one addressbook to another but it "
+"You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:512
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Add"
 msgstr "Cuir _Leis"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "_Caith uait"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
 msgstr "_Ná sábháil"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Resize"
 msgstr "_Athmhéadaigh"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "_Use as it is"
 msgstr "Ú_sáid mar atá sé"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:41
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "Seoladh Shionc. Loicthe:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
-#: ../addressbook/conduit/address-conduit.c:1320
-#, fuzzy
-msgid "Could not load addressbook"
-msgstr "(Ní féidir téama a luchtú)"
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
+msgid "Could not load address book"
+msgstr ""
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Comhlánú Uathoibríoch"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "_Teagmhálacha"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
-msgstr "Teastasaí"
+msgstr "Teastais"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "Cumraigh comhlánú uathoibríoch anseo"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Configure contacts and autocompletion here"
+msgstr ""
 
 #. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: ../addressbook/gui/component/addressbook-view.c:1213
+#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "Teagmhálacha"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Address Book"
 msgstr "Leabhar Seoltaí Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Address Book address pop-up"
-msgstr "Leabhar Sheoladh Evolution"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Address Book address popup"
+msgstr ""
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address viewer"
-msgstr "&Cuir leis an leabhar seoltaí"
+msgstr ""
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book card viewer"
-msgstr "Cruthaigh cárta nua sa leabhar seoltaí"
+msgstr ""
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book component"
-msgstr "&Cuir leis an leabhar seoltaí"
+msgstr ""
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr ""
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution folder settings configuration control"
 msgstr ""
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:497
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:481
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1095
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:305
-#: ../mail/mail-vfolder.c:216
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "Ar an Ríomhaire Seo"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "Ar Fhreastalaithe LDAP"
+
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
+#. Create the default Person addressbook
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person task list
+#. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:505
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:491
-#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1103
-#: ../calendar/gui/tasks-component.c:205 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1056
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "Pearsanta"
 
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
-#: ../addressbook/gui/component/addressbook-migrate.c:515
-msgid "On LDAP Servers"
-msgstr "Ar Fhreastalaithe LDAP"
-
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:209
+msgctxt "New"
 msgid "_Contact"
 msgstr "_Teagmháil"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "Cruthaigh teaghmháil nua"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:217
+msgctxt "New"
 msgid "Contact _List"
 msgstr "_Liosta Teagmhálacha"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "Cruthaigh liosta tadhaill nua"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
 msgstr "Leabhar Seoltaí Nua"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:225
+msgctxt "New"
 msgid "Address _Book"
 msgstr "_Leabhar Seoltaí"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
 msgstr "Cruthaigh leabhar seoltaí nua"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:389
 msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:217
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:221
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
 msgstr "Bun"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Cineál:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
-#: ../plugins/itip-formatter/itip-formatter.c:2318
+#: ../addressbook/gui/component/addressbook-config.c:759
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:96
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Ginearálta"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:1021
+#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Leabhar Seoltaí"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "Eolas faoin bhFreastalaí"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "Fíordheimhniú"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Sonraí"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:922
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1021
 msgid "Searching"
 msgstr "Á Chuardach"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 msgstr "Á Íosluchtú"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Airíonna an Leabhar Seoltaí"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../addressbook/gui/component/addressbook-migrate.c:74
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../addressbook/gui/component/addressbook-migrate.c:126
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
 #, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:643
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "Freastalaí LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:758
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
-msgstr "Socruithe an Scáileáin"
+msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -795,95 +808,109 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:500
+#: ../addressbook/gui/component/addressbook-view.c:422
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Athainmnigh an fillteán \"%s\" go:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:502
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "Athainmigh Fillteán"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:508
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-view.c:430
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
-msgstr "Ní cheadaítear '/' in ainm an albaim."
+msgstr ""
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:949
 msgid "_New Address Book"
 msgstr "Leabhar Seoltaí _Nua"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "Save As vCard..."
 msgstr "Sábháil Mar vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1347
-#: ../calendar/gui/e-calendar-view.c:1696 ../calendar/gui/e-memo-table.c:937
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1327
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "_Athainmnigh..."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-view.c:1828 ../calendar/gui/e-memo-table.c:949
+#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Scrios"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "_Airíonna..."
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Airíonna"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-view.c:1223
 msgid "Contact Source Selector"
-msgstr "Roghnóir Ionadais KDE"
+msgstr ""
 
-#: ../addressbook/gui/component/addressbook.c:99
-#, fuzzy
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
-msgstr "Theip ar nascadh le freastalaí LDAP"
+msgstr ""
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
-#, fuzzy
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
-msgstr "Theip ar nascadh le %1"
+msgstr "Theip ar fhíordheimhniú.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
-#, fuzzy, c-format
+#: ../addressbook/gui/component/addressbook.c:214
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
+#, c-format
 msgid "Enter password for %s (user %s)"
-msgstr "Iontráil an focal faire nua do <b>%1</b>, le do thoil:"
+msgstr "Iontráil focal faire do %s (úsáideoir %s)"
+
+#: ../addressbook/gui/component/addressbook.c:222
+#: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:500
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Iontráil focal faire"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
-#, fuzzy
 msgid "Autocomplete length"
-msgstr "Fad an Chiú"
+msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
@@ -900,329 +927,229 @@ msgid ""
 msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-#, fuzzy
-msgid "Show preview pane"
-msgstr "Pána Réamhamhairc"
+msgid "Show autocompleted name with an address"
+msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+msgid "Show preview pane"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Vertical pane position"
-msgstr "Luach toise - ionad ingearach"
+msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#, fuzzy
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
-msgstr "Cliceáil chun réamhamharc na híomhá a thaispeáint"
+msgstr ""
+
+#: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Autocompletion"
+msgstr "Comhlánú Uathoibríoch"
+
+#: ../addressbook/gui/component/autocompletion-config.c:177
+msgid "Always _show address of the autocompleted contact"
+msgstr ""
+
+#: ../addressbook/gui/component/autocompletion-config.c:182
+msgid "Date/Time Format"
+msgstr "Formáid Dáta/Ama"
+
+#: ../addressbook/gui/component/autocompletion-config.c:185
+#: ../mail/em-mailer-prefs.c:1456
+msgid "Table column:"
+msgstr "Colún tábla:"
+
+#: ../addressbook/gui/component/autocompletion-config.c:187
+msgid "Look up in address books"
+msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "389"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "636"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
 msgstr "<b>Fíordheimhniú</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>Taispeáint</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>Íosluchtú</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>Cuardach</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>Eolas Freastalaí</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
-msgid "<b>Type:</b>"
-msgstr "<b>Cineál:</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-msgid "Add Address Book"
-msgstr "Cuir Leabhar Seoltaí Leis"
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
 
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
 #: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:777
-msgid "Always"
-msgstr "I gCónaí"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-msgid "Anonymously"
-msgstr "Gan ainm"
+msgid "B_rowse this book until limit reached"
+msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "Bunúsach"
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:18
-#, fuzzy
-msgid "Distinguished name"
-msgstr "AD:"
+msgid "Lo_gin:"
+msgstr "_Logáil Isteach:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "Seoladh ríomhphoist"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
-"Evolution will use this email address to authenticate you with the server."
+"One\n"
+"Sub"
 msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
-#, fuzzy
-msgid "Find Possible Search Bases"
-msgstr "Ní féidir an soláthraí cuardaigh a aimsiú."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-msgid "Lo_gin:"
-msgstr "_Logáil Isteach:"
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
-msgid "Never"
-msgstr "Riamh"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
-msgid "No encryption"
-msgstr "Gan criptiú"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "Aon"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:312
-msgid "SSL encryption"
-msgstr "Criptiú SSL"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-#, fuzzy
 msgid "Search Filter"
-msgstr "&Scagaire cuardaigh:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
-msgid "Search _base:"
-msgstr "URL bunaidh"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-#, fuzzy
-msgid "Search _filter:"
-msgstr "&Scagaire cuardaigh:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-#, fuzzy
-msgid "Search filter"
-msgstr "&Scagaire cuardaigh:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+msgid "Search _base:"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
+#: ../addressbook/gui/component/ldap-config.glade.h:26
+msgid "Search _filter:"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "Fó"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Supported Search Bases"
-msgstr "C&uardach cásíogair"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:308
-msgid "TLS encryption"
-msgstr "Criptiú TLS"
+msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
-msgstr ""
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-#, fuzzy
-msgid "Using distinguished name (DN)"
-msgstr "Ainm Lipéid/Riain á nÚsáid"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "Seoladh ríomhphoist á úsáid"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
-msgid "Whenever Possible"
-msgstr "Nuair is féidir"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "_Cuir Leabhar Seoltaí Leis"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "_Download limit:"
-msgstr "       --limit-rate=RÁTA         socraigh uasráta íosluchtaithe.\n"
+msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
-msgstr "Ní féidir an soláthraí cuardaigh a aimsiú."
+msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "_Login method:"
-msgstr "&Modh EAP"
+msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:161
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:176
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Ainm:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid "_Search scope:"
-msgstr "Scóip Chuardaigh"
+msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:169
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:185
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "_Freastalaí:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
-msgstr "Teorainn Ama"
+msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "Úsáid nasc daingean:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 msgstr "cartaí"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/calendar-http/calendar-http.c:288
-#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:286
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:720
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "noimeaíd"
 
@@ -1247,1719 +1174,430 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Éagsúil</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Notes</b>"
+msgstr "<b>Nótaí</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Eile</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Teileafón</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Seoltaí Gréasáin</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Obair</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
-msgid "AIM"
-msgstr "AIM"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "_Catagóirí..."
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Teagmháil"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "Eagarthóir Teagmhálacha"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "Ainm _Fhada..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Íomhá"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
-msgid "MSN Messenger"
-msgstr "Teachtaire MSN"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#, fuzzy
 msgid "Mailing Address"
-msgstr "Seoladh Baile"
+msgstr "Seoladh Poist"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
+msgid "Nic_kname:"
 msgstr "_Leasainm:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
-msgid "Novell Groupwise"
-msgstr "Groupwise Novell"
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "Nótaí"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "Eolas Pearsanta"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "Teileafón"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1055
-msgid "Work"
-msgstr "Obair"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "_Seoladh:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
-msgstr "Cothrom Lae"
+msgstr "Cothrom _Lae:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
-msgstr "KDevelop Assistant"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "_Breithlá:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:901
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:820
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "_Féilire:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "_Catagóirí..."
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "_Cathair:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "_Comhlacht:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "_Tír:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "_Roinn:"
 
 # vi
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
-msgstr "Comhad faoin chomhadlann: "
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "_Saor/Gnóthach:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "_Leathanach Baile:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
 msgstr "_Bainisteoir:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Notes:"
-msgstr "_Nótaí:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Oifig:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "Bosca _Phoist:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "_Gairm:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "_Céile:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "_Stát/Cúige:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "_Tidéal:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "Comhrá _Físeáin:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
-msgstr "Logchomhad Gréasáin &CUPS"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_An Áit:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Zip/Postal Code:"
 msgstr "_Cód Zip/Poist:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-msgid "Address"
-msgstr "Seoladh"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:473
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "Ainm"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
-#: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1832 ../widgets/text/e-text.c:3679
-#: ../widgets/text/e-text.c:3680
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../widgets/menus/gal-define-views-model.c:178
+#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "Ineagarthóireachta"
 
-# US
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "United States"
-msgstr "Stáit Aontaithe Mheiriceá"
-
-# ##
-# ## Countries (Listed in ISO 3166-1)
-# ##
-# AF
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Afghanistan"
-msgstr "An Afganastáin"
-
-# AL
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Albania"
-msgstr "An Albáin"
-
-# DZ
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Algeria"
-msgstr "An Ailgéir"
-
-# AS
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "American Samoa"
-msgstr "Samó Meiriceánach"
-
-# AD
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Andorra"
-msgstr "Andóra"
-
-# AO
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Angola"
-msgstr "Angóla"
-
-# AI
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Anguilla"
-msgstr "Anguilla"
-
-# AQ
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Antarctica"
-msgstr "An tAntartach"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Antigua And Barbuda"
-msgstr "Antigua agus Barbúda"
-
-# AR
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Argentina"
-msgstr "An Airgintín"
-
-# AM
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Armenia"
-msgstr "An Airméin"
-
-# AR
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Aruba"
-msgstr "Aruba"
-
-# AU
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Australia"
-msgstr "An Astráil"
-
-# AT
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Austria"
-msgstr "An Ostair"
-
-# AZ
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Azerbaijan"
-msgstr "An Asarbaiseáin"
-
-# BS
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Bahamas"
-msgstr "Na Bahámaí"
-
-# BS
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Bahrain"
-msgstr "Bairéin"
-
-# FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bangladesh"
-msgstr "An Bhanglaidéis"
-
-# BB
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Barbados"
-msgstr "Barbadós"
-
-# BY
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Belarus"
-msgstr "An Bhílearúis"
-
-# BE
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Belgium"
-msgstr "An Bheilg"
-
-# BZ
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Belize"
-msgstr "An Bheilís"
-
-# BJ
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Benin"
-msgstr "Beinin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Bermuda"
-msgstr "Beirmiúda"
-
-# BT
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "Bhutan"
-msgstr "An Bhútáin"
-
-# BO
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Bolivia"
-msgstr "An Bholaiv"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bosnia And Herzegowina"
-msgstr "Boisnia agus Heirseagaivéin"
-
-# BW
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Botswana"
-msgstr "An Bhotsuáin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Bouvet Island"
-msgstr "Oileán Bouvet"
-
-# BR
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Brazil"
-msgstr "An Bhrasaíl"
-
-# IO
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "British Indian Ocean Territory"
-msgstr "Críocha Briotanacha an Aigéin Indiaigh"
-
-# BN
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Brunei Darussalam"
-msgstr "Brúiné Dárasalám"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Bulgaria"
-msgstr "An Bhulgáir"
-
-# BF
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Burkina Faso"
-msgstr "Buircíne Fasó"
-
-# BI
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Burundi"
-msgstr "An Bhurúin"
-
-# KH
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Cambodia"
-msgstr "An Chambóid"
-
-# CM
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Cameroon"
-msgstr "Camarún"
-
-# CA
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "Canada"
-msgstr "Ceanada"
-
-# CV
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Cape Verde"
-msgstr "Rinn Verde"
-
-# KY
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cayman Islands"
-msgstr "Oileáin Cayman"
-
-# CF
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Central African Republic"
-msgstr "Poblacht na hAfraice Láir"
-
-# TD
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Chad"
-msgstr "Sead"
-
-# CL
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Chile"
-msgstr "An tSile"
-
-# CH
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "China"
-msgstr "An tSín"
-
-# CX
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Christmas Island"
-msgstr "Oileán na Nollag"
-
-# CC
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Cocos (Keeling) Islands"
-msgstr "Oileáin na gCócónna (Keeling)"
-
-# CO
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Colombia"
-msgstr "An Cholóim"
-
-# KM
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Comoros"
-msgstr "Oileáin Chomóra"
-
-# CG
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Congo"
-msgstr "An Congó"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Congo, The Democratic Republic Of The"
-msgstr "Congó, Poblacht Dhaonlathach an"
-
-# CK
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Cook Islands"
-msgstr "Oileáin Cook"
-
-# CR
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Costa Rica"
-msgstr "Cósta Rice"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Cote d'Ivoire"
-msgstr "An Cósta Eabhair"
-
-# HR
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Croatia"
-msgstr "An Chróit"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Cuba"
-msgstr "Cúba"
-
-# CY
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Cyprus"
-msgstr "An Chipir"
-
-# CZ
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Czech Republic"
-msgstr "Poblacht na Seice"
-
-# DK
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "Denmark"
-msgstr "An Danmhairg"
-
-# DJ
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Djibouti"
-msgstr "Djibouti"
-
-# DM
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Dominica"
-msgstr "Dominice"
-
-# DO
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Dominican Republic"
-msgstr "An Phoblacht Dhoiminiceach"
-
-# EC
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ecuador"
-msgstr "Eacuadór"
-
-# EG
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Egypt"
-msgstr "An Éigipt"
-
-# SV
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "El Salvador"
-msgstr "An tSalvadóir"
-
-# GQ
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Equatorial Guinea"
-msgstr "Guine Mheánchiorclach"
-
-# ER
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Eritrea"
-msgstr "An Eiritré"
-
-# EE
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "Estonia"
-msgstr "An Eastóin"
-
-# ET
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "Ethiopia"
-msgstr "An Aetóip"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "Falkland Islands"
-msgstr "Oileáin Fháclainne"
-
-# FO
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "Faroe Islands"
-msgstr "Oileáin Fharó"
-
-# FJ
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Fiji"
-msgstr "Fidsí"
-
-# FI
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Finland"
-msgstr "An Fhionlainn"
-
-# FR
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "France"
-msgstr "An Fhrainc"
-
-# fr
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "French Guiana"
-msgstr "Guáin na Fraince"
-
-# PF
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "French Polynesia"
-msgstr "Polainéis na Fraince"
-
-# TF
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "French Southern Territories"
-msgstr "Ceanada/Críocha Thiar Thuaidh"
-
-# GA
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Gabon"
-msgstr "Gabúin"
-
-# GM
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Gambia"
-msgstr "Gaimbia"
-
-# GE
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Georgia"
-msgstr "An tSeoirsia"
-
-# DE
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Germany"
-msgstr "An Ghearmáin"
-
-# GH
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Ghana"
-msgstr "Gána"
-
-# GI
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Gibraltar"
-msgstr "Giobráltar"
-
-# GR
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Greece"
-msgstr "An Ghréig"
-
-# GL
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Greenland"
-msgstr "An Ghraonlainn"
-
-# GD
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Grenada"
-msgstr "Grenada"
-
-# GP
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guadeloupe"
-msgstr "An Ghuadalúip"
-
-# GU
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Guam"
-msgstr "Guam"
-
-# GT
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Guatemala"
-msgstr "Guatamala"
-
-# DE
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Guernsey"
-msgstr "Geansaí"
-
-# GN
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Guinea"
-msgstr "An Ghuine"
-
-# GN
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
-msgstr "Guine Bhissau"
-
-# GY
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Guyana"
-msgstr "An Ghuáin"
-
-# HT
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Haiti"
-msgstr "Háítí"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "Heard And McDonald Islands"
-msgstr "Oileáin Heard agus McDonald"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Holy See"
-msgstr "Féach freisin: "
-
-# HN
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Honduras"
-msgstr "Hondúras"
-
-# HK
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Hong Kong"
-msgstr "Hong Cong"
-
-# HU
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Hungary"
-msgstr "An Ungáir"
-
-# IS
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Iceland"
-msgstr "An Íoslainn"
-
-# IN
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "India"
-msgstr "An India"
-
-# ID
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Indonesia"
-msgstr "An Indinéis"
-
-# EI
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Iran"
-msgstr "An Iaráin"
-
-# IL
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Iraq"
-msgstr "An Iaráic"
-
-# EI
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Ireland"
-msgstr "Éire"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Isle of Man"
-msgstr "Leathanaigh &lámhleabhair"
-
-# IL
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Israel"
-msgstr "Iosrael"
-
-# IT
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Italy"
-msgstr "An Iodáil"
-
-# JM
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Jamaica"
-msgstr "Iamáice"
-
-# JP
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Japan"
-msgstr "An tSeapáin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Jersey"
-msgstr "Geirsí"
-
-# JO
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Jordan"
-msgstr "An Iordáin"
-
-# kk
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kazakhstan"
-msgstr "An Chasacstáin"
-
-# KE
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Kenya"
-msgstr "An Chéinia"
-
-# KI
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Kiribati"
-msgstr "Ciribeas"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Korea, Democratic People's Republic Of"
-msgstr "Cóiré, Daonphoblacht Dhaonlathach na"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Korea, Republic Of"
-msgstr "Cóiré, Poblacht na"
-
-# KW
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Kuwait"
-msgstr "Cuáit"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Kyrgyzstan"
-msgstr "An Chirgeastáin"
-
-# LA
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Laos"
-msgstr "Láós"
-
-# LV
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Latvia"
-msgstr "An Laitvia"
-
-# LB
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Lebanon"
-msgstr "An Liobáin"
-
-# LS
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Lesotho"
-msgstr "Leosóta"
-
-# LR
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Liberia"
-msgstr "An Libéir"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Libya"
-msgstr "An Libia"
-
-# LI
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Liechtenstein"
-msgstr "Lichtinstéin"
-
-# LT
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Lithuania"
-msgstr "An Liotuáin"
-
-# LU
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Luxembourg"
-msgstr "Lucsamburg"
-
-# MC
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Macao"
-msgstr "Macao"
-
-# MK
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Macedonia"
-msgstr "An Mhacadóin"
-
-# MG
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Madagascar"
-msgstr "Madagascar"
-
-# MW
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Malawi"
-msgstr "Malawi"
-
-# MY
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Malaysia"
-msgstr "An Mhalaeisia"
-
-# mt
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Maldives"
-msgstr "Oileáin Mhaildíve"
-
-# ML
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mali"
-msgstr "Mali"
-
-# MT
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Malta"
-msgstr "Málta"
-
-# MH
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Marshall Islands"
-msgstr "Oileáin Marshall"
-
-# MQ
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Martinique"
-msgstr "An Mhartainíc"
-
-# MR
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Mauritania"
-msgstr "An Mháratáin"
-
-# mr
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mauritius"
-msgstr "Oileán Mhuirís"
-
-# YT
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Mayotte"
-msgstr "Mayotte"
-
-# MX
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Mexico"
-msgstr "Meicsiceo"
-
-# ID
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Micronesia"
-msgstr "An Mhicrinéis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Moldova, Republic Of"
-msgstr "Moldóive, Poblacht na"
-
-# MC
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Monaco"
-msgstr "Monacó"
-
-# MN
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Mongolia"
-msgstr "An Mhóngóil"
-
-# MS
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Montserrat"
-msgstr "Montsarat"
-
-# MA
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Morocco"
-msgstr "Maracó"
-
-# FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Mozambique"
-msgstr "Mósaimbic"
-
-# MM
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "Myanmar"
-msgstr "Maenmar"
-
-# NA
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "Namibia"
-msgstr "An Namaib"
-
-# na
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nauru"
-msgstr "Nárúis"
-
-# NP
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Nepal"
-msgstr "Neipeál"
-
-# NL
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Netherlands"
-msgstr "An Isiltir"
-
-# AN
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Netherlands Antilles"
-msgstr "Aintillí na hÍsiltíre"
-
-# NC
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "New Caledonia"
-msgstr "An Nua-Chaladóin"
-
-# NZ
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "New Zealand"
-msgstr "An Nua-Shéalainn"
-
-# NI
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Nicaragua"
-msgstr "Nicaragua"
-
-# NE
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Niger"
-msgstr "An Nígir"
-
-# NG
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Nigeria"
-msgstr "An Nigéir"
-
-# NU
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Niue"
-msgstr "Niue"
-
-# NF
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Norfolk Island"
-msgstr "Oileán Norfolk"
-
-# MP
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Northern Mariana Islands"
-msgstr "Oileáin Mariana Thuiadh"
-
-# NO
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Norway"
-msgstr "An Iorua"
-
-# OM
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Oman"
-msgstr "Oman"
-
-# PK
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Pakistan"
-msgstr "An Phacastáin"
-
-# PW
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Palau"
-msgstr "Palau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Palestinian Territory"
-msgstr "An Phalaistín"
-
-# PA
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Panama"
-msgstr "Panama"
-
-# PG
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Papua New Guinea"
-msgstr "Nua-Ghuine Phapua"
-
-# PY
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Paraguay"
-msgstr "Paraguay"
-
-# PE
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Peru"
-msgstr "Peiriú"
-
-# PH FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Philippines"
-msgstr "Na hOileáin"
-
-# PI
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Pitcairn"
-msgstr "Oileán Pitcairn"
-
-# PL
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Poland"
-msgstr "An Pholainn"
-
-# PT
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Portugal"
-msgstr "An Phortaingéil"
-
-# PR
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Puerto Rico"
-msgstr "Portó Ríce"
-
-# QA
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Qatar"
-msgstr "Catar"
-
-# RE
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Reunion"
-msgstr "Réunion"
-
-# RO
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Romania"
-msgstr "An Rómáin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "Russian Federation"
-msgstr "Cónaidhm na Rúise"
-
-# RW
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Rwanda"
-msgstr "Ruanda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saint Kitts And Nevis"
-msgstr "San Críostóir Nimheas"
-
-# LC
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Saint Lucia"
-msgstr "St. Lucia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Saint Vincent And The Grenadines"
-msgstr "St. Vincent agus Grenadines"
-
-# WS
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Samoa"
-msgstr "Samó"
-
-# SM
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "San Marino"
-msgstr "San Mairíne"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Sao Tome And Principe"
-msgstr "São Tomé agus Príncipe"
-
-# SA
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Saudi Arabia"
-msgstr "An Araib"
-
-# SN
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Senegal"
-msgstr "An tSeineagáil"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Serbia And Montenegro"
-msgstr "Seirbia agus Montainéagró"
-
-# SC
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Seychelles"
-msgstr "Na Séiséil"
-
-# SL
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "Sierra Leone"
-msgstr "Siarra Leon"
-
-# SG
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "Singapore"
-msgstr "Singeapór"
-
-# SK
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Slovakia"
-msgstr "An tSlóvaic"
-
-# SI
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Slovenia"
-msgstr "An tSlóivéin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "Solomon Islands"
-msgstr "Oileáin Sholamón"
-
-# SO
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "Somalia"
-msgstr "An tSomáil"
-
-# ZA
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "South Africa"
-msgstr "An Afraic Theas"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "An tSeoirsia Theas agus na hOileáin Sandwich Theas"
-
-# ES
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Spain"
-msgstr "An Spáinn"
-
-# LK
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Sri Lanka"
-msgstr "Srí Lanca"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "St. Helena"
-msgstr "St. Helena"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "St. Pierre And Miquelon"
-msgstr "Peadar Naofa agus Micilín"
-
-# SD
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Sudan"
-msgstr "An tSúdáin"
-
-# SR
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Suriname"
-msgstr "Suranam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "Oileánra Svalbard agus Jan Mayen"
-
-# SZ
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Swaziland"
-msgstr "An tSuasalainn"
-
-# SE
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Sweden"
-msgstr "An tSualainn"
-
-# CH
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Switzerland"
-msgstr "An Eilvéis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Syria"
-msgstr "An tSiria"
-
-# TW
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Taiwan"
-msgstr "An Téaváin"
-
-# TJ
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tajikistan"
-msgstr "An Táidsíceastáin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Tanzania, United Republic Of"
-msgstr "An Tansáin"
-
-# TH
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Thailand"
-msgstr "An Téalainn"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Timor-Leste"
-msgstr "Tíomór Thoir"
-
-# TG
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Togo"
-msgstr "Tógó"
-
-# TK
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Tokelau"
-msgstr "Oileáin Tócalá"
-
-# TO
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tonga"
-msgstr "Tongais"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Trinidad And Tobago"
-msgstr "Oileán na Tríonóide agus Tobága"
-
-# TN
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Tunisia"
-msgstr "An Túinéis"
-
-# TR
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "Turkey"
-msgstr "An Tuirc"
-
-# TM
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "Turkmenistan"
-msgstr "An Tuircméanastáin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "Turks And Caicos Islands"
-msgstr "Oileáin Turks agus Caicos"
-
-# TV
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Tuvalu"
-msgstr "Tuvalu"
-
-# UG
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uganda"
-msgstr "Uganda"
-
-# UA
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Ukraine"
-msgstr "An Úcráin"
-
-# AR
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "United Arab Emirates"
-msgstr "Aontas na nÉimíríochtaí Arabacha"
-
-# UK
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "United Kingdom"
-msgstr "An Ríocht"
-
-# UM
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "United States Minor Outlying Islands"
-msgstr "Mion-Oileáin Imeallachta S.A.M."
-
-# UY
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Uruguay"
-msgstr "Uragua"
-
-# UZ
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Uzbekistan"
-msgstr "Úisbéiceastáin"
-
-# VU
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Vanuatu"
-msgstr "Vanuatú"
-
-# VE
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Venezuela"
-msgstr "Veiniséala"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Viet Nam"
-msgstr "Vítneam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Virgin Islands, British"
-msgstr "Oileáin Bhriotanacha na Maighdean"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
-msgid "Virgin Islands, U.S."
-msgstr "Oileáin na Maighdean"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
-msgid "Wallis And Futuna Islands"
-msgstr "Oileáin Vailís agus Futúna"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
-msgid "Western Sahara"
-msgstr "An Sahára Thiar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
-msgid "Yemen"
-msgstr "Éimin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
-msgid "Zambia"
-msgstr "An tSaimbia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
-msgid "Zimbabwe"
-msgstr "An tSiombáib"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:279
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
-msgid "Name"
-msgstr "Ainm"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
-msgid "AOL Instant Messenger"
-msgstr "Teachtaire Meandarach AOL"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
-msgid "Yahoo Messenger"
-msgstr "Teachtaire Yahoo"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "Yahoo"
 
-# mt
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-msgid "Gadu-Gadu Messenger"
-msgstr "Teachtaire Gadu-Gadu"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-msgid "Service"
-msgstr "Seirbhís"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:514
-#: ../plugins/save-calendar/csv-format.c:396
-msgid "Location"
-msgstr "Áit"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
+msgid "Skype"
+msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
-msgid "Username"
-msgstr "Ainm Úsaideoir"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "Obair"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Baile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2289
 msgid "Other"
 msgstr "Eile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "Leabhar Foinse"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
-msgstr "Leabhar Seoltaí"
+msgstr "Spriocleabhar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "Is Tadhall Nua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
-msgstr "Réimsí saincheaptha"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
-msgstr "Réimsí uile ag teastáil"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "Athraithe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Eagarthóir Teagmhálacha - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
-msgstr "Dealaigh na tadhallaí roghnaithe"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid "_No image"
 msgstr "_Gan íomhá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
-msgstr "Tá an stílbhileog roghnaithe neamhbhailí."
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
-#, fuzzy, c-format
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#, c-format
 msgid "'%s' has an invalid format"
-msgstr "Tá an cháipéis chainéil i bhformáid neamhbhailí."
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
-#, fuzzy, c-format
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#, c-format
 msgid "%s'%s' has an invalid format"
-msgstr "Tá an cháipéis chainéil i bhformáid neamhbhailí."
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "Is folamh é %s'%s'"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
 msgstr "Teagmháil neamhbhailí."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:298
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
-msgstr "Cuir Scagaire Gasta Leis"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "_Eagar Ainm Fhada"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "_Ainm iomlán"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "_Ríomhphost"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:369
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
 msgstr "_Roghnaigh Leabhar Seoltaí"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
-#, fuzzy, c-format
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact list (%s)?"
 msgstr ""
-"An bhfuil tú cinnte gur mian leat an liosta postála roghnaithe a scriosadh?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
-#, fuzzy, c-format
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact (%s)?"
 msgstr ""
-"An bhfuil tú cinnte go dteastaíonn uait an leabharmharc <b>%1</b> a "
-"scriosadh?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
-#, fuzzy
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
-"An bhfuil tú cinnte gur mian leat na comhaid aistrithe seo a scriosadh?"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Seoladh _2:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "_Cathair:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "_Tír:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "Seoladh"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "Cód _ZIP:"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "Dr."
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Ainm Fhada"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Óg"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Iníon"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "An t-Uas."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Bean"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Ms."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-#, fuzzy
-msgid "Sr."
-msgstr "SR CEARNACH"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "_Cead:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "_Deireadh:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "_Méan:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "_Iarmhír:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#, fuzzy
-msgid "Add IM Account"
-msgstr "Iontráil sonraí an chuntais:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "_Ainm cuntais:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "Seirbhís _IM:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:234
-msgid "_Location:"
-msgstr "_Suíomh:"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "<b>Members</b>"
 msgstr "<b>Baill</b>"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
 msgid "Contact List Editor"
 msgstr "Eagarthóir Liosta Teagmhálacha"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
+#: ../calendar/gui/e-day-view-time-item.c:812
+#: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
 msgstr "Roghnaigh..."
 
@@ -2975,42 +1613,40 @@ msgstr "Ainm _Líosta:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
 msgstr "Baill Liosta Teagmhálacha"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:383
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+msgid "_Members"
+msgstr "_Baill"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
+#: ../addressbook/gui/widgets/e-addressbook-view.c:211
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Leabhar"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
 msgid "Is New List"
 msgstr "Is Líosta Nua"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "_Baill"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-#, fuzzy
 msgid "Changed Contact:"
-msgstr "Glaoigh Teagmháil"
+msgstr ""
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-#, fuzzy
 msgid "Conflicting Contact:"
-msgstr "Glaoigh Teagmháil"
+msgstr ""
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
-#, fuzzy
 msgid "Duplicate Contact Detected"
-msgstr "Braitheadh comhéadan nua: %1"
+msgstr ""
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
@@ -3032,47 +1668,46 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Cumaisc Teagmháil"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "Cu_maisc"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
+msgid "Merge Contact"
+msgstr "Cumaisc Teagmháil"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "Ríomhphost"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
-msgstr "Tá ainmneacha na réimsí sa chéad ró."
+msgstr "Aon réimse ina bhfuil"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Email begins with"
-msgstr "Cuir macra '%email' in ionad seolaidh ríomhphoist '%1'"
+msgstr "Tosaíonn ríomhphost le"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Ainm a thosaíonn le"
+msgid "Name contains"
+msgstr "Ainm ina bhfuil"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Gan teagmhálacha"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -3082,139 +1717,137 @@ msgstr[2] "%d theagmháil"
 msgstr[3] "%d dteagmháil"
 msgstr[4] "%d teagmháil"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
+#: ../addressbook/gui/widgets/e-addressbook-view.c:225
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Iarratas"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
-msgstr "Tharla earráid agus an leabhar seoltaí á léamh"
-
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
-#: ../widgets/table/e-table-click-to-add.c:510
-#: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3543
-#: ../widgets/text/e-text.c:3544
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
+#: ../widgets/table/e-table-selection-model.c:302
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "Samhail"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
-msgstr "GenericName=Cluiche Cártaí"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
+msgid "Name begins with"
+msgstr "Ainm a thosaíonn le"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:218
 msgid "Source"
 msgstr "Foinse"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../addressbook/gui/widgets/e-addressbook-view.c:232
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "Cineál"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
 msgid "Save as vCard..."
 msgstr "Sábháil mar vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../calendar/gui/e-calendar-table.c:1325
-#: ../calendar/gui/e-calendar-view.c:1674 ../calendar/gui/e-memo-table.c:920
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1806 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Oscail"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "_New Contact..."
 msgstr "Teagmháil _Nua..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "New Contact _List..."
 msgstr "_Liosta Teagmhálacha Nua..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Save as vCard..."
 msgstr "_Sábháil mar vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contact"
 msgstr "_Cuir Teagmháil ar Aghaidh"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contacts"
 msgstr "_Cuir Teagmhálacha ar Aghaidh"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to Contact"
 msgstr "Seol _Teachtaireacht chuig Teagmháil"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to List"
 msgstr "Seol _Teachtaireacht chuig Liosta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contacts"
 msgstr "Seol _Teachtaireacht chuig Teagmhálacha"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "_Print"
 msgstr "_Priontáil"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Cop_y to Address Book..."
 msgstr "_Cóipeáil go Leabhar Seoltaí..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Mo_ve to Address Book..."
 msgstr "_Bog go Leabhar Seoltaí..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Cu_t"
 msgstr "_Gearr"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1333
-#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:928
-#: ../composer/e-msg-composer.c:3103 ../mail/em-folder-tree.c:1013
-#: ../mail/em-folder-view.c:1312 ../mail/message-list.c:2057
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:940
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Cóipeáil"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "P_aste"
 msgstr "G_reamaigh"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
-#: ../calendar/gui/cal-search-bar.c:681
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "Catagóir ar Bith"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1705
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "Other error"
-msgstr "Earraidh Eile"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
+msgid "Unmatched"
+msgstr "Gan Chomhoiriúnú"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "Cúntóir"
 
@@ -3224,28 +1857,27 @@ msgstr "Fón Chúntóir"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
-msgstr "Facs Ghnó"
+msgstr "Facs Gnó"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
-msgstr "Fón Ghnó"
+msgstr "Fón Gnó"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
-msgstr "Fón Ghnó 2"
+msgstr "Fón Gnó 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#, fuzzy
 msgid "Callback Phone"
-msgstr "Comment=Fón"
+msgstr "Fón Aisghlaoigh"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
-msgstr "Fón Char"
+msgstr "Fón Cairr"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:169
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3253,13 +1885,13 @@ msgid "Categories"
 msgstr "Catagóirí"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Company"
 msgstr "Comhlacht"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Company Phone"
-msgstr "Fón Ghnó"
+msgstr "Fón Comhlachta"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
@@ -3271,7 +1903,7 @@ msgstr "Ríomhphost 3"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
-msgstr "Ainm Chlainn"
+msgstr "Sloinne"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
@@ -3279,7 +1911,7 @@ msgstr "Sábháil Mar"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
-msgstr "Ainm Réimse"
+msgstr "Ainm"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
@@ -3302,22 +1934,22 @@ msgid "Journal"
 msgstr "Iris"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
 msgstr "Bainisteoir"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "Fón Póca"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "Leasainm"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "Nóta"
 
@@ -3339,21 +1971,21 @@ msgstr "Glaoire"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
-msgstr "Fón Thósaiocht"
+msgstr "Príomhfhón"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
-msgstr "Raidio"
+msgstr "Raidió"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Ról"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "Céile"
 
@@ -3384,41 +2016,38 @@ msgid "Web Site"
 msgstr "Suíomh Gréasáin"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
-#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-group-leaf.c:642
+#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "Leithead"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
-#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
-#: ../widgets/table/e-table-click-to-add.c:531
-#: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-group-leaf.c:635
+#: ../widgets/table/e-table-group-leaf.c:636
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "Airde"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
-msgstr "Glac le &fócas"
+msgstr ""
 
 # FI
 #: ../addressbook/gui/widgets/e-minicard-label.c:136
@@ -3434,15 +2063,21 @@ msgid "Text Model"
 msgstr "Samhail Téacs"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:157
-#, fuzzy
 msgid "Max field name length"
-msgstr "ainm neamhbhailí comhaid: folamh"
+msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Leithead Colúin"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3451,7 +2086,7 @@ msgid ""
 "or double-click here to create a new Contact."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3460,355 +2095,355 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
 "Search for the Contact."
-msgstr "TEITREAGRAM: TEAGMHÁIL"
+msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Cuibheoir"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Ríomhphost Oibre"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Ríomhphost Baile"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:825
 msgid "Other Email"
 msgstr "Ríomhphost Eile"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Roghnaithe"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
-msgstr "&Cúrsóir Chaochadh"
+msgstr "Cúrsóir Aige"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
-msgstr "Oscail i mbrabhsálaí seachtrach"
+msgstr "_Oscail Nasc i mBrabhsálaí"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2746
+#: ../addressbook/gui/widgets/eab-contact-display.c:170
+#: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
 msgstr "_Cóipeáil Suíomh an Naisc"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
-msgstr "_Seol Teachtaireacht Nua Go..."
+msgstr "_Seol Teachtaireacht Nua Chuig..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "Cóipeáil _Seoladh Ríomhphoist"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
-msgstr "(mapa)"
+msgstr "(léarscáil)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
-msgstr "mapa"
+msgstr "léarscáil"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:456
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "Liosta Ball"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "Roinn"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "Gairm"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "Ionad"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
 msgstr "Comhrá Físeáin"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
-#: ../plugins/hula-account-setup/camel-hula-listener.c:378
-#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2548
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Féilire"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Saor/Gnóthach"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "Fón"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "Facs"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "Seoladh"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "Leathanach Baile"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
-msgstr "Logchomhad Gréasáin &CUPS"
+msgstr "Loga Gréasáin"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-#: ../calendar/gui/e-calendar-view.c:2318
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2580
 msgid "Birthday"
 msgstr "Breithlá"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
-#: ../calendar/gui/e-calendar-view.c:2319
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2581
 msgid "Anniversary"
 msgstr "Cothrom Lae"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
 msgstr "Teideal Poist"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "Leathanach Baile"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Blag"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "D'éirigh Leis"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
-msgstr "Printéir gnóthach"
+msgstr "Inneall gnóthach"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
-msgstr "Úsáid As Líne..."
+msgstr ""
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "Níl Leabhar Seoltaí ann"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
-msgstr "Níl aon bhosca isteach socraithe agat."
+msgstr ""
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "Diúlaíodh cead"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Teagmháil gan aimsiú"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
-msgstr "Tá an t-aitheantas seo ann cheana..."
+msgstr ""
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
-msgstr "Níl an prótacal ar fáil"
+msgstr "Prótacal gan tacaíocht"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
-#: ../calendar/gui/e-cal-model-tasks.c:350
-#: ../calendar/gui/e-cal-model-tasks.c:665
-#: ../calendar/gui/e-calendar-table.c:403 ../calendar/gui/print.c:2419
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "Cealaithe"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
-msgstr "Níorbh fhéidir a chealú"
+msgstr "Níorbh fhéidir cealú"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/comp-editor-factory.c:422
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "Theip ar Fhíordheimhniú"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
-msgstr "Fíordheimhniú de dhíth"
+msgstr "Fíordheimhniú de Dhíth"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "Níl TLS ar Fáil"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "Níl a leithéid d'fhoinse ann"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
-msgstr "Gníomhartha ar fáil sa mhód <b>%1</b> amháin"
+msgstr ""
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
+msgid "Other error"
+msgstr "Earráid eile"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
-msgstr "Leagan neamhbhailí ar fhormáid na ngannchomhad"
+msgstr "Leagan freastalaí neamhbhailí"
+
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
+msgid "Unsupported authentication method"
+msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:95
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
-"We were unable to open this addressbook. This either means this book is not "
+"This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
-"load the addressbook once in online mode to download its contents"
+"load the address book once in online mode to download its contents."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
 msgid ""
-"We were unable to open this addressbook.  Please check that the path %s "
-"exists and that you have permission to access it."
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:113
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error message:"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+"the directory server preferences for this address book."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
+"configured for this address book.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
+"preferences for this address book."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
+msgid "The backend for this address book was unable to parse this query."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+msgid "The backend for this address book refused to perform this query."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "Earráid agus liosta á chur leis"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
-#: ../addressbook/gui/widgets/eab-gui-util.c:666
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "Earráid agus teagmháil á chur leis"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 #, fuzzy
 msgid "Error modifying list"
 msgstr "liosta earráidí %d as %d; %d earráid"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Tharla Earráid agus Teagmháil á Cruthú"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "Earráid agus liosta á bhaint"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:616
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "Earráid agus teagmháil á bhaint"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:293
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3819,33 +2454,33 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:301
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "_Ná Taispeáin"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:302
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "Taispeáin _Gach Teagmháil"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
+#, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
-"Tá an comhad \"%1\" ann cheana.\n"
-"An bhfuil tú cinnte gur mian leat scríobh air?"
+"Tá %s ann cheana\n"
+"Ar mhaith leat é a fhorscríobh?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
 msgstr "Forscríobh"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
-#: ../addressbook/gui/widgets/eab-gui-util.c:378
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "teagmháil"
@@ -3855,841 +2490,660 @@ msgstr[3] "dteagmháil"
 msgstr[4] "teagmháil\t"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:424
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "carta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:461
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
 msgstr "Roghnaigh Leabhar Seoltaí"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:575
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "liosta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:727
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "Bog teagmháil go"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:729
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "Cóipeáil teagmháil go"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:732
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "Bog teagmhálacha go"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:734
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "Cóipeáil teagmhálacha go"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:960
+#: ../addressbook/gui/widgets/eab-gui-util.c:901
 msgid "Multiple vCards"
 msgstr "vCardanna Iomadúla"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:963
+#: ../addressbook/gui/widgets/eab-gui-util.c:908
 #, c-format
 msgid "vCard for %s"
-msgstr "vCard le %s"
+msgstr "vCard do %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
-#: ../addressbook/gui/widgets/eab-gui-util.c:1022
+#: ../addressbook/gui/widgets/eab-gui-util.c:920
+#: ../addressbook/gui/widgets/eab-gui-util.c:946
+#, c-format
 msgid "Contact information"
 msgstr "Eolas teagmhála"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1024
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
 #, c-format
 msgid "Contact information for %s"
 msgstr "Eolas teagmhála le %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 msgid "Querying Address Book..."
-msgstr "Oscail an leabhar seoltaí"
+msgstr "Iarratas á Dhéanamh ar Leabhar Seoltaí..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
-#, fuzzy, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "E427: Tá aon chlib chomhoiriúnach amháin"
-msgstr[1] "agus aon carta eile."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
-#, fuzzy
-msgid "Show Full vCard"
-msgstr "Taispeáin/Folaigh vCárta"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
-#, fuzzy
-msgid "Show Compact vCard"
-msgstr "Taispeáin/Folaigh vCárta"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
-msgstr "Sábháil sa leabhar seoltaí"
-
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Amharc Carta"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Á Iompórtáil..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "CSV Outlook nó Táb (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:862
 #, fuzzy
 msgid "Outlook CSV and Tab Importer"
 msgstr "Comhphairt Coimriú Evolution"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "CSV Mozilla nó Táb (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr ""
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "CSV Evolution nó Táb (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:880
 #, fuzzy
 msgid "Evolution CSV and Tab Importer"
 msgstr "Comhphairt Coimriú Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 #, fuzzy
 msgid "Evolution LDIF importer"
 msgstr "Theip an parsálaí LDIF."
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 #, fuzzy
 msgid "Evolution vCard Importer"
 msgstr "Iompórtáil an v-Chárta ainmnithe"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "Tahoma 10 pt."
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "Tahoma 8 pt."
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-#, fuzzy
-msgid "Blank forms at end:"
-msgstr "Carac&htair ag deireadh na líne"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Corp"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Bun:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Toisí:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "_Cló..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Clónna"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Buntásc:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Formáid"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:503
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:648
-#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:310
-msgid "Header"
-msgstr "Ceanntásc"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Ceanntásc/Buntásc"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Ceannteidil"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-#, fuzzy
-msgid "Headings for each letter"
-msgstr "Taispeáin aon réiltín amháin do gach litir"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Airde:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr ""
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Cuir San Áireamh:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Tírdhreach"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Ar Chlé:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-#, fuzzy
-msgid "Letter tabs on side"
-msgstr "Scar ar an Bun"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Imill"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-#, fuzzy
-msgid "Number of columns:"
-msgstr "Líon na gcolún:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Roghanna"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Treoshuíomh"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Leathanach"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Socraigh Leathanach:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Páipéir"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Foinse an pháipéir:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Portráid"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Réamhthaispeántais:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-#, fuzzy
-msgid "Print using gray shading"
-msgstr "Clóbhual leis an tiománaí PS inmheánach"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-#, fuzzy
-msgid "Reverse on even pages"
-msgstr "&Scáthánaigh ar leathanaigh chothroma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Ar Dheis:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Rannáin:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-#, fuzzy
-msgid "Shading"
-msgstr "Scáthlíniú"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:967
-#: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:217
-msgid "Size:"
-msgstr "Méid:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Tosaigh ar leathanach nua"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Ainm stíle:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Barr:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
-msgid "Type:"
-msgstr "Cineál:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Leithead:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "_Cló..."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:53
-msgid "Contact Print Style Editor Test"
-msgstr ""
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:44
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Cóipcheart (C) 2000, Ximian, Inc."
-
-#: ../addressbook/printing/test-contact-print-style-editor.c:56
-msgid "This should test the contact print style editor widget"
-msgstr ""
-
-#: ../addressbook/printing/test-print.c:43
-msgid "Contact Print Test"
-msgstr "Tástáil Phriontáil Teagmhála"
-
-#: ../addressbook/printing/test-print.c:46
-msgid "This should test the contact print code"
-msgstr ""
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "Ní féidir comhad a oscailt"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 #, fuzzy
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "níl aon fháil ar am an tosaithe is déanaí"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "theip ar oscailt leabhar"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 #, fuzzy
 msgid "Specify the output file instead of standard output"
 msgstr "Scríobh i gcomhad AINM, in ionad an aschuir chaighdeánaigh"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
-msgstr "COMHADASCHUR"
+msgstr "COMHADASCHURTHA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 #, fuzzy
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "Ná taispeáin ach fillteáin atá oscailte"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 #, fuzzy
 msgid "Export in asynchronous mode"
 msgstr "Rith sa mhód tástála"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "UIMHIR"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:99
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In async mode, output must be file."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 msgid "In normal mode, there is no need for the size option."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "Unhandled error"
 msgstr "Earráid gan láimhseáil"
 
-#: ../calendar/calendar.error.xml.h:1
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:2
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
+
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:2
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:11
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:12
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:15
 #, fuzzy
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr ""
 "An bhfuil tú cinnte go dteastaíonn uait an leabharmharc <b>%1</b> a "
 "scriosadh?"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:16
 #, fuzzy
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr ""
 "An bhfuil tú cinnte gur mian leat an t-imeacht leis an teideal seo a "
 "scriosadh: "
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:17
 #, fuzzy
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr ""
 "An bhfuil tú cinnte go dteastaíonn uait an leabharmharc <b>%1</b> a "
 "scriosadh?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:18
 #, fuzzy
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr ""
 "An bhfuil tú cinnte gur mian leat na comhaid aistrithe seo a scriosadh?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:19
 #, fuzzy
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr ""
 "An bhfuil tú cinnte gur mian leat na comhaid aistrithe seo a scriosadh?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:20
 #, fuzzy
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr ""
 "An bhfuil tú cinnte gur mian leat na comhaid aistrithe seo a scriosadh?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:21
 #, fuzzy
 msgid "Are you sure you want to delete this appointment?"
 msgstr "An bhfuil tú cinnte go dteastaíonn uait an airí seo a scriosadh?"
 
-#: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:183
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:182
+#, fuzzy, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "An bhfuil tú cinnte go dteastaíonn uait an airí seo a scriosadh?"
 
-#: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:189
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:188
+#, fuzzy, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "An bhfuil tú cinnte go dteastaíonn uait an airí seo a scriosadh?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:185
+#, fuzzy, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "An bhfuil tú cinnte go dteastaíonn uait an airí seo a scriosadh?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:28
+#, fuzzy
+msgid "Calendar repository is offline."
+msgstr "Úsáid As Líne..."
+
+#: ../calendar/calendar.error.xml.h:29
 #, fuzzy
 msgid "Cannot create a new event"
 msgstr "Cruthaigh Cineál Nua Comhaid %1"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:30
+#, fuzzy
+msgid "Cannot save event"
+msgstr "Cruthaigh Cineál Nua Comhaid %1"
+
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Scrios féilire '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Scrios liosta meamram '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Scrios liosta tascanna '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "_Ná Seol"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:37
 #, fuzzy
 msgid "Editor could not be loaded."
 msgstr "Ní féidir SOCKS a luchtú."
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Earráid agus féilire á luchtú"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Earráid agus liosta meamram á luchtú"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Earráid agus liosta tascanna á luchtú"
 
-#: ../calendar/calendar.error.xml.h:37
+#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+#, fuzzy
+msgid "Error on '{0}'"
+msgstr "Earráid agus {0}."
+
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:48
+msgid "No response from the server."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:49
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Coinne Nua"
+
+#: ../calendar/calendar.error.xml.h:50
+#, fuzzy
+msgid "Save Memo"
+msgstr "_Meamram Comhroinnte"
+
+#: ../calendar/calendar.error.xml.h:51
+#, fuzzy
+msgid "Save Task"
+msgstr "Sábháil Mar"
+
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:55
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:56
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:58
 #, fuzzy
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Tá scoirthe gan choinne ag réad painéil"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:59
+#, fuzzy
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Tá scoirthe gan choinne ag réad painéil"
+
+#: ../calendar/calendar.error.xml.h:60
 #, fuzzy
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Tá scoirthe gan choinne ag réad painéil"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:61
 #, fuzzy
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Tá scoirthe gan choinne ag réad painéil"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "The memo list is not marked for offline usage"
-msgstr ""
+#: ../calendar/calendar.error.xml.h:63
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
+msgstr "Gníomhartha ar fáil sa mhód <b>%1</b> amháin"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:65
 #, fuzzy
 msgid "This calendar will be removed permanently."
 msgstr "Scriosfar an tsainghné seo ina iomlán."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:68
+#, fuzzy
+msgid "Unable to load the calendar"
+msgstr "Comhad féilire le luchtú"
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this appointment?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:78
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:64
-msgid ""
-"You have a read-only calendar source selected. Change to Calendar View and "
-"highlight a calendar that can accept appointments."
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this task, but not yet saved it."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:81
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:85
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "Cuir Athruithe i _Leataobh"
 
-#: ../calendar/calendar.error.xml.h:72 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "_Sábháil"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Save Changes"
 msgstr "_Sábháil Athruithe"
 
-#: ../calendar/calendar.error.xml.h:74
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:88
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Seol"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:89
 msgid "_Send Notice"
 msgstr "_Seol Fógra"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:90
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:50
-#: ../plugins/publish-calendar/publish-calendar.c:93
-#: ../smime/gui/component.c:50
-msgid "Enter password"
-msgstr "Iontráil focal faire"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 #, fuzzy
 msgid "Split Multi-Day Events:"
 msgstr "Níl aon imeachtaí ar an lá seo."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1515
-#: ../calendar/conduits/calendar/calendar-conduit.c:1516
-#: ../calendar/conduits/memo/memo-conduit.c:816
-#: ../calendar/conduits/memo/memo-conduit.c:817
-#: ../calendar/conduits/todo/todo-conduit.c:1014
-#: ../calendar/conduits/todo/todo-conduit.c:1015
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 #, fuzzy
 msgid "Could not start evolution-data-server"
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1623
-#: ../calendar/conduits/calendar/calendar-conduit.c:1626
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: ../calendar/conduits/memo/memo-conduit.c:910
-#: ../calendar/conduits/memo/memo-conduit.c:913
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr ""
 
-#: ../calendar/conduits/memo/memo-conduit.c:957
-#: ../calendar/conduits/memo/memo-conduit.c:960
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr ""
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "Tosaíocht Réamhshocrú:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1098
-#: ../calendar/conduits/todo/todo-conduit.c:1101
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: ../calendar/conduits/todo/todo-conduit.c:1143
-#: ../calendar/conduits/todo/todo-conduit.c:1146
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 msgid "Could not write pilot's ToDo application block"
 msgstr ""
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
 msgstr "Féilire agus Tascanna"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "Féilirí"
 
@@ -4732,25 +3186,24 @@ msgid "Memo_s"
 msgstr "_Meamraim"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1166
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1100 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "Meamraim"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/e-tasks.c:1433
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1875
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1089 ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tascanna"
@@ -4759,8 +3212,9 @@ msgstr "Tascanna"
 msgid "_Calendars"
 msgstr "_Féilirí"
 
+#. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tascanna"
 
@@ -4768,7 +3222,7 @@ msgstr "_Tascanna"
 msgid "Evolution Calendar alarm notification service"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "nóiméad"
@@ -4777,13 +3231,15 @@ msgstr[2] "nóiméad"
 msgstr[3] "nóiméad"
 msgstr[4] "nóiméad"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:289
-#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:287
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:721
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] ""
@@ -4792,7 +3248,7 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "Am tosaigh"
 
@@ -4801,74 +3257,80 @@ msgstr "Am tosaigh"
 msgid "Appointments"
 msgstr "Coinní"
 
-#. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
-#: ../plugins/itip-formatter/itip-view.c:1004
+msgid "Dismiss _All"
+msgstr ""
+
+#. Location
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "Suíomh:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #, fuzzy
 msgid "Snooze _time:"
 msgstr "&Teorainn ama:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:155
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+msgid "_Dismiss"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:168
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:52
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Eagar"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #, fuzzy
 msgid "_Snooze"
 msgstr "Glac Néal"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 #, fuzzy
 msgid "location of appointment"
 msgstr "Cuir Coinne in Eagar: \"%1\""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
 #, fuzzy
 msgid "No summary available."
 msgstr "-níl aon leid le fáil-"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
 #, fuzzy
 msgid "No description available."
 msgstr "Níl cur síos ar fáil."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 #, fuzzy
 msgid "No location information available."
 msgstr "Níl aon eolas faoi %1 ar fáil."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
 #, fuzzy, c-format
 msgid "You have %d alarms"
 msgstr "&Aláraim Arna gCumasú"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1512
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4876,7 +3338,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4887,28 +3349,28 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 #, fuzzy
 msgid "Could not initialize Bonobo"
 msgstr "Ní féidir OpenGL a thúsú"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:154
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "am neamhbhailí"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4919,8 +3381,8 @@ msgstr[3] ""
 msgstr[4] ""
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4933,8 +3395,8 @@ msgstr[4] "%d nóiméad"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4950,402 +3412,506 @@ msgid "Alarm programs"
 msgstr "Ríomhchláir Chabhracha"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-msgid "Ask for confirmation when deleting items"
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgid "Ask for confirmation when deleting items"
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
-msgid "Calendars to run alarms for"
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
+msgid "Calendars to run alarms for"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Check this to use system timezone in Evolution."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 #, fuzzy
 msgid "Confirm expunge"
 msgstr "Theip ar scriosadh"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 #, fuzzy
 msgid "Default appointment reminder"
 msgstr "Meabhrúchán ann/as"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#, fuzzy
+msgid "Default recurrence count"
+msgstr "Aonaid na Maise Adamhaí (u)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 #, fuzzy
 msgid "Default reminder units"
 msgstr "Aonaid na Maise Adamhaí (u)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 #, fuzzy
 msgid "Default reminder value"
 msgstr "Gan luach réamhshocruithe"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 #, fuzzy
 msgid "Directory for saving alarm audio files"
 msgstr "Comhadlann a sábhálfar comhaid uathúla chúltaca inti"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 #, fuzzy
 msgid "Event Gradient"
 msgstr "Grádán Cothrománach"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 #, fuzzy
 msgid "Event Transparency"
 msgstr "Cumasaigh trédhearcacht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 #, fuzzy
 msgid "Free/busy server URLs"
 msgstr "Tá an freastalaí LDAP gnóthach"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 #, fuzzy
 msgid "Free/busy template URL"
 msgstr "Ní féidir sonraí saor/gnóthach a léamh: "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 #, fuzzy
 msgid "Gradient of the events in calendar views."
 msgstr "Imeachtaí i rith na míosa seo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 #, fuzzy
 msgid "Hide completed tasks"
 msgstr "Folaigh Tascanna Críochnaithe"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 #, fuzzy
 msgid "Hide task units"
 msgstr "Aonaid na Maise Adamhaí (u)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 #, fuzzy
 msgid "Hide task value"
 msgstr "Snámhphointe"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 #, fuzzy
 msgid "Horizontal pane position"
 msgstr "Luach toise - ionad cothrománach"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 #, fuzzy
 msgid "Last alarm time"
 msgstr "&Taispeáin am an aláraim"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid "Level beyond which the message should be logged."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of server URLs for free/busy publishing."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 #, fuzzy
 msgid "Marcus Bains Line"
 msgstr "An Chéad Líne a Mheaitseálann"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line Color - Day View"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Time bar"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+msgid "Maximum number of recently used timezones to remember."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Minute the workday ends on, 0 to 59."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday starts on, 0 to 59."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Month view horizontal pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view vertical pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Number of units for determining a default reminder."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining when to hide tasks."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 #, fuzzy
 msgid "Overdue tasks color"
 msgstr "Dath nóid rialta"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#, fuzzy
+msgid "Primary calendar"
+msgstr "Priontáil an féilire seo"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#, fuzzy
+msgid "Primary memo list"
+msgstr "Liosta meamram nua"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#, fuzzy
+msgid "Primary task list"
+msgstr "Liosta tascanna nua"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Programs that are allowed to be run by alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Save directory for alarm audio"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Scroll Month View by a week"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show Role field in the event/task/meeting editor"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show appointment end times in week and month views"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show categories field in the event/meeting/task editor"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show display alarms in notification tray"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Show status field in the event/task/meeting editor"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show the \"Preview\" pane"
 msgstr "Taispeán an pána \"Réamhamharc\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show the \"Preview\" pane."
 msgstr "Taispeán an pána \"Réamhamharc\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show timezone field in the event/meeting editor"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show type field in the event/task/meeting editor"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#, fuzzy
+msgid "Show week number in Day and Work Week View"
+msgstr "Má tá fíor, taispeáin uimhreacha na seachtainí san fhéilire."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 #, fuzzy
 msgid "Show week numbers in date navigator"
 msgstr "Má tá fíor, taispeáin uimhreacha na seachtainí san fhéilire."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Tasks due today color"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 #, fuzzy
 msgid "Tasks vertical pane position"
 msgstr "Luach toise - ionad ingearach"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 #, fuzzy
 msgid "Time divisions"
 msgstr "&Teorainn ama:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Time the last alarm ran, in time_t."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Timezone"
 msgstr "Crios Ama"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Twenty four hour time format"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+msgid "Use system timezone"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Week start"
 msgstr "Tosach seachtaine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Whether to set a default reminder for appointments."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
-msgid "Whether to show week numbers in the date navigator."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+msgid "Whether to show week number in the Day and Work Week View."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
-msgid "Whether to use daylight savings time while displaying events."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+msgid "Whether to show week numbers in the date navigator."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Work days"
 msgstr "Laethanta oibre"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 #, fuzzy
 msgid "Workday end hour"
 msgstr ""
@@ -5355,7 +3921,7 @@ msgstr ""
 "%n n-uaire\n"
 "%n uair"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 #, fuzzy
 msgid "Workday end minute"
 msgstr ""
@@ -5365,7 +3931,7 @@ msgstr ""
 "%n nóiméad\n"
 "%n nóiméad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 #, fuzzy
 msgid "Workday start hour"
 msgstr ""
@@ -5375,7 +3941,7 @@ msgstr ""
 "%n n-uaire\n"
 "%n uair"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 #, fuzzy
 msgid "Workday start minute"
 msgstr ""
@@ -5385,252 +3951,380 @@ msgstr ""
 "%n nóiméad\n"
 "%n nóiméad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
-#, fuzzy
-msgid "daylight savings time"
-msgstr "Riail DST"
-
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "Achoimre ina bhfuil"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "Cur síos ina bhfuil"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "Is catagóir"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "Nóta ina bhfuil"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
 msgstr "Suíomh ina bhfuil"
 
-#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
-#: ../calendar/gui/cal-search-bar.c:685
-#, fuzzy
-msgid "Unmatched"
-msgstr "\\{ corr"
-
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
-msgstr "Tascanna na Chéad 7 Lá"
+msgstr "Tascanna na Chéad 7 Lá Eile"
 
-#: ../calendar/gui/cal-search-bar.c:635
-#, fuzzy
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
-msgstr "Gan tascanna gníomhacha"
+msgstr "Tascanna Gníomhacha"
 
-#: ../calendar/gui/cal-search-bar.c:639
-#, fuzzy
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Overdue Tasks"
-msgstr "Tascanna CD"
+msgstr "Tascanna Déanacha"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Completed Tasks"
 msgstr "Tascanna Críochnaithe"
 
-#: ../calendar/gui/cal-search-bar.c:647
-#, fuzzy
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Tasks with Attachments"
-msgstr "Tá iatáin leis an teachtaireacht"
+msgstr "Tascanna le hIatáin"
 
-#: ../calendar/gui/cal-search-bar.c:693
-#, fuzzy
+#: ../calendar/gui/cal-search-bar.c:698
 msgid "Active Appointments"
-msgstr "Coinní á liostú"
+msgstr "Coinní Gníomhach"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
 msgstr "Coinní na Chéad 7 Lá Eile"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Priontáil"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:331
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:337
 #, fuzzy
 msgid "Purge events older than"
 msgstr "&Scrios ailt níos sine ná:"
 
-#: ../calendar/gui/calendar-commands.c:335
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
-#: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:397
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../calendar/gui/calendar-commands.c:342
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:288
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:722
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "lá"
 
-#. Create the On the web source group
-#. Create the LDAP source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:511
-#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1122
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "Ar An nGréasán"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:405
-#, fuzzy
-msgid "Birthdays & Anniversaries"
-msgstr "_Breithlaethanta agus Cothrom Laethanta"
-
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
-#: ../plugins/calendar-weather/calendar-weather.c:100
+#: ../calendar/gui/calendar-component.c:195
+#: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Aimsir"
 
-#: ../calendar/gui/calendar-component.c:605
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "Breithlaethanta & Cothroim Lae"
+
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "Féilire _Nua"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "_Cóipeáil..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3634 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Airíonna"
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
+#, fuzzy
+msgid "_Make available for offline use"
+msgstr "Roghnaigh grúpaí nuachta le haghaidh úsáide as líne..."
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
+#, fuzzy
+msgid "_Do not make available for offline use"
+msgstr "Gníomhartha ar fáil sa mhód <b>%1</b> amháin"
+
+#: ../calendar/gui/calendar-component.c:961
 #, fuzzy
 msgid "Failed upgrading calendars."
 msgstr "&Athluchtaigh Cianfhéilirí"
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1218
 #, fuzzy
 msgid "Calendar Source Selector"
 msgstr "Roghnóir Ionadais KDE"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
 msgstr "Coinne nua"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1434
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_Coinne"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
 msgstr "Cruthaigh coinne nua"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
-msgstr "Cruinniú Nua"
+msgstr "Cruinniú nua"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1442
+msgctxt "New"
 msgid "M_eeting"
 msgstr "_Cruinniú"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1443
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Cruthaigh Cineál Nua Comhaid %1"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "Coinne an lá ar fad nua"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1450
+msgctxt "New"
 msgid "All Day A_ppointment"
-msgstr "Coinne an Lá ar _Fad"
+msgstr "Coinne an Lae ar _Fad"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "Féilire nua"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1458
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Féilire"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "Cruthaigh féilire nua"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
-msgstr "Amharc Lá"
+msgstr "Amharc Lae"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
-msgstr "Amharc Seachatin Oibre"
+msgstr "Amharc Seachtaine Oibre"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
-msgstr "Amharc Seachtain"
+msgstr "Amharc Seachtaine"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
-msgstr "Amharc Mí"
+msgstr "Amharc Míosa"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
+msgid "Any Field"
+msgstr "Aon Réimse"
+
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Iatáin"
+
+#: ../calendar/gui/caltypes.xml.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:6
+msgid "Attendee"
+msgstr "Rannpháirtí"
+
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
+#, fuzzy
+msgid "Category"
+msgstr "Is catagóir"
+
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
+#, fuzzy
+msgid "Classification"
+msgstr "Aicmiúchán"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
+#: ../calendar/gui/memotypes.xml.h:6
+#: ../plugins/email-custom-header/email-custom-header.c:340
+#, fuzzy
+msgid "Confidential"
+msgstr "Faoi Rún"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:10
+#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Tuarascail"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "Cur Síos ina bhfuil"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:722
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "Location"
+msgstr "Suíomh"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Organizer"
+msgstr "Eagraí"
+
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
+#: ../calendar/gui/memotypes.xml.h:12
+msgid "Private"
+msgstr "Príobháideach"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
+#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
+msgid "Public"
+msgstr "Poiblí"
+
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/dialogs/event-editor.c:304
+#, fuzzy
+msgid "Recurrence"
+msgstr "Atarlú"
+
+#: ../calendar/gui/caltypes.xml.h:17
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:22
+#: ../plugins/save-calendar/csv-format.c:357
+msgid "Summary"
+msgstr "Achoimre"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "Achoimre ina bhfuil"
 
-#: ../calendar/gui/comp-editor-factory.c:404
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "ina bhfuil"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
+#, fuzzy
+msgid "does not contain"
+msgstr "nach bhfuil ann"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
+msgid "is"
+msgstr "is"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
+#, fuzzy
+msgid "is not"
+msgstr "nach bhfuil"
+
+#: ../calendar/gui/comp-editor-factory.c:408
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Earráid agus comhad á oscailt"
 
-#: ../calendar/gui/comp-editor-factory.c:410
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: ../calendar/gui/comp-editor-factory.c:416
+#: ../calendar/gui/comp-editor-factory.c:420
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Diúltaíodh cead chun cáilíocht %S.%S a fháil"
 
-#: ../calendar/gui/comp-editor-factory.c:428 ../shell/e-shell.c:1285
+#: ../calendar/gui/comp-editor-factory.c:438
+#: ../plugins/mail-to-task/mail-to-task.c:455 ../shell/e-shell.c:1261
 msgid "Unknown error"
-msgstr "Earraidh gan fhois"
+msgstr "Earráid anaithnid"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "Cuir Aláram in Eagar"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+#, fuzzy
+msgid "Pop up an alert"
+msgstr "Roghchlár aníos cille"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Seinn fuaim"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Rith roghchlár"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Seol ríomhphost"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Aláram</b>"
@@ -5661,89 +4355,72 @@ msgid "Mes_sage:"
 msgstr "_Teachtaireacht:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
-msgid "Play a sound"
-msgstr "Seinn fuaim"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
-#, fuzzy
-msgid "Pop up an alert"
-msgstr "Roghchlár aníos cille"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
-msgid "Run a program"
-msgstr "Rith roghchlár"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "Roghnaigh Comhad"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 msgid "Send To:"
 msgstr "Seol Chuig:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
-msgid "Send an email"
-msgstr "Seol ríomhphost"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "_Argóintí:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "_Clár:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 #, fuzzy
 msgid "_Repeat the alarm"
 msgstr "Athdhéan an t-aláram go brách"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "_Fuaim:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "tar éis"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-msgid "before"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid ""
+"before\n"
+"after"
 msgstr "roimh"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "day(s)"
-msgstr "la(e)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "deireadh an coinne"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 #, fuzzy
 msgid "extra times every"
 msgstr "N&uashonraigh mionsamhail gach: "
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "uair"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"Nóiméid\n"
+"Uaire\n"
+"Lae"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "noimea(i)d"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#, fuzzy
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"Nóiméid\n"
+"Uaire\n"
+"Lae"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 #, fuzzy
-msgid "start of appointment"
+msgid ""
+"start of appointment\n"
+"end of appointment"
 msgstr "Cuir Coinne in Eagar: \"%1\""
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 #, fuzzy
 msgid "Action/Trigger"
 msgstr "Tosaigh nuair a"
@@ -5753,27 +4430,63 @@ msgid "A_dd"
 msgstr "_Suimigh"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Aláraim"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-msg-composer-select-file.c:93
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "Ceangail comha(i)d"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:785
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
+#: ../plugins/calendar-weather/calendar-weather.c:333
+#: ../plugins/calendar-weather/calendar-weather.c:387
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
+#: ../widgets/misc/e-signature-combo-box.c:74
+msgid "None"
+msgstr "Neamhní"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
 #, fuzzy
 msgid "Selected Calendars for Alarms"
 msgstr "Téacs réamhshocraithe d'aláraim:"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+#, fuzzy
+msgid "Time and date:"
+msgstr "Crios ama:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+#, fuzzy
+msgid "Date only:"
+msgstr "Dáta:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+msgid "(Shown in a Day View)"
+msgstr "Amharc (I bhFuinneog Nua)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5787,61 +4500,73 @@ msgstr ""
 "10 nóiméad\n"
 "05 nóiméad"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Clófhoireann</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:10
 #, fuzzy
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Clófhoireann</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../mail/mail-config.glade.h:14
+#, fuzzy
+msgid "<span weight=\"bold\">Date/Time Format</span>"
+msgstr "<span weight=\"bold\">Am</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<b>Roghnachais Féilire</b>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Ginearálta</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">Liosta Tascanna</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Am</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Seachtain Oibre</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Adjust for daylight sa_ving time"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #, fuzzy
 msgid "Day _ends:"
 msgstr "atá críochnaithe le"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Display"
 msgstr "Taispeáin"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#, fuzzy
+msgid "Display alarms in _notification area only"
+msgstr "Taispeáin deilbhín sa limistéar fógartha"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Aoine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5851,13 +4576,13 @@ msgstr ""
 "Uaire\n"
 "Lae"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Luain"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5868,479 +4593,625 @@ msgid ""
 "Sunday"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:105
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../mail/mail-config.glade.h:119
 msgid "Pick a color"
 msgstr "Roghnaigh dath"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "S_un"
 msgstr "_Dom"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Sathairn"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Sc_roll Month View by a week"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#, fuzzy
+msgid "Se_cond zone:"
+msgstr "Seol Chuig:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Select the calendars for alarm notification"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #, fuzzy
 msgid "Sh_ow a reminder"
 msgstr "Taispeáin an &lógó"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#, fuzzy
+msgid "Show a _reminder"
+msgstr "Taispeáin an &lógó"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 #, fuzzy
 msgid "Show week _numbers in date navigator"
 msgstr "Má tá fíor, taispeáin uimhreacha na seachtainí san fhéilire."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Show week n_umber in Day and Work Week View"
+msgstr "Má tá fíor, taispeáin uimhreacha na seachtainí san fhéilire."
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Domhnaigh"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Breithlá aige/aici inniu."
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "T_hu"
 msgstr "D_ea"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Template:"
 msgstr "Teimpléad:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Deardaoin"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "Am _Críos:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Time format:"
 msgstr "Formáid ama:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Máirt"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "Use s_ystem time zone"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Céadaoin"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 #, fuzzy
 msgid "Wee_k starts on:"
 msgstr "Ar fanacht (logánta)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 #, fuzzy
 msgid "Work days:"
 msgstr "l"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
 msgstr "_12 uair (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "_24 uair"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 #, fuzzy
 msgid "_Day begins:"
 msgstr "a thosaíonn le"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Fri"
 msgstr "_Aoi"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Hide completed tasks after"
 msgstr ""
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Mon"
 msgstr "_Lua"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Tascanna CD"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Sat"
 msgstr "_Sat"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "&Teorainn ama:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "_Tue"
 msgstr "_Mai"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "_Wed"
 msgstr "_Cea"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
+msgid "before every anniversary/birthday"
+msgstr ""
+
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "before every appointment"
 msgstr "roimh gach coinne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "Cineál:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+msgid "Colo_r:"
 msgstr "_Dath:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Liosta Tascanna"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Liosta Meamram"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Roghnachais na Fheilire"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Féilire Nua"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Airíonna Liosta Tascanna"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:531
+msgid "New Task List"
+msgstr "Liosta Tascanna Nua"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+msgid "Memo List Properties"
+msgstr "Airíonna Liosta Meamram"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Liosta Meamram Nua"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 #, fuzzy
 msgid "This event has been deleted."
 msgstr "Foilsíodh an imeacht seo"
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 #, fuzzy
 msgid "This task has been deleted."
 msgstr "Foilsíodh an tasc seo"
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 #, fuzzy
 msgid "This memo has been deleted."
 msgstr "Scriosadh an cuntas úsáideora seo"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:83
 #, fuzzy
 msgid "This event has been changed."
 msgstr "Foilsíodh an imeacht seo"
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:87
 #, fuzzy
 msgid "This task has been changed."
 msgstr "Foilsíodh an tasc seo"
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:91
 #, fuzzy
 msgid "This memo has been changed."
 msgstr "Athraíodh d'fhocal faire."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, fuzzy, c-format
 msgid "Validation error: %s"
 msgstr "Earráid le linn deimhnithe"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2247
+#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " go "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2251
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (Críochnaithe "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2253
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "Críochnaithe "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2258
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr " (Spriocdháta "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2260
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "Spriocdháta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
-#, fuzzy, c-format
-msgid "Attached message - %s"
-msgstr "Teachtaireacht Faoi Iamh"
-
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3040
-#, fuzzy, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "Teachtaireacht Faoi Iamh"
-msgstr[1] "(Scéal gan tideál)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3104
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:365
-#: ../mail/em-folder-view.c:1185 ../mail/message-list.c:2058
-msgid "_Move"
-msgstr "_Bog"
-
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3106
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2060
-msgid "Cancel _Drag"
-msgstr "Cealaigh Tarraingt"
+#: ../calendar/gui/dialogs/comp-editor.c:224
+#, fuzzy
+msgid "Could not save attachments"
+msgstr "Sábháil iatáin"
 
-#: ../calendar/gui/dialogs/comp-editor.c:824
+#: ../calendar/gui/dialogs/comp-editor.c:487
 #, fuzzy
 msgid "Could not update object"
 msgstr "Níorbh fhéidir réad \"%1\" a athainmniú."
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../composer/e-msg-composer.c:2487
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> Iatán"
-msgstr[1] "<b>%d</b> Iatán"
-msgstr[2] "<b>%d</b> Iatán"
-msgstr[3] "<b>%d</b> n-Iatán"
-msgstr[4] "<b>%d</b> Iatán"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-#, fuzzy
-msgid "Hide Attachment _Bar"
-msgstr "Folaigh an Barra Stádais"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1009
-#: ../calendar/gui/dialogs/comp-editor.c:1557
-#, fuzzy
-msgid "Show Attachment _Bar"
-msgstr "Taispeáin Barra na Roghchlár"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/dialogs/event-page.c:1969
-#: ../calendar/gui/dialogs/task-page.c:1259 ../composer/e-msg-composer.c:3633
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "_Bain"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1131
-#: ../composer/e-msg-composer.c:3636
-msgid "_Add attachment..."
-msgstr "_Cuir iatán leis..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:1581
-#: ../mail/em-format-html-display.c:2328
-msgid "Show Attachments"
-msgstr "Taispeáin Iatáin"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-msgid "Press space key to toggle attachment bar"
-msgstr ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:2188
-#: ../calendar/gui/dialogs/comp-editor.c:2231
+#: ../calendar/gui/dialogs/comp-editor.c:582
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2194
-#: ../calendar/gui/dialogs/comp-editor.c:2237
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Meeting - %s"
 msgstr "Cruinniú - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2196
-#: ../calendar/gui/dialogs/comp-editor.c:2239
+#: ../calendar/gui/dialogs/comp-editor.c:591
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2200
-#: ../calendar/gui/dialogs/comp-editor.c:2243
+#: ../calendar/gui/dialogs/comp-editor.c:597
 #, fuzzy, c-format
 msgid "Assigned Task - %s"
 msgstr "An Chéad Tasc &Eile"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2202
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:599
 #, c-format
 msgid "Task - %s"
 msgstr "Tasc - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2205
-#: ../calendar/gui/dialogs/comp-editor.c:2248
+#: ../calendar/gui/dialogs/comp-editor.c:604
 #, c-format
 msgid "Memo - %s"
 msgstr "Meamram - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2216
-#: ../calendar/gui/dialogs/comp-editor.c:2258
-msgid "No summary"
+#: ../calendar/gui/dialogs/comp-editor.c:620
+#, fuzzy
+msgid "No Summary"
 msgstr "Gan achoimhre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2820 ../mail/em-utils.c:370
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:360
-msgid "attachment"
-msgstr "iatán"
+#: ../calendar/gui/dialogs/comp-editor.c:762
+msgid "Keep original item?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:968
+#, fuzzy
+msgid "Click here to close the current window"
+msgstr "Cliceáil anseo chun an clár reatha logo a atosú."
+
+#: ../calendar/gui/dialogs/comp-editor.c:975
+msgid "Copy selected text to the clipboard"
+msgstr "Cóipeáil téacs roghnaithe go dtí an gearrthaisce"
+
+#: ../calendar/gui/dialogs/comp-editor.c:982
+#, fuzzy
+msgid "Cut selected text to the clipboard"
+msgstr "Déan cóip den téacs roghnaithe sa ghearrthaisce."
+
+#: ../calendar/gui/dialogs/comp-editor.c:989
+msgid "Click here to view help available"
+msgstr "Cliceáil anseo chun amharc ar cabhair ar fáil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2909
-#: ../calendar/gui/dialogs/comp-editor.c:2963
-#: ../calendar/gui/dialogs/comp-editor.c:2987
+#: ../calendar/gui/dialogs/comp-editor.c:996
+#, fuzzy
+msgid "Paste text from the clipboard"
+msgstr "Uathghreamaigh ón ghearrthaisce"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1017
+#, fuzzy
+msgid "Click here to save the current window"
+msgstr "Cliceáil anseo chun an clár reatha logo a atosú."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1024
+msgid "Select all text"
+msgstr "Roghnaigh gach teacs"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1031
+#, fuzzy
+msgid "_Classification"
+msgstr "Aicmiú:"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1045
+#: ../mail/mail-signature-editor.c:209
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Comhad"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1052
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "Cab_hair"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1059
+#, fuzzy
+msgid "_Insert"
+msgstr "Io_nsáigh"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1066
+msgid "_Options"
+msgstr "_Roghanna"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/em-folder-tree.c:2106
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "_Amharc"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../composer/e-composer-actions.c:315
+msgid "_Attachment..."
+msgstr "_Iatán..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1085
+#, fuzzy
+msgid "Click here to attach a file"
+msgstr "Cliceáil anseo chun cineál nua comhaid a chur leis."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1093
+msgid "_Categories"
+msgstr "_Catagóirí"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1095
+msgid "Toggles whether to display categories"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1101
+msgid "Time _Zone"
+msgstr "_Crios Ama"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1103
+msgid "Toggles whether the time zone is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1112
+msgid "Pu_blic"
+msgstr "Poi_blí"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1114
+#, fuzzy
+msgid "Classify as public"
+msgstr "Aicmigh mar dhramhphost"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1119
+msgid "_Private"
+msgstr "_Príobháideach"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1121
+#, fuzzy
+msgid "Classify as private"
+msgstr "Úsáid mar Príobháideach"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1126
+#, fuzzy
+msgid "_Confidential"
+msgstr "Faoi Rún"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1128
+#, fuzzy
+msgid "Classify as confidential"
+msgstr "Aicmigh mar dhramhphost"
+
+# FI
+#: ../calendar/gui/dialogs/comp-editor.c:1136
+#, fuzzy
+msgid "R_ole Field"
+msgstr "Réimse Anaithnid"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1138
+msgid "Toggles whether the Role field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1144
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1146
+msgid "Toggles whether the RSVP field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1152
+#, fuzzy
+msgid "_Status Field"
+msgstr "Réimse Anaithnid"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1154
+msgid "Toggles whether the Status field is displayed"
+msgstr ""
+
+# FI
+#: ../calendar/gui/dialogs/comp-editor.c:1160
+#, fuzzy
+msgid "_Type Field"
+msgstr "Cineál an Réimse"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1162
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../composer/e-composer-private.c:67
+#, fuzzy
+msgid "Recent _Documents"
+msgstr "Á Shábháil... Críochnaithe"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1615
+#: ../composer/e-composer-actions.c:518
+msgid "Attach"
+msgstr "Ceangail"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1670
+msgid "Save"
+msgstr "Sábháil"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1924
+#: ../calendar/gui/dialogs/comp-editor.c:1973
+#: ../calendar/gui/dialogs/comp-editor.c:2833
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:3016
+#: ../calendar/gui/dialogs/comp-editor.c:2801 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "iatán"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2862
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "%X%P: ní féidir spleáchóg leagain `%s' a aimsiú\n"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 #, fuzzy
 msgid "Could not open source"
 msgstr "Níorbh fhéidir comhad foinseach \\\"$a\\\" a oscailt"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 #, fuzzy
 msgid "Could not open destination"
 msgstr "Ní féidir an teastas a oscailt."
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 #, fuzzy
 msgid "Destination is read only"
 msgstr "Tá fillteán %1 inléite amháin."
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr ""
 "Earráid IMAP: níorbh fhéidir an teachtaireacht a shábháil de bharr earráide."
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr ""
 "Earráid IMAP: níorbh fhéidir an teachtaireacht a shábháil de bharr earráide."
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The memo could not be deleted due to an error"
 msgstr ""
 "Earráid IMAP: níorbh fhéidir an teachtaireacht a shábháil de bharr earráide."
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:96
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr ""
@@ -6351,7 +5222,7 @@ msgid "Contacts..."
 msgstr "Teagmhálacha..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 #, fuzzy
 msgid "Delegate To:"
 msgstr "Súmáil go %1 %%"
@@ -6361,180 +5232,222 @@ msgstr "Súmáil go %1 %%"
 msgid "Enter Delegate"
 msgstr "Iontráil Eolas"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Alarms"
+msgstr "_Aláraim"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Click here to set or unset alarms for this event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#, fuzzy
+msgid "_Recurrence"
+msgstr "Ata&rlú"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#, fuzzy
+msgid "Make this a recurring event"
+msgstr "Is príobháideach é an t-imeacht seo."
+
+#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
+#: ../widgets/misc/e-send-options.glade.h:18
+#, fuzzy
+msgid "Send Options"
+msgstr "Roghanna Seolta"
+
+#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/task-editor.c:125
+#, fuzzy
+msgid "Insert advanced send options"
+msgstr "Roghanna Seolta agus HTML"
+
+#: ../calendar/gui/dialogs/event-editor.c:226
+msgid "All _Day Event"
+msgstr "Teagmhas an _Lá ar Fad"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Toggles whether to have All Day Event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:234
+#, fuzzy
+msgid "Show Time as _Busy"
+msgstr "Taispeáin colúi&n mar uimhreacha"
+
+#: ../calendar/gui/dialogs/event-editor.c:236
+msgid "Toggles whether to show time as busy"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:245
+msgid "_Free/Busy"
+msgstr "_Saor/Gnóthach"
+
+#: ../calendar/gui/dialogs/event-editor.c:247
+msgid "Query free / busy information for the attendees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:301
 msgid "Appoint_ment"
 msgstr "Coi_nne"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-#, fuzzy
-msgid "Recurrence"
-msgstr "Atarlú"
+#: ../calendar/gui/dialogs/event-page.c:748
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:752
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:828
-#: ../calendar/gui/dialogs/event-page.c:2837
+#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:2769
 #, fuzzy
 msgid "This event has alarms"
 msgstr "Foilsíodh an imeacht seo"
 
-#: ../calendar/gui/dialogs/event-page.c:908
+#: ../calendar/gui/dialogs/event-page.c:827
 #: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "_Eagraí:"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:874
 #, fuzzy
 msgid "_Delegatees"
 msgstr "Dealaigh"
 
-#: ../calendar/gui/dialogs/event-page.c:948
+#: ../calendar/gui/dialogs/event-page.c:876
 msgid "Atte_ndees"
 msgstr "_Rannpháirtithe"
 
-#: ../calendar/gui/dialogs/event-page.c:1130
+#: ../calendar/gui/dialogs/event-page.c:1062
 #, fuzzy
 msgid "Event with no start date"
 msgstr "Ní féidir imeacht a chur roimh dáta tosaithe an chúrsa"
 
-#: ../calendar/gui/dialogs/event-page.c:1133
+#: ../calendar/gui/dialogs/event-page.c:1065
 msgid "Event with no end date"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1305
-#: ../calendar/gui/dialogs/memo-page.c:703
-#: ../calendar/gui/dialogs/task-page.c:886
+#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:830
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Iontráladh dáta neamhbhailí tosaigh."
 
-#: ../calendar/gui/dialogs/event-page.c:1315
+#: ../calendar/gui/dialogs/event-page.c:1246
 #, fuzzy
 msgid "End date is wrong"
 msgstr "Tá do dháta tosaithe níos déanaí ná do dháta críochnaithe."
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1269
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "Tá d'am tosaithe níos déanaí ná d'am críochnaithe."
 
-#: ../calendar/gui/dialogs/event-page.c:1345
+#: ../calendar/gui/dialogs/event-page.c:1276
 #, fuzzy
 msgid "End time is wrong"
 msgstr "Tá d'am tosaithe níos déanaí ná d'am críochnaithe."
 
-#: ../calendar/gui/dialogs/event-page.c:1507
-#: ../calendar/gui/dialogs/memo-page.c:742
-#: ../calendar/gui/dialogs/task-page.c:945
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:890
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1513
-#: ../calendar/gui/dialogs/memo-page.c:748
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1444
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:896
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Luach de dhíth."
 
-#: ../calendar/gui/dialogs/event-page.c:1538
-#: ../calendar/gui/dialogs/task-page.c:975
+#: ../calendar/gui/dialogs/event-page.c:1469
+#: ../calendar/gui/dialogs/task-page.c:920
 msgid "At least one attendee is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1970
-#: ../calendar/gui/dialogs/task-page.c:1260
+#: ../calendar/gui/dialogs/event-page.c:1912
+#: ../calendar/gui/dialogs/task-page.c:1219
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "_Bain"
+
+#: ../calendar/gui/dialogs/event-page.c:1913
+#: ../calendar/gui/dialogs/task-page.c:1220
 msgid "_Add "
 msgstr "_Cuir Leis"
 
-#: ../calendar/gui/dialogs/event-page.c:2713
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ní féidir féilire a chruthú: %1"
 
-#: ../calendar/gui/dialogs/event-page.c:2757
-#: ../calendar/gui/dialogs/memo-page.c:958
-#: ../calendar/gui/dialogs/task-page.c:1921
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2683
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1825
 #, fuzzy, c-format
 msgid "You are acting on behalf of %s"
 msgstr "An teachtaireacht deiridh."
 
-#: ../calendar/gui/dialogs/event-page.c:3055
+#: ../calendar/gui/dialogs/event-page.c:2967
 #, fuzzy, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "Laethanta go dtí an chéad dáta eile don Nuashonrú"
 msgstr[1] "roimh gach coinne"
 
-#: ../calendar/gui/dialogs/event-page.c:3061
+#: ../calendar/gui/dialogs/event-page.c:2973
 #, fuzzy, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "Roimh an méid airgid"
 msgstr[1] "deireadh an coinne"
 
-#: ../calendar/gui/dialogs/event-page.c:3067
+#: ../calendar/gui/dialogs/event-page.c:2979
 #, fuzzy, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "Roimh an méid airgid"
 msgstr[1] "roimh gach coinne"
 
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:2992
 msgid "Customize"
 msgstr "Saincheap"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3085
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:200
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1996
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1728
-#: ../widgets/misc/e-signature-combo-box.c:50
-msgid "None"
-msgstr "Neamhní"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-#, fuzzy
-msgid "1 day before appointment"
-msgstr "Laethanta go dtí an chéad dáta eile don Nuashonrú"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-#, fuzzy
-msgid "1 hour before appointment"
-msgstr "Roimh an méid airgid"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-#, fuzzy
-msgid "15 minutes before appointment"
-msgstr "roimh gach coinne"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "_Rannpháirtithe..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "_Catagóirí..."
+#: ../calendar/gui/e-meeting-list-view.c:151
+msgid "Attendees"
+msgstr "Rannpháirtithe"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 #, fuzzy
 msgid "Custom Alarm:"
 msgstr "Dath an aláram:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "_Tuairisc:"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
 msgid "Event Description"
@@ -6550,59 +5463,63 @@ msgstr "_Achoimre:"
 msgid "_Alarm"
 msgstr "_Aláram"
 
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
+msgid "_Description:"
+msgstr "_Tuairisc:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "_Suíomh:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 msgid "_Time:"
 msgstr "_Am:"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
-#, fuzzy
-msgid "for"
-msgstr "do"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:193 ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
-msgid "until"
+#, fuzzy
+msgid ""
+"for\n"
+"until"
 msgstr "go dtí"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>_Rannpháirtithe</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "_Athraigh Eagraí"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "_Teagmhálacha..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Eagraí"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "Eagraí:"
-
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "Meamram"
 
-#: ../calendar/gui/dialogs/memo-page.c:920
+#: ../calendar/gui/dialogs/memo-page.c:347
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:351
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:871
 #, fuzzy, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Ní féidir an comhad seo a oscailt."
 
-#: ../calendar/gui/dialogs/memo-page.c:1104 ../mail/em-format-html.c:1527
-#: ../mail/em-format-html.c:1585 ../mail/em-format-html.c:1611
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:91 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1624 ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
+#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Chuig"
 
@@ -6615,29 +5532,29 @@ msgstr "Dáta to_saigh:"
 msgid "T_o:"
 msgstr "_Chuig:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Tuairisc:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:453
+#: ../calendar/gui/dialogs/task-page.c:380
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grúpa:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:53
+#, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:55
+#, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:59
+#, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:63
+#, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 
@@ -6660,18 +5577,22 @@ msgstr " -h, --help    - taispeáin an chabhair seo agus scoir\n"
 msgid "All Instances"
 msgstr "Gach Ásc"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 #, fuzzy
 msgid "Recurrence date is invalid"
 msgstr "Iontráladh dáta neamhbhailí tosaigh."
 
+#: ../calendar/gui/dialogs/recurrence-page.c:932
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "ar"
 
@@ -6679,7 +5600,7 @@ msgstr "ar"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:996
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "céad"
 
@@ -6688,7 +5609,7 @@ msgstr "céad"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "dara"
 
@@ -6696,7 +5617,7 @@ msgstr "dara"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "tríú"
 
@@ -6704,21 +5625,30 @@ msgstr "tríú"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "ceathrú"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#, fuzzy
+msgid "fifth"
+msgstr "Leithead"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "deireadh"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Dáta Eile"
 
@@ -6726,7 +5656,7 @@ msgstr "Dáta Eile"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 #, fuzzy
 msgid "1st to 10th"
 msgstr "An 10ú Leibhéal Imlíne"
@@ -6735,7 +5665,7 @@ msgstr "An 10ú Leibhéal Imlíne"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1057
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 #, fuzzy
 msgid "11th to 20th"
 msgstr "Téigh go Amharcphort"
@@ -6744,7 +5674,7 @@ msgstr "Téigh go Amharcphort"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1063
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #, fuzzy
 msgid "21st to 31st"
 msgstr "Téigh go Amharcphort"
@@ -6752,42 +5682,42 @@ msgstr "Téigh go Amharcphort"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "lá"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1226
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "ar an"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 #, fuzzy
 msgid "occurrences"
 msgstr "Gach ceann"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2105
 #, fuzzy
 msgid "Add exception"
 msgstr "Cuir Eisceacht Leis"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2146
 msgid "Could not get a selection to modify."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 #, fuzzy
 msgid "Modify exception"
 msgstr "Eisceacht Nua"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2196
 #, fuzzy
 msgid "Could not get a selection to delete."
 msgstr "Teíp ag dealaigh fillteán: %s"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "Dáta/Am"
 
@@ -6797,7 +5727,7 @@ msgid "<b>Exceptions</b>"
 msgstr "Eisceachtaí"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>Réamhamharc</b>"
 
@@ -6806,49 +5736,51 @@ msgstr "<b>Réamhamharc</b>"
 msgid "<b>Recurrence</b>"
 msgstr "Ata&rlú"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Every"
 msgstr "Gach"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 #, fuzzy
 msgid "This appointment rec_urs"
 msgstr "Dún an coinne seo"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
-#, fuzzy
-msgid "forever"
-msgstr "go deo"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
-msgid "month(s)"
-msgstr "mí"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
-msgid "week(s)"
-msgstr "seachtain"
+#: ../calendar/gui/dialogs/send-comp.c:160
+msgid "Send my alarms with this event"
+msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
-msgid "year(s)"
-msgstr "bliain"
+#: ../calendar/gui/dialogs/send-comp.c:162
+msgid "Notify new attendees _only"
+msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Leagan mícheart den chomhad '%1'."
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
 msgstr "Leathanach Gréasáin"
 
@@ -6860,76 +5792,38 @@ msgstr "<span weight=\"bold\">Éagsúil</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Stádas</span>"
 
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:663
-#: ../calendar/gui/e-calendar-table.c:402 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2416 ../plugins/save-calendar/csv-format.c:386
-msgid "Completed"
-msgstr "Críochnaithe"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:327 ../mail/message-list.c:1061
-msgid "High"
-msgstr "Ard"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-cal-model-tasks.c:736
-#: ../calendar/gui/e-calendar-table.c:401 ../calendar/gui/print.c:2413
-msgid "In Progress"
-msgstr "Ar Siúl"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:329 ../mail/message-list.c:1059
-msgid "Low"
-msgstr "Íseal"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:965 ../calendar/gui/e-calendar-table.c:328
-#: ../mail/message-list.c:1060
-msgid "Normal"
-msgstr "Gnáth"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:400 ../calendar/gui/print.c:2410
-#, fuzzy
-msgid "Not Started"
-msgstr "Gan Tosú"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 #, fuzzy
 msgid "P_ercent complete:"
 msgstr "Próifíl Iomlán"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "_Stádas:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:330
-msgid "Undefined"
-msgstr "Gan sainmhiniú"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #, fuzzy
 msgid "_Date completed:"
 msgstr "Cuardach críochnaithe."
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "Tosaíocht:"
 
@@ -6937,27 +5831,48 @@ msgstr "Tosaíocht:"
 msgid "_Web Page:"
 msgstr "Leathanach _Gréasáin:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "Sonraí _Stádais"
+
+#: ../calendar/gui/dialogs/task-editor.c:115
+msgid "Click to change or view the status details of the task"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:371
+#, fuzzy
+msgid "_Send Options"
+msgstr "&Roghanna Seolta..."
+
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Tasc"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Sonraí Taisc"
 
-#: ../calendar/gui/dialogs/task-page.c:461
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:340
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:388
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
 msgid "Organi_zer:"
 msgstr "Eagraí:"
 
-#: ../calendar/gui/dialogs/task-page.c:859
+#: ../calendar/gui/dialogs/task-page.c:803
 #, fuzzy
 msgid "Due date is wrong"
 msgstr "Tá do dháta tosaithe tar éis do dháta dhlite."
 
-#: ../calendar/gui/dialogs/task-page.c:1878
+#: ../calendar/gui/dialogs/task-page.c:1782
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ní féidir an comhad seo a oscailt."
@@ -6971,19 +5886,16 @@ msgid "Categor_ies..."
 msgstr "Catagó_irí..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "Cur _síos:"
+#, fuzzy
+msgid "D_ue date:"
+msgstr "_Spriocdháta:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Crios ama:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_Spriocdháta:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6994,7 +5906,7 @@ msgstr[3] "%d lá"
 msgstr[4] "%d lá"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -7004,378 +5916,443 @@ msgstr[2] "%d sheachtain"
 msgstr[3] "%d seachtain"
 msgstr[4] "%d seachtain"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:462
 #, fuzzy
 msgid "Unknown action to be performed"
 msgstr "Sonraíonn sé an tástáil loighciúil le cur i bhfeidhm."
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:476
 #, fuzzy, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "Tosaigh/Gníomhachtaigh feidhmchlár"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:481
 #, fuzzy, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "Tos&aigh i nDiaidh an Chinn Roimhe Seo"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:488
 #, fuzzy, c-format
 msgid "%s at the start of the appointment"
 msgstr "Tosaigh ag líne%1:"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:499
 #, fuzzy, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "Cuir Deireadh leis an Seisiún do \"%1\""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:504
 #, fuzzy, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "Cuir Deireadh leis an Seisiún do \"%1\""
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:511
 #, fuzzy, c-format
 msgid "%s at the end of the appointment"
 msgstr "ag deireadh seisiúin"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:535
 #, c-format
 msgid "%s at %s"
 msgstr "%s ar %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:543
 #, fuzzy, c-format
 msgid "%s for an unknown trigger type"
 msgstr "Roghnaíodh cineál anaithnid cuntais"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3144
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+#, fuzzy
+msgid "I_mport"
+msgstr "Iompórtáil"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+#, fuzzy
+msgid "Select a Calendar"
+msgstr "Roghnaigh Féilire"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+#, fuzzy
+msgid "Select a Task List"
+msgstr "Roghnaigh Liosta Tascanna"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+#, fuzzy
+msgid "I_mport to Calendar"
+msgstr "Iompórtáil go bhFéilire"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+#, fuzzy
+msgid "I_mport to Tasks"
+msgstr "_Iompórtáil go dTascanna"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Cáipéis le hoscailt."
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:160
-#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
 msgid "Untitled"
 msgstr "Gan Teideal"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:212
-#: ../calendar/gui/e-cal-component-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "Dáta Tosaigh:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-itip-control.c:1201
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:68
-#: ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:76
 msgid "Description:"
 msgstr "Cur síos:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:261
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "Leathanach Gréasáin:"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Achoimre:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "Spriocdháta:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "Stádas:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "Ar Siúl"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "Críochnaithe"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+#, fuzzy
+msgid "Not Started"
+msgstr "Gan Tosú"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "Tosaíocht:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:317
-#: ../calendar/gui/e-cal-model.c:324 ../calendar/gui/e-calendar-table.c:305
-msgid "Public"
-msgstr "Poiblí"
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:585 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "Ard"
 
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:326
-#: ../calendar/gui/e-calendar-table.c:306
-msgid "Private"
-msgstr "Príobháideach"
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1076 ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "Gnáth"
 
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:328
-#: ../calendar/gui/e-calendar-table.c:307
-#, fuzzy
-msgid "Confidential"
-msgstr "Faoi Rún"
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "Íseal"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Created"
+msgstr "Cruthaithe"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "Dáta Deiridh"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#, fuzzy
+msgid "Last modified"
+msgstr "Athraithe"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Dáta Tosaigh"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "Achoimre"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:379
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:637
 msgid "Free"
 msgstr "Saor"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:380
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Gnóthach"
 
-#: ../calendar/gui/e-cal-model-tasks.c:611
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model-tasks.c:1011 ../calendar/gui/e-cal-model.c:971
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Déan"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1011 ../calendar/gui/e-cal-model.c:971
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ná Déan"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:330 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../mail/em-utils.c:1288
-#: ../plugins/itip-formatter/itip-formatter.c:395
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:722
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
+#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Anaithnid"
 
-#: ../calendar/gui/e-cal-model.c:967
+#: ../calendar/gui/e-cal-model.c:1078
 msgid "Recurring"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:969
+#: ../calendar/gui/e-cal-model.c:1080
 msgid "Assigned"
 msgstr "Sannta"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
-msgid "Save As..."
-msgstr "Sábháil Mar..."
-
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2173
+#: ../calendar/gui/e-calendar-table.c:335
 #, fuzzy
-msgid "Select folder to save selected attachments..."
-msgstr "Roghnaigh Fillteán a Sábhálfar Iatáin Ann"
+msgid "* No Summary *"
+msgstr "Gan achoimhre"
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
-#, c-format
-msgid "untitled_image.%s"
-msgstr "íomhá_gan_teideal.%s"
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:371
+#: ../calendar/gui/e-calendar-view.c:2429
+#, fuzzy, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Eagraí"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1327
-#: ../calendar/gui/e-calendar-view.c:1675 ../calendar/gui/e-memo-table.c:922
-#: ../mail/em-folder-view.c:1323 ../mail/em-popup.c:571 ../mail/em-popup.c:582
-msgid "_Save As..."
-msgstr "_Sábháil Mar..."
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2433
+#, fuzzy, c-format
+msgid "Organizer: %s"
+msgstr "Eagraí"
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-calendar-table.c:405
 #, fuzzy
-msgid "Set as _Background"
-msgstr "&Socraigh Mar Chúlra na Deisce..."
+msgid "Start: "
+msgstr "Tús"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-calendar-table.c:417
 #, fuzzy
-msgid "_Save Selected"
-msgstr "&Sábháil Comhaid Roghnaithe"
+msgid "Due: "
+msgstr "Spriocdháta"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:791
-#, c-format
-msgid "Open in %s..."
-msgstr "Oscail i %s..."
+#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "Gan sainmhiniú"
 
-#: ../calendar/gui/e-calendar-table.c:349
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:350
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:351
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:352
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:353
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:354
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:355
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:356
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:357
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:358
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:359
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:635
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:897
+#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
 msgid "Deleting selected objects"
 msgstr "Scrios réid"
 
-#: ../calendar/gui/e-calendar-table.c:915
-#: ../calendar/gui/e-calendar-view.c:802 ../calendar/gui/e-memo-table.c:642
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:654
 #, fuzzy
 msgid "Updating objects"
 msgstr "Gach Rud"
 
-#: ../calendar/gui/e-calendar-table.c:1099
-#: ../calendar/gui/e-calendar-view.c:1224 ../calendar/gui/e-memo-table.c:817
-#: ../composer/e-msg-composer.c:1472
+#: ../calendar/gui/e-calendar-table.c:1364
+#: ../calendar/gui/e-calendar-view.c:1333 ../calendar/gui/e-memo-table.c:828
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "Sábháil mar..."
 
-#: ../calendar/gui/e-calendar-table.c:1322
-#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "New _Task"
 msgstr "_Tasc Nua"
 
-#: ../calendar/gui/e-calendar-table.c:1326 ../calendar/gui/e-memo-table.c:921
+#: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
 msgid "Open _Web Page"
 msgstr "Oscail Leathanach _Gréasáin"
 
-#: ../calendar/gui/e-calendar-table.c:1328
-#: ../calendar/gui/e-calendar-view.c:1660 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
+msgid "_Save As..."
+msgstr "_Sábháil Mar..."
+
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1792 ../calendar/gui/e-memo-table.c:935
 msgid "P_rint..."
 msgstr "P_riontáil..."
 
-#: ../calendar/gui/e-calendar-table.c:1332
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Gearr"
 
-#: ../calendar/gui/e-calendar-table.c:1334
-#: ../calendar/gui/e-calendar-view.c:1663
-#: ../calendar/gui/e-calendar-view.c:1682 ../calendar/gui/e-memo-table.c:929
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:941
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "G_reamaigh"
 
-#: ../calendar/gui/e-calendar-table.c:1338 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1604 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Sann Tasc"
 
 # ln
-#: ../calendar/gui/e-calendar-table.c:1339 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1605 ../calendar/gui/e-memo-table.c:945
 #: ../ui/evolution-tasks.xml.h:26
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Seol iad ar aghaidh mar iatáin?"
 
-#: ../calendar/gui/e-calendar-table.c:1340
+#: ../calendar/gui/e-calendar-table.c:1606
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "&Marcáil \"Críochnaithe\""
 
-#: ../calendar/gui/e-calendar-table.c:1341
+#: ../calendar/gui/e-calendar-table.c:1607
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Marcáil an t-alt roghnaithe mar léite"
 
-#: ../calendar/gui/e-calendar-table.c:1342
+#: ../calendar/gui/e-calendar-table.c:1608
 #, fuzzy
 msgid "_Mark as Incomplete"
 msgstr "&Marcáil \"Neamhchríochnaithe\""
 
-#: ../calendar/gui/e-calendar-table.c:1343
+#: ../calendar/gui/e-calendar-table.c:1609
 #, fuzzy
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Marcáil an t-alt roghnaithe mar léite"
 
-#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-table.c:1614
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Scrios na Tascanna Roghnaithe"
 
-#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-table.c:1849
 #: ../calendar/gui/e-calendar-table.etspec.h:4
-#, fuzzy
 msgid "Click to add a task"
-msgstr "Cliceáil chun seirbhís a chur leis"
+msgstr "Cliceáil chun tasc a chur leis"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -7391,152 +6368,184 @@ msgstr "Críochnaithe"
 msgid "Completion date"
 msgstr "Breithlá"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "Spriocdháta"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "Tosaíocht"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "Dáta tosaigh"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2337
+#: ../calendar/gui/e-meeting-list-view.c:601
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Stádas"
 
-#: ../calendar/gui/e-calendar-view.c:1343
+#: ../calendar/gui/e-calendar-view.c:1478
 #, fuzzy
 msgid "Moving items"
 msgstr "Míreanna Speisialta"
 
-#: ../calendar/gui/e-calendar-view.c:1345
+#: ../calendar/gui/e-calendar-view.c:1480
 #, fuzzy
 msgid "Copying items"
 msgstr "Míreanna Speisialta"
 
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Appointment..."
 msgstr "_Coinne Nua..."
 
-#: ../calendar/gui/e-calendar-view.c:1655
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New All Day _Event"
 msgstr "_Teagmhas an Lá ar Fad Nua"
 
-#: ../calendar/gui/e-calendar-view.c:1656
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "New _Meeting"
 msgstr "_Cruinniú Nua"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "_Current View"
 msgstr "Amharc _Reatha"
 
-#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1801
 msgid "Select T_oday"
 msgstr "Roghnaigh _Inniu"
 
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-view.c:1802
 msgid "_Select Date..."
 msgstr "_Roghnaigh Dáta..."
 
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1808
 msgid "Pri_nt..."
 msgstr "Prio_ntáil..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1818
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Féilire ó %1 go %2"
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1819
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr ""
 "Theip ar shábhail an fhéilire:\n"
 "'%1'"
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1820
 #, fuzzy
 msgid "_Delegate Meeting..."
 msgstr "_Dealaigh..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1821
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Athshocraigh an sceideal"
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1822
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Seol iad ar aghaidh mar iatáin?"
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1823
 msgid "_Reply"
 msgstr "_Freagair"
 
-#: ../calendar/gui/e-calendar-view.c:1692 ../mail/em-folder-view.c:1317
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1824
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "Freagair _Cách"
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1829
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Níor aimsíodh an patrún in aon áit eile"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1830 ../ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "An ceann seo amháin"
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1831
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Scrios gach aitheantóir."
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2196
-#, fuzzy, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Eagraí"
+#: ../calendar/gui/e-calendar-view.c:2284
+#: ../calendar/gui/e-itip-control.c:1183
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
+#, fuzzy
+msgid "Accepted"
+msgstr "Glactha"
 
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2200
-#, fuzzy, c-format
-msgid "Organizer: %s"
-msgstr "Eagraí"
+#: ../calendar/gui/e-calendar-view.c:2285
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
+#, fuzzy
+msgid "Declined"
+msgstr "Diúltaithe"
+
+#: ../calendar/gui/e-calendar-view.c:2286
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
+#, fuzzy
+msgid "Tentative"
+msgstr "Sealadach"
+
+#: ../calendar/gui/e-calendar-view.c:2287
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
+#, fuzzy
+msgid "Delegated"
+msgstr "Tarmligthe"
+
+#: ../calendar/gui/e-calendar-view.c:2288
+#, fuzzy
+msgid "Needs action"
+msgstr "Gníomh de Dhíth"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2216 ../calendar/gui/print.c:2384
+#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
 #, c-format
 msgid "Location: %s"
 msgstr "Suíomh: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2247
+#: ../calendar/gui/e-calendar-view.c:2480
 #, c-format
 msgid "Time: %s %s"
 msgstr "Am: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:116
+#: ../calendar/gui/e-cell-date-edit-text.c:102
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:119
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:127
+#: ../calendar/gui/e-cell-date-edit-text.c:113
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7547,7 +6556,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:807
+#: ../calendar/gui/e-day-view-time-item.c:747
 #, fuzzy, c-format
 msgid "%02i minute divisions"
 msgstr ""
@@ -7557,63 +6566,60 @@ msgstr ""
 "%n nóiméad\n"
 "%n nóiméad"
 
+#: ../calendar/gui/e-day-view-time-item.c:768
+#, fuzzy
+msgid "Show the second time zone"
+msgstr "Taispeán an pána \"Réamhamharc\""
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1354
-#: ../calendar/gui/e-day-view.c:2141
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1566
+#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:766 ../calendar/gui/e-day-view.c:1119
-#: ../calendar/gui/e-week-view.c:507 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:769 ../calendar/gui/e-day-view.c:1122
-#: ../calendar/gui/e-week-view.c:510 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2309
+#, fuzzy, c-format
+msgid "Week %d"
+msgstr "Seachtain"
+
+#: ../calendar/gui/e-itip-control.c:758
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Neamhní"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:775
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Leid an Lae"
 msgstr[1] "Gach lá"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:788
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Gach &Seachtain"
 msgstr[1] "Gach seachtain"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:795
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7621,414 +6627,385 @@ msgstr[0] "Le gach athrú"
 msgstr[1] ""
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " agus "
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:815
 #, fuzzy, c-format
 msgid "The %s day of "
 msgstr "lá:"
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
 #: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:842
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "Gach &Mí"
 msgstr[1] "gach mí"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:854
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "I mBliain"
 msgstr[1] "Gach bliain"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:867
 #, fuzzy, c-format
 msgid "a total of %d time"
-msgid_plural " a total of %d times"
+msgid_plural "a total of %d times"
 msgstr[0] "Am Iomlán"
 msgstr[1] ""
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:878
 #, fuzzy
 msgid ", ending on "
 msgstr "Ar fanacht"
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:900
 #, fuzzy
 msgid "Starts"
 msgstr "Tosaíonn"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:914
 #, fuzzy
 msgid "Ends"
 msgstr "le críochnú"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "Spriocdháta"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "Eolas iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "Earráid iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
+#: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:434
 #: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
+#: ../plugins/itip-formatter/itip-view.c:522
 #: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
 msgid "An unknown person"
 msgstr "Duine anaithnid"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1135
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:730
-#: ../plugins/itip-formatter/itip-formatter.c:2009
-#, fuzzy
-msgid "Accepted"
-msgstr "Glactha"
-
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:733
-#: ../plugins/itip-formatter/itip-formatter.c:2012
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Earráid ghlactha"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:736 ../calendar/gui/itip-utils.c:765
-#: ../plugins/itip-formatter/itip-formatter.c:2015
-#, fuzzy
-msgid "Declined"
-msgstr "Diúltaithe"
-
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1274
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1276
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1353
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Cealaíodh an cruinniú seo"
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "Eolas cruinniú"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1360
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1355
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1363
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Moladh scagaire"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1370
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Theip ar nuashonrú"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1375
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Iarratas Teastais KDE"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1382
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "Freagra Cruinniú"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1390
 #, fuzzy, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "Cealaíodh an cruinniú seo"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1391
 #, fuzzy
 msgid "Meeting Cancelation"
 msgstr "Eolas cruinniú"
 
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "Seoladh do theachtaireacht"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1402
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Teachtaireacht OpenPGP - Drochshíniú"
 
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1429
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Foilsíodh an tasc seo"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
 msgstr "Eolas Taisc"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1437
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "Cuir an tasc seo leis an phainéal"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1440
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Moladh scagaire"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1447
 #, fuzzy
 msgid "Task Update"
 msgstr "Theip ar nuashonrú"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1452
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Iarratas Teastais KDE"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1460
 #, fuzzy
 msgid "Task Reply"
 msgstr "&Freagair"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1467
 #, fuzzy, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "Cealaíodh an tasc seo"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1468
 #, fuzzy
 msgid "Task Cancelation"
 msgstr "An Chéad Tasc &Eile"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "Teachtaireacht Drochthaisc"
 
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1503
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1504
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Eolas faoin Fhillteán Líonra"
 
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1509
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Iarratas Teastais KDE"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1514
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "ag feitheamh le freagra"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1519
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Teachtaireacht OpenPGP - Drochshíniú"
 
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:1967
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Nuashonrú críochnaithe."
 
-#: ../calendar/gui/e-itip-control.c:1988
+#: ../calendar/gui/e-itip-control.c:2001
 #, fuzzy
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Is neamhbhailí é an luach, agus ní féidir é a shocrú."
 
-#: ../calendar/gui/e-itip-control.c:2005
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2023
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2047
+#: ../calendar/gui/e-itip-control.c:2060
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Sealadach"
 
-#: ../calendar/gui/e-itip-control.c:2054
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../calendar/gui/e-itip-control.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2085 ../calendar/gui/e-itip-control.c:2142
+#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
 msgstr "Mír seolta!\n"
 
-#: ../calendar/gui/e-itip-control.c:2091 ../calendar/gui/e-itip-control.c:2150
-#, fuzzy
+#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
-msgstr "Níorbh fhéidir na teachtaireachtaí ríomhphoist a sheoladh"
+msgstr "Níorbh fhéidir an mhír a sheoladh!\n"
 
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "Roghnaigh gníomh:"
 
-#: ../calendar/gui/e-itip-control.c:2301
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "Nuashonraigh"
 
-#: ../calendar/gui/e-itip-control.c:2329
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "Glac Leis"
 
-#: ../calendar/gui/e-itip-control.c:2330
+#: ../calendar/gui/e-itip-control.c:2375
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Glac le &fócas"
 
-#: ../calendar/gui/e-itip-control.c:2331
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "Diúltaigh"
 
-#: ../calendar/gui/e-itip-control.c:2360
+#: ../calendar/gui/e-itip-control.c:2401
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Ní féidir sonraí saor/gnóthach a léamh: "
 
-#: ../calendar/gui/e-itip-control.c:2388
+#: ../calendar/gui/e-itip-control.c:2425
 #, fuzzy
 msgid "Update respondent status"
 msgstr "Stádas an Nuashonrú Uathoibríoch"
 
-#: ../calendar/gui/e-itip-control.c:2416
+#: ../calendar/gui/e-itip-control.c:2449
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Seol faisnéis faoin chliant"
 
-#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:753
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cealaigh"
 
@@ -8052,116 +7029,100 @@ msgstr "Féilire á Luchtú"
 msgid "Loading calendar..."
 msgstr "Féilire á luchtú..."
 
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "Eagraí:"
+
 #: ../calendar/gui/e-itip-control.glade.h:8
 #, fuzzy
 msgid "Server Message:"
 msgstr "Teachtaireacht ón fhreastalaí:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "Cathaoirligh"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "Rannpháirtithe Riachtanacha"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "Rannpháirtithe Roghnacha"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "Acmhainní"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
-msgid "Attendees"
-msgstr "Rannpháirtithe"
-
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "Aonar"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grúpa"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "Acmhainn"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "Seomra"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
 msgstr "Cathaoirleach"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "Rannpháirtí Riachtanach"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "Rannpháirtí Roghnach"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 #, fuzzy
 msgid "Non-Participant"
 msgstr "Rannpháirtí Roghnach"
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:756
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "Gníomh de Dhíth"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-time-sel.c:411
-#, fuzzy
-msgid "Tentative"
-msgstr "Sealadach"
-
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:739
-#: ../plugins/itip-formatter/itip-formatter.c:2018
-#, fuzzy
-msgid "Delegated"
-msgstr "Tarmligthe"
-
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:484
+#: ../calendar/gui/e-meeting-list-view.c:544
 msgid "Attendee                          "
 msgstr "Rannpháirtí"
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 #, fuzzy
 msgid "In Process"
 msgstr "Idir Lámha"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2116
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -8169,90 +7130,86 @@ msgstr "%A, %d %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2147
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "As an Oifig"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Gan Eolas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:429
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "_Rannpháirtithe..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:450
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "_Roghanna"
 
-#: ../calendar/gui/e-meeting-time-sel.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:446
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Ná taispeáin ach fuinneoga íoslaghdaithe"
 
-#: ../calendar/gui/e-meeting-time-sel.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:456
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Priontáil an suíomh"
 
-#: ../calendar/gui/e-meeting-time-sel.c:492
+#: ../calendar/gui/e-meeting-time-sel.c:471
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "Tá KArchiver gnóthach"
 
-#: ../calendar/gui/e-meeting-time-sel.c:507
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:525
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "_Uathpioc"
 
-#: ../calendar/gui/e-meeting-time-sel.c:540
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:557
+#: ../calendar/gui/e-meeting-time-sel.c:536
 #, fuzzy
 msgid "_All people and resources"
 msgstr "Meaitseáil gach ceann de na rudaí seo  a leanas (AGUS)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:575
+#: ../calendar/gui/e-meeting-time-sel.c:554
 #, fuzzy
 msgid "_Required people"
 msgstr "Teastais Dhaoine Eile"
 
-#: ../calendar/gui/e-meeting-time-sel.c:584
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "Am _tosaithe:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:647
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "Am _deiridh:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Rannpháirtí"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 #, fuzzy
 msgid "Click here to add an attendee"
@@ -8281,18 +7238,15 @@ msgstr "Teanga"
 msgid "Member"
 msgstr "Ball"
 
-#: ../calendar/gui/e-memo-table.c:938
-#, fuzzy
+#: ../calendar/gui/e-memo-table.c:950
 msgid "_Delete Selected Memos"
-msgstr "Scrios na comhaid roghnaithe"
+msgstr "_Scrios Meamraim Roghnaithe"
 
-#: ../calendar/gui/e-memo-table.c:1089 ../calendar/gui/e-memo-table.etspec.h:2
-#, fuzzy
+#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
-msgstr "Cliceáil chun seirbhís a chur leis"
+msgstr "Cliceáil chun meamram a chur leis"
 
-#: ../calendar/gui/e-memos.c:805 ../calendar/gui/e-tasks.c:920
-#: ../calendar/gui/gnome-cal.c:2867
+#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8301,289 +7255,318 @@ msgstr ""
 " Earráid le %s:\n"
 "  %s"
 
-#: ../calendar/gui/e-memos.c:854
-#, fuzzy
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
-msgstr "Taisce á luchtú"
+msgstr "Meamraim á luchtú"
 
-#: ../calendar/gui/e-memos.c:935
-#, fuzzy, c-format
+#: ../calendar/gui/e-memos.c:897
+#, c-format
 msgid "Opening memos at %s"
-msgstr "$(TARGET) á oscailt ag $(HOST)"
+msgstr "Meamraim á n-oscailt ag %s"
 
-#: ../calendar/gui/e-memos.c:1108 ../calendar/gui/e-tasks.c:1325
-#, fuzzy
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
-msgstr "Súmáil Réada Roghnaithe"
+msgstr "Réada roghnaithe á scriosadh..."
 
-#: ../calendar/gui/e-tasks.c:970
-#, fuzzy
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
-msgstr "Tascanna á luchtú..."
+msgstr "Tascanna á luchtú"
 
-#: ../calendar/gui/e-tasks.c:1057
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
-msgstr "Ag oscailt tascanna as %s"
+msgstr "Tascanna á n-oscailt ag %s"
 
-#: ../calendar/gui/e-tasks.c:1302
-#, fuzzy
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
-msgstr "Tascanna CD"
+msgstr "Tascanna á chur i gcrích"
 
-#: ../calendar/gui/e-tasks.c:1352
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr ""
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:124
 msgid "Select Timezone"
 msgstr "Roghnaigh Crios Ama"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1547
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:828
-#, fuzzy
-msgid "Updating query"
-msgstr "Freastalaí na nIarratas"
-
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2673
 msgid "_Custom View"
 msgstr "_Amharc Saincheaptha"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2674
 msgid "_Save Custom View"
 msgstr "_Sábháil Amharc Saincheaptha"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2679
 #, fuzzy
 msgid "_Define Views..."
 msgstr "&Amhairc Uirlisí"
 
-#: ../calendar/gui/gnome-cal.c:2691
+#: ../calendar/gui/gnome-cal.c:2916
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Taispeáin ag am tosaithe"
 
-#: ../calendar/gui/gnome-cal.c:2710
+#: ../calendar/gui/gnome-cal.c:2931
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Taispeáin ag am tosaithe"
 
-#: ../calendar/gui/gnome-cal.c:2719
+#: ../calendar/gui/gnome-cal.c:2940
 #, fuzzy, c-format
 msgid "Loading memos at %s"
 msgstr "Taispeáin ag am tosaithe"
 
-#: ../calendar/gui/gnome-cal.c:2826
+#: ../calendar/gui/gnome-cal.c:3052
 #, c-format
 msgid "Opening %s"
 msgstr "Ag Oscailt %s"
 
 # tr
-#: ../calendar/gui/gnome-cal.c:3783
+#: ../calendar/gui/gnome-cal.c:4012
 msgid "Purging"
 msgstr ""
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "Aibreán"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Lúnasa"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Nollaig"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "Feabhra"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "Eanáir"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "Iúil"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "Meitheamh"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "Marta"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "Bealtaine"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "Samhain"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "Deireadh Fómhair"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "Roghnaigh Dáta"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "Meán Fómhair"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Roghnaigh Inniu"
 
-#: ../calendar/gui/itip-utils.c:451 ../calendar/gui/itip-utils.c:500
-#: ../calendar/gui/itip-utils.c:606
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:553
 #, fuzzy
 msgid "An organizer must be set."
 msgstr "_Roghnaigh Inniu"
 
-#: ../calendar/gui/itip-utils.c:487
+#: ../calendar/gui/itip-utils.c:453
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
 #, fuzzy
 msgid "Event information"
 msgstr "Faisnéis Mhícheart"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
 msgid "Task information"
 msgstr "Eolas Tasc"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
 #, fuzzy
 msgid "Memo information"
 msgstr "Faisnéis Mhícheart"
 
-#: ../calendar/gui/itip-utils.c:698 ../calendar/gui/itip-utils.c:837
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
 msgid "Free/Busy information"
 msgstr "Eolas"
 
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "Eolas fhéilire"
 
-#: ../calendar/gui/itip-utils.c:749
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:677
+#, fuzzy
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Glactha"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:684
+#, fuzzy
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Earráid ghlactha"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
 #, fuzzy
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Diúltaithe"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:698
+#, fuzzy
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Tarmligthe"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:711
+#, fuzzy
+msgctxt "Meeting"
 msgid "Updated"
 msgstr "Nuashonraithe"
 
-#: ../calendar/gui/itip-utils.c:757
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Cancel: Meeting Name".
+#: ../calendar/gui/itip-utils.c:718
+#, fuzzy
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Cealaigh"
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Refresh: Meeting Name".
+#: ../calendar/gui/itip-utils.c:725
+#, fuzzy
+msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Athnuaigh"
 
-#: ../calendar/gui/itip-utils.c:761
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Counter-proposal: Meeting Name".
+#: ../calendar/gui/itip-utils.c:732
 #, fuzzy
+msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Fritogra"
 
-#: ../calendar/gui/itip-utils.c:833
+#: ../calendar/gui/itip-utils.c:802
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ní féidir sonraí saor/gnóthach a léamh: "
 
-#: ../calendar/gui/itip-utils.c:843
+#: ../calendar/gui/itip-utils.c:810
 msgid "iCalendar information"
 msgstr "Eeolas iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1010
+#: ../calendar/gui/itip-utils.c:981
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "Liosta Meamram _Nua"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:560
 #, fuzzy, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "Meamram"
 msgstr[1] " %d noimeáid"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "Roghnaithe"
 msgstr[1] "Scrioste"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:609
 #, fuzzy
 msgid "Failed upgrading memos."
 msgstr "Name=KNotes / Meamraim"
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr ""
 
-#: ../calendar/gui/memos-component.c:1075
+#: ../calendar/gui/memos-component.c:862
 #, fuzzy
 msgid "Memo Source Selector"
 msgstr "Roghnóir Ionadais KDE"
 
-#: ../calendar/gui/memos-component.c:1258
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "Meamram nua"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1042
+#, fuzzy
+msgctxt "New"
 msgid "Mem_o"
 msgstr "_Meamram"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "Cruthaigh meamram nua"
 
-#: ../calendar/gui/memos-component.c:1266
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "Meamram comhroinnte nua"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1050
+#, fuzzy
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Meamram Comhroinnte"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1051
 #, fuzzy
 msgid "Create a shared new memo"
 msgstr "Cruthaigh Cineál Nua Comhaid %1"
 
-#: ../calendar/gui/memos-component.c:1274
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "Liosta meamram nua"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1058
+#, fuzzy
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "Liosta _Meamram"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "Cruthaigh liosta meamram nua"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "Priontáil Meamraim"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8591,7 +7574,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8600,235 +7583,227 @@ msgid ""
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
+#, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:809
+#: ../calendar/gui/migration.c:803
 #, fuzzy, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Ní féidir féilire a chruthú: %1"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:971
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ní féidir an bosca poist a dhúnadh."
 
-#: ../calendar/gui/migration.c:1226
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
-msgid "Notes"
-msgstr "Nótaí"
-
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1ú"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2ú"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3ú"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4ú"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5ú"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6ú"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7ú"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8ú"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9ú"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10ú"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11ú"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12ú"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13ú"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14ú"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15ú"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16ú"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17ú"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18ú"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19ú"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20ú"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21ú"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22ú"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23ú"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24ú"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25ú"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26ú"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27ú"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28ú"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29ú"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30ú"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "31ú"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "Má"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "Cé"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "Dé"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "Ao"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2351
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
 msgstr "Coinne"
 
-#: ../calendar/gui/print.c:2353
+#: ../calendar/gui/print.c:2467
 msgid "Task"
 msgstr "Tasc"
 
-#: ../calendar/gui/print.c:2375
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
 msgstr "Achoimre: %s"
 
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2515
+#, fuzzy
+msgid "Attendees: "
+msgstr "Rannpháirtithe"
+
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "Stádas: %s"
 
-#: ../calendar/gui/print.c:2443
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "Tosaíocht: %s"
 
-#: ../calendar/gui/print.c:2455
+#: ../calendar/gui/print.c:2584
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "%1 %"
 
-#: ../calendar/gui/print.c:2467
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2480
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "Catagóirí: %s"
 
-#: ../calendar/gui/print.c:2491
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "Teagmhálacha:"
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2593
-#, fuzzy
-msgid "Upcoming Appointments"
-msgstr "Coinní á liostú"
-
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:470
 msgid "_New Task List"
 msgstr "Liosta Tascanna _Nua"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8838,59 +7813,69 @@ msgstr[2] "%d thasc"
 msgstr[3] "%d dtasc"
 msgstr[4] "%d tasc"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:602
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Tascanna go dtí seo:"
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1064
+#: ../calendar/gui/tasks-component.c:859
 #, fuzzy
 msgid "Task Source Selector"
 msgstr "Roghnóir Ionadais KDE"
 
-#: ../calendar/gui/tasks-component.c:1320
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
 msgstr "Tasc nua"
 
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/tasks-component.c:1114
+#, fuzzy
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tasc"
+
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
 msgstr "Cruthaigh tasc nua"
 
-#: ../calendar/gui/tasks-component.c:1328
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
 msgstr "Tasc sannta nua"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1122
+#, fuzzy
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tasc Sannta"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1123
 #, fuzzy
 msgid "Create a new assigned task"
 msgstr "Cruthaigh tasc nua barrleibhéil"
 
-#: ../calendar/gui/tasks-component.c:1336
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
 msgstr "Liosta tascanna nua"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1130
+#, fuzzy
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "Liosta _Tascanna"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
 msgstr "Cruthaigh liosta taisc nua"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8898,1740 +7883,1952 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1125
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Ná tabhair rabhadh dom arís."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "Priontáil Tascanna"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, fuzzy, no-c-format
+msgid "% Completed"
+msgstr "% Críochnaithe"
+
+#: ../calendar/gui/tasktypes.xml.h:7
+#, fuzzy
+msgid "Cancelled"
+msgstr "Cealaithe"
+
+#: ../calendar/gui/tasktypes.xml.h:15
+#, fuzzy
+msgid "In progress"
+msgstr "Ar Siúl"
+
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#, fuzzy
+msgid "is greater than"
+msgstr "atá níos mó ná"
+
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "is less than"
+msgstr "atá níos lú ná"
+
+#: ../calendar/importers/icalendar-importer.c:75
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Dearadh agus ríomhchlárú"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1562
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 msgid "Opening calendar"
 msgstr "Féilire á oscailt"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "Comhaid iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:443
 #, fuzzy
 msgid "Evolution iCalendar importer"
 msgstr "Comment=Comhad iCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "Meabhrúchán!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "Comhaid vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:584
 #, fuzzy
 msgid "Evolution vCalendar importer"
 msgstr "Aimsíodh vCalendar Leagan 1.0"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:746
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Imeachtaí ón Fhéilire"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
 #.
+#. *
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#. *
+#.
+#.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:7
+#: ../calendar/zones.h:26
 msgid "Africa/Abidjan"
 msgstr "An Afraic/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "An Afraic/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "An Afraic/Addis_Ababa"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "An Afraic/Cathair_na_hAilgéire"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "An Afraic/Asmera"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "An Afraic/Bamako"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "An Afraic/Bangui"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "An Afraic/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "An Afraic/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "An Afraic/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "An Afraic/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "An Afraic/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "An Afraic/Caireo"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "An Afraic/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "An Afraic/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "An Afraic/Conakry"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "An Afraic/Dakar"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "An Afraic/Dar_es_Salaam"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "An Afraic/Djibouti"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "An Afraic/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "An Afraic/El_Aaiun"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "An Afraic/Freetown"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "An Afraic/Gaborone"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "An Afraic/Harare"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "An Afraic/Johannesburg"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "An Afraic/Kampala"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "An Afraic/Khartoum"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "An Afraic/Kigali"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "An Afraic/Kinshasa"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "An Afraic/Lagos"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "An Afraic/Libreville"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "An Afraic/Lome"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "An Afraic/Lúanda"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "An Afraic/Lubumbashi"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "An Afraic/Lusaka"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "An Afraic/Malabo"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "An Afraic/Maputo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "An Afraic/Maseru"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "An Afraic/Mbabane"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "An Afraic/Mogadishu"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "An Afraic/Monrovia"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "An Afraic/Nairobi"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "An Afraic/Ndjamena"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "An Afraic/Niamey"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "An Afraic/Nouakchott"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "An Afraic/Ouagadougou"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "An Afraic/Porto-Novo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "An Afraic/Sao_Tome"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "An Afraic/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "An Afraic/Tripoli"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "An Afraic/Túinis"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "An Afraic/Windhoek"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "Meiriceá/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "Meiriceá/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "Meiriceá/Anguilla"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "Meiriceá/Antigua"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "Meiriceá/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "Meiriceá/Aruba"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "Meiriceá/Asunción"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "Meiriceá/Barbadós"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "Meiriceá/Belem"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "Meiriceá/Belize"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "Meiriceá/Boa_Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "Meiriceá/Bogota"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "Meiriceá/Boise"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "Meiriceá/Buenos Aires"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "Meiriceá/Cambridge_Bay"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "Meiriceá/Cancún"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "Meiriceá/Caracas"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "Meiriceá/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "Meiriceá/Cayenne"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "Meiriceá/Cayman"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "Meiriceá/Chicago"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "Meiriceá/Chihuahua"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "Meiriceá/Cordoba"
 
 # CR
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "Meiriceá/Cósta_Rice"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "Meiriceá/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "Meiriceá/Curacao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "Meiriceá/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "Meiriceá/Dawson"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "Meiriceá/Dawson_Creek"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "Meiriceá/Denver"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "Meiriceá/Detroit"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "Meiriceá/Dominica"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "Meiriceá/Edmonton"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "Meiriceá/Eirunepe"
 
 # SV
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "Meiriceá/An tSalvadóir"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "Meiriceá/Fortaleza"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "Meiriceá/Glace_Bay"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "Meiriceá/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "Meiriceá/Goose_Bay"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "Meiriceá/Grand_Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "Meiriceá/Grenada"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "Meiriceá/Guadalúip"
 
 # GT
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "Meiriceá/Guatamala"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "Meiriceá/Guayaquil"
 
 # GY
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "Meiriceá/An Ghuáin"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "Meiriceá/Halifax"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "Meiriceá/Havana"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "Meiriceá/Hermosillo"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "Meiriceá/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "Meiriceá/Indiana/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "Meiriceá/Indiana/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "Meiriceá/Indiana/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "Meiriceá/Indianapolis"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "Meiriceá/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "Meiriceá/Iqaluit"
 
 # JM
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "Meiriceá/Iamáice"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "Meiriceá/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "Meiriceá/Juneau"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "Meiriceá/Kentucky/Louisville"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "Meiriceá/Kentucky/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "Meiriceá/La_Paz"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "Meiriceá/Lima"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "Meiriceá/Los_Angeles"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "Meiriceá/Louisville"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "Meiriceá/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "Meiriceá/Managua"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "Meiriceá/Manaus"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "Meiriceá/Martinique"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "Meiriceá/Mazatlan"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "Meiriceá/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "Meiriceá/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "Meiriceá/Merida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "Meiriceá/Cathair_Mheicsiceo"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "Meiriceá/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "Meiriceá/Monterrey"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "Meiriceá/Montevideo"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "Meiriceá/Montréal"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "Meiriceá/Montserrat"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "Meiriceá/Nassau"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "Meiriceá/Nua_Eabhrac"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "Meiriceá/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "Meiriceá/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "Meiriceá/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "Meiriceá/North_Dakota/Center"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "Meiriceá/Panama"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "Meiriceá/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "Meiriceá/Paramaribo"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "Meiriceá/Phoenix"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "Meiriceá/Port-au-Prince"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "Meiriceá/Port_of_Spain"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "Meiriceá/Porto_Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "Meiriceá/Puerto_Rico"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "Meiriceá/Rainy_River"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "Meiriceá/Rankin_Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "Meiriceá/Recife"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "Meiriceá/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "Meiriceá/Rio_Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "Meiriceá/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "Meiriceá/Santiago"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "Meiriceá/Santo_Domingo"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "Meiriceá/Sao_Paulo"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "Meiriceá/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "Meiriceá/Shiprock"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "Meiriceá/St_Johns"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "Meiriceá/St_Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "Meiriceá/St_Lucia"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "Meiriceá/St_Thomas"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "Meiriceá/St_Vincent"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "Meiriceá/Swift_Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "Meiriceá/Tegucigalpa"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "Meiriceá/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "Meiriceá/Thunder_Bay"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "Meiriceá/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "Meiriceá/Tortola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "Meiriceá/Vancouver"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "Meiriceá/Whitehorse"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "Meiriceá/Winnipeg"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "Meiriceá/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "Meiriceá/Yellowknife"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "An tAntartach/Casey"
 
 # AQ
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "an tAntartach/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "An tAntartach/Dumont_DUrville"
 
 # AQ
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "an tAntartach/Mawson"
 
 # AQ
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "an tAntartach/McMurdo"
 
 # AQ
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "an tAntartach/Palmer"
 
 # AQ
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "an tAntartach/An Mhol Theas"
 
 # AQ
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "an tAntartach/Síowa"
 
 # AQ
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "an tAntartach/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arctic/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "An Áise/Áidin"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "An Áise/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "An Áise/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "An Áise/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "An Áise/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "An Áise/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "An Áise/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "An Áise/Baghdad"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "An Áise/Bairéin"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "An Áise/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "An Áise/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "An Áise/Beirut"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "An Áise/Bishkek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "An Áise/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "An Áise/Calcúta"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "An Áise/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "An Áise/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "An Áise/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "An Áise/An_Damaisc"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "An Áise/Dhaka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "An Áise/Dili"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "An Áise/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "An Áise/Dushanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "An Áise/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "An Áise/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "An Áise/Hong_Cong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "An Áise/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "An Áise/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "An Áise/Iostanbúl"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "An Áise/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "An Áise/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "An Áise/Iarúsailéim"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "An Áise/Kabul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "An Áise/Kamchatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "An Áise/Karachi"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "An Áise/Kashgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "An Áise/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "An Áise/Krasnoyarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "An Áise/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "An Áise/Kuching"
 
 # KW
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "An Áise/Cuáit"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "An Áise/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "An Áise/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "An Áise/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "An Áise/Makassar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "An Áise/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "An Áise/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "An Áise/Nicosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "An Áise/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "An Áise/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "An Áise/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "An Áise/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "An Áise/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "An Áise/Pyongyang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "An Áise/Catar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "An Áise/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "An Áise/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "An Áise/Riyadh"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "An Áise/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "An Áise/Sakhalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "An Áise/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "An Áise/Seoul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "An Áise/Shanghai"
 
 # SG
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "An Áise/Singeapór"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "An Áise/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "An Áise/Tashkent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "An Áise/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "An Áise/Tehran"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "An Áise/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "An Áise/Tóiceo"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "An Áise/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "An Áise/Ulaanbaatar"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "An Áise/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "An Áise/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "An Áise/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "An Áise/Yakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "An Áise/Yekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "An Áise/Yerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "An tAtlantach/Na_hAsóir"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "An tAtlantach/Beirmiúda"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "An tAtlantach/Oileáin_Chanáracha"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "An tAtlantach/Cape_Verde"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "An tAtlantach/Faró"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "An tAtlantach/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "An tAtlantach/Maidéara"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "An tAtlantach/Reykjavik"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "An tAtlantach/Georgia_Theas"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "An tAtlantach/San_Héilin"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "An tAtlantach/Stanley"
 
 # AU
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "An Astráil/Adelaide"
 
 # AU
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "An Astráil/Brisbane"
 
 # AU
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "An Astráil/Broken_Hill"
 
 # AU
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "An Astráil/Darwin"
 
 # AU
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "An Astráil/Hobart"
 
 # AU
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "An Astráil/Lindeman"
 
 # AU
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "An Astráil/Lord_Howe"
 
 # AU
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "An Astráil/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "An Astráil/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "An Astráil/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "An Eoraip/Amstardam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "An Eoraip/Andóra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "An Eoraip/An_Aithin"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "An Eoraip/Béal Feirste"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "An Eoraip/Béalgrád"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "An Eoraip/Beirlín"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "An Eoraip/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "An Eoraip/An Bhruiséil"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "An Eoraip/Búcairist"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "An Eoraip/Búdaipeist"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "An Eoraip/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "An Eoraip/Cóbanhávan"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "An Eoraip/Baile Átha Cliath"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "An Eoraip/Giobráltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "An Eoraip/Heilsincí"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "An Eoraip/Iostanbúl"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "An Eoraip/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "An Eoraip/Kiev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "An Eoraip/Liospóin"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "An Eoraip/Ljubljana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "An Eoraip/Londain"
 
 # LU
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "An Eoraip/Lucsamburg"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "An Eoraip/Maidrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "An Eoraip/Málta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "An Eoraip/Minsk"
 
 # MC
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "An Eoraip/Monacó"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "An Eoraip/Moscó"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "An Eoraip/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "An Eoraip/Osló"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "An Eoraip/Páras"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "An Eoraip/Prág"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "An Eoraip/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "An Eoraip/An Róimh"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "An Eoraip/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "An Eoraip/San_Mairíne"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "An Eoraip/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "An Eoraip/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "An Eoraip/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "An Eoraip/Sóifia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "An Eoraip/Stócólm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "An Eoraip/Tallinn"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "An Eoraip/Tirane"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "An Eoraip/Uzhgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "An Eoraip/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "An Eoraip/Vatacáin"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "An Eoraip/Vín"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "An Eoraip/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "An Eoraip/Vársá"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "An Eoraip/Zagreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "An Eoraip/Zaporozhye"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "An Eoraip/Zürich"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "An tAigéan Indiach/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "An tAigéan Indiach/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "An tAigéan Indiach/Christmas"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "An tAigéan Indiach/Cocos"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "An tAigéan Indiach/Comoro"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "An tAigéan Indiach/Kerguelen"
 
 # IN
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "An tAigéan Indiach/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "An tAigéan Indiach/Oileáin Mhaildíve"
 
 # mr
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "An tAigéan Indiach/Oileán Mhuirís"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "An tAigéan Indiach/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "An tAigéan Indiach/Réunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "An tAigéan Ciúin/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "An tAigéan Ciúin/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "An tAigéan Ciúin/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "An tAigéan Ciúin/Easter"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "An tAigéan Ciúin/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "An tAigéan Ciúin/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "An tAigéan Ciúin/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "An tAigéan Ciúin/Fidsí"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "An tAigéan Ciúin/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "An tAigéan Ciúin/Galapagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "An tAigéan Ciúin/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "An tAigéan Ciúin/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "An tAigéan Ciúin/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "An tAigéan Ciúin/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "An tAigéan Ciúin/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "An tAigéan Ciúin/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "An tAigéan Ciúin/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "An tAigéan Ciúin/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "An tAigéan Ciúin/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "An tAigéan Ciúin/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "An tAigéan Ciúin/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "An tAigéan Ciúin/Nárú"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "An tAigéan Ciúin/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "An tAigéan Ciúin/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "An tAigéan Ciúin/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "An tAigéan Ciúin/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "An tAigéan Ciúin/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "An tAigéan Ciúin/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "An tAigéan Ciúin/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "An tAigéan Ciúin/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "An tAigéan Ciúin/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "An tAigéan Ciúin/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "An tAigéan Ciúin/Taihítí"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "An tAigéan Ciúin/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "An tAigéan Ciúin/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "An tAigéan Ciúin/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "An tAigéan Ciúin/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "An tAigéan Ciúin/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "An tAigéan Ciúin/Yap"
 
-#: ../composer/e-composer-name-header.c:95
+#: ../composer/e-composer-autosave.c:443
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:84
+msgid "Untitled Message"
+msgstr "Teachtaireacht Gan Teideal"
+
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
+msgid "Attach a file"
+msgstr "Ceangail comhad"
+
+#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "_Dún"
+
+#: ../composer/e-composer-actions.c:324
 #, fuzzy
-msgid "Click here for the address book"
-msgstr "Earráid agus comhad á rochtain don leabhar seoltaí %S."
+msgid "Close the current file"
+msgstr "Féach ar an gcomhad reatha"
+
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "_Priontáil..."
+
+#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "_Réamhamharc Priontála"
 
-#: ../composer/e-composer-post-header.c:117
+#: ../composer/e-composer-actions.c:345
 #, fuzzy
-msgid "Posting destination"
-msgstr "Sprioc-chomhad\n"
+msgid "Save the current file"
+msgstr "Uath &choimeád gach comhad reatha"
+
+#: ../composer/e-composer-actions.c:350
+msgid "Save _As..."
+msgstr "Sábháil _Mar..."
 
-#: ../composer/e-composer-post-header.c:118
+#: ../composer/e-composer-actions.c:352
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:357
 #, fuzzy
-msgid "Choose folders to post the message to."
-msgstr "Ceangal comhad ar an scéal"
+msgid "Save as _Draft"
+msgstr "Sábháil mar dréacht"
 
-#: ../composer/e-composer-post-header.c:152
+#: ../composer/e-composer-actions.c:359
+msgid "Save as draft"
+msgstr "Sábháil mar dréacht"
+
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
+msgid "S_end"
+msgstr "_Seol"
+
+#: ../composer/e-composer-actions.c:366
 #, fuzzy
-msgid "Click here to select folders to post to"
-msgstr "Cliceáil anseo chun fabht a roghnú de réir a uimhir"
+msgid "Send this message"
+msgstr "Seol an teachtaireacht seo"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "_Síniú:"
+#: ../composer/e-composer-actions.c:373
+#, fuzzy
+msgid "Insert Send options"
+msgstr "Roghanna Seolta agus HTML"
+
+#: ../composer/e-composer-actions.c:378
+#, fuzzy
+msgid "New _Message"
+msgstr "_Teachtaireacht"
+
+#: ../composer/e-composer-actions.c:380
+#, fuzzy
+msgid "Open New Message window"
+msgstr "_Seol Teachtaireacht Nua Go..."
 
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-composer-actions.c:387
+#, fuzzy
+msgid "Character _Encoding"
+msgstr "Ionchódú Carachtar"
+
+#: ../composer/e-composer-actions.c:394
+msgid "_Security"
+msgstr "_Slándáil"
+
+#: ../composer/e-composer-actions.c:404
+msgid "PGP _Encrypt"
+msgstr "_Criptigh le PGP"
+
+#: ../composer/e-composer-actions.c:406
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Ná Criptigh Leis an Eochair Seo Riamh"
+
+#: ../composer/e-composer-actions.c:412
+msgid "PGP _Sign"
+msgstr "_Sínigh le PGP"
+
+#: ../composer/e-composer-actions.c:414
+msgid "Sign this message with your PGP key"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:420
+#, fuzzy
+msgid "_Prioritize Message"
+msgstr "Seol &Teachtaireacht..."
+
+#: ../composer/e-composer-actions.c:422
+msgid "Set the message priority to high"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:428
+#, fuzzy
+msgid "Re_quest Read Receipt"
+msgstr "Nuair a thagann admháil léite:"
+
+#: ../composer/e-composer-actions.c:430
+msgid "Get delivery notification when your message is read"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:436
+msgid "S/MIME En_crypt"
+msgstr "_Criptigh le S/MIME"
+
+#: ../composer/e-composer-actions.c:438
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:444
+msgid "S/MIME Sig_n"
+msgstr "_Sínigh le S/MIME"
+
+#: ../composer/e-composer-actions.c:446
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:452
+#, fuzzy
+msgid "_Bcc Field"
+msgstr "Cuir leis an réimse 'Bcc'"
+
+#: ../composer/e-composer-actions.c:454
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:460
+#, fuzzy
+msgid "_Cc Field"
+msgstr "Cuir leis an réimse 'Cc'"
+
+#: ../composer/e-composer-actions.c:462
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:468
+#, fuzzy
+msgid "_From Field"
+msgstr "cuir an réimse \"Ó\" in eagar\""
+
+#: ../composer/e-composer-actions.c:470
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:476
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "cuir an réimse \"Reply-To\" in eagar"
+
+#: ../composer/e-composer-actions.c:478
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:521
+msgid "Save Draft"
+msgstr "Sábháil Dréacht"
+
+#: ../composer/e-composer-header.c:120
+#, fuzzy
+msgid "Show"
+msgstr "_Taispeáin:"
+
+#: ../composer/e-composer-header.c:123
+#, fuzzy
+msgid "Hide"
+msgstr "_Folaigh"
+
+#: ../composer/e-composer-header-table.c:41
+#, fuzzy
+msgid "Enter the recipients of the message"
+msgstr "Iontráil teachtaireacht anseo"
+
+#: ../composer/e-composer-header-table.c:43
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:46
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:945
 msgid "Fr_om:"
 msgstr "Ó (_O):"
 
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:923 ../mail/em-mailer-prefs.c:76
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
+msgid "From"
+msgstr "Ó"
+
+#: ../composer/e-composer-header-table.c:954
 msgid "_Reply-To:"
 msgstr "_Freagra-Chuig:"
 
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-composer-header-table.c:959
 msgid "_To:"
 msgstr "_Chuig:"
 
-#: ../composer/e-msg-composer-hdrs.c:337
-#, fuzzy
-msgid "Enter the recipients of the message"
-msgstr "Iontráil teachtaireacht anseo"
-
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-composer-header-table.c:965
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:342
-msgid "Enter the addresses that will receive a carbon copy of the message"
+#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
+msgid "CC"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-composer-header-table.c:971
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:348
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message"
+#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
+msgid "BCC"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:976
 #, fuzzy
 msgid "_Post To:"
 msgstr "Súmáil go %1 %%"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:980
 msgid "S_ubject:"
 msgstr "Á_bhar: "
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "_Ceangail"
+#: ../composer/e-composer-header-table.c:989
+msgid "Si_gnature:"
+msgstr "_Síniú:"
 
-#: ../composer/e-msg-composer-select-file.c:198
+#: ../composer/e-composer-name-header.c:116
 #, fuzzy
-msgid "Insert Attachment"
-msgstr "&Oscail Iatán"
-
-#: ../composer/e-msg-composer.c:819
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-
-#: ../composer/e-msg-composer.c:826
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
+msgid "Click here for the address book"
+msgstr "Earráid agus comhad á rochtain don leabhar seoltaí %S."
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../composer/e-composer-post-header.c:137
 #, fuzzy
-msgid "Hide _Attachment Bar"
-msgstr "Folaigh an Barra Stádais"
+msgid "Posting destination"
+msgstr "Sprioc-chomhad\n"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3880
+#: ../composer/e-composer-post-header.c:138
 #, fuzzy
-msgid "Show _Attachment Bar"
-msgstr "Taispeáin Barra na Roghchlár"
+msgid "Choose folders to post the message to."
+msgstr "Ceangal comhad ar an scéal"
 
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "Cúis anaithnid"
+#: ../composer/e-composer-post-header.c:172
+#, fuzzy
+msgid "Click here to select folders to post to"
+msgstr "Cliceáil anseo chun fabht a roghnú de réir a uimhir"
 
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "Níorbh fhéidir comhad a oscailt"
+#: ../composer/e-composer-private.c:208
+#, fuzzy
+msgid "Save draft"
+msgstr "Sábháil Dréacht"
 
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
+#: ../composer/e-msg-composer.c:807
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "Teachtaireacht Gan Teideal"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "Oscail Comhad"
+#: ../composer/e-msg-composer.c:814
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
 
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3761
-#: ../composer/e-msg-composer.c:3764
+#: ../composer/e-msg-composer.c:1350 ../composer/e-msg-composer.c:2189
 msgid "Compose Message"
 msgstr "Cum Teachtaireacht"
 
-#: ../composer/e-msg-composer.c:5023
+#: ../composer/e-msg-composer.c:3347
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10658,8 +9855,7 @@ msgstr ""
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "Mar &quot;{1}&quot;."
 
@@ -10721,7 +9917,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr ""
 
@@ -10771,28 +9967,33 @@ msgstr "Ceangal comhad ar an scéal"
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+#, fuzzy
+msgid "_Continue Editing"
+msgstr "Na hOrdú Eagarthóireachta"
+
+#: ../composer/mail-composer.error.xml.h:31
 #, fuzzy
 msgid "_Do not Recover"
 msgstr "Ná Cuir Isteach Orm"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:309
+#: ../composer/mail-composer.error.xml.h:32
 #, fuzzy
 msgid "_Recover"
 msgstr "Earráid - ní féidir leis an gclár teacht chuige féin"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Sábháil Teachtaireacht"
+#: ../composer/mail-composer.error.xml.h:33
+#, fuzzy
+msgid "_Save Draft"
+msgstr "Sábháil Dréacht"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Post agus Féilire Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
-#, fuzzy
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
-msgstr "GenericName=Sraith Feidhmchlár Oifige"
+msgstr "Sraith Feidhmchlár Grúpa-Earraí"
 
 #: ../data/evolution.desktop.in.in.h:3
 #, fuzzy
@@ -10807,53 +10008,169 @@ msgstr "carta sheoladh"
 msgid "calendar information"
 msgstr "eolas fhéilire"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:188 ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
+msgid "Today"
+msgstr "Inniu"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:200 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "Amárach"
+
+#: ../e-util/e-datetime-format.c:202
+msgid "Yesterday"
+msgstr "Inné"
+
+#: ../e-util/e-datetime-format.c:205
+#, c-format
+msgid "%d days from now"
+msgstr ""
+
+#: ../e-util/e-datetime-format.c:207
+#, c-format
+msgid "%d days ago"
+msgstr "%d lá ó shin"
+
+#: ../e-util/e-datetime-format.c:281 ../e-util/e-datetime-format.c:291
+#: ../e-util/e-datetime-format.c:300
+#, fuzzy
+msgid "Use locale default"
+msgstr "Úsáid _Réamhshocrú"
+
+#: ../e-util/e-datetime-format.c:495
+msgid "Format:"
+msgstr "Formáid:"
+
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Earráid Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
-#, fuzzy
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
-msgstr "Rabhadh Cadhnra"
+msgstr "Rabhadh Evolution"
 
-#: ../e-util/e-error.c:126
-#, fuzzy
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
-msgstr "Faisnéis Mhícheart"
+msgstr "Eolas Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:120
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Freastalaí na nIarratas"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:448
 #, fuzzy, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "earráid inmheánach - cód %1 anaithnid"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:161
+#, fuzzy
+msgid "Component"
+msgstr "Críochnaithe"
+
+#: ../e-util/e-logger.c:162
+msgid "Name of the component being logged"
+msgstr ""
+
+#: ../e-util/e-non-intrusive-error-dialog.c:191
+#, fuzzy
+msgid "Debug Logs"
+msgstr "Logchomhad Gréasáin &CUPS"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:205
+msgid "Show _errors in the status bar for"
+msgstr ""
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../e-util/e-non-intrusive-error-dialog.c:223
+msgid "second(s)."
+msgstr "s(h)oicind."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:229
+msgid "Log Messages:"
+msgstr "Teachtaireachtaí Loga:"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:274
+msgid "Log Level"
+msgstr ""
+
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:380
+msgid "Time"
+msgstr "Am"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Teachtaireachtaí"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:301
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Dún an fhuinneog seo"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:39
+msgid "Error"
+msgstr "Earráid"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:39
+msgid "Errors"
+msgstr "Earráidí"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Warnings and Errors"
+msgstr ""
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Debug"
+msgstr "Dífhabhtú"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:41
+msgid "Error, Warnings and Debug messages"
+msgstr ""
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
+#: ../plugins/plugin-manager/plugin-manager.c:355
+#: ../plugins/publish-calendar/publish-calendar.c:718
+msgid "Enabled"
+msgstr "Cumasaithe"
+
+#: ../e-util/e-plugin.c:309
+#, fuzzy
+msgid "Whether the plugin is enabled"
+msgstr "Cé acu atá an fhuinneog uasmhéadaithe nó nach bhfuil"
+
+#: ../e-util/e-print.c:160
 #, fuzzy
 msgid "An error occurred while printing"
 msgstr "Tharla earráid anaithnid le linn priontála."
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr ""
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "Mar \"{1}\"."
+
 #: ../e-util/e-system.error.xml.h:2
 #, fuzzy
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "Ní féidir comhad téama %1 a oscailt"
+msgid "Cannot open file \"{0}\"."
+msgstr "Ní féidir comhad a oscailt"
 
 #: ../e-util/e-system.error.xml.h:3
 #, fuzzy
-msgid "Cannot save file &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
 msgstr "Ní féidir an comhad a shábháil; dúnfar anois é."
 
 #: ../e-util/e-system.error.xml.h:4
@@ -10863,7 +10180,7 @@ msgstr "Tá an comhad ann cheana. An mian leat scríobh air?"
 
 #: ../e-util/e-system.error.xml.h:5
 #, fuzzy
-msgid "File exists &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
 msgstr "Tá an comhad ann cheana"
 
 #: ../e-util/e-system.error.xml.h:6
@@ -10874,21 +10191,86 @@ msgstr "Forscríobh comhad?"
 msgid "_Overwrite"
 msgstr "_Forscríobh"
 
-#: ../filter/filter-datespec.c:80
+#: ../e-util/e-util.c:133
+#, fuzzy
+msgid "Could not open the link."
+msgstr "Níorbh fhéidir comhad a oscailt"
+
+#: ../e-util/e-util.c:183
+#, fuzzy
+msgid "Could not display help for Evolution."
+msgstr "Ní féidir na ceadanna a nuashonrú."
+
+#: ../e-util/e-util-labels.c:45
+msgid "I_mportant"
+msgstr "_Tábhachtach"
+
+#. red
+#: ../e-util/e-util-labels.c:46
+msgid "_Work"
+msgstr "_Obair"
+
+#. orange
+#: ../e-util/e-util-labels.c:47
+msgid "_Personal"
+msgstr "_Pearsanta"
+
+#. green
+#: ../e-util/e-util-labels.c:48
+msgid "_To Do"
+msgstr "Le _Déanamh"
+
+#. blue
+#: ../e-util/e-util-labels.c:49
+msgid "_Later"
+msgstr "Ar _Ball"
+
+#: ../e-util/e-util-labels.c:320
+msgid "Label _Name:"
+msgstr "_Ainm Lipéid:"
+
+#: ../e-util/e-util-labels.c:343
+msgid "Edit Label"
+msgstr "Cuir Lipéad in Eagar"
+
+#: ../e-util/e-util-labels.c:343
+msgid "Add Label"
+msgstr "Cuir Lipéad Leis"
+
+#: ../e-util/e-util-labels.c:362
+msgid "Label name cannot be empty."
+msgstr ""
+
+#: ../e-util/e-util-labels.c:367
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+msgstr ""
+
+#: ../e-util/gconf-bridge.c:1222
+#, c-format
+msgid "GConf error: %s"
+msgstr "Earráid GConf: %s"
+
+#: ../e-util/gconf-bridge.c:1233
+msgid "All further errors shown only on terminal."
+msgstr ""
+
+#: ../filter/filter-datespec.c:73
 #, fuzzy, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%S lá ó shin"
 msgstr[1] "1 soicind ó shin"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:74
 #, fuzzy, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "<qt>Uathluchtaigh DTD <b>%1</b> amach anseo?</qt>"
 msgstr[1] ""
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:75
 #, fuzzy, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -10900,14 +10282,14 @@ msgstr[0] ""
 "%n nóiméad ó shin"
 msgstr[1] "1 noiméad ó shin"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:76
 #, fuzzy, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "<qt>Uathluchtaigh DTD <b>%1</b> amach anseo?</qt>"
 msgstr[1] ""
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:77
 #, fuzzy, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -10919,14 +10301,14 @@ msgstr[0] ""
 "%n uaire ó shin"
 msgstr[1] "1 uair ó shin"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:78
 #, fuzzy, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "<qt>Uathluchtaigh DTD <b>%1</b> amach anseo?</qt>"
 msgstr[1] ""
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:79
 #, fuzzy, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -10938,14 +10320,14 @@ msgstr[0] ""
 "%n lá ó shin"
 msgstr[1] "1 lá ó shin"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:80
 #, fuzzy, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "Lá # sa Bhlian"
 msgstr[1] ""
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:81
 #, fuzzy, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -10957,28 +10339,28 @@ msgstr[0] ""
 "%n seachtaine ó shin"
 msgstr[1] "1 seachtain ó shin"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:82
 #, fuzzy, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "<qt>Uathluchtaigh DTD <b>%1</b> amach anseo?</qt>"
 msgstr[1] ""
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:83
 #, fuzzy, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%S lá ó shin"
 msgstr[1] "1 mí ó shin"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:84
 #, fuzzy, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "Imeachtaí Sa Mhí Seo Chugainn"
 msgstr[1] ""
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:85
 #, fuzzy, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -10992,109 +10374,95 @@ msgid_plural "%d years in the future"
 msgstr[0] "Lá # sa Bhlian"
 msgstr[1] ""
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:294
 #, fuzzy
 msgid "<click here to select a date>"
 msgstr "Cliceáil anseo chun táirge a roghnú"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "anois"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr ""
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "Roghnaigh comhad"
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1054
-msgid "Important"
-msgstr "Tábhachtach"
-
-#. green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1057
-msgid "To Do"
-msgstr "Le Déanamh"
-
-#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1058
-msgid "Later"
-msgstr "Ar Ball"
-
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:528
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Tástáil"
 
 # vi
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:854
 #, fuzzy
 msgid "R_ule name:"
 msgstr "Roghnaigh ainm eile ar an riail"
 
-#: ../filter/filter-rule.c:828
-msgid "Find items that meet the following criteria"
+#: ../filter/filter-rule.c:882
+msgid "Find items that meet the following conditions"
 msgstr ""
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:916
 #, fuzzy
-msgid "A_dd Filter Criteria"
-msgstr "Cuir Riail Nua Leis..."
+msgid "A_dd Condition"
+msgstr "Cuir _Gníomh Leis"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:922
 #, fuzzy
-msgid "If all criteria are met"
+msgid "If all conditions are met"
 msgstr "Aisfhilleann sé TRUE más TRUE iad na hargóintí go léir."
 
-#: ../filter/filter-rule.c:868
-msgid "If any criteria are met"
-msgstr ""
+#: ../filter/filter-rule.c:922
+#, fuzzy
+msgid "If any conditions are met"
+msgstr "Aisfhilleann sé TRUE más TRUE iad na hargóintí go léir."
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:924
 #, fuzzy
 msgid "_Find items:"
 msgstr "Míreanna Speisialta"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:942
 #, fuzzy
 msgid "All related"
 msgstr "Gníomhartha gaolmhara:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:942
 #, fuzzy
 msgid "Replies"
 msgstr "Freagraí"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:942
 #, fuzzy
 msgid "Replies and parents"
 msgstr "Ceadaítear plé agus freagraí"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:942
 #, fuzzy
 msgid "No reply or parent"
 msgstr "Níl;Tá;Máthairfhoirm"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:944
 #, fuzzy
 msgid "I_nclude threads"
 msgstr "Sná&itheanna ar a dtugtar neamhaird"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:307
+#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Isteach"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Amach"
 
@@ -11122,7 +10490,7 @@ msgstr "Breithlá"
 msgid "Missing file name."
 msgstr "Ainm comhaid ar iarraidh.\n"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 #, fuzzy
 msgid "Missing name."
 msgstr "Ainm ar lár"
@@ -11187,58 +10555,41 @@ msgstr ""
 
 #: ../filter/filter.glade.h:12
 #, fuzzy
-msgid "a time relative to the current time"
-msgstr "Gach rud go d&tí an Deasc Reatha"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "ó shin"
-
-#: ../filter/filter.glade.h:16
-#, fuzzy
-msgid "in the future"
+msgid ""
+"ago\n"
+"in the future"
 msgstr "Ar siúl"
 
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "mí"
-
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:179
-msgid "seconds"
-msgstr "soicind"
-
-#: ../filter/filter.glade.h:20
-#, fuzzy
-msgid "the current time"
-msgstr "Am Reatha"
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
 
 #: ../filter/filter.glade.h:21
-#, fuzzy
-msgid "the time you specify"
-msgstr "Caithfidh tú gníomh a thabhairt"
-
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
-#: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
-msgid "weeks"
-msgstr "seachtain"
-
-#: ../filter/filter.glade.h:23
-msgid "years"
-msgstr "bliain"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr ""
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:381
 #, fuzzy
 msgid "Add Rule"
 msgstr "Cuir Riail Leis..."
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:462
 #, fuzzy
 msgid "Edit Rule"
 msgstr "Cuir Riail in Eagar"
 
 # vi
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:808
 #, fuzzy
 msgid "Rule name"
 msgstr "Roghnaigh ainm eile ar an riail"
@@ -11262,59 +10613,179 @@ msgid "Configure your email accounts here"
 msgstr "Cumraigh logáil do bhalla dóiteáin anseo."
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Configure your network connection settings here"
+msgstr "Cumraigh logáil do bhalla dóiteáin anseo."
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Post Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Comhphairt Phost Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
 msgid "Evolution Mail composer"
 msgstr "malartóir poist (MX)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
 msgid "Evolution Mail preferences control"
 msgstr "Loga smachtú an dramhphoist"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:607
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:567 ../mail/mail-component.c:568
-#: ../mail/mail-component.c:732
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Network configuration control"
+msgstr "Blaosc Evolution"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:793
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Post"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "Cuntais Poist"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:109
 msgid "Mail Preferences"
 msgstr "Sainroghanna Poist"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "Sainroghanna Líonra"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr "_Post"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "_Seol Ar Aghaidh"
+
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+#, fuzzy
+msgid "_Reply to Sender"
+msgstr "Freagra don Seoltóir"
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334
 #, fuzzy, c-format
+msgid "%d attached messages"
+msgstr "Teachtaireacht Faoi Iamh"
+
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1642
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Iatán"
+msgstr[1] "Iatáin"
+msgstr[2] "Iatáin"
+msgstr[3] "Iatáin"
+msgstr[4] "Iatáin"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:607
+msgid "Icon View"
+msgstr "Amharc Deilbhín"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:608
+msgid "List View"
+msgstr "Amharc Liosta"
+
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:520
+#, fuzzy
+msgid "Close the find bar"
+msgstr "Dún an fhuinneog seo"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "Ai_msigh:"
+
+#: ../mail/e-mail-search-bar.c:540
+#, fuzzy
+msgid "Clear the search"
+msgstr "Cuardaigh i gcónaí"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "_Roimhe Seo"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "_Ar Aghaidh"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:587
+#, fuzzy
+msgid "Mat_ch case"
+msgstr "Cá&síogair"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr ""
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:309
+msgid "No encryption"
+msgstr "Gan chriptiú"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+msgid "TLS encryption"
+msgstr "Criptiú TLS"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+msgid "SSL encryption"
+msgstr "Criptiú SSL"
+
+#: ../mail/em-account-editor.c:408
+#, c-format
 msgid "%s License Agreement"
-msgstr "&Comhaontú um Cheadúnas"
+msgstr ""
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -11323,137 +10794,139 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Roghnaigh Fillteán"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
-msgid "Autogenerated"
-msgstr "Uathcruthach"
+#: ../mail/em-account-editor.c:797
+msgid "Never"
+msgstr "Riamh"
+
+#: ../mail/em-account-editor.c:798
+msgid "Always"
+msgstr "I gCónaí"
 
-#: ../mail/em-account-editor.c:778
-#, fuzzy
+#: ../mail/em-account-editor.c:799
 msgid "Ask for each message"
-msgstr "Teachtaireacht %1 as %2 (%3 as %4 kB) á fáil le haghaidh %5@%6."
+msgstr ""
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Identity"
 msgstr "Aitheantas"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:116
+#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Seoltaí Ríomhphoist"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2200
 #, fuzzy
 msgid "Check for _new messages every"
 msgstr "Ag seiceáil do theachtaireachtaí nua..."
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2208
 msgid "minu_tes"
 msgstr "_nóiméad"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:129
-#, fuzzy
+#: ../mail/em-account-editor.c:2398 ../mail/mail-config.glade.h:139
 msgid "Sending Email"
-msgstr "Earráid agus Ríomhphost á Sheoladh."
+msgstr ""
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:66
+#: ../mail/em-account-editor.c:2457 ../mail/mail-config.glade.h:74
 msgid "Defaults"
 msgstr "Réamhshocruithe"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2523 ../mail/mail-config.glade.h:134
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "Slándáil"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2560 ../mail/em-account-editor.c:2655
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Roghanna Beochana"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2561 ../mail/em-account-editor.c:2656
 #, fuzzy
 msgid "Checking for New Messages"
 msgstr "Ag seiceáil do theachtaireachtaí nua..."
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:32
+#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:35
 msgid "Account Editor"
 msgstr "Eagarthóir Cuntas"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Name=Qt Assistant"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[Réamhshocrú]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:943
-#: ../plugins/plugin-manager/plugin-manager.c:325
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "Cumasaithe"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr "Ainm chuntas"
 
-#: ../mail/em-account-prefs.c:497
-#, fuzzy
+#: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr "Prótacal"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1365
+#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
 msgid "Unnamed"
 msgstr "Gan Ainm"
 
-#: ../mail/em-composer-prefs.c:949
+#: ../mail/em-composer-prefs.c:961
 msgid "Language(s)"
 msgstr "Teang(ach)a"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:994
 #, fuzzy
 msgid "Add signature script"
 msgstr "Cuir script úsáideora leis:"
 
-#: ../mail/em-composer-prefs.c:1012
+#: ../mail/em-composer-prefs.c:1036
 msgid "Signature(s)"
 msgstr "Síni(ú/uithe)"
 
-#: ../mail/em-composer-utils.c:897 ../mail/em-format-quote.c:399
-#, fuzzy
+#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
-msgstr "Teachtaireacht Curtha Ar Aghaidh"
+msgstr "-------- Teachtaireacht Curtha Ar Aghaidh --------"
 
-#: ../mail/em-composer-utils.c:1696
+#: ../mail/em-composer-utils.c:1585
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1591
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2058
 msgid "an unknown sender"
 msgstr "seoltóir anaithnid"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1743
+#: ../mail/em-composer-utils.c:2105
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1884
-#, fuzzy
+#: ../mail/em-composer-utils.c:2248
 msgid "-----Original Message-----"
-msgstr "-------- Teachtaireacht Bhunaidh --------"
+msgstr "-----Bunteachtaireacht-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:172
 #, fuzzy
 msgid "_Filter Rules"
 msgstr "Rialacha Scagtha"
@@ -11474,356 +10947,346 @@ msgstr "Dath téacs"
 msgid "Assign Score"
 msgstr "GAN SCÓR"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Iatáin"
-
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Bíp"
 
-#: ../mail/em-filter-i18n.h:7
-msgid "contains"
-msgstr "ina bhfuil"
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr "Críochnaithe Ar"
 
-#: ../mail/em-filter-i18n.h:8
-#, fuzzy
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
-msgstr "Cóipeáil go fillteán"
+msgstr "Cóipeáil go Fillteán"
 
-#: ../mail/em-filter-i18n.h:9
-#, fuzzy
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
-msgstr "Paicéid Faighte"
+msgstr ""
 
-#: ../mail/em-filter-i18n.h:10
-#, fuzzy
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
-msgstr "Bearta Seolta"
+msgstr ""
 
-#: ../mail/em-filter-i18n.h:11
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:765
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Scrios"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Scriosta"
 
-#: ../mail/em-filter-i18n.h:13
-#, fuzzy
-msgid "does not contain"
-msgstr "nach bhfuil ann"
-
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
 #, fuzzy
 msgid "does not end with"
 msgstr "Ní chríochaíonn sainmhíniú ar `%1$s' le `END %1$s'"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
 #, fuzzy
 msgid "does not exist"
 msgstr "níl sé ann"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
 #, fuzzy
 msgid "does not return"
 msgstr "Nach bhfuil ann"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
 #, fuzzy
 msgid "does not sound like"
 msgstr "Níl an comhad ann!"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
 #, fuzzy
 msgid "does not start with"
 msgstr "Ní chríochaíonn sainmhíniú ar `%1$s' le `END %1$s'"
 
-#: ../mail/em-filter-i18n.h:19
-msgid "Do Not Exist"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Dréacht"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
 #, fuzzy
 msgid "ends with"
 msgstr "atá críochnaithe le"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Exist"
-msgstr ""
-
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "ann"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
 #, fuzzy
 msgid "Expression"
 msgstr "Slonn"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
 #, fuzzy
 msgid "Follow Up"
 msgstr "Teachtaireacht leantach go %s%s?"
 
-#: ../mail/em-filter-i18n.h:27
-msgid "is"
-msgstr "is"
-
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:29
 #, fuzzy
+msgid "Forward to"
+msgstr "Cuir Ar Aghaidh"
+
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
+msgid "Important"
+msgstr "Tábhachtach"
+
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "atá i ndiaidh"
 
-#: ../mail/em-filter-i18n.h:29
-#, fuzzy
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "atá roimh"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:34
 #, fuzzy
 msgid "is Flagged"
 msgstr "réidh"
 
-#: ../mail/em-filter-i18n.h:31
-#, fuzzy
-msgid "is greater than"
-msgstr "atá níos mó ná"
-
-#: ../mail/em-filter-i18n.h:32
-#, fuzzy
-msgid "is less than"
-msgstr "atá níos lú ná"
-
-#: ../mail/em-filter-i18n.h:33
-#, fuzzy
-msgid "is not"
-msgstr "nach bhfuil"
-
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:38
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Is neamhbhailí é '%1'."
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:39
+msgid "is not set"
+msgstr "nach bhfuil socruithe"
+
+#: ../mail/em-filter-i18n.h:40
+msgid "is set"
+msgstr "atá socruithe"
+
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:103
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Dramhphost"
 
 # GN
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:42
 #, fuzzy
 msgid "Junk Test"
 msgstr "Nasc &Tástála..."
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-mailer-prefs.c:328
-#: ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "Lipéad"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:44
 #, fuzzy
 msgid "Mailing list"
 msgstr "Liosta &seoltaí:"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:45
 #, fuzzy
 msgid "Match All"
 msgstr "&Meaitseáil gach ceann de seo a leanas"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:46
 #, fuzzy
 msgid "Message Body"
 msgstr "Cor&p Teachtaireachta Mar"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:47
 #, fuzzy
 msgid "Message Header"
 msgstr "Ceanntásc &nua teachtaireachta:"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:48
 #, fuzzy
 msgid "Message is Junk"
 msgstr "Is nialasach í an teachtaireacht."
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:49
 #, fuzzy
 msgid "Message is not Junk"
 msgstr "Ní Dramhphost é seo"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:50
+#, fuzzy
+msgid "Message Location"
+msgstr "Teachtaireacht ina bhfuil"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Bog go Fillteán"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:52
 #, fuzzy
 msgid "Pipe to Program"
 msgstr "Píopáil go dtí an Consól?"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "Seinn Fuaim"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
+#. Translators: "Read" as in "has been read" (message-tag-followup.c)
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "Léigh"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 #, fuzzy
 msgid "Recipients"
 msgstr "<faighteoirí>"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:56
 #, fuzzy
 msgid "Regex Match"
 msgstr "Meaitseáil Bheacht"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:57
 #, fuzzy
 msgid "Replied to"
 msgstr "Marcáil \"Freagartha\""
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:58
 #, fuzzy
 msgid "returns"
 msgstr "Filleann COMPLEX(0;-1) é seo: \"-i\""
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:59
 #, fuzzy
 msgid "returns greater than"
 msgstr "> (&#062;) Comhartha níos mó"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:60
 #, fuzzy
 msgid "returns less than"
 msgstr "< (&#060;) Comhartha níos lú"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "Rith Clár"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Scór"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Seoltóir"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:64
+#, fuzzy
+msgid "Sender or Recipients"
+msgstr "&Ná seol admháil léite riamh"
+
+#: ../mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Set Label"
+msgstr "Lipéad"
+
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "Socraigh Stádas"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "Méid (kB)"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:68
 #, fuzzy
 msgid "sounds like"
 msgstr "a fhuaimnítear cosúil le"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "Cuntáis foinse"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:70
 #, fuzzy
 msgid "Specific header"
 msgstr "Priontáil an &ceanntásc"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:71
 #, fuzzy
 msgid "starts with"
 msgstr "a thosaíonn le"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:73
 #, fuzzy
 msgid "Stop Processing"
 msgstr "Earráid: \"%1\" agus %2 á phróiseáil"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1684
-#: ../mail/em-format-quote.c:320 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:94 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:336
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
+#: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "Ábhar"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "Díshocraigh Stádas"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Ansin"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Cuir _Gníomh Leis"
 
-#: ../mail/em-folder-browser.c:187
+#: ../mail/em-folder-browser.c:194
 #, fuzzy
 msgid "C_reate Search Folder From Search..."
 msgstr "Oscail Íomhánna Ó Fhillteán"
 
-#: ../mail/em-folder-browser.c:212
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "Gach Teachtaireacht"
 
-#: ../mail/em-folder-browser.c:213
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "Teachtaireachtaí Gan Léamh"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "Gan Lipéad"
 
-#: ../mail/em-folder-browser.c:222
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "Teachtaireachtaí Léite"
 
-#: ../mail/em-folder-browser.c:223
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "Teachtaireachtaí le Déanaí"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "Teachtaireachtaí na 5 Lá is Déanaí"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "Teachtaireachtaí le Iatáin"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "Teachtaireachtaí Tabhachtacha"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "Teachtaireachtaí Nach Dramhphost"
 
-#: ../mail/em-folder-browser.c:1094
+#: ../mail/em-folder-browser.c:1194
 msgid "Account Search"
 msgstr "Cuardach Cuntas"
 
-#: ../mail/em-folder-browser.c:1138
+#: ../mail/em-folder-browser.c:1256
 #, fuzzy
 msgid "All Account Search"
 msgstr "Cuardaigh i ngach bileog"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:174
 #, fuzzy
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
@@ -11832,950 +11295,948 @@ msgstr[1] "(Scéal gan tideál)"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:178
 #, fuzzy
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Líon na dTeachtaireachtaí"
 msgstr[1] "Ag bogadh scéaltaí"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:196
+#, fuzzy, c-format
+msgid "Quota usage (%s):"
+msgstr "Líon na dTeachtaireachtaí"
+
+#: ../mail/em-folder-properties.c:198
+#, fuzzy, c-format
+msgid "Quota usage"
+msgstr "Líon na dTeachtaireachtaí"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
+msgid "Inbox"
+msgstr "Bosca Isteach"
+
+#: ../mail/em-folder-properties.c:390
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Airíonna Fillteáin"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 #, fuzzy
 msgid "<click here to select a folder>"
 msgstr "Cliceáil anseo chun fillteán a roghnú"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "C_ruthaigh"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr "Ai_nm Fillteán:"
 
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:922 ../mail/mail-vfolder.c:995
-#, fuzzy
+#. load store to mail component
+#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
-msgstr "Fillteáin Chuardaigh Shábháilte"
+msgstr "Fillteáin Cuardaigh"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
-msgstr "NEAMHCHOMHOIRÚNAITHE"
+msgstr "GAN CHOMHOIRIÚNÚ"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "Dréachtaí"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Bosca Isteach"
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Teimpléid"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "Bosca Amach"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "Seolta"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
-msgstr "Ag Lódáil..."
+msgstr "Á Luchtú..."
 
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:318
 #, c-format
-msgid "folder-display|%s (%u)"
-msgstr "%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:727
 #, fuzzy
 msgid "Mail Folder Tree"
 msgstr "&Fillteán na dteachtaireachtaí seolta:"
 
-#: ../mail/em-folder-tree.c:891
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:886
+#, c-format
 msgid "Moving folder %s"
-msgstr "Fillteán Nua"
+msgstr "Fillteán %s á bhogadh"
 
-#: ../mail/em-folder-tree.c:893
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:888
+#, c-format
 msgid "Copying folder %s"
-msgstr "Teachtaireacht á cóipeáil go fillteán %S..."
+msgstr "Fillteán %s á chóipeáil"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1966
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Bog Teachtaireachtaí go Fillteán"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1968
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Bog Teachtaireachtaí go Fillteán"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "_Cóipeáil go Fillteán"
 
-#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "_Bog go Fillteán"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1055
-#, fuzzy, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Scanadh ar siúl"
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
+msgid "_Move"
+msgstr "_Bog"
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Amharc"
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
+msgid "Cancel _Drag"
+msgstr "Cealaigh Tarraingt"
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "Fillteáin i \"%s\" á scanadh"
+
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
-msgstr "Oscail 'san Fhuinneog _Nua"
+msgstr "Oscail i bhFuinneog _Nua"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "Fillteán _Nua..."
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "_Bog..."
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "_Athainmnigh..."
-
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "_Athnuaigh"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2124
 #, fuzzy
 msgid "Fl_ush Outbox"
 msgstr "NASCLITIR BHEAG LAIDINE FL"
 
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Folmhaigh Bruscar"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-tree.c:2232
+#, fuzzy
+msgid "_Unread Search Folder"
+msgstr "Ní féidir an fillteán %1 a chruthú."
+
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr ""
 
-#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1185
-#: ../mail/em-folder-view.c:1200
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "Roghnaigh fillteán"
 
-#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1200
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "_Cóipeáil"
 
-#: ../mail/em-folder-utils.c:584
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Ag cruthú na comhadlainne %1"
 
-#: ../mail/em-folder-utils.c:739
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:382
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Cruthaigh fillteán"
 
-#: ../mail/em-folder-utils.c:739
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:382
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 #, fuzzy
 msgid "Specify where to create the folder:"
 msgstr "<qt>Theip ar chruthú na comhadlainne <b>%1</b>.</qt>i "
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
 #, fuzzy
 msgid "Mail Deletion Failed"
 msgstr "Theip ar scriosadh."
 
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1316 ../ui/evolution-mail-message.xml.h:127
-#, fuzzy
-msgid "_Reply to Sender"
-msgstr "Freagra don Seoltóir"
-
-#: ../mail/em-folder-view.c:1318 ../mail/em-popup.c:578 ../mail/em-popup.c:589
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Forward"
-msgstr "_Seol Ar Aghaidh"
-
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1322 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "Cuir in _Eagar Mar Teachtaireacht Nua..."
 
-#: ../mail/em-folder-view.c:1324
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "_Priontáil..."
-
-#: ../mail/em-folder-view.c:1328
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_Díscrios"
 
-#: ../mail/em-folder-view.c:1329
+#: ../mail/em-folder-view.c:1342
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Bog go fillteán"
 
-#: ../mail/em-folder-view.c:1330
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Cóipeáil go Fillteán..."
 
-#: ../mail/em-folder-view.c:1333
+#: ../mail/em-folder-view.c:1346
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Marcáil mar léite"
 
-#: ../mail/em-folder-view.c:1334
+#: ../mail/em-folder-view.c:1347
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcáil \"Neamhléite\""
 
-#: ../mail/em-folder-view.c:1335
+#: ../mail/em-folder-view.c:1348
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marcáil \"Neamhléite\""
 
-#: ../mail/em-folder-view.c:1336
+#: ../mail/em-folder-view.c:1349
 #, fuzzy
 msgid "Mark as Un_important"
 msgstr "Marcáil \"Freagartha\""
 
-#: ../mail/em-folder-view.c:1337
+#: ../mail/em-folder-view.c:1350
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marcáil na teachtaireachtaí roghnaithe mar dhramhphost"
 
-#: ../mail/em-folder-view.c:1338
+#: ../mail/em-folder-view.c:1351
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marcáil na teachtaireachtaí roghnaithe mar phost ceart"
 
-#: ../mail/em-folder-view.c:1339
+#: ../mail/em-folder-view.c:1352
 #, fuzzy
 msgid "Mark for Follo_w Up..."
 msgstr "Roghchlár aníos le haghaidh réad líníochta"
 
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_Lipéad"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1342 ../widgets/misc/e-dateedit.c:496
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "_Neamhní"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1358
+msgid "_New Label"
+msgstr "Lipéad _Nua"
+
+#: ../mail/em-folder-view.c:1362
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Cuardach críochnaithe."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "_Bánaigh Brat"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr ""
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1368
 #, fuzzy
 msgid "Search Folder based on _Subject"
 msgstr "Oscail Íomhánna Ó Fhillteán"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1369
 #, fuzzy
 msgid "Search Folder based on Se_nder"
 msgstr "Ai_nm Fillteán:"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1370
 #, fuzzy
 msgid "Search Folder based on _Recipients"
 msgstr "Oscail Íomhánna Ó Fhillteán"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1371
 #, fuzzy
 msgid "Search Folder based on Mailing _List"
 msgstr "líosta ríomhphost %s"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1361
+#: ../mail/em-folder-view.c:1376
 #, fuzzy
 msgid "Filter based on Sub_ject"
 msgstr "Rith s&cagairí roghnaithe ar:"
 
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1377
 #, fuzzy
 msgid "Filter based on Sen_der"
 msgstr "Rith s&cagairí roghnaithe ar:"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1378
 #, fuzzy
 msgid "Filter based on Re_cipients"
 msgstr "&Ataispeáin ar gach leathanach"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1379
 #, fuzzy
 msgid "Filter based on _Mailing List"
 msgstr "Tá an Liosta Postála Ann Cheana"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2236 ../mail/em-folder-view.c:2280
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:593
+#: ../plugins/google-account-setup/google-source.c:764
 msgid "Default"
 msgstr "Réamhshocrú"
 
-#: ../mail/em-folder-view.c:2498
+#: ../mail/em-folder-view.c:2493
 #, fuzzy
 msgid "Unable to retrieve message"
 msgstr "Ní féidir an teachtaireacht a rá"
 
-#: ../mail/em-folder-view.c:2517
-#, fuzzy
-msgid "Retrieving Message..."
-msgstr "Seol &Teachtaireacht..."
-
-#: ../mail/em-folder-view.c:2745
-#, fuzzy
-msgid "C_all To..."
-msgstr " do gach rud"
-
-#: ../mail/em-folder-view.c:2748
+#: ../mail/em-folder-view.c:2696
 #, fuzzy
 msgid "Create _Search Folder"
 msgstr "Ní féidir an fillteán %1 a chruthú."
 
-#: ../mail/em-folder-view.c:2749
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr "Ón _Seoladh Seo"
 
-#: ../mail/em-folder-view.c:2750
+#: ../mail/em-folder-view.c:2698
 msgid "_To this Address"
 msgstr "Chuig an S_eoladh Seo"
 
-#: ../mail/em-folder-view.c:3125
+#: ../mail/em-folder-view.c:3191
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Seol ríomhphost chuig '%1'"
 
-#: ../mail/em-folder-view.c:3137
+#: ../mail/em-folder-view.c:3203
 #, fuzzy, c-format
 msgid "Click to call %s"
 msgstr "Theip ar ghlao '%s': %s\n"
 
-#: ../mail/em-folder-view.c:3142
+#: ../mail/em-folder-view.c:3208
 #, fuzzy
 msgid "Click to hide/unhide addresses"
 msgstr "Cliceáil chun féilire an mhíosa a fholú"
 
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Fuarthas %S meaitseáil"
-
-#: ../mail/em-format-html-display.c:659
-msgid "Fin_d:"
-msgstr "Ai_msigh:"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
-msgid "_Previous"
-msgstr "_Roimhe Seo"
-
-#: ../mail/em-format-html-display.c:688
-msgid "_Next"
-msgstr "_Ar Aghaidh"
-
-#: ../mail/em-format-html-display.c:693
-#, fuzzy
-msgid "M_atch case"
-msgstr "Cá&síogair"
-
-#: ../mail/em-format-html-display.c:946 ../mail/em-format-html.c:635
+#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
 msgid "Unsigned"
 msgstr "Gan Siniú"
 
-#: ../mail/em-format-html-display.c:946
+#: ../mail/em-format-html-display.c:560
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 
 # SG
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:636
+#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
 msgid "Valid signature"
 msgstr "Siniú Bhailithe."
 
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:561
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr ""
 
 # SG
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:637
+#: ../mail/em-format-html-display.c:562 ../mail/em-format-html.c:656
 msgid "Invalid signature"
 msgstr "Siniú neambhailí."
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:562
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:638
+#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
 msgid "Valid signature, but cannot verify sender"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:563
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:639
+#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
 msgid "Signature exists, but need public key"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:564
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:957 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
 msgid "Unencrypted"
 msgstr "Neamhchriptithe"
 
-#: ../mail/em-format-html-display.c:957
+#: ../mail/em-format-html-display.c:571
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:646
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
 #, fuzzy
 msgid "Encrypted, weak"
 msgstr "&Criptithe &amháin"
 
-#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html-display.c:572
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
 msgid "Encrypted"
 msgstr "Criptithe"
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:573
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:667
 #, fuzzy
 msgid "Encrypted, strong"
 msgstr ""
 "<strong><large><large><large><large>K</large></large></large></large></"
 "strong>"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:574
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1061 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Feach Teastas"
 
-#: ../mail/em-format-html-display.c:1076
+#: ../mail/em-format-html-display.c:690
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Ní teastas sínitheora é seo."
 
-#: ../mail/em-format-html-display.c:1395
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "Chríochnaigh ar %d %B, %Y, %k:%M"
+#: ../mail/em-format-html-display.c:980
+#, fuzzy
+msgid "Completed on"
+msgstr "Críochnaithe "
 
-#: ../mail/em-format-html-display.c:1403
+#: ../mail/em-format-html-display.c:988
 #, fuzzy
 msgid "Overdue:"
 msgstr "thar téarma"
 
-#: ../mail/em-format-html-display.c:1406
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "le %d %B, %Y, %l:%M %p"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:992
+msgid "by"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:1466
+#: ../mail/em-format-html-display.c:1071
+#: ../widgets/misc/e-attachment-view.c:357
 #, fuzzy
 msgid "_View Inline"
 msgstr "&Inlíne"
 
-#: ../mail/em-format-html-display.c:1467
+#: ../mail/em-format-html-display.c:1072
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "_Folaigh"
 
-#: ../mail/em-format-html-display.c:1468
-#, fuzzy
+#: ../mail/em-format-html-display.c:1073
 msgid "_Fit to Width"
-msgstr "Oiriúnaigh don &Leithead"
+msgstr "Oiriúnaigh don _Leithead"
 
-#: ../mail/em-format-html-display.c:1469
+#: ../mail/em-format-html-display.c:1074
 #, fuzzy
 msgid "Show _Original Size"
 msgstr "Taispeáin méid an chomhaid"
 
-#: ../mail/em-format-html-display.c:1913 ../mail/em-format-html-display.c:2526
-#: ../mail/mail-config.glade.h:43 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Iatán"
-
-#: ../mail/em-format-html-display.c:2127
-msgid "Save attachment as"
-msgstr "Sábháil iatán mar"
-
-#: ../mail/em-format-html-display.c:2131
-#, fuzzy
-msgid "Select folder to save all attachments"
-msgstr "&Sábháil gach iatán san fhillteán seo:"
-
-#: ../mail/em-format-html-display.c:2182
-msgid "_Save Selected..."
-msgstr "_Sábháil Roghnaithe..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2249
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d ia_tán"
-msgstr[1] "%d ia_tán"
-msgstr[2] "%d ia_tán"
-msgstr[3] "%d n-ia_tán"
-msgstr[4] "%d ia_tán"
-
-#: ../mail/em-format-html-display.c:2256 ../mail/em-format-html-display.c:2334
-msgid "S_ave"
-msgstr "_Sábháil"
-
-#: ../mail/em-format-html-display.c:2267
-msgid "S_ave All"
-msgstr "Sábháil G_ach Rud"
-
-#: ../mail/em-format-html-display.c:2330
-msgid "No Attachment"
-msgstr "Gan Iatán"
-
-#: ../mail/em-format-html-display.c:2461 ../mail/em-format-html-display.c:2499
+#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
 #, fuzzy
 msgid "View _Unformatted"
 msgstr "Téacs neamhfhormáidithe"
 
-#: ../mail/em-format-html-display.c:2463
+#: ../mail/em-format-html-display.c:1577
 #, fuzzy
 msgid "Hide _Unformatted"
 msgstr "Téacs neamhfhormáidithe"
 
-#: ../mail/em-format-html-display.c:2518
+#: ../mail/em-format-html-display.c:1634
 msgid "O_pen With"
 msgstr "_Oscail Le"
 
-#: ../mail/em-format-html-display.c:2589
+#: ../mail/em-format-html-display.c:1711
 msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 
-#: ../mail/em-format-html-print.c:156
+#: ../mail/em-format-html-print.c:157
 #, c-format
 msgid "Page %d of %d"
 msgstr "Leathanach %d as %d"
 
-#: ../mail/em-format-html.c:489 ../mail/em-format-html.c:498
+#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' á Fháil"
 
-#: ../mail/em-format-html.c:910
-#, fuzzy
+#: ../mail/em-format-html.c:929
 msgid "Unknown external-body part."
-msgstr "Earraidh gan fhois"
+msgstr ""
 
-#: ../mail/em-format-html.c:918
+#: ../mail/em-format-html.c:937
 msgid "Malformed external-body part."
 msgstr ""
 
-#: ../mail/em-format-html.c:948
+#: ../mail/em-format-html.c:967
 #, fuzzy, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Uasluchtaigh go suíomh saincheaptha FTP"
 
-#: ../mail/em-format-html.c:959
+#: ../mail/em-format-html.c:978
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: ../mail/em-format-html.c:961
+#: ../mail/em-format-html.c:980
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Easpórtáil: Easpórtáil imeachtaí go comhad logánta."
 
-#: ../mail/em-format-html.c:982
+#: ../mail/em-format-html.c:1001
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Ag iarraidh sonraí le seoladh"
 
-#: ../mail/em-format-html.c:993
+#: ../mail/em-format-html.c:1012
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: ../mail/em-format-html.c:1221
+#: ../mail/em-format-html.c:1240
 msgid "Formatting message"
 msgstr "Teachtaireacht á fhormáidiú"
 
-#: ../mail/em-format-html.c:1388
+#: ../mail/em-format-html.c:1414
 msgid "Formatting Message..."
 msgstr "Teachtaireacht á Fhormáidiú..."
 
-#: ../mail/em-format-html.c:1528 ../mail/em-format-html.c:1592
-#: ../mail/em-format-html.c:1614 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:92
+#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1631
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1529 ../mail/em-format-html.c:1598
-#: ../mail/em-format-html.c:1617 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1637
+#: ../mail/em-format-html.c:1655 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1688 ../mail/em-format-quote.c:329
-#: ../mail/em-mailer-prefs.c:1325
+#: ../mail/em-format-html.c:1747 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1435
 msgid "Mailer"
 msgstr "Postóir"
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1715
-msgid " (%a, %R %Z)"
-msgstr "(%a, %R %Z)"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1720
-msgid " (%R %Z)"
-msgstr " (%R %Z)"
-
-#: ../mail/em-format-html.c:1732 ../mail/em-format-quote.c:336
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:95
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:344
-#: ../widgets/misc/e-dateedit.c:366
-msgid "Date"
-msgstr "Dáta"
-
-#: ../mail/em-format-html.c:1755 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:96
-msgid "Newsgroups"
-msgstr "Grúpaí Nuachta"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1845
+#: ../mail/em-format-html.c:1910
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr ""
 
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:89 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:332
-msgid "From"
-msgstr "Ó"
-
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
+#: ../mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "Freagra-Chuig"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
+msgid "Date"
+msgstr "Dáta"
+
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
+msgid "Newsgroups"
+msgstr "Grúpaí Nuachta"
+
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
+msgid "Face"
+msgstr "Aghaidh"
+
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "iatán %s"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "Níorbh fhéidir teachtaireacht PGP/MIME a pharsáil"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1552
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Leasú na formáide comhaid gan tacaíocht."
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Earráid agus an síniú á sheiceáil"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Earráid: Síniú gan deimhniú"
 
-#: ../mail/em-format.c:1658
+#: ../mail/em-format.c:1772
 #, fuzzy
 msgid "Could not parse PGP message"
 msgstr "Níorbh fhéidir an teachtaireacht PGP a dhíchriptiú"
 
-#: ../mail/em-format.c:1658
+#: ../mail/em-format.c:1772
 #, fuzzy
 msgid "Could not parse PGP message: Unknown error"
 msgstr ""
 "[-- Earráid: níorbh fhéidir tosach na teachtaireachta PGP a aimsiú! --]\n"
 "\n"
 
-#: ../mail/em-mailer-prefs.c:107
+#: ../mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "Gach uair"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "Uair sa lá"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "Uair sa seachtain"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "Uair sa mhí"
 
-#: ../mail/em-mailer-prefs.c:271
+#: ../mail/em-mailer-prefs.c:332
+#, fuzzy
+msgid "Add Custom Junk Header"
+msgstr "Ceanntáisc Saincheaptha"
+
+#: ../mail/em-mailer-prefs.c:336
+#, fuzzy
+msgid "Header Name:"
+msgstr "Ainm _Fillteáin:"
+
+#: ../mail/em-mailer-prefs.c:337
+#, fuzzy
+msgid "Header Value Contains:"
+msgstr "Seoltóir ina bhfuil"
+
+#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "Ceanntásc"
+
+#: ../mail/em-mailer-prefs.c:442
+#, fuzzy
+msgid "Contains Value"
+msgstr "Ar Aghaidh"
+
+#: ../mail/em-mailer-prefs.c:465
 msgid "Color"
 msgstr "Dath"
 
-#: ../mail/em-mailer-prefs.c:274
+#: ../mail/em-mailer-prefs.c:468
 msgid "Tag"
 msgstr "Clib"
 
-#: ../mail/em-mailer-prefs.c:414
-#, fuzzy
-msgid "Select color for label..."
-msgstr "_Roghnaigh Dáta..."
-
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:958 ../mail/em-mailer-prefs.c:1012
+#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr ""
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:966 ../mail/em-mailer-prefs.c:1021
+#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:987
+#: ../mail/em-mailer-prefs.c:1092
 #, fuzzy
 msgid "No Junk plugin available"
 msgstr "Níl eolas faoi bhreiseáin ar fáil"
 
-#: ../mail/em-migrate.c:1211
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
+#: ../mail/em-mailer-prefs.c:1455
+#, fuzzy
+msgid "Date header:"
+msgstr "Ceanntásc Tábla"
+
+#. green
+#: ../mail/em-migrate.c:961
+msgid "To Do"
+msgstr "Le Déanamh"
 
-#: ../mail/em-migrate.c:1650
+#. blue
+#: ../mail/em-migrate.c:962
+msgid "Later"
+msgstr "Ar Ball"
+
+#: ../mail/em-migrate.c:1128
+#, fuzzy
+msgid "Migration"
+msgstr "Cumraíocht"
+
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Ní féidir fillteán nua `%s' a chruthú: %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Ní féidir fillteán `%s' a chóipeáil go `%s': %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2065
+#: ../mail/em-migrate.c:1789
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2004
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Teip ag cruthaigh eolaire '%s':\n"
 "%s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 "Teip ag cruthaigh eolaire '%s':\n"
 "%s"
 
-#: ../mail/em-migrate.c:2827
+#: ../mail/em-migrate.c:2874
+#, fuzzy
+msgid "Migrating Folders"
+msgstr "Ag cruthú na comhadlainne %1"
+
+#: ../mail/em-migrate.c:2874
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Ní féidir fillteáin poist logánta a chruthú ag `%s': %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2974
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:364
+msgid "Save As..."
+msgstr "Sábháil Mar..."
+
+#: ../mail/em-popup.c:389
+#, c-format
+msgid "untitled_image.%s"
+msgstr "íomhá_gan_teideal.%s"
+
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Socraigh mar _Chúlra"
+
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "_Freagra chuig an seoltóir"
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr "Freagrair do Líosta"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
 msgid "_Add to Address Book"
 msgstr "_Cuir leis an Leabhar Seoltaí"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-popup.c:725
+#, c-format
+msgid "Open in %s..."
+msgstr "Oscail i %s..."
+
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "Liostáilte"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "Fillteán"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:858
 #, fuzzy
 msgid "Please select a server."
 msgstr "Roghnaigh Freastalaí monopd"
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:894
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Níl raon roghnaithe agat."
 
-#: ../mail/em-utils.c:120
+#. Check buttons
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
 #, fuzzy
 msgid "_Do not show this message again."
 msgstr "Ná taispeáin an teachtaireacht seo arís"
 
-#: ../mail/em-utils.c:315
+#: ../mail/em-utils.c:317
 #, fuzzy
 msgid "Message Filters"
 msgstr "Scagairí Teachtaireachta"
 
-#: ../mail/em-utils.c:368
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "teachtaireacht"
 
-#: ../mail/em-utils.c:641
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
 msgstr "Sábháil Scéal...."
 
-#: ../mail/em-utils.c:690
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "Suimigh seoladh"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1174
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "Teachtaireachtaí ó %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "Cuardaigh _Fillteáin"
 
@@ -12785,554 +12246,761 @@ msgid "Search Folder source"
 msgstr "Fillteán foinseach: %1 - Spriocfhillteán: %2"
 
 #: ../mail/evolution-mail.schemas.in.h:1
-msgid "Allows evolution to display text part of limited size"
-msgstr ""
+#, fuzzy
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Seol & Faigh Post"
 
 #: ../mail/evolution-mail.schemas.in.h:2
-msgid "Amount of time in seconds the error should be showed on the status bar."
+msgid "\"Send and Receive Mail\" window maximize state"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:3
 #, fuzzy
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Seol & Faigh Post"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Allows Evolution to display text part of limited size"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:5
+#, fuzzy
+msgid "Always request read receipt"
+msgstr "Nuair a thagann admháil léite:"
+
+#: ../mail/evolution-mail.schemas.in.h:7
+#, fuzzy
 msgid "Automatic emoticon recognition"
 msgstr "Aithint uathoibríoch cineálacha"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:8
 #, fuzzy
 msgid "Automatic link recognition"
 msgstr "Aithint uathoibríoch cineálacha"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:10
 #, fuzzy
 msgid "Citation highlight color"
 msgstr "Athraigh Dath an Aibhsiú"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:11
 #, fuzzy
 msgid "Citation highlight color."
 msgstr "Athraigh Dath an Aibhsiú"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:12
 #, fuzzy
 msgid "Composer Window default height"
 msgstr "Airde fuinneoige réamhshocraithe (i bpicteilíní)"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:13
 #, fuzzy
 msgid "Composer Window default width"
 msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Custom headers to use while checking for junk."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:24
 #, fuzzy
 msgid "Default forward style"
 msgstr "Stíl Réamhshocraithe KDE"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:25
 #, fuzzy
-msgid "Default height of the Composer Window"
+msgid "Default height of the Composer Window."
 msgstr "Airde fuinneoige réamhshocraithe (i bpicteilíní)"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:26
 #, fuzzy
-msgid "Default height of the Message Window"
+msgid "Default height of the message window."
 msgstr "Airde fuinneoige réamhshocraithe (i bpicteilíní)"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:27
 #, fuzzy
-msgid "Default height of the Subscribe dialog"
+msgid "Default height of the subscribe dialog."
 msgstr "Airde fuinneoige réamhshocraithe (i bpicteilíní)"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:28
 #, fuzzy
 msgid "Default reply style"
 msgstr "Stíl Réamhshocraithe KDE"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:30
 #, fuzzy
-msgid "Default width of the Composer Window"
+msgid "Default width of the Composer Window."
 msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:31
 #, fuzzy
-msgid "Default width of the Message Window"
+msgid "Default width of the message window."
 msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:32
 #, fuzzy
-msgid "Default width of the Subscribe dialog"
+msgid "Default width of the subscribe dialog."
 msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Determines whether to lookup in address book for sender email"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:35
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:36
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:37
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:39
 #, fuzzy
-msgid "Directory for loading/attaching files to composer"
+msgid "Directory for loading/attaching files to composer."
 msgstr "Comhadlann a sábhálfar comhaid uathúla chúltaca inti"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:40
 #, fuzzy
-msgid "Directory for saving mail component files"
+msgid "Directory for saving mail component files."
 msgstr "Comhadlann a sábhálfar comhaid uathúla chúltaca inti"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:43
 #, fuzzy
 msgid "Empty Junk folders on exit"
 msgstr "Folmhaigh taisce na mionsamhlacha go huathoibríoch ag am scortha"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:44
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Folmhaigh taisce na mionsamhlacha go huathoibríoch ag am scortha"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:47
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:49
 #, fuzzy
 msgid "Enable or disable magic space bar"
 msgstr "Bainistigh Gléasanna agus Breiseáin"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable or disable type ahead search feature"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:52
+#, fuzzy
+msgid "Enable search folders"
+msgstr "Fillteáin Chuardaigh Shábháilte"
+
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Enable search folders on startup."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable to render message text part of limited size."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:57
 #, fuzzy
 msgid "Enable/disable caret mode"
 msgstr "Cumasaigh an &mhód éighníomhach (PASV)"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:87
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:60
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:61
 #, fuzzy
 msgid "Height of the message-list pane."
 msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Hides the per-folder preview and removes the selection"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
-"It disables the feature where repeated prompts to ask if delete messages "
-"from search folder."
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
-"It disables the feature where repeated prompts to ask if offline sync is "
-"required."
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:48
-msgid "It disables/enables the prompt while marking multiple messages."
+#: ../mail/evolution-mail.schemas.in.h:68
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid ""
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty junk was run"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Last time empty trash was run"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:51
-msgid "Level beyond which it should the message should be logged."
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "List of Labels and their associated colors"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:52
-msgid "List of Labels and their associated colors"
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "List of MIME types to check for Bonobo component viewers"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:76
 #, fuzzy
 msgid "List of accepted licenses"
 msgstr ""
 "  -D,  --domains=LIOSTA            fearainn ghlactha, scartha le camóga.\n"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of accounts"
 msgstr "Líosta do cuntasaí"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:58
-msgid "List of mime types to check for bonobo component viewers"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:60
-msgid "Load images for HTML messages over http"
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:83
+#, fuzzy
+msgid "Load images for HTML messages over HTTP"
+msgstr "Post sceál do tadhall"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images in messages from contacts 2 - Always "
-"load images off the net"
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:85
 #, fuzzy
 msgid "Log filter actions"
 msgstr "&Cumasaigh Loga na Scagairí"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:93
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Airde fuinneoige réamhshocraithe (i bpicteilíní)"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:94
 #, fuzzy
 msgid "Message Window default width"
 msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:101
 #, fuzzy
 msgid "Prompt on empty subject"
 msgstr "Folmhaigh an Bruscar ag an &Scor"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:105
 #, fuzzy
 msgid "Prompt when deleting messages in search folder"
 msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:106
 #, fuzzy
 msgid "Prompt when user expunges"
 msgstr "Tabhair &leid nuair a dhéanann feidhmchlár rochtain ar sparán oscailte"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Prompt while marking multiple messages"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Put the cursor at the bottom of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Recognize emoticons in text and replace them with images."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid "Run junk test on incoming mail"
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid "Run junk test on incoming mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Save directory"
 msgstr "Sábháil comhadlann"
 
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid "Search for the sender photo in local addressbooks"
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid "Search for the sender photo in local address books"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Send HTML mail by default"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Send HTML mail by default."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Sender email-address column in the message list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:123
+#, fuzzy
+msgid "Server synchronization interval"
+msgstr "Roghanna Beochana"
+
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Show \"From\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show Animations"
 msgstr "Taispeán Beocháin"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show animated images as animations."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:134
+#, fuzzy
+msgid "Show image animations"
+msgstr "Taispeáin cineál na híomhá"
+
+#: ../mail/evolution-mail.schemas.in.h:135
 #, fuzzy
 msgid "Show photo of the sender"
 msgstr "&Seoladh nua an tseoltóra:"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:105
-msgid "Show the photo of the sender in the message reading pane."
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:106
-msgid "Show the sender email in the messages column in the message list"
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Show the photo of the sender in the message reading pane."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:146
 #, fuzzy
 msgid "Spell check inline"
 msgstr "Seiceáil an litrithe go huathoibríoch"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:147
+#, fuzzy
+msgid "Spell checking color"
+msgstr "Seiceáil Litrithe"
+
+#: ../mail/evolution-mail.schemas.in.h:148
+#, fuzzy
+msgid "Spell checking languages"
+msgstr "Seiceáil an litrithe go huathoibríoch"
+
+#: ../mail/evolution-mail.schemas.in.h:149
 #, fuzzy
 msgid "Subscribe dialog default height"
 msgstr "Airde fuinneoige réamhshocraithe (i bpicteilíní)"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:150
 #, fuzzy
 msgid "Subscribe dialog default width"
 msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Terminal font"
 msgstr "Cló teirminéil"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:152
 #, fuzzy
 msgid "Text message part limit"
 msgstr "Teachtaireacht mar Ghnáth-théacs"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The default plugin for Junk hook"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:156
 #, fuzzy
-msgid "The terminal font for mail display"
+msgid "The terminal font for mail display."
 msgstr "Úsáid &dath uathoibríoch cló don taispeántas scáileáin"
 
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid "The variable width font for mail display"
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:157
+#, fuzzy
+msgid "The variable width font for mail display."
+msgstr "Úsáid &dath uathoibríoch cló don taispeántas scáileáin"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "This decides the max size of the text part that can be formatted under "
-"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13340,236 +13008,235 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "This option would help in improving the speed of fetching."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart"
+"collapsed state by default. Evolution requires a restart."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:168
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Liosta &snáithithe teachtaireachtaí"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:169
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Liosta &snáithithe teachtaireachtaí"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:129
-msgid "Timeout for marking message as Seen"
+#: ../mail/evolution-mail.schemas.in.h:171
+msgid "Timeout for marking message as seen"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Timeout for marking message as Seen."
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid "Timeout for marking message as seen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:173
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Úsáid an réamhshocrú ó shocruithe an chuntais"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use SpamAssassin daemon and client"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:133
-msgid "Use SpamAssassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use custom fonts"
 msgstr "Úsáid clónna saincheaptha"
 
-#: ../mail/evolution-mail.schemas.in.h:135
-msgid "Use custom fonts for displaying mail"
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:178
+#, fuzzy
+msgid "Use custom fonts for displaying mail."
+msgstr "Úsáid clónna saincheaptha"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Use only local spam tests."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Use side-by-side or wide layout"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:139
-#, fuzzy
-msgid "Variable width font"
-msgstr "Cló &il-leithid"
-
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "View/Bcc menu item is checked"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "View/Bcc menu item is checked."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:142
-msgid "View/Cc menu item is checked"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:143
-msgid "View/Cc menu item is checked."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:144
-msgid "View/From menu item is checked"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:145
-msgid "View/From menu item is checked."
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:146
-msgid "View/PostTo menu item is checked"
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:147
-msgid "View/PostTo menu item is checked."
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:184
+#, fuzzy
+msgid "Variable width font"
+msgstr "Cló &il-leithid"
 
-#: ../mail/evolution-mail.schemas.in.h:148
-msgid "View/ReplyTo menu item is checked"
+#: ../mail/evolution-mail.schemas.in.h:185
+msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid "View/ReplyTo menu item is checked."
+#: ../mail/evolution-mail.schemas.in.h:186
+msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:189
 #, fuzzy
 msgid "Width of the message-list pane"
 msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:190
 #, fuzzy
 msgid "Width of the message-list pane."
 msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 #, fuzzy
 msgid "Importing Elm data"
 msgstr "Earráid agus Sonraí á nIompórtáil"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 #, fuzzy
 msgid "Evolution Elm importer"
 msgstr "&GNOME-PIM (Evolution)"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 #, fuzzy
 msgid "Import mail from Elm."
 msgstr "Iompórtáil Ó Phost OS X"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:79
+#: ../plugins/pst-import/pst-importer.c:309
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Sprioc-fhillteán:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:82
+#: ../plugins/pst-import/pst-importer.c:302
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Ní féidir fillteán a chruthú le ríomhphost a iompórtáil isteach ann."
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Bosca Poist Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr ""
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Bosca poist á iompórtáil"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:231
+#: ../plugins/pst-import/pst-importer.c:454
+#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' á Iompórtáil"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "%s á Scanadh"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "Sonraí Pine á iompórtáil"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:424
 #, fuzzy
 msgid "Evolution Pine importer"
 msgstr "&GNOME-PIM (Evolution)"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:425
 #, fuzzy
 msgid "Import mail from Pine."
 msgstr "Iompórtáil Ó Phost OS X"
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Post do %s"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "Scéal ó %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "Tá an t-ábhar %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "líosta ríomhphost %s"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:364
 #, fuzzy
 msgid "Add Filter Rule"
 msgstr "Cuir Riail Nua Leis..."
 
-#: ../mail/mail-component.c:528
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -13579,7 +13246,7 @@ msgstr[2] "%d roghnaithe, "
 msgstr[3] "%d roghnaithe, "
 msgstr[4] "%d roghnaithe, "
 
-#: ../mail/mail-component.c:532
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13589,7 +13256,7 @@ msgstr[2] "%d scriosta"
 msgstr[3] "%d scriosta"
 msgstr[4] "%d scriosta"
 
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13599,7 +13266,7 @@ msgstr[2] "%d dhramhphost"
 msgstr[3] "%d ndramhphost"
 msgstr[4] "%d dramhphost"
 
-#: ../mail/mail-component.c:537
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13609,7 +13276,7 @@ msgstr[2] "%d dhréacht"
 msgstr[3] "%d ndréacht"
 msgstr[4] "%d dréacht"
 
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13619,7 +13286,7 @@ msgstr[2] "%d sheolta"
 msgstr[3] "%d seolta"
 msgstr[4] "%d seolta"
 
-#: ../mail/mail-component.c:541
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13629,7 +13296,7 @@ msgstr[2] "%d gan seoladh"
 msgstr[3] "%d gan seoladh"
 msgstr[4] "%d gan seoladh"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -13639,7 +13306,7 @@ msgstr[2] "%d gan léamh, "
 msgstr[3] "%d gan léamh, "
 msgstr[4] "%d gan léamh, "
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -13649,336 +13316,285 @@ msgstr[2] "%d iomlán"
 msgstr[3] "%d iomlán"
 msgstr[4] "%d iomlán"
 
-#: ../mail/mail-component.c:885
+#: ../mail/mail-component.c:952
 msgid "New Mail Message"
 msgstr "Teachtaireacht Phoist Nua"
 
-#: ../mail/mail-component.c:886
+#: ../mail/mail-component.c:953
+#, fuzzy
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Teachtaireacht Phoist"
 
-#: ../mail/mail-component.c:887
+#: ../mail/mail-component.c:954
 msgid "Compose a new mail message"
 msgstr "Cruthaigh scéal phost nua"
 
-#: ../mail/mail-component.c:893
+#: ../mail/mail-component.c:960
 msgid "New Mail Folder"
 msgstr "Fillteán Poist Nua"
 
-#: ../mail/mail-component.c:894
+#: ../mail/mail-component.c:961
+#, fuzzy
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Fillteán Poist Nua"
 
-#: ../mail/mail-component.c:895
+#: ../mail/mail-component.c:962
 msgid "Create a new mail folder"
 msgstr "Cruthaigh fillteán poist nua"
 
-#: ../mail/mail-component.c:1042
+#: ../mail/mail-component.c:1109
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: ../mail/mail-component.c:1511
-msgid "Error"
-msgstr ""
-
-#: ../mail/mail-component.c:1511
-msgid "Errors"
-msgstr ""
-
-#: ../mail/mail-component.c:1512
-msgid "Warnings and Errors"
-msgstr ""
-
-#: ../mail/mail-component.c:1513
-msgid "Debug"
-msgstr ""
-
-#: ../mail/mail-component.c:1513
-msgid "Error, Warnings and Debug messages"
-msgstr ""
-
-#: ../mail/mail-component.c:1623
-#, fuzzy
-msgid "Debug Logs"
-msgstr "Logchomhad Gréasáin &CUPS"
-
-#: ../mail/mail-component.c:1627
-msgid "Show _errors in the status bar for"
-msgstr ""
-
-#: ../mail/mail-component.c:1634
-msgid "seconds."
-msgstr "soicind."
-
-#: ../mail/mail-component.c:1644
-#, fuzzy
-msgid "Log Messages:"
-msgstr "Teachtaireachtaí HTML"
-
-#: ../mail/mail-component.c:1696
-msgid "Log Level"
-msgstr ""
-
-#: ../mail/mail-component.c:1703 ../widgets/misc/e-dateedit.c:408
-msgid "Time"
-msgstr "Am"
-
-#: ../mail/mail-component.c:1710 ../mail/message-list.c:2398
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "Teachtaireachtaí"
-
-#: ../mail/mail-config.c:83
-msgid "I_mportant"
-msgstr "_Tábhachtach"
-
-#. red
-#: ../mail/mail-config.c:84
-msgid "_Work"
-msgstr "_Obair"
-
-#. orange
-#: ../mail/mail-config.c:85
-msgid "_Personal"
-msgstr "_Pearsanta"
-
-#. green
-#: ../mail/mail-config.c:86
-msgid "_To Do"
-msgstr "Le _Déanamh"
-
-#. blue
-#: ../mail/mail-config.c:87
-msgid "_Later"
-msgstr "Ar _Ball"
-
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:3
-msgid "<b>SSL is not supported in this build of Evolution</b>"
+#: ../mail/mail-config.glade.h:2
+msgid "(Note: Requires restart of the application)"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:4
+msgid "<b>SSL is not supported in this build of Evolution</b>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:5
 #, fuzzy
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "Grian Grianghraf"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Sí_nithe</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
 msgstr "<b>_Teangacha</b>"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Eolas Cuntais</span>"
 
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Fíordheimhniú</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 #, fuzzy
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Clófhoireann</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Cumraíocht</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Oibriú Réamhshocraithe</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Scrios Post</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:17
 #, fuzzy
 msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Clófhoireann</span>"
 
-#: ../mail/mail-config.glade.h:17
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr ""
+#: ../mail/mail-config.glade.h:19
+#, fuzzy
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">Clófhoireann</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Luchtú Íomhánna</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:21
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Clófhoireann</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:22
 #, fuzzy
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Clófhoireann</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Clófhoireann</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:24
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Eolas </span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Roghanna</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:27
 #, fuzzy
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Clófhoireann</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:28
+#, fuzzy
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">Stádas</span>"
+
+#: ../mail/mail-config.glade.h:29
 #, fuzzy
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Clófhoireann</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:30
 #, fuzzy
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Clófhoireann</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Slándáil</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Clófhoireann</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:34
 #, fuzzy
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\" size=\"x-large\">Clófhoireann</span>"
 
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:36
 msgid "Account Management"
 msgstr "Bainisteoireacht Chuntas"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:37
 msgid "Add Ne_w Signature..."
 msgstr "Cuir Síniú _Nua Leis..."
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:38
 msgid "Add _Script"
 msgstr "Cuir _Script Leis"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:39
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:40
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:42
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:44
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:45
 #, fuzzy
-msgid "Attach original message"
-msgstr "Taispeáin an teachtaireacht bhunúsach"
+msgid "Always request rea_d receipt"
+msgstr "Nuair a thagann admháil léite:"
 
-#: ../mail/mail-config.glade.h:44
-#, fuzzy
+#: ../mail/mail-config.glade.h:46
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:49
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:53
 msgid "Automatically insert _emoticon images"
-msgstr "Rothlaigh íomhánna go huathoibríoch ag am luchtaithe"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltach (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:55
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltach (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:47
-#, fuzzy
+#: ../mail/mail-config.glade.h:56
 msgid "C_haracter set:"
-msgstr "&Socraigh Scagairí"
-
-#: ../mail/mail-config.glade.h:48
-msgid "C_olor"
-msgstr "_Dath"
+msgstr "Tacar c_arachtar:"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:57
 msgid "Ch_eck for Supported Types "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Check cu_stom headers for junk"
+msgstr "Post ríomhphost"
+
+#: ../mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Check incoming _messages for junk"
 msgstr "Post ríomhphost"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Check spelling while I _type"
 msgstr "Seiceáil litriú le linn clóscríofa"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:61
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:62
 msgid "Cle_ar"
 msgstr "_Glan"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:63
 msgid "Clea_r"
 msgstr "_Glan"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Uath athchuir focail litrithe mícheart"
 
-#: ../mail/mail-config.glade.h:56
-msgid "Colors"
-msgstr "Dathanna"
-
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:65
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:66
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13988,436 +13604,485 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:72
 msgid "De_fault"
 msgstr "_Réamhshocrú"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Tacar carachtar réamhshocraithe:"
 
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:75
 msgid "Delete junk messages on e_xit"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Ag bogadh scéaltaí"
 
-#: ../mail/mail-config.glade.h:70
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+#: ../mail/mail-config.glade.h:78
+msgid "Do not format messages when text si_ze exceeds"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:71
-#, fuzzy
-msgid "Do not quote original message"
-msgstr "&Ná criptigh an teachtaireacht seo"
+#: ../mail/mail-config.glade.h:79
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:80
 msgid "Done"
 msgstr "Déanta"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:81
 msgid "Drafts _Folder:"
 msgstr "_Fillteán Dréachtaí:"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:82
 msgid "Email Accounts"
 msgstr "Cuntasaí Rphoist"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:83
 msgid "Email _Address:"
 msgstr "_Seoladh Ríomhphoist:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:84
 msgid "Empty trash folders on e_xit"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:77
-msgid "Enable Magic S_pacebar "
-msgstr ""
+#: ../mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Enable Magic S_pacebar"
+msgstr "Bainistigh Gléasanna agus Breiseáin"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Enable Sea_rch Folders"
+msgstr "Fillteáin Chuardaigh Shábháilte"
+
+#: ../mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Gan Teastas Freastalaí"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Encrypt out_going messages (by default)"
 msgstr "Ag bogadh scéaltaí"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Cló &aonleithid"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Fix_ed width Font:"
 msgstr "Cló &aonleithid"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:93
 msgid "Font Properties"
 msgstr "Álbachtaí Clófhoireann"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Seol mar HTML amháin"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:95
 msgid "Full Nam_e:"
 msgstr "_Ainm Iomlán:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:97
 msgid "HTML Messages"
 msgstr "Teachtaireachtaí HTML"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:98
+#, fuzzy
+msgid "H_TTP Proxy:"
+msgstr "Bosca _Phoist:"
+
+#: ../mail/mail-config.glade.h:99
 msgid "Headers"
 msgstr "Ceanntásca"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "RockRidge le díth ainm"
 
-#: ../mail/mail-config.glade.h:91
-msgid "Inline"
-msgstr "Inlíne"
-
-#: ../mail/mail-config.glade.h:92
-msgid "Inline original message (Outlook style)"
+#: ../mail/mail-config.glade.h:102
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
 msgstr ""
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:104
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:105 ../mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Labels"
+msgstr "Lipéad"
+
+#: ../mail/mail-config.glade.h:106
 #, fuzzy
 msgid "Languages Table"
 msgstr "Cuir Tábla Leis"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Configuration"
 msgstr "Socrú Post"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:108
 #, fuzzy
 msgid "Mail Headers Table"
 msgstr "Tábla gan aimsiú"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:110
 msgid "Mailbox location"
 msgstr "Áit do Bosca Phoist"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:111
 msgid "Message Composer"
 msgstr "Scríobhóir Scéal"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:112
+msgid "No _Proxy for:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:115
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:116
 msgid "Or_ganization:"
 msgstr "_Eagrú:"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:117
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Eochar PGP:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:118
+msgid "Pass_word:"
+msgstr "_Focal Faire:"
+
+#: ../mail/mail-config.glade.h:120
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:121
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:122
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:123
 msgid "Please select among the following options"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:124
+msgid "Port:"
+msgstr "Port:"
+
+#: ../mail/mail-config.glade.h:125
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Quote original message"
-msgstr "Taispeáin an teachtaireacht bhunúsach"
-
-#: ../mail/mail-config.glade.h:113
-#, fuzzy
-msgid "Quoted"
-msgstr "Teachtaireacht athfhriotail san áireamh..."
-
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:126
 msgid "Re_member password"
 msgstr "Meabhraigh _focal faire"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:127
 msgid "Re_ply-To:"
 msgstr "_Freagra-Chuig:"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:129
 msgid "Remember _password"
 msgstr "Meabhraigh _focal faire"
 
-#: ../mail/mail-config.glade.h:118
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:130
+msgid "S_earch for sender photograph only in local address books"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:131
 msgid "S_elect..."
 msgstr "_Roghnaigh..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:132
 #, fuzzy
 msgid "S_end message receipts:"
 msgstr "[-- DEIREADH TEACHTAIREACHTA PGP --]\n"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:133
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "Cló Comhrá"
 
-#: ../mail/mail-config.glade.h:123
-#, fuzzy
-msgid "Select Drafts Folder"
-msgstr "Roghnaigh Fillteán"
-
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:135
 #, fuzzy
 msgid "Select HTML fixed width font"
 msgstr "Ní cló aonleithid é '%s'"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:137
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:138
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:128
-#, fuzzy
-msgid "Select Sent Folder"
-msgstr "Roghnaigh Fillteán"
-
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:140
 msgid "Sending Mail"
 msgstr "Post á Sheoladh"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:141
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "&Fillteán na dteachtaireachtaí seolta:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:142
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:143
 msgid "Server _Type: "
 msgstr "_Cineál Freastalaí: "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:144
 #, fuzzy
 msgid "Sig_ning certificate:"
 msgstr "Gan Teastas Freastalaí"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:145
 msgid "Signat_ure:"
 msgstr "_Síniú:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures"
 msgstr "Sínithe"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:147
 #, fuzzy
 msgid "Signatures Table"
 msgstr "Cuir Tábla Leis"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:148
 #, fuzzy
 msgid "Spell Checking"
 msgstr "Seiceáil Litrithe"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:149
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:150
 msgid "T_ype: "
 msgstr "_Cineál:"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:154
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: ../mail/mail-config.glade.h:146 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:156
+msgid "Us_ername:"
+msgstr "Ainm _Úsáideora:"
+
+#: ../mail/mail-config.glade.h:157
+msgid "Use Authe_ntication"
+msgstr "Úsáid Fío_rdheimhniú"
+
+#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:681
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "Ainm _Úsáideora:"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:159
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Leithead:"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:160
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:163
 msgid "_Add Signature"
 msgstr "_Suimigh Siniú"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "Cuirfidh %S cosc ar íomhánna ó %S i gcónaí."
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Default junk plugin:"
 msgstr "Comment=Breiseán Gadget"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:166
+msgid "_Direct connection to the Internet"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:167
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Stíl na hImlíne"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:170
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Load images in messages from contacts"
 msgstr "Post sceál do tadhall"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:172
+#, fuzzy
+msgid "_Lookup in local address book only"
+msgstr "Ná taispeáin ach fillteáin atá oscailte"
+
+#: ../mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Úsáid é seo &mar léitheoir fothaí réamhshocraithe"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Manual proxy configuration:"
+msgstr "Socrú Post"
+
+#: ../mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marcáil teachtaireachtaí mar &leite ó:"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:177
 msgid "_Never load images from the Internet"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:178
 msgid "_Path:"
 msgstr "_Cosán:"
 
-#: ../mail/mail-config.glade.h:164
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:179
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:180
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Stíl na hImlíne"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:182
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:183
+msgid "_Secure HTTP Proxy:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:184
 msgid "_Select..."
 msgstr "_Roghnaigh..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:187
 #, fuzzy
 msgid "_Show image animations"
 msgstr "Taispeáin cineál na híomhá"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:188
 msgid "_Show the photograph of sender in the message preview"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:189
 #, fuzzy
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Ní ghlacann \"mixmaster\" le ceanntásca Cc nó Bcc."
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:190
 #, fuzzy
 msgid "_Use Secure Connection:"
 msgstr "Úsáid nasc daingean:"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:191
+#, fuzzy
+msgid "_Use system defaults"
+msgstr "Úsáid _Réamhshocrú"
+
+#: ../mail/mail-config.glade.h:192
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:195
 msgid "addresses"
 msgstr "seoltaí"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:196
 msgid "color"
 msgstr "dath"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:197
 msgid "description"
-msgstr "tuairisc"
+msgstr "cur síos"
+
+#: ../mail/mail-config.glade.h:198
+msgid "seconds"
+msgstr "soicind"
 
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
@@ -14452,102 +14117,84 @@ msgid "All local folders"
 msgstr "Gach fillteán logánta"
 
 #: ../mail/mail-dialogs.glade.h:8
-#, fuzzy
-msgid "Case _sensitive"
-msgstr "Cásíogair"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "_Críochnaithe"
 
-#: ../mail/mail-dialogs.glade.h:11
-msgid "F_ind:"
-msgstr "_Aimsigh:"
-
-#: ../mail/mail-dialogs.glade.h:12
-msgid "Find in Message"
-msgstr "Aimsigh sa Teachtaireacht"
-
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "Clóigh leanúint anseo"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:10
 #, fuzzy
 msgid "Folder Subscriptions"
 msgstr "Bainistiú na Síntiús Fillteán"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:11
 #, fuzzy
 msgid "License Agreement"
 msgstr "Comhaontú um Cheadúnas"
 
-#: ../mail/mail-dialogs.glade.h:16
-#, fuzzy
-msgid "None Selected"
-msgstr "Faic Roghnaithe"
-
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "_Freastalaí:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "Eolas Slándáil"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:14
 #, fuzzy
 msgid "Specific folders"
 msgstr "Fillteáin á léamh"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:17
 #, fuzzy
 msgid "_Accept License"
 msgstr "Glac leis an Chomhaontú um Cheadúnas."
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:18
 #, fuzzy
 msgid "_Due By:"
 msgstr "&Grúpáil De Réir"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "_Bratach:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:20
 #, fuzzy
 msgid "_Tick this to accept the license agreement"
 msgstr "Líosta do cuntasaí"
 
-#: ../mail/mail-folder-cache.c:822
+#: ../mail/mail-folder-cache.c:834
 #, c-format
 msgid "Pinging %s"
 msgstr "%s á phingiú"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:107
 #, fuzzy
 msgid "Filtering Selected Messages"
 msgstr "&Scrios Teachtaireachtaí Roghnaithe"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:266
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "&Seol Ríomhphost Go..."
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14559,7 +14206,7 @@ msgstr ""
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
 #, fuzzy
 msgid "Sending message"
 msgstr "_Seol teachtaireacht"
@@ -14574,117 +14221,122 @@ msgstr "Teachtaireacht á seoladh..."
 msgid "Failed to send %d of %d messages"
 msgstr "Theip ar sheoladh an chomhaid méarchláir."
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:701
 msgid "Canceled."
 msgstr "Cealaithe."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
 msgid "Complete."
 msgstr "Críochnaithe."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:877
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Bog Teachtaireacht go Fillteán"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:954
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Teachtaireachtaí á n-aistriú go %S..."
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:954
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Teachtaireachtaí á gcóipeáil go %S..."
 
-#: ../mail/mail-ops.c:1161
+#: ../mail/mail-ops.c:1171
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Teachtaireachtaí earráide"
 
-#: ../mail/mail-ops.c:1202
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ag oscailt fillteán %s"
 
-#: ../mail/mail-ops.c:1267
+#: ../mail/mail-ops.c:1277
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "Eolas teagmhála le %s"
+
+#: ../mail/mail-ops.c:1346
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Stóráil &mionsamhlacha"
 
-#: ../mail/mail-ops.c:1338
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ag baint fillteán %s"
 
-#: ../mail/mail-ops.c:1427
+#: ../mail/mail-ops.c:1535
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Fillteán Nua"
 
-#: ../mail/mail-ops.c:1490
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1599
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Eolas faoin Chuntas"
 
-#: ../mail/mail-ops.c:1545
+#: ../mail/mail-ops.c:1653
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Fillteán Nua"
 
-#: ../mail/mail-ops.c:1582 ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Fillteán Nua"
 
-#: ../mail/mail-ops.c:1629
+#: ../mail/mail-ops.c:1740
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Oscail an bruscar i bhfuinneog nua"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "Fillteáin Logánta"
 
-#: ../mail/mail-ops.c:1711
+#: ../mail/mail-ops.c:1822
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Seol &Teachtaireacht..."
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1931
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Seol &Teachtaireacht..."
 msgstr[1] "Ag Sábháil %d scéal(aí)"
 
-#: ../mail/mail-ops.c:1903
+#: ../mail/mail-ops.c:2016
 #, fuzzy, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Seol &Teachtaireacht..."
 msgstr[1] "Ag Sábháil %d scéal(aí)"
 
-#: ../mail/mail-ops.c:1973
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
-"Earraidh ag sábhháil scéalaí  do: %s\n"
+"Earráid agus teachtaireachtaí á sábháil go: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2045
+#: ../mail/mail-ops.c:2168
 #, fuzzy
 msgid "Saving attachment"
 msgstr "&Oscail Iatán"
 
-#: ../mail/mail-ops.c:2057 ../mail/mail-ops.c:2063
+#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14693,93 +14345,94 @@ msgstr ""
 "Teip ag cruthaigh comhad aschur: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2073
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Níorbh fhéidir sonraí a scríobh: %s"
 
-#: ../mail/mail-ops.c:2219
+#: ../mail/mail-ops.c:2354
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "Earráid le linn dínasctha ó fam.\n"
 
-#: ../mail/mail-ops.c:2219
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2450
 #, fuzzy, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Míreanna le húsáid as líne"
 
-#: ../mail/mail-ops.c:2396
+#: ../mail/mail-ops.c:2536
 #, fuzzy
 msgid "Checking Service"
 msgstr "Seirbhís nua"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Á Chealú..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Seol & Faigh Post"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Cealaigh _Gach Uile"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:503
 msgid "Updating..."
 msgstr "Á Nuashonrú..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Ag Fanacht..."
 
-#: ../mail/mail-send-recv.c:792
-#, fuzzy
+#: ../mail/mail-send-recv.c:814
+#, fuzzy, c-format
 msgid "Checking for new mail"
 msgstr "Ag seiceáil do theachtaireachtaí nua..."
 
-#: ../mail/mail-session.c:203
-#, fuzzy, c-format
+#: ../mail/mail-session.c:210
+#, c-format
 msgid "Enter Passphrase for %s"
-msgstr "Iontráil focal faire do <b>%1</b>"
+msgstr "Iontráil Frása Faire do %s"
 
-#: ../mail/mail-session.c:205
-#, fuzzy
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
-msgstr "Iontráil frása faire:"
+msgstr "Iontráil Frása Faire:"
 
-#: ../mail/mail-session.c:208
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
-msgstr "Iontráil Focal Faire le %s"
+msgstr "Iontráil Focal Faire do %s"
 
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "Iontráil Focal Faire"
 
-#: ../mail/mail-session.c:252
+#: ../mail/mail-session.c:259
 #, fuzzy
 msgid "User canceled operation."
 msgstr "Chealaigh an úsáideoir an oibríocht"
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Eagar síniú"
+#: ../mail/mail-signature-editor.c:202
+#, fuzzy
+msgid "_Save and Close"
+msgstr "Sábháil agus Dún"
 
-#: ../mail/mail-signature-editor.c:431
+#: ../mail/mail-signature-editor.c:356
 #, fuzzy
-msgid "Enter a name for this signature."
-msgstr "Iontráil ainm don chatagóir seo:"
+msgid "Edit Signature"
+msgstr "Eagar síniú"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "Ainm:"
+#: ../mail/mail-signature-editor.c:371
+#, fuzzy
+msgid "_Signature Name:"
+msgstr "Cuir Tábla Leis"
 
 #: ../mail/mail-tools.c:120
 #, fuzzy, c-format
@@ -14811,39 +14464,37 @@ msgstr "Fillteán neamhbhailí: `%s'"
 msgid "Setting up Search Folder: %s"
 msgstr "cuardaigh sa bhfillteán sonraithe"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:234
 #, fuzzy, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "_Brabhsáil le fillteáin eile"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:241
 #, fuzzy, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "_Brabhsáil le fillteáin eile"
 
-#: ../mail/mail-vfolder.c:1034
+#: ../mail/mail-vfolder.c:1067
 #, fuzzy
 msgid "Edit Search Folder"
 msgstr "Cuir Airíonna an Fhillteáin in Eagar"
 
-#: ../mail/mail-vfolder.c:1118
+#: ../mail/mail-vfolder.c:1155
 #, fuzzy
 msgid "New Search Folder"
 msgstr "Fillteán Nua Cuardaigh Shábháilte"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:3
 msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
@@ -14851,14 +14502,14 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:8
@@ -14894,10 +14545,13 @@ msgid ""
 msgstr ""
 
 #: ../mail/mail.error.xml.h:14
+#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
 msgstr ""
+"An bhfuil tú cinnte go dteastaíonn uait an leabharmharc <b>%1</b> a "
+"scriosadh?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14913,12 +14567,12 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:18
 #, fuzzy
-msgid "Because &quot;{0}&quot;."
+msgid "Because \"{0}\"."
 msgstr "m.sh.: &quot;moleathanach.html&quot;"
 
 #: ../mail/mail.error.xml.h:20
 #, fuzzy
-msgid "Because &quot;{2}&quot;."
+msgid "Because \"{2}\"."
 msgstr "m.sh.: &quot;moleathanach.html&quot;"
 
 # SG
@@ -14929,17 +14583,17 @@ msgstr "Algartam Sínithe: "
 
 #: ../mail/mail.error.xml.h:22
 #, fuzzy
-msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Ní féidir teachtaireacht a chur leis an fhillteán %1 i KMail"
 
 #: ../mail/mail.error.xml.h:23
 #, fuzzy
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Cóipeáil creatlach go dtí an fillteán baile"
 
 #: ../mail/mail.error.xml.h:24
 #, fuzzy
-msgid "Cannot create folder &quot;{0}&quot;."
+msgid "Cannot create folder \"{0}\"."
 msgstr "<qt>Ní féidir an fillteán <b>%1</b> a chruthú.</qt>"
 
 #: ../mail/mail.error.xml.h:25
@@ -14948,63 +14602,58 @@ msgid "Cannot create temporary save directory."
 msgstr "ní féidir comhadlann sealadach a chruthú leis an teimpléad \"%s\""
 
 #: ../mail/mail.error.xml.h:26
-#, fuzzy
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
-"Teip ag cruthaigh eolaire\n"
-"%s\n"
-"Earraidh: %s"
 
 #: ../mail/mail.error.xml.h:27
 #, fuzzy
-msgid "Cannot delete folder &quot;{0}&quot;."
+msgid "Cannot delete folder \"{0}\"."
 msgstr "Ní féidir leat fillteán caighdeánach a scriosadh."
 
 #: ../mail/mail.error.xml.h:28
 #, fuzzy
-msgid "Cannot delete system folder &quot;{0}&quot;."
+msgid "Cannot delete system folder \"{0}\"."
 msgstr "Ní féidir leat fillteán caighdeánach a scriosadh."
 
 #: ../mail/mail.error.xml.h:29
 #, fuzzy
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
 #: ../mail/mail.error.xml.h:30
 #, fuzzy
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Bog go dtí &m'fhillteán &quot;Seolta&quot; é"
 
 #: ../mail/mail.error.xml.h:31
 #, fuzzy
-msgid "Cannot open source &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
 msgstr "Ní féidir foinse &quot;{1}&quot; a oscailt."
 
 #: ../mail/mail.error.xml.h:32
 #, fuzzy
-msgid "Cannot open source &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
 msgstr "Ní féidir an fhoinse a luchtú."
 
 #: ../mail/mail.error.xml.h:33
 #, fuzzy
-msgid "Cannot open target &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
 msgstr "ní féidir %1 a oscailt chun é a léamh"
 
 #: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:35
 #, fuzzy
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Ní féidir %1 comhad a athainmniú"
 
 #: ../mail/mail.error.xml.h:36
 #, fuzzy
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr ""
 "Teip ag athainmigh fillteán:\n"
 "%s"
@@ -15016,69 +14665,70 @@ msgstr "Sábháil \"%title%\" %reason%?"
 
 #: ../mail/mail.error.xml.h:38
 #, fuzzy
-msgid "Cannot save to directory &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
 msgstr "  -P,  --directory-prefix=RÉIMÍR  sábháil comhaid i RÉIMÍR/...\n"
 
 #: ../mail/mail.error.xml.h:39
 #, fuzzy
-msgid "Cannot save to file &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
 msgstr "Dialóg chomhaid chun URL a shábháil"
 
 #: ../mail/mail.error.xml.h:40
 #, fuzzy
-msgid "Cannot set signature script &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
 msgstr "Suimigh Siniú"
 
 #: ../mail/mail.error.xml.h:41
+#, fuzzy
+msgid "Check Junk Failed"
+msgstr "Lorg N&uashonruithe..."
+
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "Níorbh fhéidir comhad cumraíochta X a shábháil"
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "Scrios &quot;{0}&quot;?"
-
 #: ../mail/mail.error.xml.h:44
+msgid "Delete \"{0}\"?"
+msgstr "Scrios \"{0}\"?"
+
+#: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "Scrios cuntas?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
 #, fuzzy
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "Ní féidir teachtaireacht a chur leis an fhillteán %1 i KMail"
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 #, fuzzy
 msgid "Delete messages in Search Folder?"
 msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 #, fuzzy
 msgid "Discard changes?"
 msgstr "Cuir athruithe i leataobh?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Ná _scrios"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "Ná scrios"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "Ná díchumasaigh"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr ""
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -15180,77 +14830,77 @@ msgid "Mark all messages as read"
 msgstr "Marcáil teachtaireachtaí mar &leite ó:"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr ""
-
-#: ../mail/mail.error.xml.h:75
 #, fuzzy
 msgid "Missing folder."
 msgstr "Fillteán Ar Iarraidh"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 #, fuzzy
 msgid "No sources selected."
 msgstr "níl aon fhillteán roghnaithe"
 
-#: ../mail/mail.error.xml.h:78
-#, fuzzy
-msgid "Only on _Current Folder"
-msgstr "Seinn an fillteán reatha amháin"
-
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Fan go fóill."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 #, fuzzy
 msgid "Querying server"
 msgstr "Freastalaí ICQ"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 #, fuzzy
 msgid "Read receipt requested."
 msgstr "cruthaigh an fillteán iarrtha"
 
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:90
+#, fuzzy
+msgid "Report Junk Failed"
+msgstr "Iompórtáil Comhad"
+
 #: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+msgid "Report Not Junk Failed"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:92
@@ -15298,7 +14948,7 @@ msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 
@@ -15307,7 +14957,7 @@ msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 
@@ -15410,13 +15060,12 @@ msgid ""
 msgstr ""
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:135
-#, fuzzy
 msgid "_Append"
-msgstr "iarcheangail"
+msgstr "_Iarcheangail"
 
 #: ../mail/mail.error.xml.h:136
 #, fuzzy
@@ -15437,87 +15086,104 @@ msgstr "Theip ar scriosadh"
 msgid "_Open Messages"
 msgstr "_Oscail Teachtaireachtaí"
 
-#: ../mail/mail.error.xml.h:143
-#, fuzzy
-msgid "on Current Folder and _Subfolders"
-msgstr "Cruthaigh fillteán"
-
-#: ../mail/message-list.c:1049
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr ""
 
-#: ../mail/message-list.c:1050
+#: ../mail/message-list.c:1052
 #, fuzzy
 msgid "Seen"
 msgstr "Chonacthas go Deireanach"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1053
 #, fuzzy
 msgid "Answered"
 msgstr "Freagartha"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1054
+#, fuzzy
+msgid "Forwarded"
+msgstr "Cuir Ar Aghaidh"
+
+#: ../mail/message-list.c:1055
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Cumasaigh Gach Teachtaireacht"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1056
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Teachtaireachtaí earráide"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1060
 #, fuzzy
 msgid "Lowest"
 msgstr "Is Ísle"
 
-#: ../mail/message-list.c:1058
+#: ../mail/message-list.c:1061
 #, fuzzy
 msgid "Lower"
 msgstr "Íochtarach"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1065
 #, fuzzy
 msgid "Higher"
 msgstr "Níos Airde"
 
-#: ../mail/message-list.c:1063
+#: ../mail/message-list.c:1066
 #, fuzzy
 msgid "Highest"
 msgstr "Is Airde"
 
-#: ../mail/message-list.c:1609 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1616 ../plugins/itip-formatter/itip-view.c:206
-#: ../widgets/table/e-cell-date.c:70
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Inniu %l:%M %p"
 
-#: ../mail/message-list.c:1625 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1670
 msgid "Yesterday %l:%M %p"
 msgstr "Inné %l:%M %p"
 
-#: ../mail/message-list.c:1637 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1682
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1645 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1690
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1647 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1692
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:3841
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
 #, fuzzy
 msgid "Generating message list"
 msgstr "Liosta &snáithithe teachtaireachtaí"
 
+#: ../mail/message-list.c:4299
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4301
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
+msgstr ""
+
+#: ../mail/message-list.c:4303
+#, fuzzy
+msgid "There are no messages in this folder."
+msgstr "Marcáil teachtaireachtaí mar &leite ó:"
+
 #: ../mail/message-list.etspec.h:3
 #, fuzzy
 msgid "Due By"
@@ -15536,11 +15202,6 @@ msgstr ""
 msgid "Follow Up Flag"
 msgstr "Teachtaireacht leantach go %s%s?"
 
-#: ../mail/message-list.etspec.h:8
-#, fuzzy
-msgid "Labels"
-msgstr "Lipéad"
-
 #: ../mail/message-list.etspec.h:11
 #, fuzzy
 msgid "Received"
@@ -15553,48 +15214,54 @@ msgstr "Teachtaireachtaí earráide"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "Méid"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+msgid "Subject - Trimmed"
+msgstr "Gan ábhar"
+
+#: ../mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "Glao"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "Ná Cuir Ar Aghaidh"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:56
 #, fuzzy
 msgid "Follow-Up"
 msgstr "Teachtaireacht leantach go %s%s?"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Mar eolas duit"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Cuir Ar Aghaidh"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:59
 #, fuzzy
 msgid "No Response Necessary"
 msgstr ""
 "Port:\n"
 "(más gá)"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "Freagair"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "Freagair Cách"
 
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:64
 #, fuzzy
 msgid "Review"
 msgstr "Athbhreithnigh"
@@ -15620,37 +15287,45 @@ msgid "Subject contains"
 msgstr "Ábhar ina bhfuil"
 
 #: ../mail/searchtypes.xml.h:6
+#, fuzzy
+msgid "Subject or Addresses contains"
+msgstr "Ábhar nó Seoltóir ina bhfuil"
+
+#: ../mail/searchtypes.xml.h:7
+#, fuzzy
+msgid "Subject or Recipients contains"
+msgstr "Ábhar nó Seoltóir ina bhfuil"
+
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "Ábhar nó Seoltóir ina bhfuil"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "Leabhair Seoltaí Logánta"
+#, fuzzy
+msgid "Add local address books to Evolution."
+msgstr "Ná taispeáin ach fillteáin atá oscailte"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr ""
+msgid "Local Address Books"
+msgstr "Leabhair Seoltaí Logánta"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-#, fuzzy
-msgid "Enable attachment reminder plugin"
-msgstr "Cliceáil chun an breiseán OCR a chumasú"
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
-"body"
+"body."
 msgstr ""
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "Lorgfhocail"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-#, fuzzy
-msgid "Remind _missing attachments"
-msgstr "Tá iatáin leis an teachtaireacht"
-
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 #, fuzzy
@@ -15658,9 +15333,7 @@ msgid "Attachment Reminder"
 msgstr "&Scoránaigh Meabhrúchán"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
+msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr ""
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
@@ -15675,163 +15348,193 @@ msgid "Message has no attachments"
 msgstr "Tá an teachtaireacht gan síniú digiteach"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "_Cuir iatán leis..."
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 #, fuzzy
-msgid "_Continue Editing"
-msgstr "Na hOrdú Eagarthóireachta"
+msgid "_Edit Message"
+msgstr "Cuir teachtaireacht in _eagar"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
-msgstr ""
-
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 #, fuzzy
-msgid "Audio inline plugin"
+msgid "Audio Inline"
 msgstr "Roghnaigh an breiseán aschurtha fuaime."
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Play audio attachments directly from Evolution."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:139
 #, fuzzy
 msgid "Select name of the Evolution backup file"
 msgstr "Roghnaigh nó iontráil ainm comhaid."
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:167
 msgid "_Restart Evolution after backup"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:190
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:214
 msgid "_Restart Evolution after restore"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:287
 #, fuzzy
 msgid "Restore from backup"
 msgstr "Fainéis á léamh ó chúltaca"
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:289
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:297
 #, fuzzy
 msgid "_Restore Evolution from the backup file"
 msgstr "Earráid Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:307
 #, fuzzy
 msgid "Choose a file to restore"
 msgstr "Ainm an chomhaid atá le cur ar ais"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:62
 #, fuzzy
 msgid "Backup Evolution directory"
 msgstr "Comhadlann saincheaptha chúltaca:"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:64
 #, fuzzy
 msgid "Restore Evolution directory"
 msgstr "ní féidir an chomhadlann reatha a athchóiriú"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:66
 #, fuzzy
 msgid "Check Evolution Backup"
 msgstr "Stop an tSeirbhís &Chúltaca"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "Atosaigh Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:70
 #, fuzzy
 msgid "With Graphical User Interface"
 msgstr "*.ui *.UI|Comhaid Chomhéadain"
 
-#: ../plugins/backup-restore/backup.c:67
-#: ../plugins/backup-restore/backup.c:107
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 #, fuzzy
 msgid "Shutting down Evolution"
 msgstr "Quanta á mhúchadh"
 
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:77
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:87
+#: ../plugins/backup-restore/backup.c:212
 #, fuzzy
 msgid "Backup complete"
 msgstr "Cúltaca críochnaithe."
 
-#: ../plugins/backup-restore/backup.c:92
-#: ../plugins/backup-restore/backup.c:133
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "Evolution á Atosú"
 
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:254
 #, fuzzy
 msgid "Backup current Evolution data"
 msgstr "Foinse Sonraí na Cáipéise Reatha"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:259
 #, fuzzy
 msgid "Extracting files from backup"
 msgstr "Fainéis á léamh ó chúltaca"
 
-#: ../plugins/backup-restore/backup.c:122
+#: ../plugins/backup-restore/backup.c:266
 #, fuzzy
 msgid "Loading Evolution settings"
 msgstr "Socruithe Draoi an Ghréasáin á Luchtú..."
 
-#: ../plugins/backup-restore/backup.c:126
+#: ../plugins/backup-restore/backup.c:273
 #, fuzzy
 msgid "Removing temporary backup files"
 msgstr "An iomarca comhad cúltaca?"
 
-#: ../plugins/backup-restore/backup.c:244
+#: ../plugins/backup-restore/backup.c:280
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:429
 #, fuzzy, c-format
 msgid "Backing up to the folder %s"
 msgstr "Theip ar léamh na comhadlainne."
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:434
 #, fuzzy, c-format
 msgid "Restoring from the folder %s"
 msgstr "Ag díliostáil ón bhfillteán %S..."
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:264
+#: ../plugins/backup-restore/backup.c:454
 #, fuzzy
 msgid "Evolution Backup"
 msgstr "Conair chúltaca:"
 
-#: ../plugins/backup-restore/backup.c:264
+#: ../plugins/backup-restore/backup.c:454
 #, fuzzy
 msgid "Evolution Restore"
 msgstr "Athshlánaigh Cúltaca"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
+#: ../plugins/backup-restore/backup.c:489
+#, fuzzy
+msgid "Backing up Evolution Data"
+msgstr "Foinse Sonraí na Cáipéise Reatha"
+
+#: ../plugins/backup-restore/backup.c:490
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:492
+#, fuzzy
+msgid "Restoring Evolution Data"
+msgstr "Evolution á Atosú"
+
+#: ../plugins/backup-restore/backup.c:493
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:511
+msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 
 #. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
 #, fuzzy
-msgid "Backup and restore plugin"
+msgid "Backup and Restore"
 msgstr "Beoigh íoslaghdú agus athchóiriú"
 
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#, fuzzy
+msgid "Backup and restore your Evolution data and settings."
+msgstr "Foinse Sonraí na Cáipéise Reatha"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 #, fuzzy
 msgid "Are you sure you want to close Evolution?"
@@ -15852,15 +15555,25 @@ msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 #, fuzzy
+msgid "Insufficient Permissions"
+msgstr "Taispeáin Ceadanna"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#, fuzzy
 msgid "Invalid Evolution backup file"
 msgstr "Comment=Comhad Cúltaca Krecipes"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 #, fuzzy
 msgid "Please select a valid backup file to restore."
 msgstr "Dealaigh na tadhallaí roghnaithe"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#, fuzzy
+msgid "The selected folder is not writable."
+msgstr "Post an sceál seo"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
 "This will delete all your current Evolution data and settings and restore "
 "them from your backup. Evolution restore can start only when Evolution is "
@@ -15881,56 +15594,76 @@ msgstr "_Athchóirigh Socruithe..."
 msgid "_Backup Settings..."
 msgstr "Déan Cúl_taca ar Socruithe..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 #, fuzzy
 msgid "Automatic Contacts"
 msgstr "Name=Teagmhálacha"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:646
+msgid "Create _address book entries when sending mails"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:652
 #, fuzzy
 msgid "Select Address book for Automatic Contacts"
 msgstr "Tadhallaí Phoiblí"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:667
 #, fuzzy
 msgid "Instant Messaging Contacts"
 msgstr "Gan Seoladh le haghaidh Teachtaireachtaí Meandaracha"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:682
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr ""
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#, fuzzy, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "Tharla earráid anaithnid le linn priontála."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 #, fuzzy
 msgid "Convert message text to _Unicode"
 msgstr "&Tiontaigh an teachtaireacht go gnáth-théacs"
@@ -15948,71 +15681,119 @@ msgstr ""
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
 #, fuzzy
-msgid "Bogofilter Options"
+msgid "Bogofilter Junk Filter"
 msgstr "Roghanna Beochana"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Filters junk messages using Bogofilter."
+#, fuzzy
+msgid "Bogofilter Options"
+msgstr "Roghanna Beochana"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
+msgid "Filter junk messages using Bogofilter."
 msgstr ""
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "Úsáid _SSL"
 
+#. add refresh option
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:267
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-contacts-source.c:322
+#, fuzzy
+msgid "Re_fresh:"
+msgstr "_Athnuaigh"
+
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:289
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:723
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "seachtain"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "Foinsí Fhéilire CalDAV"
+msgid "Add CalDAV support to Evolution."
+msgstr ""
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "Foinsí CalDAV"
+msgid "CalDAV Support"
+msgstr "Tacaíocht CalDAV"
 
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Féilirí Logánta"
+#: ../plugins/calendar-file/calendar-file.c:204
+#, fuzzy
+msgid "_Customize options"
+msgstr "Saincheap"
 
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
+# vi
+#: ../plugins/calendar-file/calendar-file.c:224
+#, fuzzy
+msgid "File _name:"
+msgstr "Ainm chomhaid:"
+
+#: ../plugins/calendar-file/calendar-file.c:228
+#, fuzzy
+msgid "Choose calendar file"
+msgstr "Roghnaigh comhad"
+
+#: ../plugins/calendar-file/calendar-file.c:272
+#, fuzzy
+msgid "On open"
+msgstr "Oscail"
+
+#: ../plugins/calendar-file/calendar-file.c:273
+msgid "On file change"
 msgstr ""
 
-#: ../plugins/calendar-http/calendar-http.c:273
-#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
-msgid "_Refresh:"
-msgstr "_Athnuaigh:"
+#: ../plugins/calendar-file/calendar-file.c:274
+#, fuzzy
+msgid "Periodically"
+msgstr "Pearsanta"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-file/calendar-file.c:301
+msgid "Force read _only"
+msgstr ""
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+msgid "Add local calendars to Evolution."
+msgstr ""
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Local Calendars"
+msgstr "Féilirí Logánta"
+
+#: ../plugins/calendar-http/calendar-http.c:369
 #, fuzzy
 msgid "_Secure connection"
 msgstr "Nasc Daingean: "
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "_Ainm Úsáideora:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "Féilirí HTTP"
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
+msgid "Add web calendars to Evolution."
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 #, fuzzy
-msgid "Weather: Cloudy"
-msgstr "Aimsir scamallach"
+msgid "Web Calendars"
+msgstr "Féilirí"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
@@ -16020,48 +15801,63 @@ msgstr "Aimsir: Ceo"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
 #, fuzzy
-msgid "Weather: Partly Cloudy"
-msgstr "Roghanna Stáisiún Aimsire"
+msgid "Weather: Cloudy"
+msgstr "Aimsir scamallach"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
 #, fuzzy
-msgid "Weather: Rain"
-msgstr "Báisteach Mhaisiúil"
+msgid "Weather: Cloudy Night"
+msgstr "Aimsir scamallach"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
 #, fuzzy
+msgid "Weather: Overcast"
+msgstr "Báisteach Mhaisiúil"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+#, fuzzy
+msgid "Weather: Showers"
+msgstr "Gráin Shneachta"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
+#, fuzzy
 msgid "Weather: Snow"
 msgstr "Gráin Shneachta"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 #, fuzzy
 msgid "Weather: Sunny"
 msgstr "Tuairisc Aimsire"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
+#, fuzzy
+msgid "Weather: Clear Night"
+msgstr "Mionathraigh Féilirí"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
 #, fuzzy
 msgid "Weather: Thunderstorms"
 msgstr "Tuairisc Aimsire"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "Roghnaigh suíomh"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
+#: ../plugins/calendar-weather/calendar-weather.c:606
 #, fuzzy
 msgid "_Units:"
 msgstr "Aonaid:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
+#: ../plugins/calendar-weather/calendar-weather.c:614
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr ""
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
+msgid "Add weather calendars to Evolution."
 msgstr ""
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
@@ -16070,15 +15866,14 @@ msgid "Weather Calendars"
 msgstr "Mionathraigh Féilirí"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
+#, fuzzy
+msgid "Copy Tool"
+msgstr "Leid Uirlisí"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 #, fuzzy
-msgid "Copy tool"
-msgstr "Leid Uirlisí"
+msgid "Copy things to the clipboard."
+msgstr "Roghnúchán á chóipeáil go dtí an gearrthaisce..."
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -16090,12 +15885,12 @@ msgid ""
 msgstr ""
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
+msgid "Check whether Evolution is the default mail client on startup."
 msgstr ""
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 #, fuzzy
-msgid "Default Mail Client "
+msgid "Default Mail Client"
 msgstr "GenericName=Cliant Ríomhphoist"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
@@ -16104,14 +15899,28 @@ msgstr ""
 "Ar mhaith leat Evolution a úsáid mar do cliant ríomhphoist réamhshocraithe?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:610
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
+#: ../plugins/default-source/default-source.c:80
+#, fuzzy
+msgid "Mark as _default address book"
+msgstr "san fhillteán &réamhshocraithe íosluchtaithe"
+
+#: ../plugins/default-source/default-source.c:101
+#, fuzzy
+msgid "Mark as _default calendar"
+msgstr "san fhillteán &réamhshocraithe íosluchtaithe"
+
+#: ../plugins/default-source/default-source.c:102
+#, fuzzy
+msgid "Mark as _default task list"
+msgstr "san fhillteán &réamhshocraithe íosluchtaithe"
+
+#: ../plugins/default-source/default-source.c:103
 #, fuzzy
-msgid "Mark as _default folder"
+msgid "Mark as _default memo list"
 msgstr "san fhillteán &réamhshocraithe íosluchtaithe"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
@@ -16120,9 +15929,81 @@ msgid "Default Sources"
 msgstr "Foinsí Ionchurtha"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid "Mark your preferred address book and calendar as default."
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:333
+#, fuzzy
+msgid "Security:"
+msgstr "Slándáil"
+
+#: ../plugins/email-custom-header/email-custom-header.c:338
+#, fuzzy
+msgid "Unclassified"
+msgstr "Gan Siniú"
+
+#: ../plugins/email-custom-header/email-custom-header.c:339
+#, fuzzy
+msgid "Protected"
+msgstr "Cruthaithe"
+
+#: ../plugins/email-custom-header/email-custom-header.c:341
+#, fuzzy
+msgid "Secret"
+msgstr "Scór"
+
+#: ../plugins/email-custom-header/email-custom-header.c:342
+msgid "Top secret"
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:584
+#, fuzzy
+msgid "_Custom Header"
+msgstr "Ceanntáisc Saincheaptha"
+
+# KE
+#: ../plugins/email-custom-header/email-custom-header.c:906
+#, fuzzy
+msgid "Key"
+msgstr "An Chéinia"
+
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:395
+msgid "Values"
+msgstr ""
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
 msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
-"default one."
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+#, fuzzy
+msgid "Email Custom Header"
+msgstr "Ceanntáisc Saincheaptha"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Add custom headers to outgoing mail messages."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+#, fuzzy
+msgid "Custom Header"
+msgstr "Ceanntáisc Saincheaptha"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+#, fuzzy
+msgid "List of Custom Headers"
+msgstr "Ceanntáisc Saincheaptha"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
@@ -16166,104 +16047,121 @@ msgid ""
 "password authentication."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 #, fuzzy
 msgid "Out Of Office"
 msgstr "Cuir Freagraí \"As Láthair Ón Oifig\" in Eagar..."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 #, fuzzy
 msgid "I am out of the office"
 msgstr "Cuir Freagraí \"As Láthair Ón Oifig\" in Eagar..."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 #, fuzzy
 msgid "I am in the office"
 msgstr "GenericName=Sraith Feidhmchlár Oifige"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 #, fuzzy
 msgid "Change the password for Exchange account"
 msgstr "Ainm úsáideora agus focal faire do do chuntas IMAP:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #, fuzzy
 msgid "Change Password"
 msgstr "Athraigh Focal Faire"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 #, fuzzy
 msgid "Delegation Assistant"
 msgstr "KDevelop Assistant"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "Éagsúil"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 #, fuzzy
 msgid "Folders Size"
 msgstr "Leithead:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 #, fuzzy
 msgid "Exchange Settings"
 msgstr "Socruithe an Scáileáin"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:618
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 #, fuzzy
 msgid "_OWA URL:"
 msgstr "URL ó "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:644
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 #, fuzzy
 msgid "A_uthenticate"
 msgstr "Saghas _Udarú :"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:840
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
+msgid "Mailbox name is _different than user name"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
+#, fuzzy
+msgid "_Mailbox:"
+msgstr "_Post"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 #, fuzzy
 msgid "_Authentication Type"
 msgstr "Cineál fíordheimhnithe"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
 msgid "Ch_eck for Supported Types"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:960
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:962
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
+#: ../plugins/exchange-operations/exchange-contacts.c:219
+#, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "Méid:"
+
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -16272,13 +16170,13 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:114
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 #, fuzzy
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Ní ionann na focail fhaire. Triail arís é, le do thoil."
@@ -16300,7 +16198,7 @@ msgstr "Focal Faire Nua:"
 msgid "Your current password has expired. Please change your password now."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, fuzzy, c-format
 msgid "Your password will expire in the next %d days"
 msgstr ""
@@ -16310,36 +16208,33 @@ msgstr ""
 "Rachaidh d'fhocal faire as feidhm i %n lá.\n"
 "Rachaidh d'fhocal faire as feidhm i %n lá."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:159
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "Saincheaptha"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:189
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "Eagarthóir (léigh, cruthaigh, cuir in eagar)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 #, fuzzy
 msgid "Author (read, create)"
 msgstr "Cruthaigh Téama Nua"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:197
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 #, fuzzy
 msgid "Reviewer (read-only)"
 msgstr "Ar fáil (inléite amháin)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:247
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 #, fuzzy
 msgid "Delegate Permissions"
 msgstr "Taispeáin Ceadanna"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:258
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Ceadanna le %s"
@@ -16347,7 +16242,7 @@ msgstr "Ceadanna le %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16355,14 +16250,14 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr ""
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 #, fuzzy
 msgid "You are also permitted to see my private items."
 msgstr "Cruthaigh tasc nua"
@@ -16370,75 +16265,83 @@ msgstr "Cruthaigh tasc nua"
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:378
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:410
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 #, fuzzy
 msgid "Delegate To"
 msgstr "Súmáil go %1 %%"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, fuzzy, c-format
 msgid "Remove the delegate %s?"
 msgstr "Bain Gníomh"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 #, fuzzy
 msgid "Could not access Active Directory"
 msgstr "Níorbh fhéidir an chomhadlann %S a chruthú"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, fuzzy, c-format
 msgid "Could not remove delegate %s"
 msgstr "Ní féidir an fillteán %1 a bhaint."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 #, fuzzy
 msgid "Could not update list of delegates."
 msgstr "Níorbh fhéidir liosta na bhfreastalaithe a fháil."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, fuzzy, c-format
 msgid "Could not add delegate %s"
 msgstr "Níorbh Féidir Teagmháil a Chur Leis"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 #, fuzzy
 msgid "Error reading delegates list."
 msgstr "Earráid agus liosta soláthraithe á pharsáil."
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "Fé_ilire:"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "_Teagmhálacha:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 #, fuzzy
 msgid "Delegates"
 msgstr "Dealaigh"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "Ceadanna le"
 
@@ -16465,23 +16368,30 @@ msgstr "Taispeáin Ceadanna"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
 msgstr "_Tascanna:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Ceadanna..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Ainm Fillteáin"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Méid Fhillteáin"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
+#, fuzzy
+msgid "User"
+msgstr "_Úsáideoir"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 #, fuzzy
 msgid "Subscribe to Other User's Folder"
@@ -16492,21 +16402,21 @@ msgstr "Roghnaigh Fillteán Tascanna"
 msgid "Exchange Folder Tree"
 msgstr "Name=Amharc Crainn"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 #, fuzzy
 msgid "Unsubscribe Folder..."
 msgstr "Fillteán Nua"
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, fuzzy, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Oscail Íomhánna Ó Fhillteán"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, fuzzy, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Díliostáil Ó"
@@ -16576,15 +16486,18 @@ msgstr ""
 msgid "_Change Password"
 msgstr "_Athraigh Focal Faire"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Diúltaíodh cead.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "Cuir Úsáideoir Leis:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
+#: ../plugins/exchange-operations/exchange-send-options.c:410
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "Cuir Úsáideoir Leis"
 
@@ -16712,15 +16625,11 @@ msgstr "Íogaireacht"
 msgid "_User"
 msgstr "_Úsáideoir"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "button-user"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "Roghnaigh Úsáideoir"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
 msgstr "Leabhar Seoltaí..."
 
@@ -16734,9 +16643,7 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Liostáil: Liostáil le féilire ar ríomhaire i gcéin."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
-"and features."
+msgid "Activates the Evolution-Exchange extension package."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
@@ -16745,105 +16652,113 @@ msgid "Exchange Operations"
 msgstr "Roghchlár Oibríochtaí"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
-msgid "Cannot change password due to configuration problems."
+msgid "Cannot access the \"Exchange settings\" tab in offline mode."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+msgid "Cannot change password due to configuration problems."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 #, fuzzy
 msgid "Cannot display folders."
 msgstr "Ní féidir fillteáin a oscailt."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 #, fuzzy
 msgid "Cannot perform the operation."
 msgstr "Ní féidir an oibríocht iarrtha a chríochnú."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid ""
 "Changes to options for Exchange account \"{0}\" will only take effect after "
 "restarting Evolution."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 #, fuzzy
 msgid "Could not authenticate to server."
 msgstr "Níorbh fhéidir nasc a dhéanamh leis an bhfreastalaí: %1"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 #, fuzzy
 msgid "Could not change password."
 msgstr ""
 "Ní féidir ceadanna a athrú le haghaidh\n"
 "%1"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 #, fuzzy
 msgid "Could not connect to Exchange server."
 msgstr "Níorbh fhéidir dul i dteagmháil le freastalaí DCOP."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 #, fuzzy
 msgid "Could not connect to server {0}."
 msgstr "Níorbh fhéidir nasc a dhéanamh leis an bhfreastalaí: %1"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not determine folder permissions for delegates."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not find Exchange Web Storage System."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 #, fuzzy
 msgid "Could not locate server {0}."
 msgstr "Níorbh fhéidir nasc a dhéanamh leis an bhfreastalaí: %1"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 #, fuzzy
 msgid "Could not make {0} a delegate"
 msgstr "Níorbh fhéidir fillteán %1 a dhéanamh."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 #, fuzzy
 msgid "Could not read folder permissions"
 msgstr "Níl cead agat an fillteán a léamh."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 #, fuzzy
 msgid "Could not read folder permissions."
 msgstr "Níl cead agat an fillteán a léamh."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 #, fuzzy
 msgid "Could not read out-of-office state"
 msgstr ""
 "Teip ag cruthaigh comhd '%s':\n"
 "%s"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 #, fuzzy
 msgid "Could not update folder permissions."
 msgstr "Ní féidir na ceadanna a nuashonrú."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 #, fuzzy
 msgid "Could not update out-of-office state"
 msgstr "Teíp ag dealaigh fillteán: %s"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 #, fuzzy
 msgid "Exchange Account is offline."
 msgstr "Tá an líonra as líne faoi láthair..."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16859,113 +16774,113 @@ msgid ""
 "  "
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 #, fuzzy
 msgid "Failed to update delegates:"
 msgstr "Ag dul i dteagmháil le freastalaí na nuashonruithe..."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Tá an chomhadlann ann cheana"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder does not exist"
 msgstr "Níl fillteán ann"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Folder offline"
 msgstr "Fillteán as líne"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1283
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "Earráid ghinearálta"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Global Catalog Server is not reachable"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Mailbox for {0} is not on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the URL is correct and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No Global Catalog server configured for this account."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 #, fuzzy
 msgid "No mailbox for user {0} on {1}."
 msgstr "Ní thacaítear le HAL ar an gcóras seo"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "No such user {0}"
 msgstr "Níl a leithéid d'úsáideoir {0} ann"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "D'éirigh le hathrú an Phríomhfhocail Faire."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 #, fuzzy
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Ní mór duit an dialóg a atosú chun na hathruithe a chur i bhfeidhm."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Please select a user."
 msgstr "Roghnaigh úsáideoir le do thoil."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "Server rejected password because it is too weak."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16974,93 +16889,96 @@ msgid ""
 "Or you might have just typed your password wrong."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 #, fuzzy
 msgid "Try again with a different password."
 msgstr "Focal faire mícheart; triail arís é, le do thoil."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to add user to access control list:"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 #, fuzzy
 msgid "Unable to edit delegates."
 msgstr "Cliceáil chun téacs a chur in eagar"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 #, fuzzy
 msgid "Unknown error looking up {0}"
 msgstr "Ag cuardach ar an gcomhad ceart"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/mail-to-task/mail-to-task.c:343
+#: ../plugins/mail-to-task/mail-to-task.c:555
 msgid "Unknown error."
 msgstr "Earráid anaithnid."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unknown type"
 msgstr "Cineál anaithnid"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Cealaíodh an oibríocht"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You cannot make yourself your own delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "You may only configure a single Exchange account."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 #, fuzzy
 msgid "Your password has expired."
 msgstr "Athraíodh d'fhocal faire."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} cannot be added to an access control list"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 #, fuzzy
 msgid "{0} is already a delegate"
 msgstr "Tá an taisce folamh cheana."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
 #, fuzzy
 msgid "{0} is already in the list"
 msgstr "Tá comhad %1 sa liosta cheana"
@@ -17074,97 +16992,178 @@ msgstr ""
 msgid "Check folder permissions"
 msgstr "Seiceáil an spriocfhillteán."
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+msgid "Automatically launch when a new mail is edited"
+msgstr ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
+#, fuzzy
+msgid "Default External Editor"
+msgstr "Cumraigh an tEagarthóir"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
+msgid "The default command that must be used as the editor."
+msgstr ""
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+#, fuzzy
+msgid "External Editor"
+msgstr "Cumraigh an tEagarthóir"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
+#, fuzzy
+msgid "Cannot create Temporary File"
+msgstr "ní féidir comhadlann sealadach a chruthú leis an teimpléad \"%s\""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid "Editor not launchable"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
 msgstr ""
 
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 #, fuzzy
-msgid "External Editor"
+msgid "External editor still running"
 msgstr "Cumraigh an tEagarthóir"
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:109
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:110
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:307
+#: ../plugins/external-editor/external-editor.c:309
 #, fuzzy
 msgid "Compose in External Editor"
 msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr ""
-
-#: ../plugins/face/face.c:57
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr ""
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "Comhaid PNG"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Aghaidh"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 msgstr ""
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Aghaidh"
-
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Ag díliostáil ón bhfillteán %S..."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the folder tree context menu."
-msgstr ""
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 #, fuzzy
 msgid "Unsubscribe Folders"
 msgstr "Fillteáin á léamh"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid ""
+"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr ""
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Díliostáil"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-contacts-source.c:51
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-source.c:499
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+
+#: ../plugins/google-account-setup/google-source.c:604
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+
+#: ../plugins/google-account-setup/google-source.c:739
+#, fuzzy
+msgid "Cal_endar:"
+msgstr "_Féilire:"
+
+#: ../plugins/google-account-setup/google-source.c:774
+#, fuzzy
+msgid "Retrieve _list"
+msgstr "`%s' á Fháil"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+#, fuzzy
+msgid "<b>Server</b>"
+msgstr "<b>Baill</b>"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
+msgid "Add Google Calendars to Evolution."
 msgstr ""
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 #, fuzzy
-msgid "Google sources"
-msgstr "Acmhainn"
+msgid "Google Calendars"
+msgstr "Féilire Gnome"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 #, fuzzy
 msgid "Checklist"
 msgstr "líosta"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
+msgid "Add Novell GroupWise support to Evolution."
 msgstr ""
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 #, fuzzy
-msgid "Groupwise Account Setup"
+msgid "GroupWise Account Setup"
 msgstr "Cruthú Cuntais Nua"
 
-#: ../plugins/groupwise-features/install-shared.c:215
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17179,28 +17178,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:224
 #, fuzzy
 msgid "Install the shared folder"
 msgstr "Cuir comhfhillteáin leis"
 
-#: ../plugins/groupwise-features/install-shared.c:222
+#: ../plugins/groupwise-features/install-shared.c:226
 #, fuzzy
 msgid "Shared Folder Installation"
 msgstr "Cuir comhfhillteáin leis"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 #, fuzzy
 msgid "Junk Settings"
 msgstr "Socruithe Dramhphoist"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 #, fuzzy
 msgid "Junk Mail Settings"
 msgstr "Socruithe dramhphoist"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 #, fuzzy
 msgid "Junk Mail Settings..."
 msgstr "Socruithe dramhphoist"
@@ -17215,7 +17214,7 @@ msgid "Email:"
 msgstr "Ríomhphost:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Díchumasaigh"
 
@@ -17229,41 +17228,159 @@ msgstr "_Cumasaigh"
 msgid "_Junk List"
 msgstr "Liosta Cainéal"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
+#, fuzzy
+msgid "Message Retract"
+msgstr "Stádas Teactaireachta"
+
+#: ../plugins/groupwise-features/mail-retract.c:57
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:76
 #, fuzzy
 msgid "Message retracted successfully"
 msgstr "D'éirigh le díchriptiú na teachtaireachta PGP."
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:86
 #, fuzzy
 msgid "Retract Mail"
 msgstr "&Seol Ríomhphost Go..."
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
+msgid "Add Send Options to GroupWise messages"
 msgstr ""
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-#, fuzzy
-msgid "Send Options"
-msgstr "Roghanna Seolta"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+msgid "Fine-tune your GroupWise accounts."
 msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 #, fuzzy
-msgid "Groupwise Features"
+msgid "GroupWise Features"
 msgstr "Ardtréithe"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
+#, fuzzy
+msgid "Message retract failed"
+msgstr "D'éirigh le díchriptiú na teachtaireachta PGP."
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
+#, fuzzy
+msgid "The server did not allow the selected message to be retracted."
+msgstr "Post an sceál seo"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+#, fuzzy
+msgid "Account Already Exists"
+msgstr "Tá an iontráil seo ann cheana"
+
+# SG
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
+#, fuzzy
+msgid "Invalid user"
+msgstr "Siniú neambhailí."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
+#, fuzzy
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "Dialóg chomhaid chun URL a shábháil"
+
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
+#, fuzzy
+msgid "Specify User"
+msgstr "Roghnaigh Úsáideoir"
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
+msgid "You have already given proxy permissions to this user."
+msgstr ""
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+#, fuzzy
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "Ní féidir an íomhá a shábháil - ní féidir comhad sealadach a chruthú."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+#, fuzzy
+msgid "Do you want to resend the meeting ?"
+msgstr "An bhfuil tú cinnte go dteastaíonn uait an airí seo a scriosadh?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#, fuzzy
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "An bhfuil tú cinnte go dteastaíonn uait an airí seo a scriosadh?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+msgid "Do you want to retract the original item ?"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+msgid "The original will be removed from the recipient's mailbox."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
+#, fuzzy
+msgid "This is a recurring meeting"
+msgstr "Is príobháideach é an t-imeacht seo."
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
+#, fuzzy
+msgid "Would you like to accept it?"
+msgstr "Ar mhaith leat an chluiche seo a shábháil?"
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
+#, fuzzy
+msgid "Would you like to decline it?"
+msgstr "Ar mhaith leat an chluiche seo a shábháil?"
+
+#: ../plugins/groupwise-features/process-meeting.c:53
 #, fuzzy
 msgid "Accept Tentatively"
 msgstr "Glac le &fócas"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+#, fuzzy
+msgid "Rese_nd Meeting..."
+msgstr "_Dealaigh..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Úsáideoirí:</b>"
@@ -17278,7 +17395,7 @@ msgid "Con_tacts..."
 msgstr "_Teagmhálacha..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "Teachtaireacht"
 
@@ -17348,15 +17465,17 @@ msgid "Subscribe to my _notifications"
 msgstr "Liostáil leis an bPodchraoladh seo"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "_Léigh"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
 msgid "_Write"
 msgstr "_Scríobh"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#. To Translators: strip the part in front of the | and the | itself
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#, fuzzy
+msgid "permission to read|_Read"
+msgstr "Diúlaíodh cead"
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
 msgid "Proxy"
 msgstr "Seachfhreastalaí"
 
@@ -17364,15 +17483,16 @@ msgstr "Seachfhreastalaí"
 msgid "<b>Account Name</b>"
 msgstr "<b>Ainm Cuntais</b>"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
 #, fuzzy
 msgid "Proxy Login"
 msgstr "%1 - Logáil Isteach kNX"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIontráil focal faire le %s (úsáideoir %s)"
@@ -17380,121 +17500,132 @@ msgstr "%sIontráil focal faire le %s (úsáideoir %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:512
 #, fuzzy
 msgid "_Proxy Login..."
 msgstr "%1 - Logáil Isteach kNX"
 
-#: ../plugins/groupwise-features/proxy.c:701
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 
-#: ../plugins/groupwise-features/proxy.c:706
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:316
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/send-options.c:214
+#, fuzzy
+msgid "Advanced send options"
+msgstr "Roghanna Seolta agus HTML"
+
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "Úsáideoirí"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:321
 #, fuzzy
 msgid "Enter the users and set permissions"
 msgstr "Socraigh úsáideoirí agus focail fhaire"
 
-#: ../plugins/groupwise-features/share-folder-common.c:336
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
 msgstr "Comh_fhillteán Nua..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:444
+#: ../plugins/groupwise-features/share-folder-common.c:447
 #, fuzzy
 msgid "Sharing"
 msgstr "Comhroinnt"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:531
+#, fuzzy
+msgid "Custom Notification"
+msgstr "&Fógairt an Chórais"
+
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "Cuir Leis"
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:759
 #, fuzzy
 msgid "Modify"
 msgstr "Athraigh"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "Stádas Teactaireachta"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "Ábhar:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "Ó:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:137
 #, fuzzy
 msgid "Creation date:"
 msgstr "Dáta a Cruthaíodh"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "Faighteoir:"
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:183
 #, fuzzy
 msgid "Delivered: "
 msgstr "_Dealaigh"
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "Oscailte: "
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:194
 #, fuzzy
 msgid "Accepted: "
 msgstr "Glactha"
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "Scriosta:"
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:204
 #, fuzzy
 msgid "Declined: "
 msgstr "Diúltaithe"
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:209
 #, fuzzy
 msgid "Completed: "
 msgstr "Críochnaithe"
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:214
 #, fuzzy
 msgid "Undelivered: "
 msgstr "&Neamhchothromaithe:"
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:238
 #, fuzzy
 msgid "Track Message Status..."
 msgstr "[%1] %2"
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
+msgid "Add Hula support to Evolution."
 msgstr ""
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-#, fuzzy
-msgid "Hula Account Setup"
-msgstr "Cruthú Cuntais Nua"
+msgid "Hula Support"
+msgstr ""
 
-#: ../plugins/imap-features/imap-headers.c:319
+#: ../plugins/imap-features/imap-headers.c:332
 msgid "Custom Headers"
 msgstr "Ceanntáisc Saincheaptha"
 
-#: ../plugins/imap-features/imap-headers.c:332
+#: ../plugins/imap-features/imap-headers.c:345
 msgid "IMAP Headers"
 msgstr "Ceanntáisc IMAP"
 
@@ -17511,30 +17642,31 @@ msgid "Basic and _Mailing List Headers (Default)"
 msgstr ""
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "Faigh _Gach Ceanntásc"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.glade.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
 msgstr ""
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.glade.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 
+#: ../plugins/imap-features/imap-headers.glade.h:10
+#, fuzzy
+msgid "_Fetch All Headers"
+msgstr "Faigh _Gach Ceanntásc"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
+msgid "Fine-tune your IMAP accounts."
 msgstr ""
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
@@ -17542,51 +17674,17 @@ msgstr ""
 msgid "IMAP Features"
 msgstr "Ardtréithe"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Calendar"
-msgstr "_Iompórtáil go bhFéilire"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:88
-msgid "_Import to Tasks"
-msgstr "_Iompórtáil go dTascanna"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:206
-msgid "Import ICS"
-msgstr "Iompórtáil ICS"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:233
-msgid "Select Task List"
-msgstr "Roghnaigh Liosta Tascanna"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:237
-msgid "Select Calendar"
-msgstr "Roghnaigh Féilire"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:267
-#: ../shell/e-shell-importer.c:703
-msgid "_Import"
-msgstr "_Iompórtáil"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "Iompórtáil go bhFéilire"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr ""
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr ""
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
 msgstr ""
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 #, fuzzy
 msgid "Search for an iPod failed"
 msgstr ""
@@ -17594,24 +17692,25 @@ msgstr ""
 "%1\n"
 " "
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 msgid ""
 "Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
 msgstr ""
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "Formáid iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
-msgstr ""
+#, fuzzy
+msgid "Synchronize to iPod"
+msgstr "&Sioncrónaigh le Gléas Meán"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 #, fuzzy
-msgid "Synchronize to iPod"
+msgid "Synchronize your data with your Apple iPod."
 msgstr "&Sioncrónaigh le Gléas Meán"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
@@ -17619,676 +17718,677 @@ msgstr "&Sioncrónaigh le Gléas Meán"
 msgid "iPod Synchronization"
 msgstr "Sioncrónú Uathoibríoch"
 
-#: ../plugins/itip-formatter/itip-formatter.c:429
-#: ../plugins/itip-formatter/itip-formatter.c:554
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, fuzzy, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Comhad féilire le luchtú"
 
-#: ../plugins/itip-formatter/itip-formatter.c:574
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:600
+#: ../plugins/itip-formatter/itip-formatter.c:663
 #, fuzzy, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Taispeáin &Tascanna san Fhéilire"
 
-#: ../plugins/itip-formatter/itip-formatter.c:676
+#: ../plugins/itip-formatter/itip-formatter.c:753
 #, fuzzy
 msgid "Unable to find any calendars"
 msgstr "Ní féidir an soláthraí cuardaigh a aimsiú."
 
-#: ../plugins/itip-formatter/itip-formatter.c:683
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:687
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Unable to find this task in any task list"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this memo in any memo list"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:764
+#: ../plugins/itip-formatter/itip-formatter.c:839
+#, fuzzy
+msgid "Opening the calendar. Please wait.."
+msgstr "Féilire á oscailt"
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:927
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, fuzzy
 msgid "Unable to parse item"
 msgstr "Earráid: Ní féidir an comhad %1 a pharsáil.\n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:985
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, fuzzy, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Ní féidir sonraí an fhéilire a léamh: "
 
-#: ../plugins/itip-formatter/itip-formatter.c:997
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1006
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1011
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1105
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, fuzzy, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Bainte"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1112
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1114
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 #, fuzzy
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Teíp ag dealaigh fillteán: %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1199
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1226
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 #, fuzzy, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ní féidir sonraí an leabhair seoltaí a nuashonrú: "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1230
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 #, fuzzy
 msgid "Attendee status updated"
 msgstr "Sealadach"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1255
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 #, fuzzy
 msgid "Meeting information sent"
 msgstr ""
 "Seoladh teachtaireacht chuig:\n"
 "%1%2"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1258
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 #, fuzzy
 msgid "Task information sent"
 msgstr ""
 "Seoladh teachtaireacht chuig:\n"
 "%1%2"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1261
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 #, fuzzy
 msgid "Memo information sent"
 msgstr ""
 "Seoladh teachtaireacht chuig:\n"
 "%1%2"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1270
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1351
-#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 #, fuzzy
 msgid "The calendar attached is not valid"
 msgstr "Níl an t-am sonraithe bailí."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1352
-#: ../plugins/itip-formatter/itip-formatter.c:1367
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1402
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The item in the calendar is not valid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1403
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1432
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1433
+#: ../plugins/itip-formatter/itip-formatter.c:1589
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2123
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 #, fuzzy
 msgid "This meeting recurs"
 msgstr "Cealaíodh an cruinniú seo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2126
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 #, fuzzy
 msgid "This task recurs"
 msgstr "Mionathraigh an Tasc seo..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2129
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 #, fuzzy
 msgid "This memo recurs"
 msgstr "Name=Comhad Meamraim"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2334
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 #, fuzzy
 msgid "_Delete message after acting"
 msgstr "Scrios Dialóga Dúnta tar éis (Lá)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2344
-#: ../plugins/itip-formatter/itip-formatter.c:2376
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 #, fuzzy
 msgid "Conflict Search"
 msgstr "Inneall Cuardaigh"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
-msgid "Today"
-msgstr "Inniu"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Inniu %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Inniu %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Inniu %l:%M:%S %p"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
-msgid "Tomorrow"
-msgstr "Amárach"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Amárach %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Amárach %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Amárach %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Amárach %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %I:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:529
 #, fuzzy, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Ar fanacht (logánta)"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:394
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "Cealaíodh an cruinniú seo"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:396
 #, fuzzy, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "Cealaíodh an cruinniú seo"
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:446
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "Foilsíodh an tasc seo"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:448
 #, fuzzy, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "Foilsíodh an tasc seo"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:458
 #, fuzzy, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "Tá $a díreach tar éis tú a bhípeáil!"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:466
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "Cuir an tasc seo leis an phainéal"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:536
 #, fuzzy, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "Tharla an earráid inmheánach a leanas: "
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:543
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "Cuir meamram nua leis an mbunachar sonraí."
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr ""
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "_Oscail Féilire"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
-msgid "_Decline"
-msgstr "_Diúltaigh"
-
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:829
 #: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:839
 #: ../plugins/itip-formatter/itip-view.c:856
 #: ../plugins/itip-formatter/itip-view.c:861
+msgid "_Decline"
+msgstr "_Diúltaigh"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "_Glac Leis"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:833
 #, fuzzy
 msgid "_Decline all"
 msgstr "Gach Comhad"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:834
 #, fuzzy
 msgid "_Tentative all"
 msgstr "Gach Comhad"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 #, fuzzy
 msgid "_Tentative"
 msgstr "Sealadach"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:835
 #, fuzzy
 msgid "_Accept all"
 msgstr "Glac Uile"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:846
 #, fuzzy
 msgid "_Send Information"
 msgstr "Seol faisnéis faoin chliant"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 #, fuzzy
 msgid "_Update Attendee Status"
 msgstr "Sealadach"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "_Nuashonraigh"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "Am tosaithe:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "Am deiridh:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "Nóta:"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1103
 #, fuzzy
 msgid "Send _reply to sender"
 msgstr "F&reagair an Seoltóir Amháin"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1133
 #, fuzzy
 msgid "Send _updates to attendees"
 msgstr "(Ath)sheol Údarú Go"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1142
 #, fuzzy
 msgid "_Apply to all instances"
 msgstr "Cuir i bhfeidhm i ng&ach fheidhmchlár"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1151
 #, fuzzy
 msgid "Show time as _free"
 msgstr "Taispeáin colúi&n mar uimhreacha"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
-msgid "_Tasks :"
-msgstr "_Tascanna :"
+#: ../plugins/itip-formatter/itip-view.c:1154
+msgid "_Preserve my reminder"
+msgstr ""
+
+#. To Translators: This is a check box to inherit a reminder.
+#: ../plugins/itip-formatter/itip-view.c:1160
+#, fuzzy
+msgid "_Inherit reminder"
+msgstr "&Scoránaigh Meabhrúchán"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
-msgid "Memos :"
-msgstr "Meamraim :"
+#: ../plugins/itip-formatter/itip-view.c:1914
+#, fuzzy
+msgid "_Memos:"
+msgstr "_Meamraim"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
+msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr ""
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
@@ -18312,20 +18412,19 @@ msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 #, fuzzy
 msgid "Proxy _Logout"
 msgstr "Name=Logáil Amach"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-#, fuzzy
-msgid "Allows disabling of accounts."
-msgstr "Socrú Cuntais"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
 msgstr "Díchumasaigh Cuntas"
 
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr ""
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 #, fuzzy
 msgid "Beep or play sound file."
@@ -18344,18 +18443,19 @@ msgid "Enable icon in notification area."
 msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
 msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#, fuzzy
 msgid ""
-"If true, then Beep, otherwise will play sound file when new messages arrive."
-msgstr ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr "Ar theacht teachtaireachtaí nua i"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 #, fuzzy
-msgid "Notify messages in Inbox only."
+msgid "Notify new messages for Inbox only."
 msgstr "Bog Teachtaireachtaí go Fillteán"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
@@ -18396,128 +18496,190 @@ msgstr "Cé acu atá an phríomhfhuinneog uasmhéadaithe nó nach bhfuil."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:248
+#: ../plugins/mail-notification/mail-notification.c:245
 #, fuzzy
 msgid "Generate a _D-Bus message"
 msgstr "Liosta &snáithithe teachtaireachtaí"
 
-#: ../plugins/mail-notification/mail-notification.c:357
+#: ../plugins/mail-notification/mail-notification.c:368
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "&Fógairt an Chórais"
+
+#: ../plugins/mail-notification/mail-notification.c:389
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "&Fógairt an Chórais"
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:498
 #, fuzzy, c-format
 msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
 "You have received %d new messages\n"
 "in %s."
-msgstr "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[0] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[1] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[2] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[3] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[4] "Oscail &Teachtaireacht i bhFuinneog Nua"
 
-#: ../plugins/mail-notification/mail-notification.c:362
+#: ../plugins/mail-notification/mail-notification.c:503
 #, fuzzy, c-format
-msgid "You have received %d new messages."
-msgstr "Oscail &Teachtaireacht i bhFuinneog Nua"
-
-#: ../plugins/mail-notification/mail-notification.c:373
-#: ../plugins/mail-notification/mail-notification.c:378
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[1] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[2] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[3] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[4] "Oscail &Teachtaireacht i bhFuinneog Nua"
+
+#: ../plugins/mail-notification/mail-notification.c:520
+#: ../plugins/mail-notification/mail-notification.c:525
 msgid "New email"
 msgstr "Ríomhphost nua"
 
-#: ../plugins/mail-notification/mail-notification.c:433
+#: ../plugins/mail-notification/mail-notification.c:588
 msgid "Show icon in _notification area"
 msgstr "Taispeáin deilbhín sa limistéar fógartha"
 
-#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:591
 #, fuzzy
 msgid "B_link icon in notification area"
 msgstr "Saincheap Amharc na dTeachtaireachtaí"
 
-#: ../plugins/mail-notification/mail-notification.c:438
+#: ../plugins/mail-notification/mail-notification.c:593
 msgid "Popup _message together with the icon"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:619
+#: ../plugins/mail-notification/mail-notification.c:774
 #, fuzzy
 msgid "_Play sound when new messages arrive"
 msgstr "Ar theacht teachtaireachtaí nua i"
 
-#: ../plugins/mail-notification/mail-notification.c:625
+#: ../plugins/mail-notification/mail-notification.c:780
 msgid "_Beep"
 msgstr "_Bíp"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:781
 msgid "Play _sound file"
 msgstr "Seinn comhad _fuaime"
 
-#: ../plugins/mail-notification/mail-notification.c:637
+#: ../plugins/mail-notification/mail-notification.c:792
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Ainm aschomhaid"
 
-#: ../plugins/mail-notification/mail-notification.c:638
+#: ../plugins/mail-notification/mail-notification.c:793
 msgid "Select sound file"
 msgstr "Roghnaigh comhad fuaime"
 
-#: ../plugins/mail-notification/mail-notification.c:639
+#: ../plugins/mail-notification/mail-notification.c:794
 msgid "Pl_ay"
 msgstr "_Seinn"
 
-#: ../plugins/mail-notification/mail-notification.c:773
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Notify new messages for _Inbox only"
 msgstr ""
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
-msgstr ""
-
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 #, fuzzy
 msgid "Mail Notification"
 msgstr "&Fógairt an Chórais"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr ""
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-#, fuzzy
-msgid "Con_vert to Meeting"
-msgstr "Tiontaigh go &Cuar"
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 #, fuzzy
-msgid "Mail to meeting"
-msgstr "Seol ríomhphost chuig '%1'"
+msgid "Notifies you when new mail messages arrive."
+msgstr "Ar theacht teachtaireachtaí nua i"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:343
 #, fuzzy, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ní féidir an comhad %1 a oscailt"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:350
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:353
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:356
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
 msgstr ""
 
+#: ../plugins/mail-to-task/mail-to-task.c:455
+#, fuzzy, c-format
+msgid "Could not create object. %s"
+msgstr "Níorbh fhéidir réad \"%1\" a athainmniú."
+
+#: ../plugins/mail-to-task/mail-to-task.c:555
+#, fuzzy, c-format
+msgid "Cannot get source list. %s"
+msgstr ""
+"Teip ag cruthaigh comhad aschur: %s:\n"
+" %s"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#, fuzzy
+msgid "Convert a mail message to a task."
+msgstr "Post an sceál seo"
+
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
 #, fuzzy
-msgid "Con_vert to Task"
+msgid "Convert to a Mem_o"
 msgstr "Tiontaigh go &Cuar"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+#, fuzzy
+msgid "Convert to a _Meeting"
+msgstr "Tiontaigh go &Cuar"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+#, fuzzy
+msgid "Convert to a _Task"
+msgstr "Tiontaigh go &Cuar"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+#, fuzzy
+msgid "Convert to an _Event"
+msgstr "Tiontaigh go &Cuar"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
 #, fuzzy
-msgid "Mail to task"
+msgid "Mail-to-Task"
 msgstr "Seol ríomhphost chuig '%1'"
 
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+#, fuzzy
+msgid "Convert the selected message to a new event"
+msgstr "Post an sceál seo"
+
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
 #, fuzzy
+msgid "Convert the selected message to a new meeting"
+msgstr "Post an sceál seo"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+#, fuzzy
+msgid "Convert the selected message to a new memo"
+msgstr "Post an sceál seo"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+#, fuzzy
 msgid "Convert the selected message to a new task"
 msgstr "Post an sceál seo"
 
@@ -18548,8 +18710,7 @@ msgid "Mailing _List"
 msgstr "Liosta &seoltaí:"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
@@ -18610,8 +18771,8 @@ msgstr "Post sceál do tadhall"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18691,6 +18852,27 @@ msgstr "Liostáil leis an Liosta"
 msgid "_Unsubscribe from List"
 msgstr "Díliostáil ón Liosta"
 
+#: ../plugins/mark-all-read/mark-all-read.c:39
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "Bog Teachtaireachtaí go Fillteán"
+
+#: ../plugins/mark-all-read/mark-all-read.c:41
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+
+#: ../plugins/mark-all-read/mark-all-read.c:166
+#, fuzzy
+msgid "In Current Folder and _Subfolders"
+msgstr "Cruthaigh fillteán"
+
+#: ../plugins/mark-all-read/mark-all-read.c:180
+#, fuzzy
+msgid "In Current _Folder Only"
+msgstr "Fillteán Reatha"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 #, fuzzy
 msgid "Mark All Read"
@@ -18702,48 +18884,26 @@ msgid "Mark Me_ssages as Read"
 msgstr "Marcáil an t-alt roghnaithe mar léite"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr ""
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-#, fuzzy
-msgid "Mark calendar offline"
-msgstr "Tá an t-úsáideoir as líne"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr ""
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-#, fuzzy
-msgid "_Do not make available for offline use"
-msgstr "Gníomhartha ar fáil sa mhód <b>%1</b> amháin"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
 #, fuzzy
-msgid "_Make available for offline use"
-msgstr "Roghnaigh grúpaí nuachta le haghaidh úsáide as líne..."
+msgid "Mark all messages in a folder as read."
+msgstr "Marcáil teachtaireachtaí mar &leite ó:"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr ""
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "Luchtóir Mono"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-#, fuzzy
-msgid "New Mail Notification"
-msgstr "Fuaim Nua Ríomhphoist"
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr ""
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr ""
+#, fuzzy
+msgid "Manage your Evolution plugins."
+msgstr "Athraigh Socruithe Gan Fiafraí"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:227
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Bainisteoir Breiseán"
 
@@ -18756,132 +18916,164 @@ msgstr "Bainistigh Gléasanna agus Breiseáin"
 msgid "_Plugins"
 msgstr "_Breiseáin"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Úda(i)r"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Tuarascail"
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "Cumraíocht"
 
-#: ../plugins/plugin-manager/plugin-manager.c:240
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 
-#: ../plugins/plugin-manager/plugin-manager.c:262
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Foramharc"
 
-#: ../plugins/plugin-manager/plugin-manager.c:263
-msgid "Configuration"
-msgstr "Cumraíocht"
-
-#: ../plugins/plugin-manager/plugin-manager.c:279
-msgid "There is no configuration option for this plugin."
-msgstr ""
-
-#: ../plugins/plugin-manager/plugin-manager.c:332
-#: ../plugins/plugin-manager/plugin-manager.c:394
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "Breiseán"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 #, fuzzy
 msgid "Plain Text Mode"
 msgstr "Téacs Amháin"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
 #, fuzzy
-msgid "Prefer plain-text"
+msgid "Prefer Plain Text"
 msgstr "Foclóir gnáth-théacs"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:189
 #, fuzzy
 msgid "Show HTML if present"
 msgstr "Taispeáin ainmneacha gearra (má tá siad ar fáil)"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:190
 #, fuzzy
 msgid "Prefer PLAIN"
 msgstr "Clog Simplí"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:191
 #, fuzzy
 msgid "Only ever show PLAIN"
 msgstr "Ná taispeáin ach fuinneoga íoslaghdaithe"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
 msgstr "_Mód HTML"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr ""
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "Priontáil Teachtaireacht"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "_Réamhamharc Priontála"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-#, fuzzy
-msgid "Prints the message"
-msgstr "Seol &Teachtaireacht..."
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 #, fuzzy
 msgid "Evolution Profiler"
 msgstr "Aschur an phróifíleora:"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
+msgid "Profile data events in Evolution (for developers only)."
 msgstr ""
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#, fuzzy
+msgid "Import Outlook messages from PST file"
+msgstr "Iompórtáil Ó Phost OS X"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#, fuzzy
+msgid "Outlook PST import"
+msgstr "Comhphairt Coimriú Evolution"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
 msgstr ""
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#. Address book
+#: ../plugins/pst-import/pst-importer.c:315
+#, fuzzy
+msgid "_Address Book"
+msgstr "Leabhar Seoltaí"
+
+#. Appointments
+#: ../plugins/pst-import/pst-importer.c:322
+#, fuzzy
+msgid "A_ppointments"
+msgstr "Coinní"
+
+#. Journal
+#: ../plugins/pst-import/pst-importer.c:334
+#, fuzzy
+msgid "_Journal entries"
+msgstr "Iris"
+
+#: ../plugins/pst-import/pst-importer.c:349
+#, fuzzy
+msgid "Importing Outlook data"
+msgstr "Earráid agus Sonraí á nIompórtáil"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 #, fuzzy
 msgid "Calendar Publishing"
 msgstr "Mód Foilsitheoireachta"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "Suímh"
 
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#, fuzzy
+msgid "Publish calendars to the web."
+msgstr "Roghnaigh na míreanna atá le priontáil"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 #, fuzzy
 msgid "_Publish Calendar Information"
 msgstr "Eolas faoin Fhillteán Líonra"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#, fuzzy, c-format
+msgid "Could not open %s:"
+msgstr "Níorbh fhéidir comhad foinseach \\\"$a\\\" a oscailt"
+
+#: ../plugins/publish-calendar/publish-calendar.c:97
+#, fuzzy, c-format
+msgid "Could not open %s: Unknown error"
+msgstr ""
+"[-- Earráid: níorbh fhéidir tosach na teachtaireachta PGP a aimsiú! --]\n"
+"\n"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "Iontráil an focal faire le `%s'"
+msgid "There was an error while publishing to %s:"
+msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:624
 #, fuzzy
-msgid "Are you sure you want to remove this URL?"
+msgid "Are you sure you want to remove this location?"
 msgstr "An bhfuil tú cinnte gur main leat an chatagóir seo a bhaint?"
 
+#: ../plugins/publish-calendar/publish-calendar.c:788
+#, fuzzy
+msgid "Could not create publish thread."
+msgstr "Níorbh Fhéidir an Teachtaireacht a Sheoladh"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 #, fuzzy
 msgid "<span weight=\"bold\">Location</span>"
@@ -18919,7 +19111,7 @@ msgstr "Minicíocht an Chloig"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -18933,28 +19125,40 @@ msgstr ""
 msgid "Service _type:"
 msgstr "Cineál na Seirbhíse"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#, fuzzy
+msgid "Time _duration:"
+msgstr "Am _Críos:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "_Comhad:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "_Focal Faire:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 #, fuzzy
 msgid "_Publish as:"
 msgstr "Foilsigh Mar..."
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "_Meabhraigh focal faire"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "_Ainm Úsáideora:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -18962,152 +19166,191 @@ msgstr ""
 "iCal\n"
 "Saor/Gnóthach"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr ""
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 #, fuzzy
-msgid "SpamAssassin (built-in)"
-msgstr "Insuite (Wine)"
+msgid "New Location"
+msgstr "Áit"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-msgid "This will make Spamassasin more reliable, but slower"
-msgstr ""
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#, fuzzy
+msgid "Edit Location"
+msgstr "Áit"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 #, fuzzy
-msgid "I_nclude remote tests"
-msgstr "GenericName=Teisteanna agus Scrúduithe"
+msgid "Hello Python"
+msgstr "Fón Baile"
 
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
 msgstr ""
 
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using Python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 #, fuzzy
-msgid "SpamAssassin junk plugin"
+msgid "Python Loader"
+msgstr "Luchtóir Mono"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#, fuzzy, c-format
+msgid "SpamAssassin not found, code: %d"
 msgstr "Comment=Breiseán Gadget"
 
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-#, fuzzy
-msgid "Spamassassin Options"
-msgstr "Roghanna Beochana"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#, fuzzy, c-format
+msgid "Failed to create pipe: %s"
+msgstr ""
+"Teip ag cruthaigh eolaire '%s':\n"
+"%s"
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
-msgid "A plugin for saving all attachments or parts of a message at once."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#, fuzzy, c-format
+msgid "Error after fork: %s"
 msgstr ""
+" Earráid le %s:\n"
+"  %s"
 
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
-msgid "Save attachments"
-msgstr "Sábháil iatáin"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "Sábháil Iatáin..."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#, c-format
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
+msgstr ""
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "Sábháil gach iatán"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
+#, fuzzy, c-format
+msgid "SpamAssassin is not available."
+msgstr "Níl an fillteán baile le fáil."
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 #, fuzzy
-msgid "Select save base name"
-msgstr "Roghnaigh Ainm an Aschomhaid"
+msgid "I_nclude remote tests"
+msgstr "GenericName=Teisteanna agus Scrúduithe"
 
-#: ../plugins/save-attachments/save-attachments.c:355
-msgid "MIME Type"
-msgstr "Cineál MIME"
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+msgid "Filter junk messages using SpamAssassin."
+msgstr ""
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
-msgid "Save"
-msgstr "Sábháil"
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
+#, fuzzy
+msgid "SpamAssassin Junk Filter"
+msgstr "Comment=Breiseán Gadget"
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+#, fuzzy
+msgid "SpamAssassin Options"
+msgstr "Roghanna Beochana"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:358
 #, fuzzy
 msgid "Description List"
 msgstr "Liosta Cainéal"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
 msgstr "Liosta Catagóirí"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Comment List"
 msgstr "Liosta Nótaí"
 
-#: ../plugins/save-calendar/csv-format.c:387
-msgid "Created"
-msgstr "Cruthaithe"
-
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Contact List"
 msgstr "Liosta Teagmhálacha"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "Tús"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "Deireadh"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:367
 #, fuzzy
 msgid "percent Done"
 msgstr "Á Shábháil... Críochnaithe"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:370
 #, fuzzy
 msgid "Attendees List"
 msgstr "Liosta Cainéal"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "Athraithe"
 
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Advanced options for the CSV format"
+#: ../plugins/save-calendar/csv-format.c:523
+msgid "A_dvanced options for the CSV format"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:555
+#: ../plugins/save-calendar/csv-format.c:530
 #, fuzzy
-msgid "Prepend a header"
+msgid "Prepend a _header"
 msgstr "Priontáil an &ceanntásc"
 
-#: ../plugins/save-calendar/csv-format.c:564
+#: ../plugins/save-calendar/csv-format.c:539
 #, fuzzy
-msgid "Value delimiter:"
+msgid "_Value delimiter:"
 msgstr "&Teormharcóir idir eochairfhocail:"
 
-#: ../plugins/save-calendar/csv-format.c:570
+#: ../plugins/save-calendar/csv-format.c:546
 #, fuzzy
-msgid "Record delimiter:"
+msgid "_Record delimiter:"
 msgstr "&Teormharcóir idir eochairfhocail:"
 
-#: ../plugins/save-calendar/csv-format.c:576
+#: ../plugins/save-calendar/csv-format.c:553
 #, fuzzy
-msgid "Encapsulate values with:"
+msgid "_Encapsulate values with:"
 msgstr "RockRidge le díth ainm"
 
-#: ../plugins/save-calendar/csv-format.c:598
+#: ../plugins/save-calendar/csv-format.c:575
 #, fuzzy
 msgid "Comma separated value format (.csv)"
 msgstr "Comhad 'luachanna deighilte le camóga' (*.csv)"
@@ -19118,7 +19361,7 @@ msgstr "Sábháil Roghnaithe"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 #, fuzzy
-msgid "Saves selected calendar or tasks list to disk."
+msgid "Save a calendar or task list to disk."
 msgstr "Sábháil an tadhallaí seo mar VCard."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
@@ -19130,27 +19373,33 @@ msgstr "_Sábháil chuig Diosca"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:154
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:393
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "Formáid RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:104
+#, fuzzy
+msgid "_Format:"
+msgstr "Formáid"
+
+#: ../plugins/save-calendar/save-calendar.c:165
 #, fuzzy
 msgid "Select destination file"
 msgstr "Roghnaigh Comhad Téama"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 #, fuzzy
-msgid "Select one source"
-msgstr "Roghnaigh Bunachar Sonraí Foinseach"
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "Sábháil an tadhallaí seo mar VCard."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr ""
+#, fuzzy
+msgid "Select One Source"
+msgstr "Roghnaigh Bunachar Sonraí Foinseach"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 #, fuzzy
@@ -19168,13 +19417,13 @@ msgid "Show _only this Task List"
 msgstr "[Iontráil é seo i mo thascliosta]"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
+msgid "Guides you through your initial account setup."
 msgstr ""
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 #, fuzzy
-msgid "Startup wizard"
-msgstr "Draoi Tosaithe..."
+msgid "Setup Assistant"
+msgstr "Cúntóir"
 
 #: ../plugins/startup-wizard/startup-wizard.c:84
 #, fuzzy
@@ -19193,37 +19442,38 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:115
 #, fuzzy
 msgid "Importing files"
 msgstr "Comhaid nua ríomhphoist á n-iompórtáil..."
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 #, fuzzy
 msgid "Please select the information that you would like to import:"
 msgstr "Roghnaigh cineál an chomhaid a theastaíonn uait a iompórtáil:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr "Ó %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
-#, fuzzy
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:548
+#, fuzzy, c-format
 msgid "Importing data."
 msgstr "Sonraí á n-iompórtáil..."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:562
 msgid "Please wait"
 msgstr "Fán le do thoil"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
+#, fuzzy
+msgid "Sort mail message threads by subject."
+msgstr "Tá teachtaireachtaí gan léamh sa snáithe seo."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 #, fuzzy
@@ -19236,21 +19486,105 @@ msgid "Thread messages by subject"
 msgstr "Tá teachtaireachtaí gan léamh sa snáithe seo."
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
 msgstr ""
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+
+#: ../plugins/templates/templates.c:601
+#, fuzzy
+msgid "No title"
+msgstr "Teideal Poist"
+
+#: ../plugins/templates/templates.c:709
+#, fuzzy
+msgid "Save as _Template"
+msgstr "&Seol mar atá"
+
+#: ../plugins/templates/templates.c:711
+#, fuzzy
+msgid "Save as Template"
+msgstr "Sábháil mar dréacht"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
 msgstr ""
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 #, fuzzy
-msgid "TNEF Attachment decoder"
+msgid "TNEF Decoder"
 msgstr ""
 "Iatán neamhbhailí ríomhphoist:\n"
 "%1"
 
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline vCards"
+msgstr "vCardanna Iomadúla"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr ""
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+#, fuzzy
+msgid "Show Full vCard"
+msgstr "Taispeáin/Folaigh vCárta"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+#, fuzzy
+msgid "Show Compact vCard"
+msgstr "Taispeáin/Folaigh vCárta"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+#, fuzzy
+msgid "There is one other contact."
+msgstr "E427: Tá aon chlib chomhoiriúnach amháin"
+
+#: ../plugins/vcard-inline/vcard-inline.c:231
+#, fuzzy, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "E427: Tá aon chlib chomhoiriúnach amháin"
+msgstr[1] "agus aon carta eile."
+
+#: ../plugins/vcard-inline/vcard-inline.c:252
+#, fuzzy
+msgid "Save in Address Book"
+msgstr "Sábháil sa leabhar seoltaí"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "Add WebDAV contacts to Evolution."
+msgstr ""
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+#, fuzzy
+msgid "WebDAV contacts"
+msgstr "Gan teagmhálacha"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+msgid "WebDAV"
+msgstr ""
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
+#, fuzzy
+msgid "URL:"
+msgstr "_URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr ""
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Blaosc Evolution"
@@ -19271,17 +19605,18 @@ msgid "Evolution Test component"
 msgstr "Name=Comhpháirt KMathML"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings"
+msgid "Authenticate proxy server connections"
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
 #, fuzzy
-msgid "Configuration version"
-msgstr "Leagan VBIOS:"
+msgid "Automatic proxy configuration URL"
+msgstr "Aithint uathoibríoch cineálacha"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Decides whether the crash recovery should be run or not"
-msgstr ""
+#, fuzzy
+msgid "Configuration version"
+msgstr "Leagan VBIOS:"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 #, fuzzy
@@ -19302,124 +19637,249 @@ msgid "Default window width"
 msgstr "Leitheid Fuinneog Loicthe"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid "ID or alias of the component to be shown by default at start-up."
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+#, fuzzy
+msgid "HTTP proxy password"
+msgstr "Iontráil focal faire"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy username"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+#, fuzzy
+msgid "Initial attachment view"
+msgstr "&Oscail Iatán"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+#, fuzzy
+msgid "Initial file chooser folder"
+msgstr "Cuir comhfhillteáin leis"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 #, fuzzy
 msgid "Last upgraded configuration version"
 msgstr "Tá an leagan mícheart i gcomhad na cumraíochta."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "Non-proxy hosts"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+#, fuzzy
+msgid "Proxy configuration mode"
+msgstr "Cumraíocht"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "SOCKS proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid "SOCKS proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
+msgid "Secure HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+msgid "Secure HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 #, fuzzy
 msgid "Sidebar is visible"
 msgstr "Tá an barra taoibh suiteáilte."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 #, fuzzy
 msgid "Skip development warning dialog"
 msgstr "Tabhair foláireamh dom agus mé ar tí:"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-#, fuzzy
-msgid "Skip recovery warning dialog"
-msgstr "Tabhair foláireamh dom agus mé ar tí:"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:556
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "T&osaigh sa mhód lánscáileán"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 #, fuzzy
 msgid "Statusbar is visible"
 msgstr "($Arg1) dofheicthe"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default height for the main window, in pixels."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The default width for the main window, in pixels."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default width for the sidebar, in pixels."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The machine name to proxy HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid "The machine name to proxy socks through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 #, fuzzy
 msgid "Toolbar is visible"
 msgstr "($Arg1) dofheicthe"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
-msgid "Whether Evolution will start up in offline mode instead of online mode."
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+#, fuzzy
+msgid "URL that provides proxy configuration values."
+msgstr "Tá an leagan mícheart i gcomhad na cumraíochta."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid "Use HTTP proxy"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "Whether crash recovery should be done or not"
+#: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:50
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 #, fuzzy
 msgid "Whether or not the window should be maximized."
 msgstr "Cé acu atá an phríomhfhuinneog uasmhéadaithe nó nach bhfuil."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the sidebar should be visible."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 #, fuzzy
 msgid "Window button style"
 msgstr "Roghnaigh stíl chnaipe"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 #, fuzzy
 msgid "Window buttons are visible"
 msgstr "Níl aon teachtaireacht chlibeáilte le feiceáil!"
@@ -19438,26 +19898,23 @@ msgstr "Naisc PPP"
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:128
 #, fuzzy
 msgid "Choose the type of importer to run:"
 msgstr "Roghnaigh cineál an mhéarchlár le cumrú."
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:131
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"of file it is from the list."
 msgstr ""
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:135
 #, fuzzy
 msgid "Choose the destination for this import"
 msgstr "Roghnaigh am críochnaithe don imeacht seo"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -19465,72 +19922,59 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "A_inm Comhaid:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "Roghnaigh Comhad"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "_Saghas comhad:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:357
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr ""
 "Iompórtáil Teachtaireachtaí, Leabhair Seoltaí agus Socruithe ó ríomhchláir "
 "eile."
 
-#: ../shell/e-shell-importer.c:341
-#, fuzzy
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
-msgstr "Uaslódáil comhad singil"
-
-#: ../shell/e-shell-settings-dialog.c:313
-#, fuzzy
-msgid "Evolution Preferences"
-msgstr "Sainroghanna KHexEdit2"
-
-#: ../shell/e-shell-utils.c:118
-#, fuzzy
-msgid "No folder name specified."
-msgstr "Níor sonraíodh ainm tionscadail."
+msgstr "Iompórtáil comhad _aonair"
 
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr ""
+#: ../shell/e-shell-importer.c:743
+msgid "_Import"
+msgstr "_Iompórtáil"
 
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr ""
+#: ../shell/e-shell-settings-dialog.c:312
+msgid "Evolution Preferences"
+msgstr "Sainroghanna Evolution"
 
-#: ../shell/e-shell-utils.c:143
-#, fuzzy
-msgid "'.' and '..' are reserved folder names."
-msgstr "is comheisiatach iad %s agus léirainmneacha comhaid"
+#. To translators: This is the window title and %s is the
+#. component name. Most translators will want to keep it as is.
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:78
 #, fuzzy, c-format
-msgid "Error executing %s."
+msgid "Error executing %s. (%s)"
 msgstr "Earráid le linn rite"
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:135
 #, fuzzy
 msgid "Bug buddy is not installed."
 msgstr "Níor suiteáladh inneall %1 i gceart."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:138
 #, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "Níorbh fhéidir an oibríocht chuardaigh a rith."
@@ -19538,96 +19982,95 @@ msgstr "Níorbh fhéidir an oibríocht chuardaigh a rith."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:663
+#: ../shell/e-shell-window-commands.c:938
 msgid "translator-credits"
 msgstr ""
 "Alastair McKinstry <mckinstry@computer.org>\n"
 "David O'Callaghan <david.ocallaghan@cs.tcd.ie>\n"
 "Seán de Búrca <leftmostcat@gmail.com>"
 
-#: ../shell/e-shell-window-commands.c:674
-#, fuzzy
+#: ../shell/e-shell-window-commands.c:949
 msgid "Evolution Website"
-msgstr "Suíomh Gréasáin NVIDIA"
+msgstr "Suíomh Gréasáin Evolution"
 
-#: ../shell/e-shell-window-commands.c:692
-#, fuzzy
-msgid "Error opening the FAQ webpage."
-msgstr "Earráid agus comhad á oscailt"
-
-#: ../shell/e-shell-window-commands.c:888
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
 msgstr "_Oibrigh Ar Líne"
 
-#: ../shell/e-shell-window-commands.c:901 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Oibrigh As Líne"
 
-#: ../shell/e-shell-window-commands.c:914
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
 msgstr "Oibrigh As Líne"
 
-#: ../shell/e-shell-window.c:379
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:372
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
+"Tá Evolution ar líne faoi láthair.\n"
+"Cliceáil ar an gcnaipe seo chun oibriú as líne."
 
-#: ../shell/e-shell-window.c:386
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: ../shell/e-shell-window.c:392
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:386
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
 
-#: ../shell/e-shell-window.c:793
-#, fuzzy, c-format
+#: ../shell/e-shell-window.c:778
+#, c-format
 msgid "Switch to %s"
-msgstr "&Athraigh Go"
+msgstr "Athraigh go %s"
 
-#: ../shell/e-shell.c:640
-msgid "Uknown system error."
+#: ../shell/e-shell.c:634
+msgid "Unknown system error."
 msgstr "Earráid chórais anaithnid."
 
-#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1275 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "Ceart go Leor"
 
-#: ../shell/e-shell.c:1277
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "Argóintí neamhbhailí"
 
-#: ../shell/e-shell.c:1279
+#: ../shell/e-shell.c:1255
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "ní féidir ioctl a dhéanamh ar %s"
 
-#: ../shell/e-shell.c:1281
+#: ../shell/e-shell.c:1257
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Níor aimsíodh comhad cumraíochta \"$1\"."
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "Nua"
 
-#: ../shell/test/evolution-test-component.c:107
-#, fuzzy
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
-msgstr "Nasc &Tástála..."
+msgstr "Tástáil Nua"
 
-#: ../shell/test/evolution-test-component.c:108
-#, fuzzy
+#: ../shell/test/evolution-test-component.c:104
+msgctxt "New"
 msgid "_Test"
-msgstr "Tástáil"
+msgstr "_Tástáil"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:105
 #, fuzzy
 msgid "Create a new test item"
 msgstr "Roghnaigh Cineál na Míre Nuaí"
@@ -19654,11 +20097,10 @@ msgstr "Iompórtáil Suíomh"
 msgid "Importer Type"
 msgstr "Cineál Gnímh"
 
-# FIXME SP?
 #: ../shell/import.glade.h:6
 #, fuzzy
-msgid "Select Importers"
-msgstr "Roghnaigh &Comhaid..."
+msgid "Select Information to Import"
+msgstr "Ní féidir fillteán a chruthú le ríomhphost a iompórtáil isteach ann."
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -19672,7 +20114,7 @@ msgid ""
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:225
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19692,8 +20134,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: ../shell/main.c:249
-#, fuzzy
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19701,69 +20142,47 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: ../shell/main.c:256
+#: ../shell/main.c:257
 #, fuzzy
 msgid "Do not tell me again"
 msgstr "Ná tabhair rabhadh dom arís."
 
-#: ../shell/main.c:306
-#, fuzzy
-msgid "Evolution Crash Recovery"
-msgstr "Athshlánaigh Cúltaca"
-
-#: ../shell/main.c:308
-msgid "Ig_nore"
-msgstr "Tabhair _Neamhaird Air"
-
-#: ../shell/main.c:323
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-
-#: ../shell/main.c:334
-#, fuzzy
-msgid "_Do not show this message again"
-msgstr "Ná taispeáin an teachtaireacht seo arís"
-
-#: ../shell/main.c:554
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: ../shell/main.c:558
+#: ../shell/main.c:491
 #, fuzzy
 msgid "Start in online mode"
 msgstr "T&osaigh sa mhód lánscáileán"
 
-#: ../shell/main.c:561
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr ""
 
-#: ../shell/main.c:565
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: ../shell/main.c:568
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: ../shell/main.c:570
+#: ../shell/main.c:503
 #, fuzzy
 msgid "Disable loading of any plugins."
 msgstr "Breiseáin asbhainteora réamhshocraithe á luchtú.\n"
 
-#: ../shell/main.c:572
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 
-#: ../shell/main.c:601
+#: ../shell/main.c:614
 #, fuzzy
 msgid "- The Evolution PIM and Email Client"
 msgstr "Comhphairt Post Evolution"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19775,35 +20194,40 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr ""
 
 #: ../shell/shell.error.xml.h:2
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Atosaigh Evolution"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Ar Aghaidh"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 #, fuzzy
 msgid "Evolution can not start."
 msgstr "Níorbh fhéidir Evolution a thosú."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 #, fuzzy
 msgid "Insufficient disk space for upgrade."
 msgstr "Níorbh fhéidir an spás diosca infhaighte a fháil amach do: %s"
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 #, fuzzy
 msgid "Really delete old data?"
 msgstr "Níorbh fhéidir na sonraí a scriosadh"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -19816,9 +20240,9 @@ msgid ""
 "without manual intervention.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"The previous version of Evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
 "evolution&quot; directory will be removed permanently. If you choose to keep "
@@ -19826,11 +20250,11 @@ msgid ""
 "evolution&quot; at your convenience.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -19839,14 +20263,14 @@ msgid ""
 "can continue."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
 "Click help for details"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -19855,22 +20279,22 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 #, fuzzy
 msgid "_Forget"
 msgstr "Ná bac leis na hathruithe"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 #, fuzzy
 msgid "_Keep Data"
 msgstr "ná formáidigh é, coimeád na sonraí atá ann"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 #, fuzzy
 msgid "_Remind Me Later"
 msgstr "Cuir i gcuimhne dom i "
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -19878,7 +20302,7 @@ msgid ""
 "data.\n"
 msgstr ""
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19886,7 +20310,7 @@ msgid ""
 "Edit trust settings:"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:150
 #, fuzzy
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
@@ -19897,7 +20321,7 @@ msgstr ""
 "níl muinín agat as fordheimhniú an teastais seo ach amháin má léiríonn tú "
 "anseo é."
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:154
 #, fuzzy
 msgid ""
 "Because you do not trust the certificate authority that issued this "
@@ -19908,94 +20332,99 @@ msgstr ""
 "níl muinín agat as fordheimhniú an teastais seo ach amháin má léiríonn tú a "
 "mhalairt anseo."
 
-#: ../smime/gui/certificate-manager.c:137
-#: ../smime/gui/certificate-manager.c:380
-#: ../smime/gui/certificate-manager.c:604
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 #, fuzzy
 msgid "Select a certificate to import..."
 msgstr "Roghnaigh an Catalóg le hIompórtáil"
 
-#: ../smime/gui/certificate-manager.c:146
+#: ../smime/gui/certificate-manager.c:145
 msgid "All PKCS12 files"
 msgstr "Gach comhad PKCS12"
 
 #: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:394
-#: ../smime/gui/certificate-manager.c:618
+#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:625
 msgid "All files"
 msgstr "Gach comhad"
 
-#: ../smime/gui/certificate-manager.c:271
-#: ../smime/gui/certificate-manager.c:480
-#: ../smime/gui/certificate-manager.c:702
+#: ../smime/gui/certificate-manager.c:275
+#: ../smime/gui/certificate-manager.c:488
+#: ../smime/gui/certificate-manager.c:713
 msgid "Certificate Name"
 msgstr "Ainm Teastais"
 
-#: ../smime/gui/certificate-manager.c:280
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 #, fuzzy
 msgid "Purposes"
 msgstr "Aidhmeanna"
 
-#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 #, fuzzy
 msgid "Serial Number"
 msgstr "Sraithuimhir"
 
-#: ../smime/gui/certificate-manager.c:297
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr "As feidhm"
 
-#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:392
 #, fuzzy
 msgid "All email certificate files"
 msgstr ""
 "*.kat|Comhaid Katalog\n"
 "*|Gach Comhad"
 
-#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr "Seoladh Ríomhphoist:"
 
-#: ../smime/gui/certificate-manager.c:613
+#: ../smime/gui/certificate-manager.c:620
 #, fuzzy
 msgid "All CA certificate files"
 msgstr ""
 "*.kat|Comhaid Katalog\n"
 "*|Gach Comhad"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Amharcán Teastais: %s"
 
+#: ../smime/gui/component.c:46
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Iontráil an focal faire le `%s'"
+
 #. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
 #, fuzzy
 msgid "Enter new password for certificate database"
 msgstr "Iontráil an focal faire nua do <b>%1</b>, le do thoil:"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Iontráil focal faire nua"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:117
 #, fuzzy, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr "Cliceáil chun sórtáil de réir ábhair"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, fuzzy, c-format
 msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr "CRL Eisithe ag:"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Roghnaigh teastas"
 
@@ -20063,7 +20492,7 @@ msgstr ""
 "Sula gcuireann tú muinín san údarás deimhniúcháin seo, ba cheart duit a "
 "theastas, a pholasaithe agus a mhodhanna oibre a scrúdú má tá fáil orthu."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "Teastas"
 
@@ -20151,12 +20580,12 @@ msgstr "Aonad an Eagrais (Organizational Unit, OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Méarlorg SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
 #, fuzzy
 msgid "SSL Client Certificate"
 msgstr "Teastas cliaint SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
 #, fuzzy
 msgid "SSL Server Certificate"
 msgstr "Teastas freastalaí SSL"
@@ -20212,215 +20641,209 @@ msgid "_Edit CA Trust"
 msgstr "Cuir socruithe muiníne do theastais na nÚdarás Deimhniúcháin in eagar"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:652
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Tá an teastas ann cheana."
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "Sínigh"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "Criptigh"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "Leagan"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "Leagan 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "Leagan 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "Leagan 3"
 
-#: ../smime/lib/e-cert.c:634
-#, fuzzy
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "MD2 de réir PKCS #1 le criptiúchán RSA"
+msgstr "Criptiú PKCS #1 MD2 le RSA"
 
-#: ../smime/lib/e-cert.c:637
-#, fuzzy
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "MD5 de réir PKCS #1 le criptiúchán RSA"
+msgstr "Criptiú PKCS #1 MD5 le RSA"
 
-#: ../smime/lib/e-cert.c:640
-#, fuzzy
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "SHA-1 de réir PKCS #1 le criptiúchán RSA"
+msgstr "Criptiú PKCS #1 SHA-1 le RSA"
 
-#: ../smime/lib/e-cert.c:667
-#, fuzzy
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
-msgstr "Criptiúchán RSA de réir PKCS #1"
+msgstr "Criptiú PKCS #1 RSA"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:652
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Úsáid Eochrach an Teastais"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:655
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "Cineál teastais Netscape"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:658
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Aitheantóir Eochrach na nÚdarás Deimhniúcháin"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:670
 #, fuzzy, c-format
 msgid "Object Identifier (%s)"
 msgstr "Aitheantóir an Réada"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:720
 #, fuzzy
 msgid "Algorithm Identifier"
 msgstr "Aitheantóir an Algartaim"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:728
 #, fuzzy
 msgid "Algorithm Parameters"
 msgstr "Paraiméadair an Algartaim"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:750
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr "Faisnéis maidir le heochair phoiblí an aonáin ainmnithe"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:755
 #, fuzzy
 msgid "Subject Public Key Algorithm"
 msgstr "Algartam eochrach poiblí an aonáin ainmnithe"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:770
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Eochair phoiblí an aonáin ainmnithe"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Earráid: ní féidir an eisínteacht a phróiseáil"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 #, fuzzy
 msgid "Object Signer"
 msgstr "Sínitheoir na Réad"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:816
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Údarás na dTeastas SSL"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:820
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Údarás na dTeastas Ríomhphoist"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "Á Shíniú"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:852
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Neamhdhiúltú"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:856
 #, fuzzy
 msgid "Key Encipherment"
 msgstr "Criptiúchán na n-eochracha"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:860
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "Criptiúchán na sonraí"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:864
 #, fuzzy
 msgid "Key Agreement"
 msgstr "Comhaontas Eochrach"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:868
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Sínitheoir na dteastas"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:872
 #, fuzzy
 msgid "CRL Signer"
 msgstr "Sínitheoir LTC"
 
 # PK
-#: ../smime/lib/e-cert.c:939
-#, fuzzy
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "Criticiúil"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
-#, fuzzy
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "Neamh-Chriticiúil"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "Eisínteachtaí"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Algartam Sínithe Teastais"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1081
 #, fuzzy
 msgid "Issuer"
 msgstr "Eisithe ag"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1135
 #, fuzzy
 msgid "Issuer Unique ID"
 msgstr "Aitheantas uathúil an eisitheora"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1154
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Aitheantas Uathúil an aonáin ainmnithe"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1197
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Luach Sínithe Teastais"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 #, fuzzy
 msgid "PKCS12 File Password"
 msgstr "Tabhair an focal faire i gcomhad"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Iontráil ainm úsáideora agus focal faire do %1$S"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:348
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "Teastas arna iompórtáil"
@@ -20456,14 +20879,14 @@ msgstr "Cói_peáil Gach Teagmháil Go..."
 msgid "Contact _Preview"
 msgstr "_Réamhamharc Teagmhála"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Cóipeáil"
 
 #: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy Selected Contacts to Another Folder..."
+#, fuzzy
+msgid "Copy selected contacts to another folder"
 msgstr "Cóipeáil Teagmhálacha Roghnaithe go Fillteán Eile..."
 
 #: ../ui/evolution-addressbook.xml.h:8
@@ -20481,11 +20904,10 @@ msgstr "Cóipeáil go Fillteán..."
 
 #: ../ui/evolution-addressbook.xml.h:11
 #, fuzzy
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "Cruthaigh Fillteán Nua Leabharmharcanna"
 
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Gearr"
@@ -20517,7 +20939,7 @@ msgstr "Bog Gach _Teagmháil Go..."
 
 #: ../ui/evolution-addressbook.xml.h:20
 #, fuzzy
-msgid "Move Selected Contacts to Another Folder..."
+msgid "Move selected contacts to another folder"
 msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 
 #: ../ui/evolution-addressbook.xml.h:21
@@ -20529,8 +20951,7 @@ msgstr "Post an sceál seo"
 msgid "Move to Folder..."
 msgstr "Bog go Fillteán..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Greamaigh"
@@ -20562,7 +20983,8 @@ msgid "Save as VCard..."
 msgstr "Sábháil mar VCard..."
 
 #: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard."
+#, fuzzy
+msgid "Save selected contacts as a VCard"
 msgstr "Sábháil teagmhálacha roghnaithe mar VCard."
 
 #: ../ui/evolution-addressbook.xml.h:33
@@ -20570,13 +20992,11 @@ msgstr "Sábháil teagmhálacha roghnaithe mar VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Sábháil an tadhallaí seo mar VCard."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2715
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "Roghnaigh Gach Rud"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Roghnaigh _Gach rud"
 
@@ -20586,7 +21006,7 @@ msgstr "Roghnaigh gach teagmháil"
 
 #: ../ui/evolution-addressbook.xml.h:37
 #, fuzzy
-msgid "Send a message to the selected contacts."
+msgid "Send a message to the selected contacts"
 msgstr "Brúigh anseo chun an teachtaireacht a sheoladh"
 
 #: ../ui/evolution-addressbook.xml.h:38
@@ -20594,7 +21014,8 @@ msgid "Send message to contact"
 msgstr "Seol teachtaireacht chuig teagmháil"
 
 #: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person."
+#, fuzzy
+msgid "Send selected contacts to another person"
 msgstr "Seol teagmhálacha roghnaithe chuig duine eile."
 
 #: ../ui/evolution-addressbook.xml.h:40
@@ -20620,7 +21041,7 @@ msgstr "Stop an Luchtú"
 msgid "View the current contact"
 msgstr "Amharc ar Cheamara Gréasáin na Teagmhála"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_Gníomhartha"
@@ -20652,7 +21073,7 @@ msgstr "_Bog Teagmháil go..."
 msgid "_Move Folder Contacts To"
 msgstr "Bog Teachtaireachtaí go Fillteán"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nua"
 
@@ -20716,7 +21137,7 @@ msgid "Month"
 msgstr "Mí"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Ar Aghaidh"
 
@@ -20725,8 +21146,8 @@ msgstr "Ar Aghaidh"
 msgid "Previews the calendar to be printed"
 msgstr "Roghnaigh na míreanna atá le priontáil"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Siar"
 
@@ -20784,266 +21205,26 @@ msgstr "Taispeáin lá den tseachtain."
 msgid "View the current appointment"
 msgstr "Feach an coinne reatha"
 
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Week"
 msgstr "Seachtain"
 
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:38
 msgid "Work Week"
 msgstr "Seachtain Oibre"
 
-#: ../ui/evolution-calendar.xml.h:42
-msgid "_Open Appointment"
-msgstr "_Oscail Coinne"
-
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Cóipeáil téacs roghnaithe go dtí an gearrthaisce"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-#, fuzzy
-msgid "Copy selection to clipboard"
-msgstr "Roghnúchán á chóipeáil go dtí an gearrthaisce..."
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-#, fuzzy
-msgid "Cut selected text to the clipboard"
-msgstr "Déan cóip den téacs roghnaithe sa ghearrthaisce."
-
-#: ../ui/evolution-composer-entries.xml.h:7
-#, fuzzy
-msgid "Cut selection to clipboard"
-msgstr "Roghnúchán á chóipeáil go dtí an gearrthaisce..."
-
-#: ../ui/evolution-composer-entries.xml.h:9
-#, fuzzy
-msgid "Paste from clipboard"
-msgstr "Greamaigh ón ngearrthaisce"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
 #, fuzzy
-msgid "Paste text from the clipboard"
-msgstr "Uathghreamaigh ón ghearrthaisce"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Roghnaigh gach teacs"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Ceangail"
-
-#: ../ui/evolution-editor.xml.h:2
-#, fuzzy
-msgid "Click here to attach a file"
-msgstr "Cliceáil anseo chun cineál nua comhaid a chur leis."
-
-#: ../ui/evolution-editor.xml.h:3
-#, fuzzy
-msgid "Click here to close the current window"
-msgstr "Cliceáil anseo chun an clár reatha logo a atosú."
-
-#: ../ui/evolution-editor.xml.h:4
-#, fuzzy
-msgid "Click here to save the current window"
-msgstr "Cliceáil anseo chun an clár reatha logo a atosú."
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Cliceáil anseo chun amharc ar cabhair ar fáil"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Dún"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Io_nsáigh"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_Iatán..."
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_Dún"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Comhad"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "Cab_hair"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Roghanna"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Teagmhas an Lá ar Fad"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Teagmhas an _Lá ar Fad"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-#, fuzzy
-msgid "Classify as Confidential"
-msgstr "Aicmigh mar dhramhphost"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-#, fuzzy
-msgid "Classify as Private"
-msgstr "Úsáid mar Príobháideach"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-#, fuzzy
-msgid "Classify as public"
-msgstr "Aicmigh mar dhramhphost"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-#, fuzzy
-msgid "Insert advanced send options"
-msgstr "Roghanna Seolta agus HTML"
-
-#: ../ui/evolution-event-editor.xml.h:10
-#, fuzzy
-msgid "Make this a recurring event"
-msgstr "Is príobháideach é an t-imeacht seo."
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Poi_blí"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr ""
-
-# FI
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-#, fuzzy
-msgid "R_ole Field"
-msgstr "Réimse Anaithnid"
-
-#: ../ui/evolution-event-editor.xml.h:16
-#, fuzzy
-msgid "Send _Options"
-msgstr "&Roghanna Seolta..."
-
-#: ../ui/evolution-event-editor.xml.h:17
-#, fuzzy
-msgid "Show time as _busy"
-msgstr "Taispeáin colúi&n mar uimhreacha"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "_Crios Ama"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Aláraim"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Catagóirí"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-#, fuzzy
-msgid "_Classification"
-msgstr "Aicmiú:"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-#, fuzzy
-msgid "_Confidential"
-msgstr "Faoi Rún"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Saor/Gnóthach"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Príobháideach"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-#, fuzzy
-msgid "_Recurrence"
-msgstr "Ata&rlú"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-#, fuzzy
-msgid "_Status Field"
-msgstr "Réimse Anaithnid"
+msgid "_Debug Logs"
+msgstr "Logchomhad Gréasáin &CUPS"
 
-# FI
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-#, fuzzy
-msgid "_Type Field"
-msgstr "Cineál an Réimse"
+#: ../ui/evolution-calendar.xml.h:45
+msgid "_Open Appointment"
+msgstr "_Oscail Coinne"
 
 #: ../ui/evolution-mail-global.xml.h:2
 #, fuzzy
@@ -21061,9 +21242,8 @@ msgid "Create a new folder for storing mail"
 msgstr "Cruthaigh féilire nua"
 
 #: ../ui/evolution-mail-global.xml.h:5
-#, fuzzy
 msgid "Create or edit Search Folder definitions"
-msgstr "Earraidh ag lódáil leabharsheoladh loicead."
+msgstr ""
 
 #: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
@@ -21078,7 +21258,6 @@ msgid "Empty _Trash"
 msgstr "Folmhaigh _Bruscar"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Fillteán"
 
@@ -21119,10 +21298,6 @@ msgstr "Taispeáin &teachtaireacht i bpreabfhuinneog"
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr ""
-
 #: ../ui/evolution-mail-global.xml.h:20
 #, fuzzy
 msgid "_Classic View"
@@ -21132,11 +21307,6 @@ msgstr "Amharc &Clasaiceach"
 msgid "_Copy Folder To..."
 msgstr "_Cóipeáil Fillteán Go..."
 
-#: ../ui/evolution-mail-global.xml.h:22
-#, fuzzy
-msgid "_Debug Logs"
-msgstr "Logchomhad Gréasáin &CUPS"
-
 #: ../ui/evolution-mail-global.xml.h:23
 #, fuzzy
 msgid "_Download Messages for Offline Usage"
@@ -21164,7 +21334,7 @@ msgstr "_Réamhamharc"
 #.
 #: ../ui/evolution-mail-global.xml.h:32
 #, fuzzy
-msgid "_Subscriptions"
+msgid "_Subscriptions..."
 msgstr "Síntiúis"
 
 #: ../ui/evolution-mail-global.xml.h:33
@@ -21261,10 +21431,6 @@ msgstr ""
 msgid "Permanently remove this folder"
 msgstr "Is fillteán poiblí é seo."
 
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh..."
-msgstr "_Athnuaigh..."
-
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "Athnuaigh an fillteán"
@@ -21330,7 +21496,7 @@ msgstr "Liosta &snáithithe teachtaireachtaí"
 msgid "_Group By Threads"
 msgstr "Grúpáil de réir &Suímh"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Teachtaireacht"
@@ -21634,617 +21800,278 @@ msgstr "Uathghreamaigh ón ghearrthaisce"
 
 #: ../ui/evolution-mail-message.xml.h:68
 #, fuzzy
-msgid "Pos_t New Message to Folder"
-msgstr "Ní féidir fillteán nua a chruthú"
-
-#: ../ui/evolution-mail-message.xml.h:69
-#, fuzzy
-msgid "Post a Repl_y"
-msgstr "Ion&adaigh"
-
-#: ../ui/evolution-mail-message.xml.h:70
-#, fuzzy
-msgid "Post a message to a Public folder"
-msgstr "Ní féidir teachtaireacht a chur leis an fhillteán %1 i KMail"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr ""
-
-#: ../ui/evolution-mail-message.xml.h:72
-#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Liosta Teachtaireachtaí - Teachtaireachtaí Tábhachtacha"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Roghnaigh na míreanna atá le priontáil"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "Clodaigh scéal seo"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Re_direct"
 msgstr "Nasc díreach"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "Save the selected messages as a text file"
 msgstr "Post an sceál seo"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Search Folder from Mailing _List..."
 msgstr "líosta ríomhphost %s"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Search Folder from Recipien_ts..."
 msgstr "Freagraí do %s"
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "Search Folder from S_ubject..."
 msgstr "Oscail Íomhánna Ó Fhillteán"
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Search Folder from Sen_der..."
 msgstr "Cruthaigh Fillteán _Fhíorúil ó Cuardach..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "Select _All Text"
 msgstr "Roghnaigh Téacs Uile"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "Select all the text in a message"
 msgstr "Comment=Taispeáin Teachtaireacht Téacs i bPreabfhuinneog"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:95
-#, fuzzy
-msgid "Show messages in the normal style"
-msgstr "Taispeáin stampaí ama i dteachtaireachtaí comhrá"
-
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "Undelete the selected messages"
 msgstr "&Scrios Teachtaireachtaí Roghnaithe"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "Neamhthabachtach"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "Súmáil _Amach"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "_Ceangailte"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "_Caret Mode"
 msgstr "Scoránaigh Mód Carait"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "_Glan Bratach"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "_Scrios Teachtaireacht"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Find in Message..."
 msgstr "C&uardaigh sa Teachtaireacht Seo..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Flag Completed"
 msgstr "Cuardach críochnaithe."
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Téigh Go"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "_Tábhachtach"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "_Inlíne"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "_Dramhphost"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "_Luchtaigh Íomhánna"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "Foinse _Theachtaireachta"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "An Chéad Teachtaireacht _Eile"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "G_náthmhéid"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "_Post Ceart"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "_Oscail i bhFuinneog Nua"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "Teachtaireacht _Roimhe Seo"
 
-#: ../ui/evolution-mail-message.xml.h:125
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
-msgstr "Teachtaireacht athfhriotail san áireamh..."
+msgstr "_Athfhriotail"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:122
+msgid "_Read"
+msgstr "_Léigh"
+
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "_Sábháil Teachtaireacht..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "_Díscrios Teachtaireacht"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
-msgstr "Gan _léamh"
+msgstr "Gan _Léamh"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "_Súmáil"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "_Súmáil Isteach"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Dún an fhuinneog seo"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Dún"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
-msgstr "Príomhbharra Uirlisí"
+msgstr "Príomhbharra uirlisí"
 
 #: ../ui/evolution-memos.xml.h:3
-#, fuzzy
 msgid "Copy selected memo"
-msgstr "Scrios an meamram roghnaithe."
+msgstr "Cóipeáil meamram roghnaithe"
 
 #: ../ui/evolution-memos.xml.h:5
-#, fuzzy
 msgid "Cut selected memo"
-msgstr "Scrios an meamram roghnaithe."
+msgstr "Gearr meamram roghnaithe"
 
 #: ../ui/evolution-memos.xml.h:7
-#, fuzzy
 msgid "Delete selected memos"
-msgstr "Scrios na comhaid roghnaithe"
+msgstr "Scrios meamraim roghnaithe"
 
 #: ../ui/evolution-memos.xml.h:9
-#, fuzzy
 msgid "Paste memo from the clipboard"
-msgstr "Uathghreamaigh ón ghearrthaisce"
+msgstr "Greamaigh meamram ón ngearrthaisce"
 
 #: ../ui/evolution-memos.xml.h:10
 msgid "Previews the list of memos to be printed"
 msgstr ""
 
 #: ../ui/evolution-memos.xml.h:13
-#, fuzzy
 msgid "Print the list of memos"
-msgstr " ?             Priontáil an liosta seo\n"
+msgstr "Priontáil liosta meamram"
 
 #: ../ui/evolution-memos.xml.h:14
-#, fuzzy
 msgid "View the selected memo"
-msgstr "Scrios an meamram roghnaithe."
+msgstr "Amharc ar an meamram roghnaithe"
 
 #: ../ui/evolution-memos.xml.h:18
 msgid "_Open Memo"
 msgstr "_Oscail Meamram"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Ceangail comhad"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-#, fuzzy
-msgid "Close the current file"
-msgstr "Féach ar an gcomhad reatha"
-
-#: ../ui/evolution-message-composer.xml.h:5
-#, fuzzy
-msgid "Delete all but signature"
-msgstr "Scrios gach ró roghnaithe?"
-
-#: ../ui/evolution-message-composer.xml.h:6
-#, fuzzy
-msgid "Encrypt this message with PGP"
-msgstr "Ná Criptigh Leis an Eochair Seo Riamh"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "_Formáid"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-#, fuzzy
-msgid "Insert Send options"
-msgstr "Roghanna Seolta agus HTML"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "Oscail comhad"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "Criptigh le PGP"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "Sínigh le PGP"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "_Criptigh le PGP"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "_Sínigh le PGP"
-
-#: ../ui/evolution-message-composer.xml.h:19
-#, fuzzy
-msgid "R_equest Read Receipt"
-msgstr "Nuair a thagann admháil léite:"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "_Criptigh le S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "Criptigh le S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "_Sínigh le S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "Sínigh le S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "_Seol"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "Sábháil Mar"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "Sábháil Dréacht"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "Sábháil _Mar..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "Sábháil _Dréacht"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Sábháil mar dréacht"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "Sábháil i bhfillteán..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-#, fuzzy
-msgid "Save the current file"
-msgstr "Uath &choimeád gach comhad reatha"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:34
-#, fuzzy
-msgid "Save the message in a specified folder"
-msgstr "Ní féidir teachtaireacht a chur leis an fhillteán %1 i KMail"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "Seol"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Seol an post san fhormáid HTML"
-
-#: ../ui/evolution-message-composer.xml.h:37
-#, fuzzy
-msgid "Send this message"
-msgstr "Seol an teachtaireacht seo"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:48
-#, fuzzy
-msgid "_Bcc Field"
-msgstr "Cuir leis an réimse 'Bcc'"
-
-#: ../ui/evolution-message-composer.xml.h:49
-#, fuzzy
-msgid "_Cc Field"
-msgstr "Cuir leis an réimse 'Cc'"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "_Dealaigh gach rud"
-
-#: ../ui/evolution-message-composer.xml.h:54
-#, fuzzy
-msgid "_From Field"
-msgstr "cuir an réimse \"Ó\" in eagar\""
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "_Oscail..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-#, fuzzy
-msgid "_Post-To Field"
-msgstr "Meaitseálann an réimse:"
-
-#: ../ui/evolution-message-composer.xml.h:57
-#, fuzzy
-msgid "_Prioritize Message"
-msgstr "Seol &Teachtaireacht..."
-
-#: ../ui/evolution-message-composer.xml.h:58
-#, fuzzy
-msgid "_Reply-To Field"
-msgstr "cuir an réimse \"Reply-To\" in eagar"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "_Slándáil"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-#, fuzzy
-msgid "_Send Options"
-msgstr "&Roghanna Seolta..."
-
-# FI
-#: ../ui/evolution-message-composer.xml.h:62
-#, fuzzy
-msgid "_To Field"
-msgstr "Meaitseálann an réimse:"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Dún"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Sábháil agus Dún"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Sábháil agus _Dún"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr ""
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr ""
-
-#: ../ui/evolution-subscribe.xml.h:3
-#, fuzzy
-msgid "Refresh List"
-msgstr "Athnuaigh an Liosta"
-
-#: ../ui/evolution-subscribe.xml.h:4
-#, fuzzy
-msgid "Refresh List of Folders"
-msgstr "Athnuaigh liosta na gclibeanna"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr ""
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Liostáil"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Díliostáil"
-
-#: ../ui/evolution-subscribe.xml.h:12
-#, fuzzy
-msgid "_Invert Selection"
-msgstr "&Inbhéartaigh an Rogha"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr ""
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Sonraí Stádais"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Crios Ama"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Sonraí _Stádais"
-
 #: ../ui/evolution-tasks.xml.h:3
-#, fuzzy
 msgid "Copy selected tasks"
-msgstr "Scrios na Tascanna Roghnaithe"
+msgstr "Cóipeáil tascanna roghnaithe"
 
 #: ../ui/evolution-tasks.xml.h:5
-#, fuzzy
 msgid "Cut selected tasks"
-msgstr "Scrios na Tascanna Roghnaithe"
+msgstr "Gearr tascanna roghnaithe"
 
 #: ../ui/evolution-tasks.xml.h:7
-#, fuzzy
 msgid "Delete completed tasks"
-msgstr "Folaigh Tascanna Críochnaithe"
+msgstr "Scrios tascanna críochnaithe"
 
 #: ../ui/evolution-tasks.xml.h:8
-#, fuzzy
 msgid "Delete selected tasks"
-msgstr "Scrios na Tascanna Roghnaithe"
+msgstr "Scrios tascanna roghnaithe"
 
 #: ../ui/evolution-tasks.xml.h:9
-#, fuzzy
 msgid "Mar_k as Complete"
-msgstr "&Marcáil \"Críochnaithe\""
+msgstr "_Marcáil mar Chríochnaithe"
 
 #: ../ui/evolution-tasks.xml.h:10
-#, fuzzy
 msgid "Mark selected tasks as complete"
-msgstr "Marcáil an t-alt roghnaithe mar léite"
+msgstr "Marcáil tascanna roghnaithe mar chríochnaithe"
 
 #: ../ui/evolution-tasks.xml.h:12
-#, fuzzy
 msgid "Paste tasks from the clipboard"
-msgstr "Uathghreamaigh ón ghearrthaisce"
+msgstr "Greamaigh tascanna ón ngearrthaisce"
 
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr ""
 
 #: ../ui/evolution-tasks.xml.h:16
-#, fuzzy
 msgid "Print the list of tasks"
-msgstr "Leathnaigh liosta tascanna"
+msgstr "Priontáil an liosta tascanna"
 
 #: ../ui/evolution-tasks.xml.h:18
-#, fuzzy
 msgid "Show task preview window"
-msgstr "Oscail an fhuinneog réamhamhairc priontála"
+msgstr "Taispeáin fuinneog réamhamhairc taisc"
 
 #: ../ui/evolution-tasks.xml.h:19
 msgid "Task _Preview"
@@ -22263,19 +22090,16 @@ msgid "About Evolution..."
 msgstr "Maidir le Evolution..."
 
 #: ../ui/evolution.xml.h:2
-#, fuzzy
 msgid "Change Evolution's settings"
-msgstr "Athraigh Socruithe Gan Fiafraí"
+msgstr "Athraigh socruithe Evolution"
 
 #: ../ui/evolution.xml.h:3
-#, fuzzy
 msgid "Change the visibility of the toolbar"
-msgstr "Cumasaigh/díchumasaigh barra na n-uirlisí"
+msgstr ""
 
 #: ../ui/evolution.xml.h:5
-#, fuzzy
 msgid "Create a new window displaying this folder"
-msgstr "Brúigh an cnaipe seo chun fillteán nua a chruthú."
+msgstr ""
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
@@ -22295,7 +22119,7 @@ msgstr ""
 
 #: ../ui/evolution.xml.h:10
 msgid "Evolution _FAQ"
-msgstr "_FAQ Evolution"
+msgstr "CC_anna Evolution"
 
 #: ../ui/evolution.xml.h:11
 msgid "Exit the program"
@@ -22306,9 +22130,8 @@ msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
 #: ../ui/evolution.xml.h:13
-#, fuzzy
 msgid "Hide window buttons"
-msgstr "Taispeáin cnaipí folú"
+msgstr "Folaigh cnaipí fuinneoige"
 
 #: ../ui/evolution.xml.h:14
 msgid "I_mport..."
@@ -22319,9 +22142,8 @@ msgid "Icons _and Text"
 msgstr "Deilbhíní _agus Téacs"
 
 #: ../ui/evolution.xml.h:16
-#, fuzzy
 msgid "Import data from other programs"
-msgstr "Iompórtáil sonraí tábla as chomhad"
+msgstr "Iompórtáil sonraí ó chláir eile"
 
 #: ../ui/evolution.xml.h:17
 msgid "Lay_out"
@@ -22372,9 +22194,8 @@ msgid "Show _Toolbar"
 msgstr "Taispeáin Barra _Uirlisí"
 
 #: ../ui/evolution.xml.h:31
-#, fuzzy
 msgid "Show information about Evolution"
-msgstr "Eolas Faoin Fhuinneog Roghnaithe"
+msgstr "Taispeáin eolas faoi Evolution"
 
 #: ../ui/evolution.xml.h:32
 msgid "Submit Bug Report"
@@ -22397,64 +22218,62 @@ msgid "Tool_bar Style"
 msgstr "Stíl _Bharra Uirlisí"
 
 #: ../ui/evolution.xml.h:37
-#, fuzzy
 msgid "View/Hide the Side Bar"
-msgstr "Folaigh an colún."
+msgstr ""
 
 #: ../ui/evolution.xml.h:38
-#, fuzzy
 msgid "View/Hide the Status Bar"
-msgstr "Taispeáin nó folaigh an treobarra"
+msgstr ""
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Oibrigh _As Líne"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_Maidir Leis Seo"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Dún Fuinneog"
 
-#: ../ui/evolution.xml.h:43
-#, fuzzy
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
-msgstr "Name=Focail Fhaire"
+msgstr ""
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr ""
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Folaigh Cnaipí"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "_Deilbhíní Amháin"
 
-#: ../ui/evolution.xml.h:49
-#, fuzzy
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
-msgstr "Earráid tagartha"
+msgstr ""
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Scoir"
 
-#: ../ui/evolution.xml.h:51
-#, fuzzy
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
-msgstr "Name=Cuma"
+msgstr ""
 
-#: ../ui/evolution.xml.h:52
-#, fuzzy
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
-msgstr "Roghanna Beochana"
+msgstr ""
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "_Téacs Amháin"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Fuinneog"
 
@@ -22487,9 +22306,8 @@ msgid "_Work Week View"
 msgstr "Amharc Seachtain _Oibre"
 
 #: ../views/mail/galview.xml.h:1
-#, fuzzy
 msgid "As Sent Folder for Wi_de View"
-msgstr "Mar Fillteán Seolta"
+msgstr ""
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
@@ -22508,14 +22326,12 @@ msgid "By Su_bject"
 msgstr "Mar _Ábhar"
 
 #: ../views/mail/galview.xml.h:6
-#, fuzzy
 msgid "By _Follow Up Flag"
-msgstr "Clóigh leanúint anseo"
+msgstr ""
 
 #: ../views/mail/galview.xml.h:7
-#, fuzzy
 msgid "For _Wide View"
-msgstr "Féach tuairiscí ar $a iarracht"
+msgstr ""
 
 #: ../views/mail/galview.xml.h:8
 msgid "_Messages"
@@ -22533,12 +22349,12 @@ msgstr "Le Sprioc_dháta"
 msgid "With _Status"
 msgstr "Le _Stádas"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:213
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:408
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:410
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:759
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
 msgid "UTC"
 msgstr "AUL"
 
@@ -22555,9 +22371,8 @@ msgid "Select a Time Zone"
 msgstr "Roghnaigh Crios Ama"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-#, fuzzy
-msgid "TimeZone Combobox"
-msgstr "Bosca Teaglama"
+msgid "Timezone drop-down combination box"
+msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -22566,40 +22381,38 @@ msgid ""
 "Use the right mouse button to zoom out."
 msgstr ""
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
-#: ../widgets/menus/gal-define-views-model.c:186
+#: ../widgets/menus/gal-define-views-dialog.c:74
+#: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Bailiúchán"
 
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Define Views for %s"
-msgstr "Roghnaigh Ainm ar an Raon"
+msgstr ""
 
-#: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
-#, fuzzy
+#: ../widgets/menus/gal-define-views-dialog.c:364
+#: ../widgets/menus/gal-define-views-dialog.c:366
 msgid "Define Views"
-msgstr "&Amhairc Uirlisí"
+msgstr ""
 
 #: ../widgets/menus/gal-define-views.glade.h:2
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Define Views for \"%s\""
-msgstr "Roghnaigh Ainm ar an Raon"
+msgstr ""
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tábla"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "Ásc"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "Sábháil Amharc Reatha"
 
@@ -22608,67 +22421,60 @@ msgid "_Create new view"
 msgstr "_Cruthaigh amharc nua"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
-#, fuzzy
 msgid "_Replace existing view"
-msgstr "Asáitigh na leabharlanna atá ann"
+msgstr ""
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:354
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "Sainradharc"
 
-#: ../widgets/menus/gal-view-instance.c:583
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "Sábháil Amharc Féindheanamh"
 
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:378
-#, fuzzy
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
-msgstr "&Amhairc Uirlisí"
+msgstr ""
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:304
 msgid "C_urrent View"
 msgstr "Amharc _Reatha"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "Roghnaigh Amharc: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
-#, fuzzy
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
-msgstr "Is folamh é an fillteán reatha."
+msgstr "Is amharc saincheaptha é an t-amharc reatha"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
-msgstr "Sábháil Amharc Féindheanamh..."
+msgstr "Sábháil Amharc Saincheaptha..."
 
-#: ../widgets/menus/gal-view-menus.c:369
-#, fuzzy
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
-msgstr "Dún an t-amharc reatha cáipéise"
+msgstr "Sábháil amharc saincheaptha reatha"
 
-#: ../widgets/menus/gal-view-menus.c:383
-#, fuzzy
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
-msgstr "Cruthaigh nó Roghnaigh Cluiche monopd"
+msgstr "Cruthaigh amhairc nó cuir iad in eagar"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "Monarcha"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
-#, fuzzy
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
-msgstr "Dearadh Nua &Amhairc"
+msgstr ""
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#, fuzzy
 msgid "Name of new view:"
-msgstr "Dearadh Nua &Amhairc"
+msgstr "Ainm an amhairc nua:"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Type of View"
@@ -22678,354 +22484,390 @@ msgstr "Cineál Amhairc"
 msgid "Type of view:"
 msgstr "Cineál amhairc:"
 
-#: ../widgets/misc/e-attachment-bar.c:1029
-msgid "Attachment Bar"
-msgstr "Barra Iatán"
+#: ../widgets/misc/e-attachment.c:990
+msgid "Attached message"
+msgstr ""
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:636
+msgid "attachment.dat"
+msgstr "iatán.dat"
+
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr ""
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:507 ../widgets/misc/e-attachment.c:524
+#: ../widgets/misc/e-attachment.c:1923
 #, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Ní féidir an comhad %s a cheangail: %s"
+msgid "Could not load '%s'"
+msgstr "Níorbh fhéidir '%s' a luchtú"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:516
-#, fuzzy, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "níorbh fhéidir %s a chur in eagar: ní gnáthchomhad é"
+#: ../widgets/misc/e-attachment.c:1926
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Níorbh fhéidir an t-iatán a luchtú"
+
+#: ../widgets/misc/e-attachment.c:2190
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Níorbh fhéidir '%s' a oscailt"
+
+#: ../widgets/misc/e-attachment.c:2193
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Níorbh fhéidir an t-iatán a oscailt"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-attachment.c:2635
+msgid "Attachment contents not loaded"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:2712
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Níorbh fhéidir '%s' a shábháil"
+
+#: ../widgets/misc/e-attachment.c:2715
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Níorbh fhéidir an t-iatán a shábháil"
+
+#: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Airíonna Iatáin"
 
-# vi
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Ainm chomhaid:"
+#: ../widgets/misc/e-attachment-dialog.c:328
+msgid "_Filename:"
+msgstr "A_inm Comhaid:"
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
+#: ../widgets/misc/e-attachment-dialog.c:363
+msgid "MIME Type:"
 msgstr "Cineál MIME:"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
+#: ../widgets/misc/e-attachment-handler-image.c:95
+msgid "Could not set as background"
+msgstr ""
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+msgid "_Send To..."
+msgstr "_Seol Chuig..."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+msgid "Send the selected attachments somewhere"
+msgstr ""
+
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+msgid "Loading"
+msgstr "Á Luchtú"
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+msgid "Saving"
+msgstr "Á Shábháil"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide _Attachment Bar"
 msgstr ""
 
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show _Attachment Bar"
+msgstr ""
+
+#: ../widgets/misc/e-attachment-store.c:541
+msgid "Add Attachment"
+msgstr "Cuir Iatán Leis"
+
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "_Ceangail"
+
+#: ../widgets/misc/e-attachment-store.c:607
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "Sábháil G_ach Rud"
+
+#: ../widgets/misc/e-attachment-view.c:326
+msgid "A_dd Attachment..."
+msgstr ""
+
+#: ../widgets/misc/e-attachment-view.c:643
+#, c-format
+msgid "Open with \"%s\""
+msgstr "Oscail le \"%s\""
+
+#: ../widgets/misc/e-attachment-view.c:646
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "Oscail an t-iatán seo i %s"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1724
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "Féilire Míosa"
 
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3635
-#: ../widgets/text/e-text.c:3636
-#, fuzzy
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
-msgstr "Dath an líonta"
+msgstr ""
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651
-#, fuzzy
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
-msgstr "Athraigh Dath an Líonta"
+msgstr ""
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
-#, fuzzy
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
-msgstr "Leibhéal Líonta"
+msgstr ""
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:488
 #: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:495
 #: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:502
 #: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3014
-#, fuzzy
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:649
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
-msgstr "Íosleithead"
+msgstr ""
 
-#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3015
-#, fuzzy
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-leaf.c:650
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
-msgstr "Íosleithead:"
+msgstr ""
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "Spásáil"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "Anois"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
-#, fuzzy, c-format
+#: ../widgets/misc/e-cell-date-edit.c:846
+#, c-format
 msgid "The time must be in the format: %s"
-msgstr "Ní mór duit an paschód a líonadh isteach!"
+msgstr ""
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
-msgstr "Araibis"
+msgstr "Arabach"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltach"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Lár-Eorpach"
 
 # zh
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
-msgstr "Sínis"
+msgstr "Síneach"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
-msgstr "Cirilleach"
+msgstr "Coireallach"
 
 # el
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
-msgstr "Gréigis"
+msgstr "Gréagach"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
-msgstr "Eabhrais"
+msgstr "Eabhrach"
 
 # ja
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
-msgstr "Seapáinis"
+msgstr "Seapánach"
 
 # ko
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
-msgstr "Coiréis"
+msgstr "Cóiréach"
 
 # TH
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Téalannach"
 
 # tr
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
-msgstr "Tuircis"
+msgstr "Turcach"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Iarthar na hEorpa"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Iarthar na hEorpa, Nua"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "Traidisiúnta"
 
-#: ../widgets/misc/e-charset-picker.c:100
-#: ../widgets/misc/e-charset-picker.c:101
-#: ../widgets/misc/e-charset-picker.c:102
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
 msgid "Simplified"
 msgstr "Simplithe"
 
 # uk
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
-msgstr "Úcráinis"
+msgstr "Úcránach"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
-msgstr "Radharcach"
+msgstr "Infheicthe"
 
-#: ../widgets/misc/e-charset-picker.c:178
-#, fuzzy, c-format
+#: ../widgets/misc/e-charset-picker.c:170
+#, c-format
 msgid "Unknown character set: %s"
-msgstr "Tacar carachtar réamhshocraithe:"
+msgstr "Tacar carachtar anaithnid: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Ionchódú Carachtar"
 
-#: ../widgets/misc/e-charset-picker.c:238
-#, fuzzy
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
-msgstr "Úsáid an luch chun focail a iontráil"
+msgstr "Iontráil an tacar carachtar le húsáid"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Eile..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "Ionchódú C_arachtar"
 
-#: ../widgets/misc/e-dateedit.c:322
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "Dáta agus Am"
 
-#: ../widgets/misc/e-dateedit.c:343
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:365
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
-msgstr "Brúigh an cnaipe seo chun fillteán nua a chruthú."
+msgstr "Cliceáil an cnaipe seo chun féilire a thaispeáint"
 
-#: ../widgets/misc/e-dateedit.c:407
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:379
+msgid "Drop-down combination box to select time"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:482
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "_Anois"
 
-#: ../widgets/misc/e-dateedit.c:488
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "_Inniu"
 
 # SG
-#: ../widgets/misc/e-dateedit.c:1641
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
-msgstr "Luach neamhbhailí."
+msgstr "Luach Dáta Neamhbhailí"
 
 # SG
-#: ../widgets/misc/e-dateedit.c:1667
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:1613
 msgid "Invalid Time Value"
-msgstr "Amluach inmheánach"
-
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "Leathnaithe"
-
-#: ../widgets/misc/e-expander.c:183
-#, fuzzy
-msgid "Whether or not the expander is expanded"
-msgstr "Cé acu atá an fhuinneog uasmhéadaithe nó nach bhfuil"
-
-#: ../widgets/misc/e-expander.c:191
-#, fuzzy
-msgid "Text of the expander's label"
-msgstr "Lipéad"
-
-#: ../widgets/misc/e-expander.c:198
-#, fuzzy
-msgid "Use underline"
-msgstr "Cumasaithe"
-
-#: ../widgets/misc/e-expander.c:199
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr ""
-
-#: ../widgets/misc/e-expander.c:216
-#, fuzzy
-msgid "Label widget"
-msgstr "&Dath Giuirléidí"
-
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr ""
-
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3354
-#, fuzzy
-msgid "Expander Size"
-msgstr "Leithead:"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3355
-#, fuzzy
-msgid "Size of the expander arrow"
-msgstr "Saighead Stríocach Ar Dheis"
-
-#: ../widgets/misc/e-expander.c:232
-#, fuzzy
-msgid "Indicator Spacing"
-msgstr "Spásáil na &línte:"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr ""
+msgstr "Luach Ama Neamhbhailí"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:182
-#: ../widgets/misc/e-filter-bar.c:310 ../widgets/misc/e-filter-bar.c:747
+#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
-msgstr "Cuardach Ardmód"
+msgstr "Cuardach Casta"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:233
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "Sábháil Cuardach"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "Cuar_daigh"
 
-#: ../widgets/misc/e-filter-bar.c:272
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 msgstr "Cuardaigh"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "_Sábháil Cuardach..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
-#, fuzzy
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
-msgstr "Cuir Airíonna an Chuardaigh Shábháilte do %S in Eagar"
+msgstr "Cuir Cuardaigh Sábháilte in _Eagar..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "Cuardach C_asta..."
 
@@ -23041,189 +22883,165 @@ msgstr "Cuntas Reatha"
 msgid "Current Folder"
 msgstr "Fillteán Reatha"
 
-#: ../widgets/misc/e-filter-bar.h:106
-msgid "Current Message"
-msgstr "Teachtaireacht Reatha"
-
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:168
 msgid "Choose Image"
 msgstr "Roghnaigh Íomhá"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "Léarscáil an Domhain"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:607
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
 msgstr ""
 
-#: ../widgets/misc/e-pilot-settings.c:103
-#, fuzzy
+#: ../widgets/misc/e-online-button.c:106
+msgid "Online"
+msgstr "Ar Líne"
+
+#: ../widgets/misc/e-online-button.c:107
+msgid "The button state is online"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
-msgstr "Oscail le %1"
+msgstr ""
 
-#: ../widgets/misc/e-pilot-settings.c:111
-#, fuzzy
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
-msgstr "Comhadlann neamhbhailí taifead."
+msgstr ""
 
-#: ../widgets/misc/e-pilot-settings.c:120
-#, fuzzy
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr ""
-"Aon Chatagóir\n"
-"Dhá Chatagóir\n"
-"%n Chatagóir\n"
-"%n gCatagóir\n"
-"%n Catagóir"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
-#, fuzzy
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
-msgstr "Tá an comhad teachtaireachta folamh!"
+msgstr "Teachtaireacht folamh"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
-#, fuzzy
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
-msgstr "Déanamh: %1, Leagan Amach: %2"
+msgstr ""
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
-#, fuzzy
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Column width"
 msgstr "Leithead colúin"
 
-#: ../widgets/misc/e-search-bar.c:348 ../widgets/misc/e-search-bar.c:477
-#: ../widgets/misc/e-search-bar.c:479
+#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:1021
 msgid "Search"
 msgstr "Cuardaigh"
 
-#: ../widgets/misc/e-search-bar.c:348 ../widgets/misc/e-search-bar.c:477
-#: ../widgets/misc/e-search-bar.c:479
-#, fuzzy
+#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
 msgid "Click here to change the search type"
-msgstr "Cliceáil anseo chun cineál nua comhaid a chur leis."
+msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:637
 msgid "_Search"
 msgstr "Cuar_daigh"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:643
 msgid "_Find Now"
 msgstr "_Aimsigh Anois"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:644
 msgid "_Clear"
 msgstr "_Glan"
 
-#: ../widgets/misc/e-search-bar.c:869
-#, fuzzy
+#: ../widgets/misc/e-search-bar.c:899
 msgid "Item ID"
-msgstr "Aitheantas Imleabhair:"
+msgstr "CA Míre"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3557
-#: ../widgets/text/e-text.c:3558
+#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 msgid "Text"
 msgstr "Téacs"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1010
+#: ../widgets/misc/e-search-bar.c:1053
 msgid "Sho_w: "
 msgstr "_Taispeáin:"
 
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1027
+#: ../widgets/misc/e-search-bar.c:1072
 msgid "Sear_ch: "
-msgstr "_Cuardaigh:"
+msgstr "C_uardaigh:"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1039
+#: ../widgets/misc/e-search-bar.c:1088
 msgid " i_n "
 msgstr " _i "
 
-#: ../widgets/misc/e-selection-model-array.c:543
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "Ró Cursóra"
 
-#: ../widgets/misc/e-selection-model-array.c:550
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "Colún Cursóra"
 
-#: ../widgets/misc/e-selection-model.c:210
-#, fuzzy
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
-msgstr "Sórtálaí Sleamhnán"
+msgstr ""
 
-#: ../widgets/misc/e-selection-model.c:217
-#, fuzzy
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
-msgstr "Mód an Roghnaithe"
+msgstr ""
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "Mód Cursóra"
 
-#: ../widgets/misc/e-send-options.c:522
-#, fuzzy
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
-msgstr "Rochtain dei&sce:"
+msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:1
-#, fuzzy
 msgid "<b>Delivery Options</b>"
-msgstr "Roghanna Beochana"
+msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:2
-#, fuzzy
 msgid "<b>Replies</b>"
-msgstr "Freagraí"
+msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:3
-#, fuzzy
 msgid "<b>Return Notification</b>"
-msgstr "&Fógairt an Chórais"
+msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:4
-#, fuzzy
 msgid "<b>Status Tracking</b>"
-msgstr "&UathRianú"
+msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:5
-#, fuzzy
 msgid "A_uto-delete sent item"
-msgstr "Níorbh fhéidir an mhír a scriosadh"
+msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:6
-#, fuzzy
-msgid "Classification"
-msgstr "Aicmiúchán"
-
-#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "Roghanna Ginearálta"
 
-#: ../widgets/misc/e-send-options.glade.h:10
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
-msgstr "Nuair a thagann admháil léite:"
+msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23233,17 +23051,15 @@ msgid ""
 "For Your Eyes Only"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:18
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
-msgstr "Athrú iarrtha:"
+msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:20
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
-msgstr "Formáid chaighdeá&nach (%1)"
+msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -23251,147 +23067,112 @@ msgid ""
 "Low"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:25
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
-msgstr "Agus teastais á gcur leis"
+msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:26
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
-msgstr "Folaigh ta&scanna críochnaithe"
+msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:27
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
-msgstr "Agus teastais á gcur leis"
+msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:28
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
-msgstr "Páipéar Tanaí"
+msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "_Tar Éis:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
-msgstr "Faisnéis Mhícheart"
+msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:31
-#, fuzzy
-msgid "_Delay message delivery"
-msgstr "Úsáid seachadadh logánta"
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_Classification:"
+msgstr ""
 
+#. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
-#, fuzzy
+msgid "_Delay message delivery"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
-msgstr "_Dealaigh"
+msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:34
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
-msgstr "ní féidir an dáta a shocrú"
+msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_Go dtí:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
-msgstr "Tosaigh nuair a"
+msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:37
-#, fuzzy
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
-msgstr "NASC OSCAILTE"
+msgstr ""
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:296
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:302
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% críochnaithe)"
 
-#: ../widgets/misc/e-url-entry.c:107
-#, fuzzy
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
-msgstr "Cliceáil anseo chun an slonn ionadaíochta a shocrú"
-
-#: ../widgets/misc/gal-categories.glade.h:1
-#, fuzzy
-msgid "Edit Master Category List..."
-msgstr "Cuir Liosta "
-
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
 msgstr ""
 
-#: ../widgets/misc/gal-categories.glade.h:3
-#, fuzzy
-msgid "_Available Categories:"
-msgstr ""
-"Aon Chatagóir\n"
-"Dhá Chatagóir\n"
-"%n Chatagóir\n"
-"%n gCatagóir\n"
-"%n Catagóir"
-
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "catagóirí"
-
-#: ../widgets/table/e-cell-combo.c:169
-#, fuzzy
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
-msgstr "Liosta Cainéal"
-
-#: ../widgets/table/e-cell-date.c:62
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
+msgstr ""
 
-#: ../widgets/table/e-cell-pixbuf.c:383
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Colún Roghnaithe"
 
-#: ../widgets/table/e-cell-pixbuf.c:390
-#, fuzzy
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
-msgstr "Colún Nua"
+msgstr ""
 
-#: ../widgets/table/e-cell-pixbuf.c:397
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "Colún Neamhroghnaithe"
 
-#: ../widgets/table/e-cell-text.c:1804
+#: ../widgets/table/e-cell-text.c:1788
 #, fuzzy
 msgid "Strikeout Column"
 msgstr "Colún Nua"
 
-#: ../widgets/table/e-cell-text.c:1811
+#: ../widgets/table/e-cell-text.c:1795
 #, fuzzy
 msgid "Underline Column"
 msgstr "Colún Nua"
 
-#: ../widgets/table/e-cell-text.c:1818
+#: ../widgets/table/e-cell-text.c:1802
 #, fuzzy
 msgid "Bold Column"
 msgstr "Colún Nua"
 
-#: ../widgets/table/e-cell-text.c:1825
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "Colún Datha"
 
-#: ../widgets/table/e-cell-text.c:1839
+#: ../widgets/table/e-cell-text.c:1823
 #, fuzzy
 msgid "BG Color Column"
 msgstr "Athraigh Dath an Chúlra"
@@ -23416,12 +23197,12 @@ msgstr "Gan sórtáil"
 msgid "No grouping"
 msgstr "Gan grúpáil"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "Taispeáin Réimsí"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "Réimsí ar Fáil"
 
@@ -23430,7 +23211,7 @@ msgid "A_vailable Fields:"
 msgstr "Réimsí ar _Fáil:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "Ag dul suas"
 
@@ -23443,7 +23224,7 @@ msgid "Clear _All"
 msgstr "Glan _Gach Rud"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "Ag dul síos"
 
@@ -23509,22 +23290,7 @@ msgstr "Tai&speáin na pictiúir in ord randamach"
 msgid "_Sort..."
 msgstr "_Sórtáil..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "cód DnD"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1900
-#, fuzzy
-msgid "Full Header"
-msgstr "Priontáil an &ceanntásc"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "Cuir colún leis..."
 
@@ -23539,7 +23305,7 @@ msgid ""
 "the location in which you want it to appear."
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
@@ -23549,7 +23315,7 @@ msgstr[2] "%s : %s (%d mhír)"
 msgstr[3] "%s : %s (%d mír)"
 msgstr[4] "%s : %s (%d mír)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -23559,331 +23325,335 @@ msgstr[2] "%s (%d mhír)"
 msgstr[3] "%s (%d mír)"
 msgstr[4] "%s (%d mír)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:2972 ../widgets/table/e-table-item.c:2973
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-leaf.c:586
+#: ../widgets/table/e-table-group-leaf.c:587
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 #, fuzzy
 msgid "Alternating Row Colors"
 msgstr "Tuilleadh Dathanna Téacs..."
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:2979 ../widgets/table/e-table-item.c:2980
-#: ../widgets/table/e-tree.c:3307 ../widgets/table/e-tree.c:3308
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-leaf.c:593
+#: ../widgets/table/e-table-group-leaf.c:594
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 #, fuzzy
 msgid "Horizontal Draw Grid"
 msgstr "Greille Chothrománach Ann/As"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2986 ../widgets/table/e-table-item.c:2987
-#: ../widgets/table/e-tree.c:3313 ../widgets/table/e-tree.c:3314
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-leaf.c:600
+#: ../widgets/table/e-table-group-leaf.c:601
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 #, fuzzy
 msgid "Vertical Draw Grid"
 msgstr "Greille Ingearach Ann/As"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2993 ../widgets/table/e-table-item.c:2994
-#: ../widgets/table/e-tree.c:3319 ../widgets/table/e-tree.c:3320
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-leaf.c:607
+#: ../widgets/table/e-table-group-leaf.c:608
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 #, fuzzy
 msgid "Draw focus"
 msgstr "Glac le &fócas"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3000 ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-leaf.c:614
+#: ../widgets/table/e-table-group-leaf.c:615
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 #, fuzzy
 msgid "Cursor mode"
 msgstr "Mód &Lánscáileán"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2965 ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-leaf.c:628
+#: ../widgets/table/e-table-group-leaf.c:629
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 #, fuzzy
 msgid "Selection model"
 msgstr "Déanamh: %1, Leagan Amach: %2"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3301
-#: ../widgets/table/e-tree.c:3302
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-leaf.c:621
+#: ../widgets/table/e-table-group-leaf.c:622
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 #, fuzzy
 msgid "Length Threshold"
 msgstr "Tairseach an phointeora:"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3333
-#: ../widgets/table/e-tree.c:3334
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-leaf.c:663
+#: ../widgets/table/e-table-group-leaf.c:664
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 #, fuzzy
 msgid "Uniform row height"
 msgstr "Airde an ró roghnaithe"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-leaf.c:656
+#: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "Reoite"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1449
 #, fuzzy
 msgid "Customize Current View"
 msgstr "Féach ar an gcomhad reatha"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1469
 #, fuzzy
 msgid "Sort _Ascending"
 msgstr "Sórtáil in ord Ardaitheach"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1470
 #, fuzzy
 msgid "Sort _Descending"
 msgstr "Sórtáil in ord Íslitheach"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "_Díshórtáil"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1473
 #, fuzzy
 msgid "Group By This _Field"
 msgstr "&Seiceáil litriú an réimse seo"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1474
 #, fuzzy
 msgid "Group By _Box"
 msgstr "Grúpáil de réir &Suímh"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "Bain an Co_lún Seo"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "Cuir C_olún Leis..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1479
 #, fuzzy
 msgid "A_lignment"
 msgstr "Ai&líniú..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1480
 #, fuzzy
 msgid "B_est Fit"
 msgstr "Laghdaigh go leithead leathanaigh"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "Formáidigh Colúi_n..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1483
 #, fuzzy
 msgid "Custo_mize Current View..."
 msgstr "Dún an t-amharc reatha cáipéise"
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Sort By"
 msgstr "_Sórtáil De Réir"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "_Custom"
 msgstr "_Saincheaptha"
 
-#: ../widgets/table/e-table-header-item.c:1893
-#, fuzzy
-msgid "Font Description"
-msgstr "Taispeáin &cur síos"
-
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Eolas Sórtála"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "Crann"
-
-#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 #, fuzzy
 msgid "Table header"
 msgstr "Ceanntásc Tábla"
 
-#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 #, fuzzy
 msgid "Table model"
 msgstr "Déanamh: %1, Leagan Amach: %2"
 
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 #, fuzzy
 msgid "Cursor row"
 msgstr "Ró Tábla"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3340
-#: ../widgets/table/e-tree.c:3341
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "Eolas Sórtála"
+
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "Cuardaigh i gcónaí"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3337
 #, fuzzy
 msgid "Use click to add"
 msgstr "Cliceáil chun seirbhís a chur leis"
 
-#: ../widgets/table/e-tree.c:3326 ../widgets/table/e-tree.c:3327
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "Crann"
+
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 #, fuzzy
 msgid "ETree table adapter"
 msgstr "Tábla gan aimsiú"
 
-#: ../widgets/table/e-tree.c:3347
+#: ../widgets/table/e-tree.c:3379
 #, fuzzy
 msgid "Retro Look"
 msgstr "&Amharc i:"
 
-#: ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3380
 #, fuzzy
 msgid "Draw lines and +/- expanders."
 msgstr "Greille (línte agus carachtair)"
 
-#: ../widgets/text/e-text.c:2727
+#: ../widgets/table/e-tree.c:3386
+#, fuzzy
+msgid "Expander Size"
+msgstr "Leithead:"
+
+#: ../widgets/table/e-tree.c:3387
+#, fuzzy
+msgid "Size of the expander arrow"
+msgstr "Saighead Stríocach Ar Dheis"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "Modhanna Ionchuir"
 
-#: ../widgets/text/e-text.c:3550 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 #, fuzzy
 msgid "Event Processor"
 msgstr "Name=Próiseálaí"
 
-#: ../widgets/text/e-text.c:3564 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "Trom"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 #, fuzzy
 msgid "Strikeout"
 msgstr "Scríoblíne"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 #, fuzzy
 msgid "Anchor"
 msgstr "Ancaire"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 #, fuzzy
 msgid "Clip Width"
 msgstr "Leithead:"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 #, fuzzy
 msgid "Clip Height"
 msgstr "Oiriúnaigh don Airde"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 #, fuzzy
 msgid "Clip"
 msgstr "Gearrthóg Fuaime"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 #, fuzzy
 msgid "Fill clip rectangle"
 msgstr "Dronuilleog Chuar, Gan Líonadh"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 #, fuzzy
 msgid "X Offset"
 msgstr "Fritháireamh X"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 #, fuzzy
 msgid "Y Offset"
 msgstr "Fritháireamh Y"
 
-#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "Leithead an téacs"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "Airde an téacs"
 
-#: ../widgets/text/e-text.c:3686 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "Úsáid focalbhá"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "Focalbhá"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 #, fuzzy
 msgid "Line wrap"
 msgstr "Timfhilleadh Focal"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 #, fuzzy
 msgid "Break characters"
 msgstr "Carachtair roimh bhriseadh"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 #, fuzzy
 msgid "Max lines"
 msgstr "Comment=Línte"
 
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 #, fuzzy
 msgid "Draw borders"
 msgstr "Dear &imlínte"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 #, fuzzy
 msgid "Allow newlines"
 msgstr "Ceadaigh Múchadh"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 #, fuzzy
 msgid "Draw background"
 msgstr "Cúlra trédhearcach?"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 #, fuzzy
 msgid "Draw button"
 msgstr "Cúlra na gCnaipí"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 #, fuzzy
 msgid "Cursor position"
 msgstr "Taispeáin ionad an chúrsóra"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#. Translators: Input Method Context
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "Comhthéacs IM"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 #, fuzzy
 msgid "Handle Popup"
 msgstr "Preabfhuinneoga"
author	Seán de Búrca <leftmostcat@gmail.com>	2009-08-07 18:28:59 +0800
committer	Matthew Barnes <mbarnes@redhat.com>	2009-08-11 04:42:06 +0800
commit	aa543334cbe0f91380bff2ef98818d0743c312ca (patch)
tree	7df41d25f9e14075cd715ba0539be638b3a28c83
parent	8a430c7ff07ff836dd771ac7cbf98a67193059cf (diff)
download	gsoc2013-evolution-aa543334cbe0f91380bff2ef98818d0743c312ca.tar gsoc2013-evolution-aa543334cbe0f91380bff2ef98818d0743c312ca.tar.gz gsoc2013-evolution-aa543334cbe0f91380bff2ef98818d0743c312ca.tar.bz2 gsoc2013-evolution-aa543334cbe0f91380bff2ef98818d0743c312ca.tar.lz gsoc2013-evolution-aa543334cbe0f91380bff2ef98818d0743c312ca.tar.xz gsoc2013-evolution-aa543334cbe0f91380bff2ef98818d0743c312ca.tar.zst gsoc2013-evolution-aa543334cbe0f91380bff2ef98818d0743c312ca.zip