removed outdated strings and run "mak update-po".

svn path=/trunk/; revision=30341

1 files changed, 2991 insertions, 3820 deletions

diff --git a/po/ga.po b/po/ga.po
index 9a4189e692..b209d4f5a8 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-21 13:59+0800\n"
+"POT-Creation-Date: 2005-09-11 17:30+0200\n"
 "PO-Revision-Date: 2004-03-21 21:56+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -24,12 +24,12 @@ msgid "evolution addressbook"
 msgstr "Leabhar Sheoladh Evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:196
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgid "New Contact"
 msgstr "Tadhall Nua"
 
 #: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:204
+#: ../addressbook/gui/component/addressbook-component.c:233
 msgid "New Contact List"
 msgstr "Líosta Tadhall Nua"
 
@@ -101,7 +101,7 @@ msgstr "_Coinne Nua"
 msgid "New All Day Event"
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1483
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
 msgid "New Meeting"
 msgstr "Cruinniú Nua"
 
@@ -163,7 +163,7 @@ msgstr "%a %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1516
+#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
 #: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -196,14 +196,14 @@ msgstr "%d %B %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1532
+#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
 #: ../calendar/gui/e-week-view-main-item.c:335
 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:726
+#: ../calendar/importers/icalendar-importer.c:738
 msgid "Gnome Calendar"
 msgstr "Féilire Gnome"
 
@@ -414,58 +414,63 @@ msgstr "Leabhar Sheoladh Evolution"
 
 #: ../addressbook/addressbook.error.xml.h:16
 msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:17
+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:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "This address book will be removed permanently."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "This addressbook could not be opened."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "This addressbook server does not have any suggested search bases."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This server does not support LDAPv3 schema information."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "Sábháil san leabhar seoladh"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Unable to perform search."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 #, fuzzy
 msgid "Unable to save {0}."
 msgstr "Roghnaigh gach tadhallaí"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "Would you like to save your changes?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 #: ../calendar/calendar.error.xml.h:59
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
@@ -473,31 +478,34 @@ msgid ""
 "a supported version"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:30 ../mail/em-vfolder-rule.c:494
+#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:494
+#: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Suimigh"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "_Discard"
 msgstr "_Caith uait"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "{1}"
 msgstr ""
 
@@ -534,7 +542,7 @@ msgstr ""
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1119
+#: ../addressbook/gui/component/addressbook-view.c:1133
 #: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Tadhallaí"
@@ -572,13 +580,13 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #. create the local source group
-#. On This Computer is always first and vFolders is always last
-#: ../addressbook/gui/component/addressbook-component.c:133
-#: ../addressbook/gui/component/addressbook-migrate.c:493
+#. On This Computer is always first and Search Folders is always last
+#: ../addressbook/gui/component/addressbook-component.c:137
+#: ../addressbook/gui/component/addressbook-migrate.c:502
 #: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
 #: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
 #: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
-#: ../mail/mail-component.c:291 ../mail/mail-vfolder.c:223
+#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr ""
 
@@ -587,8 +595,8 @@ msgstr ""
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:141
-#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/component/addressbook-component.c:145
+#: ../addressbook/gui/component/addressbook-migrate.c:510
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
 #: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
@@ -598,106 +606,106 @@ msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:149
-#: ../addressbook/gui/component/addressbook-migrate.c:509
+#: ../addressbook/gui/component/addressbook-component.c:155
+#: ../addressbook/gui/component/addressbook-migrate.c:520
 msgid "On LDAP Servers"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-component.c:197
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "_Contact"
 msgstr "_Tadhall"
 
-#: ../addressbook/gui/component/addressbook-component.c:198
+#: ../addressbook/gui/component/addressbook-component.c:227
 msgid "Create a new contact"
 msgstr "Cruthaigh tadhall nua"
 
-#: ../addressbook/gui/component/addressbook-component.c:205
+#: ../addressbook/gui/component/addressbook-component.c:234
 msgid "Contact _List"
 msgstr "_Liosta Tadhaill"
 
-#: ../addressbook/gui/component/addressbook-component.c:206
+#: ../addressbook/gui/component/addressbook-component.c:235
 msgid "Create a new contact list"
 msgstr "Cruthaigh liosta tadhaill nua"
 
-#: ../addressbook/gui/component/addressbook-component.c:212
-#: ../addressbook/gui/component/addressbook-config.c:1120
-#: ../addressbook/gui/component/addressbook-view.c:757
+#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-config.c:1118
+#: ../addressbook/gui/component/addressbook-view.c:763
 #, fuzzy
 msgid "New Address Book"
 msgstr "Leabhar Seoladh Nua"
 
-#: ../addressbook/gui/component/addressbook-component.c:213
+#: ../addressbook/gui/component/addressbook-component.c:242
 #, fuzzy
 msgid "Address _Book"
 msgstr "_Leabhar Seoladh:"
 
-#: ../addressbook/gui/component/addressbook-component.c:214
+#: ../addressbook/gui/component/addressbook-component.c:243
 #, fuzzy
 msgid "Create a new address book"
 msgstr "Cruthaigh tasc nua"
 
-#: ../addressbook/gui/component/addressbook-component.c:287
+#: ../addressbook/gui/component/addressbook-component.c:385
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:313
 #, fuzzy
 msgid "Base"
 msgstr "Gnáth"
 
-#: ../addressbook/gui/component/addressbook-config.c:510
+#: ../addressbook/gui/component/addressbook-config.c:508
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Saghas:"
 
-#: ../addressbook/gui/component/addressbook-config.c:609
+#: ../addressbook/gui/component/addressbook-config.c:607
 msgid "Copy book content locally for offline operation"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:904
+#: ../addressbook/gui/component/addressbook-config.c:902
 #: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Gnáth"
 
-#: ../addressbook/gui/component/addressbook-config.c:905
-#: ../mail/importers/pine-importer.c:479
+#: ../addressbook/gui/component/addressbook-config.c:903
+#: ../mail/importers/pine-importer.c:393
 msgid "Addressbook"
 msgstr "Leabhar Seoladh:"
 
-#: ../addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:907
 #, fuzzy
 msgid "Server Information"
 msgstr "Ceim 2: Eolas Freastalaí"
 
-#: ../addressbook/gui/component/addressbook-config.c:911
+#: ../addressbook/gui/component/addressbook-config.c:909
 #, fuzzy
 msgid "Authentication"
 msgstr "Údarú"
 
-#: ../addressbook/gui/component/addressbook-config.c:914
+#: ../addressbook/gui/component/addressbook-config.c:912
 #: ../addressbook/gui/component/ldap-config.glade.h:18
-#: ../mail/mail-dialogs.glade.h:8 ../smime/gui/smime-ui.glade.h:20
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Sonraí"
 
-#: ../addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:913
 #, fuzzy
 msgid "Searching"
 msgstr "Ag Cuardaigh..."
 
-#: ../addressbook/gui/component/addressbook-config.c:917
+#: ../addressbook/gui/component/addressbook-config.c:915
 #, fuzzy
 msgid "Downloading"
 msgstr "<b>_Áit</b>"
 
-#: ../addressbook/gui/component/addressbook-config.c:1118
+#: ../addressbook/gui/component/addressbook-config.c:1116
 #: ../addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
@@ -714,15 +722,15 @@ msgstr ""
 msgid "Migrating `%s':"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:637
+#: ../addressbook/gui/component/addressbook-migrate.c:648
 msgid "LDAP Servers"
 msgstr "Freastalaí LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:752
+#: ../addressbook/gui/component/addressbook-migrate.c:763
 msgid "Autocompletion Settings"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1123
+#: ../addressbook/gui/component/addressbook-migrate.c:1134
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -730,43 +738,43 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1148
 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:1146
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
 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:1156
+#: ../addressbook/gui/component/addressbook-migrate.c:1167
 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:758
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/component/addressbook-view.c:764
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
 #: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-tasks.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Dealaigh"
 
-#: ../addressbook/gui/component/addressbook-view.c:760
+#: ../addressbook/gui/component/addressbook-view.c:766
 #: ../calendar/gui/calendar-component.c:538
 #: ../calendar/gui/tasks-component.c:442
 msgid "Properties..."
 msgstr "Álbachtaí..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1130
+#: ../addressbook/gui/component/addressbook-view.c:1144
 #, fuzzy
 msgid "Contact Source Selector"
 msgstr "Scrioste"
@@ -775,13 +783,13 @@ msgstr "Scrioste"
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook.c:193
-#: ../plugins/groupwise-features/camel-gw-listener.c:478
+#: ../addressbook/gui/component/addressbook.c:191
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
 msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-features/camel-gw-listener.c:461
+#: ../addressbook/gui/component/addressbook.c:198
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%sPasfhocal do %s, le do thoil (úsáideoir %s)"
@@ -845,9 +853,14 @@ msgstr ""
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/mail-dialogs.glade.h:2 ../mail/message-tags.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
 msgid "*"
 msgstr "*"
 
@@ -913,7 +926,7 @@ msgstr "Leabhar Seoladh:"
 # ##     in iso-639.def from glibc
 # aa 
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:757
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
 msgid "Always"
 msgstr "i gCónaí"
 
@@ -949,7 +962,7 @@ msgid "Lo_gin:"
 msgstr "Logann"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:756
+#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
 msgid "Never"
 msgstr ""
 
@@ -1072,7 +1085,8 @@ msgstr "Ainm _Líosta:"
 #: ../addressbook/gui/component/ldap-config.glade.h:47
 #: ../calendar/gui/dialogs/calendar-setup.c:244
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Ainm:"
 
@@ -1087,6 +1101,7 @@ msgid "_Search scope:"
 msgstr "Cuardaigh"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Server:"
 msgstr "_Freastalaí:"
@@ -1108,9 +1123,9 @@ msgstr "cartaí"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1940
+#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
 #: ../plugins/calendar-http/calendar-http.c:263
-#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "noimeaíd"
 
@@ -1159,21 +1174,23 @@ msgid "<b>Work</b>"
 msgstr "<b>Seachtain Oibre</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
 #: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:181
+#: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "Tadhall"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:531
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:525
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
 msgid "Contact Editor"
 msgstr ""
 
@@ -1222,7 +1239,7 @@ msgstr ""
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
 #: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
 #: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
 msgid "Work"
@@ -1248,7 +1265,7 @@ msgid "_Birthday:"
 msgstr "Brei_thlá:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1631
+#: ../plugins/itip-formatter/itip-view.c:1662
 #, fuzzy
 msgid "_Calendar:"
 msgstr "Féilire:"
@@ -1369,14 +1386,15 @@ msgstr "Seoladh"
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:519
-#: ../addressbook/gui/widgets/e-minicard.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:520
+#: ../addressbook/gui/widgets/e-minicard.c:175
+#: ../widgets/menus/gal-define-views-model.c:181
 #: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
 #: ../widgets/text/e-text.c:3585
@@ -2565,6 +2583,8 @@ msgid "Zimbabwe"
 msgstr "An tSiombáib"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: ../plugins/exchange-operations/exchange-delegates.c:936
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
 #: ../plugins/plugin-manager/plugin-manager.c:44
 #: ../plugins/save-attachments/save-attachments.c:362
 #: ../widgets/menus/gal-view-new-dialog.c:73
@@ -2576,7 +2596,7 @@ msgid "AOL Instant Messenger"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
 #: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr ""
@@ -2586,7 +2606,7 @@ msgid "Yahoo Messenger"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
@@ -2607,75 +2627,81 @@ msgid "Username"
 msgstr "Ainm Úsaideoir"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Baile"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Eile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:349
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grupa"
 
 # Avoid; either use KR or KP
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Leabhar Foinse"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Is Tadhall Nua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
 msgid "Required Fields"
 msgstr ""
 
 # FR
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
 msgid "Changed"
 msgstr "Athraithe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:535
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
+#, fuzzy, c-format
+msgid "Contact Editor - %s"
+msgstr "Eagarthôir Líosta Tadhall"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Dealaigh na tadhallaí roghnaithe"
 
 # NE
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
 #, fuzzy
 msgid "No image"
 msgstr "An Nígir"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2855
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2907
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
 #, fuzzy
 msgid "Invalid contact."
 msgstr "%d Tadhallaí"
@@ -2822,7 +2848,9 @@ msgid "_IM Service:"
 msgstr "Seirbhís"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../plugins/calendar-weather/calendar-weather.c:410
+#: ../plugins/calendar-weather/calendar-weather.c:409
+#: ../plugins/exchange-operations/exchange-calendar.c:215
+#: ../plugins/exchange-operations/exchange-contacts.c:193
 #, fuzzy
 msgid "_Location:"
 msgstr "Áit:"
@@ -2836,7 +2864,7 @@ msgid "Add an email to the List"
 msgstr ""
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
 msgid "Contact List Editor"
 msgstr "Eagarthôir Líosta Tadhall"
 
@@ -2873,9 +2901,9 @@ msgstr ""
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:505
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Leabhar"
 
@@ -2946,9 +2974,9 @@ msgstr[1] "%d Tadhallaí"
 # DE
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:512
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "Ceist"
 
@@ -2970,36 +2998,36 @@ msgstr "Samhail"
 msgid "Error modifying card"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:168
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
 #: ../calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../addressbook/gui/widgets/e-addressbook-view.c:177
+#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../addressbook/gui/widgets/e-addressbook-view.c:178
 msgid "Advanced..."
 msgstr "Ardmód..."
 
 # Avoid; either use KR or KP
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Foinse"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:370
@@ -3007,78 +3035,100 @@ msgstr "Foinse"
 msgid "Type"
 msgstr "Saghas"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:543
+#: ../addressbook/gui/widgets/e-addressbook-view.c:544
 #, fuzzy
 msgid "Address Book"
 msgstr "Leabhar Seoladh:"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:806
-#: ../addressbook/gui/widgets/e-addressbook-view.c:924
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1986
+#: ../addressbook/gui/widgets/e-addressbook-view.c:807
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
 #: ../ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Sábháil mar VCard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:920
+#: ../addressbook/gui/widgets/e-addressbook-view.c:930
+#: ../calendar/gui/e-calendar-table.c:1154
+#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Oscail"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
 msgid "New Contact..."
 msgstr "Tadhall Nua..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:921
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
 msgid "New Contact List..."
 msgstr "Líosta Tadhall Nua..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:925
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:926
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#, fuzzy
+msgid "Forward Contacts"
+msgstr "Tadhallaí Eile"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "Send Message to Contact"
 msgstr ""
 
+# as 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#, fuzzy
+msgid "Send Message to List"
+msgstr "_Scéalaí"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#, fuzzy
+msgid "Send Message to Contacts"
+msgstr "Post sceál do tadhall"
+
 # fa 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:927
-#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2501
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
 #: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:74 ../ui/evolution-tasks.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Priontáil"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:930
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Leabhar Seoladh..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:931
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Leabhar Seoladh..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 #: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Gearr"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 #: ../calendar/gui/calendar-component.c:536
 #: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-tasks.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Cóip"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 #: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Greamaigh"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1539
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1738
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
 msgid "Print cards"
 msgstr "Priontáil Cartaí"
 
@@ -3123,7 +3173,7 @@ msgstr "Fón Ghnó"
 
 # ta
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
 #: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Rpost"
@@ -3222,6 +3272,7 @@ msgstr "Raidio"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
 #: ../calendar/gui/e-meeting-list-view.c:378
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 msgid "Role"
 msgstr ""
 
@@ -3256,34 +3307,38 @@ msgid "Web Site"
 msgstr "Idirlíon"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:137
+#: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
 #: ../widgets/table/e-table-click-to-add.c:517
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:667
+#: ../widgets/table/e-table-group-container.c:971
+#: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
 #: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
 msgid "Width"
 msgstr "Leitheid"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:144
+#: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-field-chooser-item.c:674
+#: ../widgets/table/e-table-group-container.c:964
+#: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 #: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
 msgid "Height"
 msgstr "Airde"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:152
+#: ../addressbook/gui/widgets/e-minicard.c:153
 msgid "Has Focus"
 msgstr ""
 
@@ -3309,7 +3364,7 @@ msgstr ""
 msgid "Column Width"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:171
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3318,7 +3373,7 @@ msgid ""
 "or double-click here to create a new Contact."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
 "\n"
 "\n"
@@ -3327,7 +3382,7 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:179
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 #, fuzzy
 msgid ""
 "\n"
@@ -3335,22 +3390,22 @@ msgid ""
 "Search for the Contact."
 msgstr "agus aon carta eile."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:498
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "Adaptar"
 
-#: ../addressbook/gui/widgets/e-minicard.c:160
+#: ../addressbook/gui/widgets/e-minicard.c:161
 msgid "Selected"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard.c:167
+#: ../addressbook/gui/widgets/e-minicard.c:168
 msgid "Has Cursor"
 msgstr ""
 
@@ -3365,7 +3420,7 @@ msgid "map"
 msgstr ""
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:276
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr ""
 
@@ -3405,7 +3460,7 @@ msgstr ""
 
 # PE
 #: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Blog"
 msgstr "Blog"
 
@@ -3414,11 +3469,11 @@ msgstr "Blog"
 msgid "personal"
 msgstr "Leagan"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Job Title"
 msgstr "Tideal Post"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
 msgid "Home page"
 msgstr "Leathanach Baile"
 
@@ -3454,6 +3509,7 @@ msgstr "Líosta Tadhall Nua"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr ""
 
@@ -3476,9 +3532,9 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:61
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:232
-#: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2364
+#: ../calendar/gui/e-cal-model-tasks.c:348
+#: ../calendar/gui/e-cal-model-tasks.c:661
+#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
 msgid "Cancelled"
 msgstr "Ceangailte"
 
@@ -3490,7 +3546,7 @@ msgstr "Teip ag oscailt '%s': %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../calendar/gui/comp-editor-factory.c:431
+#: ../calendar/gui/comp-editor-factory.c:438
 msgid "Authentication Failed"
 msgstr ""
 
@@ -3511,44 +3567,56 @@ msgstr ""
 msgid "No such source"
 msgstr "Níl aon fillteán: %s"
 
-#. E_BOOK_ERROR_OTHER_ERROR
+#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Not available in offline mode"
+msgstr ""
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Other error"
 msgstr "Earraidh Eile"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:90
+#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#, fuzzy
+msgid "Invalid server version"
+msgstr "Leagan"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:93
 msgid ""
 "We were unable to open this addressbook. 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"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:98
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#, c-format
 msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
+"We were unable to open this addressbook.  Please check that the path %s "
+"exists and that you have permission to access it."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:105
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:115
 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."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:122
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3556,7 +3624,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:143
+#: ../addressbook/gui/widgets/eab-gui-util.c:151
 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"
@@ -3564,45 +3632,45 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#: ../addressbook/gui/widgets/eab-gui-util.c:157
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:155
+#: ../addressbook/gui/widgets/eab-gui-util.c:163
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:185
 msgid "Error adding list"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
-#: ../addressbook/gui/widgets/eab-gui-util.c:675
+#: ../addressbook/gui/widgets/eab-gui-util.c:185
+#: ../addressbook/gui/widgets/eab-gui-util.c:693
 msgid "Error adding contact"
 msgstr "Earraidh ag suimigh tadhall"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:196
 msgid "Error modifying list"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:196
 msgid "Error modifying contact"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "Error removing list"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:200
-#: ../addressbook/gui/widgets/eab-gui-util.c:633
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:648
 msgid "Error removing contact"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:282
+#: ../addressbook/gui/widgets/eab-gui-util.c:290
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3613,22 +3681,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:323
 msgid "Overwrite"
 msgstr ""
 
 #. 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:360
-#: ../addressbook/gui/widgets/eab-gui-util.c:363
+#: ../addressbook/gui/widgets/eab-gui-util.c:368
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 #, fuzzy
 msgid "contact"
 msgid_plural "contacts"
@@ -3636,40 +3704,40 @@ msgstr[0] "1 Tadhall"
 msgstr[1] "1 Tadhall"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:410
+#: ../addressbook/gui/widgets/eab-gui-util.c:418
 msgid "card.vcf"
 msgstr "carta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:580
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "líosta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:729
+#: ../addressbook/gui/widgets/eab-gui-util.c:754
 msgid "Move contact to"
 msgstr "Bog tadhall go"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Copy contact to"
 msgstr "Cóip tadhall go"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:734
+#: ../addressbook/gui/widgets/eab-gui-util.c:759
 msgid "Move contacts to"
 msgstr "Bog tadhallaí go"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Copy contacts to"
 msgstr "Cóip tadhallaî go"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:739
+#: ../addressbook/gui/widgets/eab-gui-util.c:764
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Roghnaigh Tadhallaí o Leabhar Seoladh"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:962
+#: ../addressbook/gui/widgets/eab-gui-util.c:987
 msgid "Multiple VCards"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:965
+#: ../addressbook/gui/widgets/eab-gui-util.c:990
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard do %s"
@@ -3706,7 +3774,7 @@ msgstr ""
 msgid "Querying Address Book..."
 msgstr "Leabhar Seoladh..."
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:970
+#: ../addressbook/gui/widgets/eab-popup-control.c:968
 msgid "Merge E-Mail Address"
 msgstr ""
 
@@ -3738,24 +3806,32 @@ msgstr "Amharc Carta"
 msgid "GTK Tree View"
 msgstr "Amharc Seachtain"
 
-#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#: ../addressbook/importers/evolution-ldif-importer.c:486
+#: ../addressbook/importers/evolution-vcard-importer.c:249
+#: ../calendar/importers/icalendar-importer.c:311
+#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
 #, fuzzy
-msgid "Evolution LDIF importer"
-msgstr "Comhphairt Post Evolution"
+msgid "Importing ..."
+msgstr "Comhad Inchur"
 
-#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+#: ../addressbook/importers/evolution-ldif-importer.c:652
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#: ../addressbook/importers/evolution-ldif-importer.c:653
 #, fuzzy
-msgid "Evolution VCard Importer"
-msgstr "Comhphairt Coimriú Evolution"
+msgid "Evolution LDIF importer"
+msgstr "Comhphairt Post Evolution"
 
-#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: ../addressbook/importers/evolution-vcard-importer.c:529
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: ../addressbook/importers/evolution-vcard-importer.c:530
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Comhphairt Coimriú Evolution"
+
 #: ../addressbook/printing/e-contact-print-envelope.c:213
 #: ../addressbook/printing/e-contact-print-envelope.c:234
 msgid "Print envelope"
@@ -3917,7 +3993,11 @@ msgstr ""
 msgid "Shading"
 msgstr ""
 
+#. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
+#: ../plugins/exchange-operations/exchange-account-setup.c:917
+#: ../plugins/exchange-operations/exchange-calendar.c:205
+#: ../plugins/exchange-operations/exchange-contacts.c:176
 msgid "Size:"
 msgstr "Méid:"
 
@@ -3967,8 +4047,8 @@ msgstr ""
 msgid "This should test the contact print code"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr ""
@@ -4239,7 +4319,7 @@ msgid "Save Changes"
 msgstr "Sábháil Scéal...."
 
 #: ../calendar/calendar.error.xml.h:40
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
 msgstr "Post"
 
@@ -4333,13 +4413,12 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:64
-#: ../ui/evolution-message-composer.xml.h:49
-#: ../ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Save"
 msgstr "_Sábháil"
 
 #: ../calendar/calendar.error.xml.h:65
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:118
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
 #, fuzzy
 msgid "_Send"
 msgstr "Post"
@@ -4357,8 +4436,8 @@ msgstr "Pasfhocal, le do thoil"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1359
-#: ../calendar/conduits/calendar/calendar-conduit.c:1360
+#: ../calendar/conduits/calendar/calendar-conduit.c:1365
+#: ../calendar/conduits/calendar/calendar-conduit.c:1366
 #: ../calendar/conduits/todo/todo-conduit.c:879
 #: ../calendar/conduits/todo/todo-conduit.c:880
 #, fuzzy
@@ -4367,8 +4446,8 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1468
-#: ../calendar/conduits/calendar/calendar-conduit.c:1471
+#: ../calendar/conduits/calendar/calendar-conduit.c:1474
+#: ../calendar/conduits/calendar/calendar-conduit.c:1477
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -4386,7 +4465,7 @@ msgid "Calendar and Tasks"
 msgstr ""
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1292
+#: ../calendar/gui/calendar-component.c:1309
 msgid "Calendars"
 msgstr "Féilirí"
 
@@ -4420,12 +4499,14 @@ msgstr "Comhpháirt Tascanna Evolution"
 
 # tg
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1222 ../calendar/gui/print.c:1822
-#: ../calendar/gui/tasks-component.c:519 ../calendar/gui/tasks-component.c:994
-#: ../calendar/gui/tasks-control.c:408
-#: ../calendar/importers/icalendar-importer.c:83
-#: ../calendar/importers/icalendar-importer.c:701
-#: ../plugins/groupwise-features/camel-gw-listener.c:383
+#: ../calendar/gui/e-tasks.c:1257 ../calendar/gui/print.c:1822
+#: ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:707
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tascanna"
 
@@ -4450,12 +4531,12 @@ msgid_plural "minutes"
 msgstr[0] "noimeaíd"
 msgstr[1] "noimeaíd"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
 #, fuzzy
 msgid "Start time"
 msgstr "Dáta Breithe"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:312
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid ""
 "<big><b>%s</b></big>\n"
@@ -4463,13 +4544,14 @@ msgid ""
 msgstr ""
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 msgid "Appointments"
 msgstr "Coinní"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1118
-#: ../plugins/itip-formatter/itip-view.c:863
+#: ../calendar/gui/e-itip-control.c:1120
+#: ../plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
 msgstr "Áit:"
 
@@ -4481,13 +4563,14 @@ msgstr ""
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
 #: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:8
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-message-composer.xml.h:42
-#: ../ui/evolution-signature-editor.xml.h:12
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:22
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-signature-editor.xml.h:23
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution.xml.h:35
 msgid "_Edit"
 msgstr "_Eagar"
 
@@ -4565,11 +4648,11 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:140
 msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/notify-main.c:150
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -4908,31 +4991,32 @@ msgstr "Áit"
 msgid "Unmatched"
 msgstr ""
 
-#: ../calendar/gui/calendar-commands.c:120
+#: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:1974
-#: ../plugins/groupwise-features/camel-gw-listener.c:382
-#: ../plugins/groupwise-features/camel-gw-listener.c:412
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2094
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
 msgid "Calendar"
 msgstr "Féilire"
 
-#: ../calendar/gui/calendar-commands.c:355
+#: ../calendar/gui/calendar-commands.c:354
 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:361
+#: ../calendar/gui/calendar-commands.c:360
 msgid "Purge events older than"
 msgstr ""
 
-#: ../calendar/gui/calendar-commands.c:366
+#: ../calendar/gui/calendar-commands.c:365
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
-#: ../plugins/calendar-weather/calendar-weather.c:566
+#: ../plugins/calendar-weather/calendar-weather.c:565
 #: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "lae"
@@ -4956,76 +5040,76 @@ msgid "Weather"
 msgstr "Aimsir"
 
 #: ../calendar/gui/calendar-component.c:535
-#: ../calendar/gui/dialogs/calendar-setup.c:450
+#: ../calendar/gui/dialogs/calendar-setup.c:449
 msgid "New Calendar"
 msgstr "Féilire Nua"
 
-#: ../calendar/gui/calendar-component.c:843
+#: ../calendar/gui/calendar-component.c:858
 #, fuzzy
 msgid "Failed upgrading calendars."
 msgstr "Ag Lódáil féilire..."
 
-#: ../calendar/gui/calendar-component.c:1139
+#: ../calendar/gui/calendar-component.c:1154
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1170
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1267
+#: ../calendar/gui/calendar-component.c:1284
 #, fuzzy
 msgid "Calendar Source Selector"
 msgstr "Áit Fhéilire"
 
-#: ../calendar/gui/calendar-component.c:1458
+#: ../calendar/gui/calendar-component.c:1475
 msgid "New appointment"
 msgstr "Coinne nua"
 
-#: ../calendar/gui/calendar-component.c:1459
+#: ../calendar/gui/calendar-component.c:1476
 msgid "_Appointment"
 msgstr "_Coinne"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1477
 msgid "Create a new appointment"
 msgstr "Cruthaigh coinne nua"
 
-#: ../calendar/gui/calendar-component.c:1466
+#: ../calendar/gui/calendar-component.c:1483
 msgid "New meeting"
 msgstr "Cruinniú Nua"
 
-#: ../calendar/gui/calendar-component.c:1467
+#: ../calendar/gui/calendar-component.c:1484
 msgid "M_eeting"
 msgstr "_Cruinniú"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1485
 msgid "Create a new meeting request"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1474
+#: ../calendar/gui/calendar-component.c:1491
 msgid "New all day appointment"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1492
 #, fuzzy
 msgid "All Day A_ppointment"
 msgstr "Coinne Nua"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1493
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1482
+#: ../calendar/gui/calendar-component.c:1499
 msgid "New calendar"
 msgstr "Féilire nua"
 
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1500
 #, fuzzy
 msgid "Cale_ndar"
 msgstr "Féilire"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1501
 msgid "Create a new calendar"
 msgstr "Cruthaigh féilire nua"
 
@@ -5045,19 +5129,19 @@ msgstr "Amharc Seachtain"
 msgid "Month View"
 msgstr "Amharc Mí"
 
-#: ../calendar/gui/comp-editor-factory.c:413
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Error while opening the calendar"
 msgstr ""
 
-#: ../calendar/gui/comp-editor-factory.c:419
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: ../calendar/gui/comp-editor-factory.c:425
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: ../calendar/gui/comp-editor-factory.c:437 ../shell/e-shell.c:1288
+#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
 msgid "Unknown error"
 msgstr "Earraidh gan fhois"
 
@@ -5168,7 +5252,7 @@ msgstr "uair"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:565
+#: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
 msgstr "uair"
 
@@ -5200,50 +5284,64 @@ msgstr "Alairm on %s"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:110
 #: ../composer/e-msg-composer-attachment-bar.c:105
+#: ../widgets/misc/e-attachment-bar.c:106
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:113
 #: ../composer/e-msg-composer-attachment-bar.c:108
+#: ../widgets/misc/e-attachment-bar.c:109
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:116
 #: ../composer/e-msg-composer-attachment-bar.c:111
+#: ../widgets/misc/e-attachment-bar.c:112
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:438
+#: ../calendar/gui/dialogs/comp-editor.c:2440
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
+#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "ceangaltáin"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/meeting-page.c:889
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/meeting-page.c:887
 #: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../composer/e-msg-composer.c:3400
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Scríos"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:28
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
+#: ../ui/evolution-mail-list.xml.h:29
 #, fuzzy
 msgid "_Properties"
 msgstr "Álbactaí"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 #: ../composer/e-msg-composer-attachment-bar.c:473
+#: ../composer/e-msg-composer.c:3403
 #, fuzzy
 msgid "_Add attachment..."
 msgstr "_Ceangaltán..."
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:736
 #: ../composer/e-msg-composer-attachment-bar.c:740
+#: ../widgets/misc/e-attachment-bar.c:963
 #, fuzzy
 msgid "Attachment Bar"
 msgstr "Ceangaltán"
@@ -5252,13 +5350,14 @@ msgstr "Ceangaltán"
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:6
-#: ../composer/e-msg-composer-select-file.c:96
-#: ../composer/e-msg-composer-select-file.c:116
+#: ../composer/e-msg-composer-select-file.c:97
+#: ../composer/e-msg-composer-select-file.c:117
+#: ../widgets/misc/e-attachment.glade.h:6
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:235
+#: ../composer/e-msg-composer-select-file.c:241
 msgid "Attach file(s)"
 msgstr ""
 
@@ -5270,6 +5369,8 @@ msgstr ""
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
+#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
+#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Ní féidir an comhad %s a cheangail: %s"
@@ -5278,38 +5379,42 @@ msgstr "Ní féidir an comhad %s a cheangail: %s"
 #: ../calendar/gui/dialogs/cal-attachment.c:327
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
+#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
 #: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Álbactaí Cheangaltáin"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.c:1166
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Tuarascail:"
 
 # vi
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:4
 #: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Ainm chomhaid:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:5
 #: ../composer/e-msg-composer-attachment.glade.h:5
+#: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr ""
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:476 ../mail/em-composer-prefs.c:888
+#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr ""
@@ -5329,16 +5434,16 @@ msgstr ""
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
-#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
-#: ../mail/em-account-prefs.c:382
+#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
+#: ../mail/em-account-prefs.c:406
 msgid "Disable"
 msgstr "Míchumasach"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
-#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
-#: ../mail/em-account-prefs.c:384
+#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
+#: ../mail/em-account-prefs.c:408
 msgid "Enable"
 msgstr "Chumasach"
 
@@ -5438,8 +5543,8 @@ msgid "Free/Busy"
 msgstr "Eolas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Friday"
 msgstr "Aoine"
 
@@ -5452,8 +5557,8 @@ msgid "Minutes"
 msgstr "Noimeaíd"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1042
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Monday"
 msgstr "Luain"
 
@@ -5467,8 +5572,8 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Saturday"
 msgstr "Sathairn"
 
@@ -5481,8 +5586,8 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Sunday"
 msgstr "Domhnaigh"
 
@@ -5499,8 +5604,8 @@ msgid "Template:"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Thursday"
 msgstr "Deardaoin"
 
@@ -5513,8 +5618,8 @@ msgid "Time format:"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Tuesday"
 msgstr "Mairt"
 
@@ -5523,8 +5628,8 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Wednesday"
 msgstr "Ceádaoin"
 
@@ -5612,18 +5717,18 @@ msgstr ""
 msgid "Copy task list contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:341
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 #, fuzzy
 msgid "C_olor:"
 msgstr "_Dathanna"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 #, fuzzy
 msgid "Tasks List"
 msgstr "Líosta Tasc"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:448
+#: ../calendar/gui/dialogs/calendar-setup.c:447
 msgid "Calendar Properties"
 msgstr "Roghnachais na Fheilire"
 
@@ -5659,7 +5764,7 @@ msgstr "Suimigh Líosta Tasc Nua"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:248
-#: ../plugins/calendar-weather/calendar-weather.c:549
+#: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr ""
 
@@ -5671,7 +5776,7 @@ msgstr "_URL:"
 # el 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
-#: ../plugins/calendar-weather/calendar-weather.c:567
+#: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
 msgstr "seachtanna"
 
@@ -5744,105 +5849,105 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:184 ../composer/e-msg-composer.c:2654
+#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
 #, fuzzy, c-format
 msgid "Attached message - %s"
 msgstr "Ni raibh scéal sinn: %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:189
-#: ../calendar/gui/dialogs/comp-editor.c:358 ../composer/e-msg-composer.c:2659
-#: ../composer/e-msg-composer.c:2835
+#: ../calendar/gui/dialogs/comp-editor.c:195
+#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
+#: ../composer/e-msg-composer.c:2846
 #, fuzzy, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "(Scéal gan tideál)"
 msgstr[1] "(Scéal gan tideál)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:421
-#: ../calendar/gui/e-calendar-table.c:1164
-#: ../calendar/gui/e-calendar-view.c:1513 ../composer/e-msg-composer.c:2899
-#: ../mail/em-folder-tree.c:1047 ../mail/em-folder-view.c:1033
+#: ../calendar/gui/dialogs/comp-editor.c:428
+#: ../calendar/gui/e-calendar-table.c:1162
+#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
 #: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:100 ../ui/evolution-tasks.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
 msgid "_Copy"
 msgstr "_Cóip"
 
-#: ../calendar/gui/dialogs/comp-editor.c:422 ../composer/e-msg-composer.c:2900
-#: ../mail/em-folder-tree.c:1048 ../mail/em-folder-utils.c:383
-#: ../mail/em-folder-view.c:929 ../mail/message-list.c:1709
+#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
+#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Bog"
 
-#: ../calendar/gui/dialogs/comp-editor.c:424 ../composer/e-msg-composer.c:2902
-#: ../mail/em-folder-tree.c:1050 ../mail/message-list.c:1711
+#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
+#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Cealaigh Tasc"
 
-#: ../calendar/gui/dialogs/comp-editor.c:697
+#: ../calendar/gui/dialogs/comp-editor.c:774
 msgid "Could not update object"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:883 ../composer/e-msg-composer.c:2308
+#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
 #, fuzzy, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "Ceangaltán"
 msgstr[1] "Ceangaltán"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978
+#: ../calendar/gui/dialogs/comp-editor.c:1249
 msgid "_Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1588
-#: ../calendar/gui/dialogs/comp-editor.c:1631
+#: ../calendar/gui/dialogs/comp-editor.c:1850
+#: ../calendar/gui/dialogs/comp-editor.c:1893
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1594
-#: ../calendar/gui/dialogs/comp-editor.c:1637
+#: ../calendar/gui/dialogs/comp-editor.c:1856
+#: ../calendar/gui/dialogs/comp-editor.c:1899
 #, fuzzy, c-format
 msgid "Meeting - %s"
 msgstr "_Cruinniú"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1596
-#: ../calendar/gui/dialogs/comp-editor.c:1639
+#: ../calendar/gui/dialogs/comp-editor.c:1858
+#: ../calendar/gui/dialogs/comp-editor.c:1901
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1600
-#: ../calendar/gui/dialogs/comp-editor.c:1643
+#: ../calendar/gui/dialogs/comp-editor.c:1862
+#: ../calendar/gui/dialogs/comp-editor.c:1905
 #, fuzzy, c-format
 msgid "Assigned Task - %s"
 msgstr "Tasc - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1602
-#: ../calendar/gui/dialogs/comp-editor.c:1645
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1907
 #, c-format
 msgid "Task - %s"
 msgstr "Tasc - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1605
-#: ../calendar/gui/dialogs/comp-editor.c:1648
+#: ../calendar/gui/dialogs/comp-editor.c:1867
+#: ../calendar/gui/dialogs/comp-editor.c:1910
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1616
-#: ../calendar/gui/dialogs/comp-editor.c:1658
+#: ../calendar/gui/dialogs/comp-editor.c:1878
+#: ../calendar/gui/dialogs/comp-editor.c:1920
 msgid "No summary"
 msgstr "Gan coimriú"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2137
-#: ../calendar/gui/dialogs/comp-editor.c:2170
-#: ../calendar/gui/dialogs/comp-editor.c:2194
+#: ../calendar/gui/dialogs/comp-editor.c:2528
+#: ../calendar/gui/dialogs/comp-editor.c:2561
+#: ../calendar/gui/dialogs/comp-editor.c:2585
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2218
+#: ../calendar/gui/dialogs/comp-editor.c:2609
 msgid "Unable to use current version!"
 msgstr ""
 
@@ -5914,6 +6019,7 @@ msgid "Contacts..."
 msgstr "_Tadhallaí..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-delegates.c:421
 msgid "Delegate To:"
 msgstr ""
 
@@ -5929,73 +6035,73 @@ msgstr "Coinne"
 msgid "Recurrence"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:166
-#: ../calendar/gui/dialogs/event-editor.c:249
+#: ../calendar/gui/dialogs/event-editor.c:164
+#: ../calendar/gui/dialogs/event-editor.c:248
 #: ../calendar/gui/dialogs/event-editor.c:422
 msgid "Scheduling"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:175
+#: ../calendar/gui/dialogs/event-editor.c:174
 #, fuzzy
 msgid "Delegatees"
 msgstr "Dealaigh"
 
-#: ../calendar/gui/dialogs/event-editor.c:179
+#: ../calendar/gui/dialogs/event-editor.c:178
 #, fuzzy
 msgid "Attendees"
 msgstr "<b>Am</b> "
 
-#: ../calendar/gui/dialogs/event-editor.c:252
+#: ../calendar/gui/dialogs/event-editor.c:251
 #: ../calendar/gui/dialogs/event-editor.c:425
 #, fuzzy
 msgid "Invitations"
 msgstr "Eolas"
 
-#: ../calendar/gui/dialogs/event-page.c:725
+#: ../calendar/gui/dialogs/event-page.c:731
 msgid "Event with no start date"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:728
+#: ../calendar/gui/dialogs/event-page.c:734
 msgid "Event with no end date"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:894
+#: ../calendar/gui/dialogs/event-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:556
 msgid "Start date is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:904
+#: ../calendar/gui/dialogs/event-page.c:910
 msgid "End date is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:933
 msgid "Start time is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:934
+#: ../calendar/gui/dialogs/event-page.c:940
 msgid "End time is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1680
+#: ../calendar/gui/dialogs/event-page.c:1686
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1886
+#: ../calendar/gui/dialogs/event-page.c:1892
 #, fuzzy, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "roimh gach coinne"
 msgstr[1] "roimh gach coinne"
 
-#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/event-page.c:1900
 #, fuzzy, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "deireadh an coinne"
 msgstr[1] "deireadh an coinne"
 
-#: ../calendar/gui/dialogs/event-page.c:1902
+#: ../calendar/gui/dialogs/event-page.c:1908
 #, fuzzy, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -6067,8 +6173,8 @@ msgstr "Áit:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:305
-#: ../calendar/gui/e-calendar-table.c:362
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:360
 msgid "Confidential"
 msgstr ""
 
@@ -6084,15 +6190,15 @@ msgstr "Áit:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 #: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:303
-#: ../calendar/gui/e-calendar-table.c:361
+#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:359
 msgid "Private"
 msgstr "Priobhdach"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/task-page.glade.h:11
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:294
-#: ../calendar/gui/e-cal-model.c:301 ../calendar/gui/e-calendar-table.c:360
+#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
 msgid "Public"
 msgstr ""
 
@@ -6148,33 +6254,34 @@ msgstr "<b>Am</b> "
 #. is not permitted.
 #: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:652
-#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2112
+#: ../calendar/gui/e-cal-model-tasks.c:653
+#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1346 ../mail/em-account-prefs.c:437
-#: ../mail/em-folder-view.c:1062
-#: ../plugins/calendar-weather/calendar-weather.c:371
-#: ../plugins/calendar-weather/calendar-weather.c:425
-#: ../plugins/itip-formatter/itip-formatter.c:1539
+#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
+#: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
+#: ../plugins/calendar-weather/calendar-weather.c:370
+#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/itip-formatter/itip-formatter.c:1627
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
 #: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
 #: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
 msgid "None"
 msgstr "Ar Bith"
 
-#: ../calendar/gui/dialogs/meeting-page.c:463
+#: ../calendar/gui/dialogs/meeting-page.c:461
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: ../calendar/gui/dialogs/meeting-page.c:469
+#: ../calendar/gui/dialogs/meeting-page.c:467
 msgid "An organizer is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/meeting-page.c:484
+#: ../calendar/gui/dialogs/meeting-page.c:482
 msgid "At least one attendee is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/meeting-page.c:886
+#: ../calendar/gui/dialogs/meeting-page.c:884
 msgid "_Delegate To..."
 msgstr ""
 
@@ -6296,85 +6403,89 @@ msgstr "Grupa na Líosta Tasc"
 msgid "Task List Name"
 msgstr "Ainm do Líosta Tasc"
 
-#: ../calendar/gui/dialogs/recur-comp.c:51
+#: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:54
+msgid "You are delegating a recurring event, what would like to delegate?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:58
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:62
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:494
+#: ../calendar/gui/dialogs/recurrence-page.c:496
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:815
+#: ../calendar/gui/dialogs/recurrence-page.c:817
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:926
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:986
+#: ../calendar/gui/dialogs/recurrence-page.c:988
 msgid "first"
 msgstr "céad"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:987
+#: ../calendar/gui/dialogs/recurrence-page.c:989
 msgid "second"
 msgstr "dara"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#: ../calendar/gui/dialogs/recurrence-page.c:990
 msgid "third"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#: ../calendar/gui/dialogs/recurrence-page.c:991
 msgid "fourth"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "last"
 msgstr "deireadh"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "Other Date"
 msgstr "Dáta Eile"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "day"
 msgstr "lá"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1178
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "on the"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1367
+#: ../calendar/gui/dialogs/recurrence-page.c:1369
 msgid "occurrences"
 msgstr ""
 
 #
-#: ../calendar/gui/dialogs/recurrence-page.c:2323
+#: ../calendar/gui/dialogs/recurrence-page.c:2325
 msgid "Date/Time"
 msgstr "Dáta/Am:"
 
@@ -6428,7 +6539,7 @@ msgid "year(s)"
 msgstr "blia(i)n"
 
 #: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:430
 msgid "Completed date is wrong"
 msgstr ""
 
@@ -6449,9 +6560,9 @@ msgstr ""
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
 #: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/e-itip-control.c:896
+#: ../calendar/gui/e-cal-model-tasks.c:346
+#: ../calendar/gui/e-cal-model-tasks.c:659
+#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 #: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
@@ -6459,37 +6570,37 @@ msgstr "Críochnaithe"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1008
+#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Ard"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
 #: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-cal-model-tasks.c:731
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-cal-model-tasks.c:344
+#: ../calendar/gui/e-cal-model-tasks.c:657
+#: ../calendar/gui/e-cal-model-tasks.c:732
+#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
 msgid "In Progress"
 msgstr ""
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1006
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Bun"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:899 ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
 #: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Gnáth"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
 #: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:341
-#: ../calendar/gui/e-cal-model-tasks.c:654
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/print.c:2355
+#: ../calendar/gui/e-cal-model-tasks.c:342
+#: ../calendar/gui/e-cal-model-tasks.c:655
+#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
 msgid "Not Started"
 msgstr ""
 
@@ -6499,7 +6610,7 @@ msgid "P_ercent complete:"
 msgstr "Crí_ochnaithe"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:383
 msgid "Undefined"
 msgstr ""
 
@@ -6526,9 +6637,9 @@ msgstr "Leathanach _Lín:"
 msgid "Task"
 msgstr "Tasc"
 
-#: ../calendar/gui/dialogs/task-editor.c:163
-#: ../calendar/gui/dialogs/task-editor.c:225
-#: ../calendar/gui/dialogs/task-editor.c:379
+#: ../calendar/gui/dialogs/task-editor.c:162
+#: ../calendar/gui/dialogs/task-editor.c:224
+#: ../calendar/gui/dialogs/task-editor.c:378
 msgid "Assignment"
 msgstr "Coinne"
 
@@ -6700,7 +6811,7 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2693
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
 #, c-format
 msgid "Click to open %s"
 msgstr ""
@@ -6710,7 +6821,7 @@ msgid "Untitled"
 msgstr "Gan Tidéal"
 
 #: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1110
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Coimriú:"
@@ -6727,12 +6838,11 @@ msgid "Due Date:"
 msgstr "Dáta:"
 
 #. write status
-#. translators: exchange out of office status header
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1132
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:227
-#: ../plugins/itip-formatter/itip-view.c:888
+#: ../calendar/gui/e-itip-control.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
 msgstr "Stádas:"
 
@@ -6756,29 +6866,29 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:17 ../plugins/save-calendar/csv-format.c:386
+#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Coimriú"
 
-#: ../calendar/gui/e-cal-model-calendar.c:179
-#: ../calendar/gui/e-calendar-table.c:434
+#: ../calendar/gui/e-cal-model-calendar.c:180
+#: ../calendar/gui/e-calendar-table.c:432
 msgid "Free"
 msgstr "Saor"
 
-#: ../calendar/gui/e-cal-model-calendar.c:182
-#: ../calendar/gui/e-calendar-table.c:435
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:433
 #: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model-tasks.c:606
+#: ../calendar/gui/e-cal-model-tasks.c:607
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model-tasks.c:1017 ../calendar/gui/e-cal-model.c:905
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
 #: ../calendar/gui/e-meeting-store.c:808
@@ -6786,7 +6896,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Tá"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1017 ../calendar/gui/e-cal-model.c:905
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:180
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6794,161 +6904,157 @@ msgid "No"
 msgstr "Níl"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:307 ../calendar/gui/e-cal-model.c:310
-#: ../calendar/gui/e-itip-control.c:1149 ../calendar/gui/e-itip-control.c:1290
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1175
-#: ../plugins/itip-formatter/itip-formatter.c:235
-#: ../plugins/itip-formatter/itip-formatter.c:1564
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
+#: ../plugins/itip-formatter/itip-formatter.c:240
+#: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../shell/e-component-registry.c:205 ../shell/e-component-registry.c:211
+#: ../widgets/misc/e-attachment-bar.c:659
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Gan fhois"
 
-#: ../calendar/gui/e-cal-model.c:901
+#: ../calendar/gui/e-cal-model.c:921
 msgid "Recurring"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:903
+#: ../calendar/gui/e-cal-model.c:923
 msgid "Assigned"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:402
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:403
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:516
+#: ../calendar/gui/e-calendar-table.c:514
 #, fuzzy
 msgid "Task Table"
 msgstr "Tabla"
 
-#: ../calendar/gui/e-calendar-table.c:694
-#: ../calendar/gui/e-calendar-view.c:653
+#: ../calendar/gui/e-calendar-table.c:692
+#: ../calendar/gui/e-calendar-view.c:661
 msgid "Deleting selected objects"
 msgstr "Scríos an sceal seo"
 
-#: ../calendar/gui/e-calendar-table.c:873
-#: ../calendar/gui/e-calendar-view.c:780
+#: ../calendar/gui/e-calendar-table.c:871
+#: ../calendar/gui/e-calendar-view.c:789
 msgid "Updating objects"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1014
-#: ../calendar/gui/e-calendar-view.c:1083 ../composer/e-msg-composer.c:1241
+#: ../calendar/gui/e-calendar-table.c:1012
+#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
 msgid "Save as..."
 msgstr "Sábháil mar..."
 
-#: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1506 ../ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Oscail"
-
-#: ../calendar/gui/e-calendar-table.c:1157
+#: ../calendar/gui/e-calendar-table.c:1155
 msgid "Open _Web Page"
 msgstr "_Oscail Leathanach _Lín"
 
-#: ../calendar/gui/e-calendar-table.c:1158
-#: ../calendar/gui/e-calendar-view.c:1507 ../mail/em-folder-view.c:1043
-#: ../mail/em-popup.c:494
+#: ../calendar/gui/e-calendar-table.c:1156
+#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
+#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
 msgid "_Save As..."
 msgstr "_Sábháil Mar..."
 
-#: ../calendar/gui/e-calendar-table.c:1159
-#: ../calendar/gui/e-calendar-view.c:1487
-#: ../calendar/gui/e-calendar-view.c:1508 ../mail/em-folder-view.c:1044
+#: ../calendar/gui/e-calendar-table.c:1157
+#: ../calendar/gui/e-calendar-view.c:1509
+#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
+#: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:117 ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "_Priontáil..."
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1512 ../ui/evolution-addressbook.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1161
+#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
 #: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "G_earr"
 
 # PS
-#: ../calendar/gui/e-calendar-table.c:1165
-#: ../calendar/gui/e-calendar-view.c:1490
-#: ../calendar/gui/e-calendar-view.c:1514 ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:1512
+#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
 #: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-tasks.xml.h:24
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "_Greamaigh"
 
-#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr ""
 
 # ln
-#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1171
+#: ../calendar/gui/e-calendar-table.c:1169
 msgid "_Mark as Complete"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-table.c:1170
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
 #. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1526 ../mail/em-folder-tree.c:2119
-#: ../mail/em-folder-view.c:1047 ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:26
-#: ../ui/evolution-tasks.xml.h:21
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-tasks.xml.h:22
 msgid "_Delete"
 msgstr "_Dealaigh"
 
-#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-table.c:1175
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1328
+#: ../calendar/gui/e-calendar-table.c:1326
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr ""
@@ -6986,81 +7092,81 @@ msgstr "Dáta Breithe"
 msgid "Task sort"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1204
+#: ../calendar/gui/e-calendar-view.c:1231
 #, fuzzy
 msgid "Moving items"
 msgstr "Ag bogadh scéaltaí"
 
-#: ../calendar/gui/e-calendar-view.c:1206
+#: ../calendar/gui/e-calendar-view.c:1233
 #, fuzzy
 msgid "Copying items"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: ../calendar/gui/e-calendar-view.c:1481
+#: ../calendar/gui/e-calendar-view.c:1503
 msgid "New _Appointment..."
 msgstr "_Coinne Nua..."
 
-#: ../calendar/gui/e-calendar-view.c:1482
+#: ../calendar/gui/e-calendar-view.c:1504
 msgid "New All Day _Event"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1484
+#: ../calendar/gui/e-calendar-view.c:1506
 msgid "New Task"
 msgstr "Tasc Nua"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1494
+#: ../calendar/gui/e-calendar-view.c:1516
 msgid "Current View"
 msgstr "Amharc Reatha"
 
-#: ../calendar/gui/e-calendar-view.c:1496 ../ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Roghnaigh fillteán"
 
-#: ../calendar/gui/e-calendar-view.c:1497
+#: ../calendar/gui/e-calendar-view.c:1519
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Roghnaigh..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1502 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1518
+#: ../calendar/gui/e-calendar-view.c:1540
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Cóip do Fillteán..."
 
-#: ../calendar/gui/e-calendar-view.c:1519
+#: ../calendar/gui/e-calendar-view.c:1541
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Bog go Fillteán..."
 
-#: ../calendar/gui/e-calendar-view.c:1520
+#: ../calendar/gui/e-calendar-view.c:1542
 #, fuzzy
 msgid "_Delegate Meeting..."
 msgstr "_Dealaigh..."
 
-#: ../calendar/gui/e-calendar-view.c:1521
+#: ../calendar/gui/e-calendar-view.c:1543
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1522
+#: ../calendar/gui/e-calendar-view.c:1544
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1527
+#: ../calendar/gui/e-calendar-view.c:1549
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Scríos an Tarlú seo"
 
-#: ../calendar/gui/e-calendar-view.c:1528
+#: ../calendar/gui/e-calendar-view.c:1550
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1529
+#: ../calendar/gui/e-calendar-view.c:1551
 msgid "Delete _All Occurrences"
 msgstr ""
 
@@ -7103,411 +7209,413 @@ msgstr ""
 #. 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:715 ../calendar/gui/e-day-view.c:1499
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
 #: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 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:752 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "rn"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:755 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "in"
 
-#: ../calendar/gui/e-itip-control.c:761
+#: ../calendar/gui/e-itip-control.c:763
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:772
+#: ../calendar/gui/e-itip-control.c:774
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Gach lá"
 msgstr[1] "Gach lá"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:779
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Gach seachtain"
 msgstr[1] "Gach seachtain"
 
-#: ../calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:781
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/e-itip-control.c:787
+#: ../calendar/gui/e-itip-control.c:789
 msgid " and "
 msgstr " agus "
 
-#: ../calendar/gui/e-itip-control.c:794
+#: ../calendar/gui/e-itip-control.c:796
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:807
+#: ../calendar/gui/e-itip-control.c:809
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:814
+#: ../calendar/gui/e-itip-control.c:816
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "gach mí"
 msgstr[1] "gach mí"
 
-#: ../calendar/gui/e-itip-control.c:818
+#: ../calendar/gui/e-itip-control.c:820
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Gach bliain"
 msgstr[1] "Gach bliain"
 
-#: ../calendar/gui/e-itip-control.c:829
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:840
 msgid ", ending on "
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:862
+#: ../calendar/gui/e-itip-control.c:864
 #, fuzzy
 msgid "Starts"
 msgstr "Stádas"
 
-#: ../calendar/gui/e-itip-control.c:875
+#: ../calendar/gui/e-itip-control.c:877
 msgid "Ends"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:909
+#: ../calendar/gui/e-itip-control.c:911
 #: ../plugins/save-calendar/csv-format.c:395
 #, fuzzy
 msgid "Due"
 msgstr "Ran."
 
-#: ../calendar/gui/e-itip-control.c:949 ../calendar/gui/e-itip-control.c:1006
+#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Information"
 msgstr "Eolas iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:966
+#: ../calendar/gui/e-itip-control.c:968
 msgid "iCalendar Error"
 msgstr "Féilire"
 
-#: ../calendar/gui/e-itip-control.c:1038 ../calendar/gui/e-itip-control.c:1054
-#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1082
-#: ../plugins/itip-formatter/itip-view.c:333
-#: ../plugins/itip-formatter/itip-view.c:334
-#: ../plugins/itip-formatter/itip-view.c:401
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
+#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
+#: ../plugins/itip-formatter/itip-view.c:338
+#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "Duine anaithnid"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1089
+#: ../calendar/gui/e-itip-control.c:1091
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1137
+#: ../calendar/gui/e-itip-control.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:547
-#: ../plugins/itip-formatter/itip-formatter.c:1552
+#: ../calendar/gui/itip-utils.c:548
+#: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:550
-#: ../plugins/itip-formatter/itip-formatter.c:1555
+#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
+#: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-itip-control.c:1147
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:553 ../calendar/gui/itip-utils.c:582
-#: ../plugins/itip-formatter/itip-formatter.c:1558
+#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
+#: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1229
+#: ../calendar/gui/e-itip-control.c:1231
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1233
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1312
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1311
+#: ../calendar/gui/e-itip-control.c:1313
 msgid "Meeting Information"
 msgstr "Eolas cruinniú"
 
-#: ../calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1320
+#: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Proposal"
 msgstr ""
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1329
 msgid "Meeting Update"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1332
+#: ../calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update Request"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1340
+#: ../calendar/gui/e-itip-control.c:1342
 msgid "Meeting Reply"
 msgstr "Freagra Cruinniú"
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1349
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1348
+#: ../calendar/gui/e-itip-control.c:1350
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1358 ../calendar/gui/e-itip-control.c:1435
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1361
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1388
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1389
 msgid "Task Information"
 msgstr "Eolas Thasc"
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1397
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Task Proposal"
 msgstr ""
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1406
 msgid "Task Update"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1410
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1409
+#: ../calendar/gui/e-itip-control.c:1411
 msgid "Task Update Request"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1418
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1417
+#: ../calendar/gui/e-itip-control.c:1419
 msgid "Task Reply"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1426
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1425
+#: ../calendar/gui/e-itip-control.c:1427
 msgid "Task Cancellation"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1438
 msgid "Bad Task Message"
 msgstr "Droch Scéal Tasc"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Free/Busy Information"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Free/Busy Request"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1551
+#: ../calendar/gui/e-itip-control.c:1553
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1610
+#: ../calendar/gui/e-itip-control.c:1612
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1643
+#: ../calendar/gui/e-itip-control.c:1645
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1675
+#: ../calendar/gui/e-itip-control.c:1677
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1909
+#: ../calendar/gui/e-itip-control.c:1911
 msgid "Update complete\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1937
+#: ../calendar/gui/e-itip-control.c:1939
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1947
+#: ../calendar/gui/e-itip-control.c:1949
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1959
+#: ../calendar/gui/e-itip-control.c:1961
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1976
+#: ../calendar/gui/e-itip-control.c:1978
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1979
-#: ../plugins/itip-formatter/itip-formatter.c:974
+#: ../calendar/gui/e-itip-control.c:1981
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2006
+#: ../calendar/gui/e-itip-control.c:2011
 msgid "Removal Complete"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2029 ../calendar/gui/e-itip-control.c:2077
+#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
 msgid "Item sent!\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2081
+#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2161
+#: ../calendar/gui/e-itip-control.c:2166
 msgid "Choose an action:"
 msgstr "Roghnaigh gníomh:"
 
-#: ../calendar/gui/e-itip-control.c:2232
+#: ../calendar/gui/e-itip-control.c:2237
 msgid "Update"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2265
+#: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Glac Leis"
 
-#: ../calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2266
 msgid "Tentatively accept"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2267
+#: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Diúltaigh Dó"
 
-#: ../calendar/gui/e-itip-control.c:2291
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2319
+#: ../calendar/gui/e-itip-control.c:2324
 msgid "Update respondent status"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2347
+#: ../calendar/gui/e-itip-control.c:2352
 msgid "Send Latest Information"
 msgstr ""
 
 # FR
-#: ../calendar/gui/e-itip-control.c:2375 ../calendar/gui/itip-utils.c:570
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7578,6 +7686,8 @@ msgstr "Pearsanta"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../widgets/table/e-table-config-no-group.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupa"
 
@@ -7627,8 +7737,8 @@ msgstr ""
 
 #: ../calendar/gui/e-meeting-list-view.c:207
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:556
-#: ../plugins/itip-formatter/itip-formatter.c:1561
+#: ../calendar/gui/itip-utils.c:557
+#: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
 msgstr ""
 
@@ -7639,7 +7749,7 @@ msgstr ""
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2104
+#: ../calendar/gui/e-meeting-time-sel.c:2102
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
@@ -7650,7 +7760,7 @@ msgstr "%A, %d %B %Y"
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
 #: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2137 ../e-util/e-time-utils.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
 #: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -7725,7 +7835,7 @@ msgstr ""
 msgid "Enter the password for %s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: ../calendar/gui/e-tasks.c:763 ../calendar/gui/gnome-cal.c:2412
+#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7734,25 +7844,25 @@ msgstr ""
 " Earráid le %s:\n"
 "  %s"
 
-#: ../calendar/gui/e-tasks.c:811
+#: ../calendar/gui/e-tasks.c:846
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Ag Lódáil íomhanna"
 
-#: ../calendar/gui/e-tasks.c:895
+#: ../calendar/gui/e-tasks.c:930
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ag oscailt tascanna as %s"
 
-#: ../calendar/gui/e-tasks.c:1091
+#: ../calendar/gui/e-tasks.c:1126
 msgid "Completing tasks..."
 msgstr ""
 
-#: ../calendar/gui/e-tasks.c:1114
+#: ../calendar/gui/e-tasks.c:1149
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: ../calendar/gui/e-tasks.c:1141
+#: ../calendar/gui/e-tasks.c:1176
 msgid "Expunging"
 msgstr ""
 
@@ -7768,40 +7878,42 @@ msgstr "Am Críos "
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:723
+#: ../calendar/gui/gnome-cal.c:789
 msgid "Updating query"
 msgstr ""
 
 #. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2089 ../widgets/menus/gal-view-menus.c:350
+#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Sainradharc"
 
-#: ../calendar/gui/gnome-cal.c:2090
+#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
 msgid "Save Custom View"
 msgstr "Sábháil Amharc Féindheanamh"
 
-#: ../calendar/gui/gnome-cal.c:2095 ../widgets/menus/gal-view-menus.c:372
+#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2258
+#: ../calendar/gui/gnome-cal.c:2378
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Gan coinní."
 
-#: ../calendar/gui/gnome-cal.c:2277
+#: ../calendar/gui/gnome-cal.c:2397
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Ag Lódáil íomhanna"
 
-#: ../calendar/gui/gnome-cal.c:2378
+#: ../calendar/gui/gnome-cal.c:2498
 #, c-format
 msgid "Opening %s"
 msgstr "Ag Oscailt %s"
 
 # tr
-#: ../calendar/gui/gnome-cal.c:3268
+#: ../calendar/gui/gnome-cal.c:3388
 msgid "Purging"
 msgstr ""
 
@@ -7867,57 +7979,57 @@ msgstr "M. Fómhair"
 msgid "_Select Today"
 msgstr "Roghnaigh fillteán"
 
-#: ../calendar/gui/itip-utils.c:352 ../calendar/gui/itip-utils.c:401
-#: ../calendar/gui/itip-utils.c:441
+#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:442
 msgid "An organizer must be set."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:388
+#: ../calendar/gui/itip-utils.c:389
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:509 ../calendar/gui/itip-utils.c:631
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
 msgid "Event information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:511 ../calendar/gui/itip-utils.c:633
+#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
 msgid "Task information"
 msgstr "Eolas Tasc"
 
-#: ../calendar/gui/itip-utils.c:513 ../calendar/gui/itip-utils.c:635
+#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
 msgid "Journal information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:515 ../calendar/gui/itip-utils.c:653
+#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
 msgid "Free/Busy information"
 msgstr "Eolas"
 
-#: ../calendar/gui/itip-utils.c:517
+#: ../calendar/gui/itip-utils.c:518
 msgid "Calendar information"
 msgstr "Eolas fhéilire"
 
-#: ../calendar/gui/itip-utils.c:566
+#: ../calendar/gui/itip-utils.c:567
 msgid "Updated"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:574
+#: ../calendar/gui/itip-utils.c:575
 msgid "Refresh"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:578
+#: ../calendar/gui/itip-utils.c:579
 msgid "Counter-proposal"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:649
+#: ../calendar/gui/itip-utils.c:650
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:659
+#: ../calendar/gui/itip-utils.c:660
 msgid "iCalendar information"
 msgstr "Eeolas iCalendar"
 
-#: ../calendar/gui/itip-utils.c:814
+#: ../calendar/gui/itip-utils.c:815
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -8201,7 +8313,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Gan Tascanna"
 msgstr[1] "Gan Tascanna"
 
-#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:545
+#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8213,59 +8325,59 @@ msgstr[1] "Scrioste"
 msgid "Failed upgrading tasks."
 msgstr "Ag Lódáil íomhanna"
 
-#: ../calendar/gui/tasks-component.c:860
+#: ../calendar/gui/tasks-component.c:872
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:887
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:969
+#: ../calendar/gui/tasks-component.c:981
 msgid "Task Source Selector"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1164
 msgid "New task"
 msgstr "Tasc nua"
 
-#: ../calendar/gui/tasks-component.c:1153
+#: ../calendar/gui/tasks-component.c:1165
 msgid "_Task"
 msgstr "_Tasc"
 
-#: ../calendar/gui/tasks-component.c:1154
+#: ../calendar/gui/tasks-component.c:1166
 msgid "Create a new task"
 msgstr "Cruthaigh tasc nua"
 
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1172
 #, fuzzy
 msgid "New assigned task"
 msgstr "Tasc nua"
 
-#: ../calendar/gui/tasks-component.c:1161
+#: ../calendar/gui/tasks-component.c:1173
 msgid "Assigne_d Task"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1162
+#: ../calendar/gui/tasks-component.c:1174
 #, fuzzy
 msgid "Create a new assigned task"
 msgstr "Cruthaigh tasc nua"
 
-#: ../calendar/gui/tasks-component.c:1168
+#: ../calendar/gui/tasks-component.c:1180
 msgid "New task list"
 msgstr "Líosta tasc nua"
 
-#: ../calendar/gui/tasks-component.c:1169
+#: ../calendar/gui/tasks-component.c:1181
 #, fuzzy
 msgid "Task l_ist"
 msgstr "Líosta Tasc"
 
-#: ../calendar/gui/tasks-component.c:1170
+#: ../calendar/gui/tasks-component.c:1182
 msgid "Create a new task list"
 msgstr "Cruthaigh tasc nua"
 
-#: ../calendar/gui/tasks-control.c:370
+#: ../calendar/gui/tasks-control.c:419
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8273,11 +8385,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: ../calendar/gui/tasks-control.c:373
+#: ../calendar/gui/tasks-control.c:422
 msgid "Do not ask me again."
 msgstr ""
 
-#: ../calendar/gui/tasks-control.c:408
+#: ../calendar/gui/tasks-control.c:457
 msgid "Print Tasks"
 msgstr "Priontáil Tascanna"
 
@@ -8286,43 +8398,43 @@ msgstr "Priontáil Tascanna"
 msgid "SMTWTFS"
 msgstr "LMCDASD"
 
-#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
-msgid "Evolution Calendar intelligent importer"
-msgstr ""
+#: ../calendar/importers/icalendar-importer.c:78
+#, fuzzy
+msgid "Appointments and Meetings"
+msgstr "Coinne - %s"
 
-#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#: ../calendar/importers/icalendar-importer.c:336
+#: ../calendar/importers/icalendar-importer.c:586
+#, fuzzy
+msgid "Opening calendar"
+msgstr "Ag oscailt féilire as %s"
+
+#: ../calendar/importers/icalendar-importer.c:429
+msgid "iCalendar files (.ics)"
+msgstr "Comhaid iCalendar (.ics)"
+
+#: ../calendar/importers/icalendar-importer.c:430
 msgid "Evolution iCalendar importer"
 msgstr ""
 
-#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-msgid "Evolution vCalendar importer"
+#: ../calendar/importers/icalendar-importer.c:494
+msgid "Reminder!!"
 msgstr ""
 
-#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
-msgid "iCalendar files (.ics)"
-msgstr "Comhaid iCalendar (.ics)"
-
-#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+#: ../calendar/importers/icalendar-importer.c:539
 msgid "vCalendar files (.vcf)"
 msgstr "Comhaid vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:82
-#, fuzzy
-msgid "Appointments and Meetings"
-msgstr "Coinne - %s"
-
-#: ../calendar/importers/icalendar-importer.c:486
-msgid "Reminder!!"
+#: ../calendar/importers/icalendar-importer.c:540
+msgid "Evolution vCalendar importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:694
+#: ../calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:719
-msgid ""
-"Evolution has found Gnome Calendar files.\n"
-"Would you like to import them into Evolution?"
+#: ../calendar/importers/icalendar-importer.c:739
+msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
 #.
@@ -9881,16 +9993,16 @@ msgstr "An tAigéan Ciúin/Wallis"
 msgid "Pacific/Yap"
 msgstr "An tAigéan Ciúin/Yap"
 
-#: ../composer/e-msg-composer-hdrs.c:525
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Posting destination"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:526
+#: ../composer/e-msg-composer-hdrs.c:559
 #, fuzzy
 msgid "Choose folders to post the message to."
 msgstr "Ceangal comhad ar an scéal"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:593
 msgid "Click here for the address book"
 msgstr ""
 
@@ -9901,7 +10013,7 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:590
+#: ../composer/e-msg-composer-hdrs.c:623
 #, fuzzy
 msgid "_Reply-To:"
 msgstr "_Freagrair-Do"
@@ -9910,7 +10022,7 @@ msgstr "_Freagrair-Do"
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:597
+#: ../composer/e-msg-composer-hdrs.c:630
 #, fuzzy
 msgid "Fr_om:"
 msgstr "Ó:"
@@ -9918,35 +10030,35 @@ msgstr "Ó:"
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:604
+#: ../composer/e-msg-composer-hdrs.c:637
 #, fuzzy
 msgid "S_ubject:"
 msgstr "Ábhar:"
 
-#: ../composer/e-msg-composer-hdrs.c:614
+#: ../composer/e-msg-composer-hdrs.c:646
 #, fuzzy
 msgid "_To:"
 msgstr "Do:"
 
-#: ../composer/e-msg-composer-hdrs.c:615
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:618
+#: ../composer/e-msg-composer-hdrs.c:650
 #, fuzzy
 msgid "_Cc:"
 msgstr "Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:619
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:622
+#: ../composer/e-msg-composer-hdrs.c:654
 #, fuzzy
 msgid "_Bcc:"
 msgstr "Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:623
+#: ../composer/e-msg-composer-hdrs.c:655
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9955,81 +10067,82 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:662
 #, fuzzy
 msgid "_Post To:"
 msgstr "Tosaíocht:"
 
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:667
 msgid "Click here to select folders to post to"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:641
+#: ../composer/e-msg-composer-hdrs.c:673
 msgid "Post To:"
 msgstr ""
 
-#: ../composer/e-msg-composer-select-file.c:81
+#: ../composer/e-msg-composer-select-file.c:82
 #, fuzzy
 msgid "A_ttach"
 msgstr "Ceangal"
 
-#: ../composer/e-msg-composer.c:737
+#: ../composer/e-msg-composer.c:738
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:744
+#: ../composer/e-msg-composer.c:745
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1222 ../composer/e-msg-composer.c:1255
+#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
+#: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1292
+#: ../composer/e-msg-composer.c:1294
 #, fuzzy
 msgid "Could not open file"
 msgstr "Níorbh fhéidir an comhad %s a n-oscailt: %s"
 
-#: ../composer/e-msg-composer.c:1300
+#: ../composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1570
+#: ../composer/e-msg-composer.c:1572
 #, fuzzy
 msgid "Untitled Message"
 msgstr "(Scéal gan tideál)"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1604
+#: ../composer/e-msg-composer.c:1606
 #, fuzzy
 msgid "Open File"
 msgstr "Oscail Comhad"
 
-#: ../composer/e-msg-composer.c:1996 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:698
+#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
+#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Uathcruthach"
 
 # SG
-#: ../composer/e-msg-composer.c:2095
+#: ../composer/e-msg-composer.c:2105
 #, fuzzy
 msgid "Si_gnature:"
 msgstr "Siniú:"
 
-#: ../composer/e-msg-composer.c:2337 ../composer/e-msg-composer.c:3373
-#: ../composer/e-msg-composer.c:3374
+#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
+#: ../composer/e-msg-composer.c:3528
 msgid "Compose a message"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:3484
+#: ../composer/e-msg-composer.c:3643
 #, fuzzy
 msgid "_Attachment Bar"
 msgstr "Ceangaltán"
 
-#: ../composer/e-msg-composer.c:4557
+#: ../composer/e-msg-composer.c:4718
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10056,7 +10169,7 @@ 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:16
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{1}&quot;."
 msgstr ""
 
@@ -10179,7 +10292,9 @@ msgstr "_Caith uait"
 msgid "_Save Message"
 msgstr "Sábháil Scéal...."
 
-#: ../data/evolution.desktop.in.in.h:1 ../shell/main.c:509
+#: ../data/evolution.desktop.in.in.h:1
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:509
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10346,7 +10461,7 @@ msgstr ""
 msgid "File exists &quot;{0}&quot;."
 msgstr ""
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:117
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
 msgstr ""
 
@@ -10453,69 +10568,69 @@ msgstr "%I %p"
 msgid "The orientation of the tray."
 msgstr "Cur síos an cheangaltáin"
 
-#: ../filter/filter-datespec.c:73
+#: ../filter/filter-datespec.c:78
 #, fuzzy, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 soicind ó shin"
 msgstr[1] "1 soicind ó shin"
 
-#: ../filter/filter-datespec.c:74
+#: ../filter/filter-datespec.c:79
 #, fuzzy, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 noiméad ó shin"
 msgstr[1] "1 noiméad ó shin"
 
-#: ../filter/filter-datespec.c:75
+#: ../filter/filter-datespec.c:80
 #, fuzzy, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 uair ó shin"
 msgstr[1] "1 uair ó shin"
 
-#: ../filter/filter-datespec.c:76
+#: ../filter/filter-datespec.c:81
 #, fuzzy, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 lá ó shin"
 msgstr[1] "1 lá ó shin"
 
-#: ../filter/filter-datespec.c:77
+#: ../filter/filter-datespec.c:82
 #, fuzzy, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 seachtain ó shin"
 msgstr[1] "1 seachtain ó shin"
 
-#: ../filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:83
 #, fuzzy, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 mí ó shin"
 msgstr[1] "1 mí ó shin"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:84
 #, fuzzy, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 bliain ó shin"
 msgstr[1] "1 bliain ó shin"
 
-#: ../filter/filter-datespec.c:280
+#: ../filter/filter-datespec.c:285
 msgid "<click here to select a date>"
 msgstr ""
 
-#: ../filter/filter-datespec.c:283 ../filter/filter-datespec.c:294
+#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
 msgid "now"
 msgstr "anois"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:290
+#: ../filter/filter-datespec.c:295
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:406
+#: ../filter/filter-datespec.c:415
 msgid "Select a time to compare against"
 msgstr ""
 
@@ -10588,10 +10703,11 @@ msgid "Include threads"
 msgstr ""
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:291
 msgid "Incoming"
 msgstr ""
 
-#: ../filter/filter-rule.c:978
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
 msgid "Outgoing"
 msgstr ""
 
@@ -10615,7 +10731,7 @@ msgstr ""
 msgid "Missing file name."
 msgstr ""
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:62
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
 #, fuzzy
 msgid "Missing name."
 msgstr "Coinne"
@@ -10699,16 +10815,16 @@ msgstr ""
 msgid "years"
 msgstr "bliana"
 
-#: ../filter/rule-editor.c:285
+#: ../filter/rule-editor.c:290
 msgid "Add Rule"
 msgstr ""
 
-#: ../filter/rule-editor.c:361
+#: ../filter/rule-editor.c:366
 msgid "Edit Rule"
 msgstr ""
 
 # vi
-#: ../filter/rule-editor.c:693
+#: ../filter/rule-editor.c:698
 msgid "Rule name"
 msgstr ""
 
@@ -10753,11 +10869,12 @@ msgstr ""
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:493
-#: ../mail/importers/elm-importer.c:418
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:494
+#: ../mail/importers/elm-importer.c:342
 #: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:474 ../mail/mail-component.c:558
-#: ../mail/mail-component.c:645
+#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
+#: ../mail/mail-component.c:648
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Post"
 
@@ -10793,104 +10910,106 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Roghnaigh Fillteán"
 
-#: ../mail/em-account-editor.c:758
+#: ../mail/em-account-editor.c:760
 #, fuzzy
 msgid "Ask for each message"
 msgstr "(Scéal gan tideál)"
 
-#: ../mail/em-account-editor.c:1719 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr ""
 
-#: ../mail/em-account-editor.c:1755 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr ""
 
-#: ../mail/em-account-editor.c:1932
+#: ../mail/em-account-editor.c:1943
 msgid "Automatically check for _new mail every"
 msgstr ""
 
-#: ../mail/em-account-editor.c:2100 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
 msgid "Sending Email"
 msgstr ""
 
-#: ../mail/em-account-editor.c:2148 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Defaults"
 msgstr "Gnáth"
 
-#: ../mail/em-account-editor.c:2207 ../mail/mail-config.glade.h:122
+#. Security settings
+#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
+#: ../plugins/exchange-operations/exchange-account-setup.c:311
 #, fuzzy
 msgid "Security"
 msgstr "_Slándáil"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2244 ../mail/em-account-editor.c:2318
+#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Cumraigh do %s"
 
-#: ../mail/em-account-editor.c:2245 ../mail/em-account-editor.c:2319
+#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Post ríomhphost"
 
-#: ../mail/em-account-editor.c:2643 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Eagarthóir Chuntas"
 
-#: ../mail/em-account-editor.c:2643 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr ""
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:428
+#: ../mail/em-account-prefs.c:455
 msgid "[Default]"
 msgstr "[Gnáth]"
 
-#: ../mail/em-account-prefs.c:482
+#: ../mail/em-account-prefs.c:510
 msgid "Account name"
 msgstr "Ainm chuntas"
 
-#: ../mail/em-account-prefs.c:484
+#: ../mail/em-account-prefs.c:512
 msgid "Protocol"
 msgstr ""
 
-#: ../mail/em-account-prefs.c:489
+#: ../mail/em-account-prefs.c:517
 #, fuzzy
 msgid "Mail Accounts Table"
 msgstr "Cuntasaí Phoist"
 
-#: ../mail/em-composer-prefs.c:306 ../mail/em-composer-prefs.c:429
-#: ../mail/mail-config.c:935
+#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
+#: ../mail/mail-config.c:958
 msgid "Unnamed"
 msgstr ""
 
-#: ../mail/em-composer-prefs.c:894
+#: ../mail/em-composer-prefs.c:897
 msgid "Language(s)"
 msgstr "Teang(ach)a"
 
-#: ../mail/em-composer-prefs.c:937
+#: ../mail/em-composer-prefs.c:940
 #, fuzzy
 msgid "Add signature script"
 msgstr "Suimigh Siniú"
 
-#: ../mail/em-composer-prefs.c:957
+#: ../mail/em-composer-prefs.c:960
 msgid "Signature(s)"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:852
+#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1644
+#: ../mail/em-composer-utils.c:1648
 msgid "an unknown sender"
 msgstr ""
 
 #. 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:1691
+#: ../mail/em-composer-utils.c:1695
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11044,7 +11163,7 @@ msgstr ""
 
 # GN
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Bruscar"
 
@@ -11055,7 +11174,7 @@ msgid "Junk Test"
 msgstr "Meitheamh"
 
 # PE
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1061
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1063
 #: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Lipéid"
@@ -11181,8 +11300,8 @@ msgstr "Líosta tasc nua"
 msgid "Stop Processing"
 msgstr "_Dearbhú:"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1541
-#: ../mail/em-format-quote.c:310 ../mail/em-format.c:848
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
+#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
 #: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:330
 #: ../plugins/groupwise-features/properties.glade.h:7
@@ -11204,7 +11323,7 @@ msgstr "<b>Am</b> "
 
 #: ../mail/em-folder-browser.c:134
 #, fuzzy
-msgid "Create _vFolder From Search..."
+msgid "C_reate Search Folder From Search..."
 msgstr "Cruthaigh Fillteán _Fhíorúil ó Cuardach..."
 
 #. TODO: can this be done in a loop?
@@ -11242,35 +11361,36 @@ msgid "Folder _name:"
 msgstr "Ai_nm Fillteán:"
 
 #: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:900 ../mail/mail-vfolder.c:970
-msgid "vFolders"
-msgstr "fFillteáin"
+#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
+#, fuzzy
+msgid "Search Folders"
+msgstr "Roghnaigh Fillteán"
 
 #. UNMATCHED is always last
 #: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:468 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
 #, fuzzy
 msgid "Drafts"
 msgstr "Dáta"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:471 ../mail/mail-component.c:142
+#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
 msgid "Inbox"
 msgstr "Imbosca"
 
-#: ../mail/em-folder-tree-model.c:474 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
 msgid "Outbox"
 msgstr "Asbosca"
 
-#: ../mail/em-folder-tree-model.c:476 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
 #, fuzzy
 msgid "Sent"
 msgstr "Post"
 
-#: ../mail/em-folder-tree-model.c:495 ../mail/em-folder-tree-model.c:799
+#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
 msgid "Loading..."
 msgstr "Ag Lódáil..."
 
@@ -11279,72 +11399,72 @@ msgstr "Ag Lódáil..."
 msgid "Mail Folder Tree"
 msgstr "_Fillteán"
 
-#: ../mail/em-folder-tree.c:922
+#: ../mail/em-folder-tree.c:849
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Ag dealaigh fillteán %s"
 
-#: ../mail/em-folder-tree.c:924
+#: ../mail/em-folder-tree.c:851
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: ../mail/em-folder-tree.c:931 ../mail/message-list.c:1613
+#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr ""
 "Earraidh ag sábhháil scéalaí  do: %s\n"
 " %s"
 
-#: ../mail/em-folder-tree.c:933 ../mail/message-list.c:1615
+#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 "Earraidh ag sábhháil scéalaí  do: %s\n"
 " %s"
 
-#: ../mail/em-folder-tree.c:949
+#: ../mail/em-folder-tree.c:876
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:1045 ../ui/evolution-mail-message.xml.h:101
+#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "_Cóip go Fillteán"
 
-#: ../mail/em-folder-tree.c:1046 ../ui/evolution-mail-message.xml.h:111
+#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
 msgid "_Move to Folder"
 msgstr "_Bog go Fillteán"
 
-#: ../mail/em-folder-tree.c:1751 ../mail/mail-ops.c:1055
+#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2107 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:52 ../ui/evolution.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
 msgid "_View"
 msgstr "_Feach"
 
-#: ../mail/em-folder-tree.c:2108
+#: ../mail/em-folder-tree.c:2032
 msgid "Open in _New Window"
 msgstr "Oscail 'san Fhuinneog _Nua"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2036
 msgid "_Copy..."
 msgstr "_Cóip..."
 
-#: ../mail/em-folder-tree.c:2113
+#: ../mail/em-folder-tree.c:2037
 msgid "_Move..."
 msgstr "_Bog..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2041
 msgid "_New Folder..."
 msgstr "Fillteán _Nua..."
 
-#: ../mail/em-folder-tree.c:2120 ../ui/evolution-mail-list.xml.h:29
+#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Athainmigh"
@@ -11354,448 +11474,489 @@ msgstr "_Athainmigh"
 msgid "Copying `%s' to `%s'"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: ../mail/em-folder-utils.c:367 ../mail/em-folder-utils.c:383
-#: ../mail/em-folder-view.c:929 ../mail/em-folder-view.c:944
-#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:931
+#: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
 #: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Roghnaigh fillteán"
 
-#: ../mail/em-folder-utils.c:367 ../mail/em-folder-view.c:944
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
 #, fuzzy
 msgid "C_opy"
 msgstr "Cóip"
 
-#: ../mail/em-folder-utils.c:521
+#: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: ../mail/em-folder-utils.c:523
+#: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "Athainmigh Fillteán"
 
-#: ../mail/em-folder-utils.c:529
+#: ../mail/em-folder-utils.c:511
 #, fuzzy
 msgid "Folder names cannot contain '/'"
 msgstr "agus aon carta eile."
 
-#: ../mail/em-folder-utils.c:599
-#: ../plugins/groupwise-features/share-folder-common.c:140
+#: ../mail/em-folder-utils.c:581
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: ../mail/em-folder-utils.c:748
-#: ../plugins/groupwise-features/install-shared.c:156
-#: ../plugins/groupwise-features/share-folder-common.c:382
+#: ../mail/em-folder-utils.c:730
+#: ../plugins/groupwise-features/install-shared.c:164
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Cruthaigh fillteán"
 
-#: ../mail/em-folder-utils.c:748
-#: ../plugins/groupwise-features/install-shared.c:156
-#: ../plugins/groupwise-features/share-folder-common.c:382
+#: ../mail/em-folder-utils.c:730
+#: ../plugins/groupwise-features/install-shared.c:164
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1037 ../mail/em-popup.c:499
+#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
 msgid "Reply to _All"
 msgstr "Freagrair do _Gach rud"
 
-#: ../mail/em-folder-view.c:1038 ../ui/evolution-mail-message.xml.h:119
+#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
 msgid "_Reply to Sender"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:501
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Forward"
 msgstr "_Seol ar aghaidh"
 
-#: ../mail/em-folder-view.c:1042 ../ui/evolution-mail-message.xml.h:103
+#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Eagar mar Scéal Nua..."
 
-#: ../mail/em-folder-view.c:1048
+#: ../mail/em-folder-view.c:1050
 msgid "U_ndelete"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1049
-msgid "Mo_ve to Folder..."
-msgstr "_Bog go Fillteán..."
+#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
+msgid "_Move to Folder..."
+msgstr ""
 
-#: ../mail/em-folder-view.c:1050 ../ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Cóip do Fillteán..."
 
-#: ../mail/em-folder-view.c:1053
+#: ../mail/em-folder-view.c:1055
 msgid "Mar_k as Read"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1054
-msgid "Mark as U_nread"
+#: ../mail/em-folder-view.c:1056
+msgid "Mark as _Unread"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1055
+#: ../mail/em-folder-view.c:1057
 msgid "Mark as _Important"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1058
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1059
 msgid "Mark as _Junk"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1058
+#: ../mail/em-folder-view.c:1060
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1061
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1067
+#: ../mail/em-folder-view.c:1069
 msgid "Fla_g Completed"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1068
+#: ../mail/em-folder-view.c:1070
 msgid "Cl_ear Flag"
 msgstr "_Bánaigh Brat"
 
-#: ../mail/em-folder-view.c:1071
+#: ../mail/em-folder-view.c:1073
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1072
+#: ../mail/em-folder-view.c:1074
 #, fuzzy
-msgid "vFolder on _Subject"
+msgid "Search Folder from _Subject"
 msgstr "Foinse FFillteáin"
 
-#: ../mail/em-folder-view.c:1073
+#: ../mail/em-folder-view.c:1075
 #, fuzzy
-msgid "vFolder on Se_nder"
+msgid "Search Folder from Se_nder"
 msgstr "Ai_nm Fillteán:"
 
-#: ../mail/em-folder-view.c:1074
+#: ../mail/em-folder-view.c:1076
 #, fuzzy
-msgid "vFolder on _Recipients"
+msgid "Search Folder from _Recipients"
 msgstr "Freagraí do %s"
 
-#: ../mail/em-folder-view.c:1075
+#: ../mail/em-folder-view.c:1077
 #, fuzzy
-msgid "vFolder on Mailing _List"
+msgid "Search Folder from Mailing _List"
 msgstr "líosta ríomhphost %s"
 
-#: ../mail/em-folder-view.c:1079
+#: ../mail/em-folder-view.c:1081
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1080
+#: ../mail/em-folder-view.c:1082
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1081
+#: ../mail/em-folder-view.c:1083
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-view.c:1084
 msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
+#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
 msgid "Default"
 msgstr "Gnáth"
 
-#: ../mail/em-folder-view.c:2065
+#: ../mail/em-folder-view.c:2064
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
+#: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Priontáil Scéal"
 
-#: ../mail/em-folder-view.c:2403
+#: ../mail/em-folder-view.c:2220
+#, fuzzy
+msgid "Unable to retrieve message"
+msgstr "Sábháil san leabhar seoladh"
+
+#: ../mail/em-folder-view.c:2413
 msgid "_Copy Link Location"
 msgstr ""
 
-#: ../mail/em-folder-view.c:2405
+#: ../mail/em-folder-view.c:2415
 #, fuzzy
-msgid "Create _vFolder"
-msgstr "Cruthaigh fillteán"
+msgid "Create _Search Folder"
+msgstr "Cruthaigh Fillteán Nua"
 
-#: ../mail/em-folder-view.c:2406
+#: ../mail/em-folder-view.c:2416
 #, fuzzy
 msgid "_From this Address"
 msgstr "Seoladh Bhaile"
 
-#: ../mail/em-folder-view.c:2407
+#: ../mail/em-folder-view.c:2417
 #, fuzzy
 msgid "_To this Address"
 msgstr "Seoladh Eile"
 
-#: ../mail/em-folder-view.c:2688
+#: ../mail/em-folder-view.c:2698
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:406
+#: ../mail/em-format-html-display.c:445
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:653 ../mail/em-format-html.c:578
+#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "Gan Siniú"
 
-#: ../mail/em-format-html-display.c:653
+#: ../mail/em-format-html-display.c:696
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 
 # SG
-#: ../mail/em-format-html-display.c:654 ../mail/em-format-html.c:579
+#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "Siniú Bhailithe."
 
-#: ../mail/em-format-html-display.c:654
+#: ../mail/em-format-html-display.c:697
 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:655 ../mail/em-format-html.c:580
+#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "Siniú neambhailí."
 
-#: ../mail/em-format-html-display.c:655
+#: ../mail/em-format-html-display.c:698
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:656
+#: ../mail/em-format-html-display.c:699
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:656
+#: ../mail/em-format-html-display.c:699
 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:662 ../mail/em-format-html.c:587
+#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:662
+#: ../mail/em-format-html-display.c:705
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:663 ../mail/em-format-html.c:588
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:663
+#: ../mail/em-format-html-display.c:706
 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:664 ../mail/em-format-html.c:589
+#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:664
+#: ../mail/em-format-html-display.c:707
 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:665 ../mail/em-format-html.c:590
+#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:665
+#: ../mail/em-format-html-display.c:708
 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:766 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Feach Teastas"
 
-#: ../mail/em-format-html-display.c:781
+#: ../mail/em-format-html-display.c:824
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1011
+#: ../mail/em-format-html-display.c:1106
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "mar %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1019
+#: ../mail/em-format-html-display.c:1114
 msgid "Overdue:"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1022
+#: ../mail/em-format-html-display.c:1117
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "mar %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1064
+#: ../mail/em-format-html-display.c:1177
 msgid "_View Inline"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1065
+#: ../mail/em-format-html-display.c:1178
 msgid "_Hide"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1309
+#: ../mail/em-format-html-display.c:1179
+msgid "_Fit to Width"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1180
+msgid "Show _Original Size"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1550
 #, fuzzy
 msgid "Attachment Button"
 msgstr "Ceangaltán"
 
+#: ../mail/em-format-html-display.c:1757
+#, fuzzy
+msgid "Select folder to save all attachments..."
+msgstr "Taispeán iatáni"
+
+#: ../mail/em-format-html-display.c:1796
+msgid "Select folder to save selected attachments..."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1804
+#, fuzzy
+msgid "Save Selected..."
+msgstr "_Roghnaigh..."
+
+#. Cant i put in the number of attachments here ?
+#: ../mail/em-format-html-display.c:1871
+#, fuzzy, c-format
+msgid "%d attachment"
+msgid_plural "%d attachments"
+msgstr[0] "ceangaltáin"
+msgstr[1] "ceangaltáin"
+
+#: ../mail/em-format-html-display.c:1935
+#, fuzzy
+msgid "No Attachment"
+msgstr "Ceangaltán"
+
+#: ../mail/em-format-html-display.c:1938
+#, fuzzy
+msgid "Save All"
+msgstr "Sábháil Mar"
+
 #: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Leathanach %d as %d"
 
-#: ../mail/em-format-html.c:471 ../mail/em-format-html.c:473
+#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
 #, c-format
 msgid "Retrieving `%s'"
 msgstr ""
 
-#: ../mail/em-format-html.c:581
+#: ../mail/em-format-html.c:600
 msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: ../mail/em-format-html.c:839
+#: ../mail/em-format-html.c:870
 msgid "Malformed external-body part."
 msgstr ""
 
-#: ../mail/em-format-html.c:869
+#: ../mail/em-format-html.c:900
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:880
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: ../mail/em-format-html.c:882
+#: ../mail/em-format-html.c:913
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:903
+#: ../mail/em-format-html.c:934
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:914
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: ../mail/em-format-html.c:1140
+#: ../mail/em-format-html.c:1171
 msgid "Formatting message"
 msgstr ""
 
-#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
-#: ../mail/em-format.c:843 ../mail/em-mailer-prefs.c:83
+#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "Ó"
 
-#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Freagrair-Do"
 
-#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Do"
 
-#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1545 ../mail/em-format-quote.c:319
-#: ../mail/em-mailer-prefs.c:986
+#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:987
 msgid "Mailer"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1572
+#: ../mail/em-format-html.c:1603
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1575
+#: ../mail/em-format-html.c:1606
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1585 ../mail/em-format-quote.c:326
-#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dáta"
 
-#: ../mail/em-format-html.c:1608 ../mail/em-format.c:850
+#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr ""
 
-#: ../mail/em-format.c:1099
+#: ../mail/em-format.c:1102
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: ../mail/em-format.c:1138 ../mail/em-format.c:1271
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: ../mail/em-format.c:1261
-msgid "Unsupported encryption type for multipart/encrypted"
+#: ../mail/em-format.c:1270 ../mail/em-format.c:1426
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: ../mail/em-format.c:1409
-msgid "Could not parse MIME message. Displaying as source."
+#: ../mail/em-format.c:1278
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: ../mail/em-format.c:1428
+#: ../mail/em-format.c:1445
 msgid "Unsupported signature format"
 msgstr ""
 
-#: ../mail/em-format.c:1436
+#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Sábháil siniú"
 
-#: ../mail/em-format.c:1436
+#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
 msgid "Unknown error verifying signature"
 msgstr ""
 
-#: ../mail/em-junk-filter.c:111
-msgid "Spamassassin (built-in)"
-msgstr ""
-
 #: ../mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Every time"
@@ -11877,65 +12038,66 @@ msgid ""
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: ../mail/em-popup.c:382
+#: ../mail/em-popup.c:399
 msgid "Save As..."
 msgstr "Sábháil Mar..."
 
 # US
-#: ../mail/em-popup.c:401
+#: ../mail/em-popup.c:424
 #, c-format
 msgid "untitled_image.%s"
 msgstr "íomhá_gan_tideál.%s"
 
-#: ../mail/em-popup.c:495
+#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
 msgid "Set as _Background"
 msgstr ""
 
-#: ../mail/em-popup.c:497
+#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
 msgid "_Reply to sender"
 msgstr ""
 
-#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
 msgstr "Freagrair do Líosta"
 
-#: ../mail/em-popup.c:549
+#: ../mail/em-popup.c:607
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: ../mail/em-popup.c:550
+#: ../mail/em-popup.c:608
 #, fuzzy
 msgid "_Send New Message To..."
 msgstr "_Eagar mar Scéal Nua..."
 
-#: ../mail/em-popup.c:551
+#: ../mail/em-popup.c:609
 msgid "_Add to Addressbook"
 msgstr "_Suim do Leabhar Seoladh"
 
-#: ../mail/em-popup.c:666
+#: ../mail/em-popup.c:762
 #, c-format
 msgid "Open in %s..."
 msgstr "Oscail san %s..."
 
-#: ../mail/em-subscribe-editor.c:611
+#: ../mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
 # Avoid; either use KR or KP
-#: ../mail/em-subscribe-editor.c:640
+#: ../mail/em-subscribe-editor.c:643
 msgid "Subscribed"
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:644
+#: ../mail/em-subscribe-editor.c:647
 msgid "Folder"
 msgstr "Fillteán"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:859
+#: ../mail/em-subscribe-editor.c:862
 msgid "Please select a server."
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:880
+#: ../mail/em-subscribe-editor.c:883
 msgid "No server has been selected"
 msgstr ""
 
@@ -11943,37 +12105,37 @@ msgstr ""
 msgid "Don't show this message again."
 msgstr ""
 
-#: ../mail/em-utils.c:294
+#: ../mail/em-utils.c:299
 msgid "Filters"
 msgstr ""
 
-#: ../mail/em-utils.c:436
+#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
 msgid "message"
 msgstr "scéal"
 
-#: ../mail/em-utils.c:545
+#: ../mail/em-utils.c:614
 msgid "Save Message..."
 msgstr "Sábháil Scéal...."
 
-#: ../mail/em-utils.c:594
+#: ../mail/em-utils.c:663
 msgid "Add address"
 msgstr "Suimigh seoladh"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1073
+#: ../mail/em-utils.c:1142
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Scéal ó %s"
 
 #: ../mail/em-vfolder-editor.c:104
 #, fuzzy
-msgid "v_Folders"
-msgstr "fFillteáin"
+msgid "Search _Folders"
+msgstr "Roghnaigh Fillteán"
 
 #: ../mail/em-vfolder-rule.c:574
 #, fuzzy
-msgid "vFolder source"
-msgstr "Foinse FFillteáin"
+msgid "Search Folder source"
+msgstr "Roghnaigh Fillteán"
 
 #: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
@@ -12431,94 +12593,64 @@ msgid ""
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr ""
-
-#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr ""
-
-#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr ""
-
-#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr ""
-
-#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: ../mail/importers/elm-importer.c:88
-msgid "Evolution is importing your old Elm mail"
-msgstr ""
-
-#: ../mail/importers/elm-importer.c:89
-#: ../mail/importers/evolution-mbox-importer.c:225
-#: ../mail/importers/evolution-outlook-importer.c:259
-#: ../mail/importers/netscape-importer.c:1251
-#: ../mail/importers/pine-importer.c:117
-msgid "Importing..."
-msgstr ""
-
-#: ../mail/importers/elm-importer.c:91
-#: ../mail/importers/evolution-mbox-importer.c:227
-#: ../mail/importers/evolution-outlook-importer.c:261
-#: ../mail/importers/netscape-importer.c:1253
-#: ../mail/importers/pine-importer.c:119
-msgid "Please wait"
-msgstr "Fán le do thoil"
-
-#: ../mail/importers/elm-importer.c:244
+#: ../mail/importers/elm-importer.c:193
 msgid "Importing Elm data"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:436
-msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+#: ../mail/importers/elm-importer.c:382
+msgid "Evolution Elm importer"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:444
-msgid "Elm"
-msgstr "Elm"
+#: ../mail/importers/elm-importer.c:383
+#, fuzzy
+msgid "Import mail from Elm."
+msgstr "Comhad Inchur"
 
-#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../mail/importers/evolution-mbox-importer.c:82
 #: ../mail/importers/evolution-outlook-importer.c:131
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Ag socraigh ffilteán: %s"
 
-#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-mbox-importer.c:85
 #: ../mail/importers/evolution-outlook-importer.c:134
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Roghnaigh fillteán"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:216
+msgid "Berkeley Mailbox (mbox)"
+msgstr ""
+
+#: ../mail/importers/evolution-mbox-importer.c:217
+msgid "Importer Berkeley Mailbox format folders"
+msgstr ""
+
 #: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:226
+#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
 #, c-format
 msgid "Importing `%s'"
 msgstr ""
 
+#: ../mail/importers/evolution-outlook-importer.c:259
+#: ../mail/importers/netscape-importer.c:1251
+msgid "Importing..."
+msgstr ""
+
+#: ../mail/importers/evolution-outlook-importer.c:261
+#: ../mail/importers/netscape-importer.c:1253
+#: ../plugins/startup-wizard/startup-wizard.c:236
+#: ../shell/e-shell-importer.c:523
+msgid "Please wait"
+msgstr "Fán le do thoil"
+
 #: ../mail/importers/evolution-outlook-importer.c:305
-#: ../mail/importers/mail-importer.c:140
+#: ../mail/importers/mail-importer.c:144
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Comhad Inchur"
 
-#: ../mail/importers/mail-importer.c:363
+#: ../mail/importers/mail-importer.c:373
 #, c-format
 msgid "Scanning %s"
 msgstr ""
@@ -12582,25 +12714,19 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:116
-msgid "Evolution is importing your old Pine data"
-msgstr ""
-
-#: ../mail/importers/pine-importer.c:314
+#: ../mail/importers/pine-importer.c:230
 #, fuzzy
 msgid "Importing Pine data"
 msgstr "Comhad Inchur"
 
-#: ../mail/importers/pine-importer.c:498
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
+#: ../mail/importers/pine-importer.c:434
+msgid "Evolution Pine importer"
 msgstr ""
 
-# PS
-#: ../mail/importers/pine-importer.c:506
-msgid "Pine"
-msgstr "Pine"
+#: ../mail/importers/pine-importer.c:435
+#, fuzzy
+msgid "Import mail from Pine."
+msgstr "Comhad Inchur"
 
 #: ../mail/mail-autofilter.c:78
 #, c-format
@@ -12626,88 +12752,90 @@ msgstr "líosta ríomhphost %s"
 msgid "Add Filter Rule"
 msgstr ""
 
-#: ../mail/mail-component.c:506
+#: ../mail/mail-component.c:509
 #, fuzzy, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "Scrioste"
 msgstr[1] "Scrioste"
 
-#: ../mail/mail-component.c:508
+#: ../mail/mail-component.c:511
 #, fuzzy, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d nua"
 msgstr[1] "%d nua"
 
-#: ../mail/mail-component.c:531
+#: ../mail/mail-component.c:534
 #, fuzzy, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d la(e)"
 msgstr[1] "%d la(e)"
 
-#: ../mail/mail-component.c:533
+#: ../mail/mail-component.c:536
 #, fuzzy, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d soicínd"
 msgstr[1] "%d soicínd"
 
-#: ../mail/mail-component.c:535
+#: ../mail/mail-component.c:538
 #, fuzzy, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d nua"
 msgstr[1] "%d nua"
 
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:542
 #, fuzzy, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d íomlán"
 msgstr[1] "%d íomlán"
 
-#: ../mail/mail-component.c:541
+#: ../mail/mail-component.c:544
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/mail-component.c:761
+#: ../mail/mail-component.c:765
 msgid "New Mail Message"
 msgstr "Scéal Post Nua"
 
 # mt
-#: ../mail/mail-component.c:762
+#: ../mail/mail-component.c:766
 msgid "_Mail Message"
 msgstr "_Scéal Ríomhphost"
 
-#: ../mail/mail-component.c:763
+#: ../mail/mail-component.c:767
 msgid "Compose a new mail message"
 msgstr "Cruthaigh scéal phost nua"
 
-#: ../mail/mail-component.c:769
+#: ../mail/mail-component.c:773
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Fillteán Nua"
 
-#: ../mail/mail-component.c:770
+#: ../mail/mail-component.c:774
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_Fillteán"
 
-#: ../mail/mail-component.c:771
+#: ../mail/mail-component.c:775
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Cruthaigh féilire nua"
 
-#: ../mail/mail-component.c:893
+#: ../mail/mail-component.c:919
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
 #: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "    "
 msgstr "      "
 
@@ -12774,7 +12902,7 @@ msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1977
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
@@ -13278,42 +13406,38 @@ msgid "_Full Name:"
 msgstr "Ainm _Fhada:"
 
 #: ../mail/mail-config.glade.h:161
-msgid "_Host:"
-msgstr "_Óst:"
-
-#: ../mail/mail-config.glade.h:162
 msgid "_Load images in mail from contacts"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Slí:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr ""
 
@@ -13337,245 +13461,245 @@ msgstr "dath"
 msgid "description"
 msgstr "sonraí"
 
-#: ../mail/mail-dialogs.glade.h:3
+#: ../mail/mail-dialogs.glade.h:2
 #, fuzzy
-msgid "<b>vFolder Sources</b>"
+msgid "<b>Search Folder Sources</b>"
 msgstr "Foinse FFillteáin"
 
-#: ../mail/mail-dialogs.glade.h:4
+#: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.glade.h:5
 msgid "Case _Sensitive"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:7 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 #, fuzzy
 msgid "Co_mpleted"
 msgstr "Críochnaithe"
 
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:8
 #, fuzzy
 msgid "F_ind:"
 msgstr "Cuardaigh:"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "_Freastalaí:"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Eolas Slándáil"
 
-#: ../mail/mail-dialogs.glade.h:18 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 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:20
+#: ../mail/mail-dialogs.glade.h:19
 #, fuzzy
 msgid "_Accept License"
 msgstr "Líosta do cuntasaí"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Bratach:"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:23
 #, fuzzy
 msgid "_Tick this to accept the license agreement"
 msgstr "Líosta do cuntasaí"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:25
 msgid "specific folders only"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:26
 msgid "with all active remote folders"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:27
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:29
+#: ../mail/mail-dialogs.glade.h:28
 msgid "with all local folders"
 msgstr ""
 
-#: ../mail/mail-folder-cache.c:813
+#: ../mail/mail-folder-cache.c:855
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:101
+#: ../mail/mail-ops.c:102
 msgid "Filtering Folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:262
+#: ../mail/mail-ops.c:263
 msgid "Fetching Mail"
 msgstr ""
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:562
+#: ../mail/mail-ops.c:563
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:621
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:731
+#: ../mail/mail-ops.c:733
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: ../mail/mail-ops.c:756
+#: ../mail/mail-ops.c:758
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: ../mail/mail-ops.c:758 ../mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Ceangailte."
 
-#: ../mail/mail-ops.c:760
+#: ../mail/mail-ops.c:762
 msgid "Complete."
 msgstr "Críochnaithe."
 
-#: ../mail/mail-ops.c:857
+#: ../mail/mail-ops.c:859
 msgid "Saving message to folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:942
+#: ../mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:942
+#: ../mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1168
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr ""
 
-#: ../mail/mail-ops.c:1211
+#: ../mail/mail-ops.c:1210
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: ../mail/mail-ops.c:1283
+#: ../mail/mail-ops.c:1282
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1361
+#: ../mail/mail-ops.c:1360
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ag dealaigh fillteán %s"
 
-#: ../mail/mail-ops.c:1455
+#: ../mail/mail-ops.c:1454
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1519
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1521
+#: ../mail/mail-ops.c:1520
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Líosta do cuntasaí"
 
-#: ../mail/mail-ops.c:1576
+#: ../mail/mail-ops.c:1575
 msgid "Refreshing folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:1612 ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
 msgid "Expunging folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1659
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1661
+#: ../mail/mail-ops.c:1660
 msgid "Local Folders"
 msgstr "Fillteáin Áitiúl"
 
-#: ../mail/mail-ops.c:1744
+#: ../mail/mail-ops.c:1743
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1816
+#: ../mail/mail-ops.c:1853
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Ag Sábháil %d scéal(aí)"
 msgstr[1] "Ag Sábháil %d scéal(aí)"
 
-#: ../mail/mail-ops.c:1902
+#: ../mail/mail-ops.c:1939
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Ag Sábháil %d scéal(aí)"
 msgstr[1] "Ag Sábháil %d scéal(aí)"
 
-#: ../mail/mail-ops.c:1952
+#: ../mail/mail-ops.c:1989
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13584,7 +13708,7 @@ msgstr ""
 "Téip ag cruthaigh comhad aschur: %s\n"
 "%s"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2017
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13593,11 +13717,11 @@ msgstr ""
 "Earraidh ag sábhháil scéalaí  do: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2051
+#: ../mail/mail-ops.c:2088
 msgid "Saving attachment"
 msgstr ""
 
-#: ../mail/mail-ops.c:2063
+#: ../mail/mail-ops.c:2100
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13606,22 +13730,22 @@ msgstr ""
 "Teip ag cruthaigh comhad aschur: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2073
+#: ../mail/mail-ops.c:2110
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2223
+#: ../mail/mail-ops.c:2260
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2223
+#: ../mail/mail-ops.c:2260
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
 
-#: ../mail/mail-ops.c:2339
+#: ../mail/mail-ops.c:2376
 msgid "Checking Service"
 msgstr ""
 
@@ -13660,16 +13784,21 @@ msgstr ""
 msgid "Waiting..."
 msgstr "Ag Fanacht..."
 
-#: ../mail/mail-session.c:208
+#: ../mail/mail-send-recv.c:699
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "Post ríomhphost"
+
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:209
 msgid "Enter Password"
 msgstr "Pasfhocal, le do thoil"
 
-#: ../mail/mail-session.c:239
+#: ../mail/mail-session.c:244
 msgid "User canceled operation."
 msgstr ""
 
@@ -13715,28 +13844,28 @@ msgstr "Fillteán neambhailí: '%s'"
 
 #: ../mail/mail-vfolder.c:91
 #, fuzzy, c-format
-msgid "Setting up vFolder: %s"
+msgid "Setting up Search Folder: %s"
 msgstr "Ag socraigh ffilteán: %s"
 
 #: ../mail/mail-vfolder.c:240
 #, fuzzy, c-format
-msgid "Updating vFolders for '%s:%s'"
+msgid "Updating Search Folders for '%s:%s'"
 msgstr "Ag oscailt an t-eolaire %s"
 
 #: ../mail/mail-vfolder.c:247
 #, fuzzy, c-format
-msgid "Updating vFolders for '%s'"
+msgid "Updating Search Folders for '%s'"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: ../mail/mail-vfolder.c:1009
+#: ../mail/mail-vfolder.c:1046
 #, fuzzy
-msgid "Edit vFolder"
-msgstr "Eagar FFilteán"
+msgid "Edit Search Folder"
+msgstr "Roghnaigh Fillteán"
 
-#: ../mail/mail-vfolder.c:1093
+#: ../mail/mail-vfolder.c:1130
 #, fuzzy
-msgid "New vFolder"
-msgstr "Fillteán Nua"
+msgid "New Search Folder"
+msgstr "Roghnaigh Fillteán"
 
 #: ../mail/mail.error.xml.h:1
 msgid ""
@@ -13764,68 +13893,72 @@ msgid ""
 msgstr ""
 
 #: ../mail/mail.error.xml.h:8
-msgid "Are you sure you want to delete this account?"
+msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:9
-msgid "Are you sure you want to open {0} messages at once?"
+msgid "Are you sure you want to delete this account?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:10
+msgid "Are you sure you want to open {0} messages at once?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message without a subject?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
 msgid "Because &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{2}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
 #, fuzzy
-msgid "Cannot add vFolder &quot;{0}&quot;."
+msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr ""
 "Teip ag dealaigh fillteán:\n"
 "%s"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
 #, fuzzy
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Ní féidir cóip a dhéanamh don fillteán: %s"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
 #, fuzzy
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:22
 #, fuzzy
 msgid "Cannot create temporary save directory."
 msgstr "Teip ag cruthaigh eolaire '%s': %s."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 #, fuzzy
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr ""
@@ -13833,189 +13966,195 @@ msgstr ""
 "%s\n"
 "Earraidh: %s"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 #, fuzzy
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr ""
 "Teip ag dealaigh fillteán:\n"
 "%s"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 #, fuzzy
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr ""
 "Teip ag dealaigh fillteán:\n"
 "%s"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 #, fuzzy
-msgid "Cannot edit vFolder &quot;{0}&quot; as it does not exist."
+msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 #, fuzzy
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr ""
 "Teip ag scŕios fillteán:\n"
 "%s"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 #, fuzzy
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Teip ag oscailt '%s': %s"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 #, fuzzy
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Teip ag oscailt '%s': %s"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 #, fuzzy
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Teip ag oscailt '%s': %s"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 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."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
 #, fuzzy
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr ""
 "Teip ag scŕios fillteán:\n"
 "%s"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 #, fuzzy
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr ""
 "Teip ag athainmigh fillteán:\n"
 "%s"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 #, fuzzy
 msgid "Cannot save changes to account."
 msgstr "agus aon carta eile."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 #, fuzzy
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Teip ag cruthaigh eolaire '%s': %s."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 #, fuzzy
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr ""
 " Ní féidir sábháil go `%s'\n"
 "  %s"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 #, fuzzy
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Suimigh Siniú"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 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:38
+#: ../mail/mail.error.xml.h:39
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "Teip ag sábháil comhad siniú: %s"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 #, fuzzy
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Dealaigh \"%s\""
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 #, fuzzy
 msgid "Delete account?"
 msgstr "Dealaigh Tadhall?"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:42
 #, fuzzy
 msgid "Discard changed?"
 msgstr "_Caith uait"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:44
 msgid "Do you wish to save your changes?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 #, fuzzy
 msgid "Don't delete"
 msgstr "_Athdealaigh"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
 #, fuzzy
 msgid "Enter password."
 msgstr "Pasfhocal, le do thoil"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr "Earraidh ag lódáil leabharsheoladh loicead."
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Error while performing operation."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Error while {0}."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "File exists but cannot overwrite it."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "File exists but is not a regular file."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
+msgid ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:56
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:58
 msgid "Ignore"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:59
 #, fuzzy
 msgid "Invalid authentication"
 msgstr "Údarú"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:60
 msgid "Mail filters automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:61
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14023,39 +14162,39 @@ msgid ""
 "recipient."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:62
 msgid "Mark all messages as read"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
 msgid "Mark all messages as read in the selected folder"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
 #, fuzzy
 msgid "Missing folder."
 msgstr "Ag dealaigh fillteán %s"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:66
 #, fuzzy
 msgid "No sources selected."
 msgstr "Scrioste"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid "Please check your account settings and try again."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
 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:67
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14063,42 +14202,46 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 #, fuzzy
 msgid "Please wait."
 msgstr "Fán le do thoil"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "Querying server"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Read receipt requested."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
+msgid "Search Folders automatically updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:80
 msgid "Send Receipt"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14108,25 +14251,25 @@ msgid ""
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:85
 msgid ""
-"The following filter rule(s):\n"
+"The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:90
 msgid ""
-"The following vFolder(s):\n"
+"The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -14134,118 +14277,114 @@ msgid ""
 "and resend."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:97
 msgid "The script file must exist and be executable."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:98
 msgid ""
-"This folder may have been added implicitly, go to the vFolder editor to add "
-"it explicitly, if required."
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:102
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:103
 msgid "Unable to connect to the GroupWise server."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:105
 #, fuzzy
 msgid "Unable to read license file."
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:106
 #, fuzzy
 msgid "Use _Default"
 msgstr "Gnáth"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:107
 msgid "Use default drafts folder?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:108
 msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:109
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:110
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:106
-msgid "You must name this vFolder."
+#: ../mail/mail.error.xml.h:111
+msgid "You must name this Search Folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:116
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:117
 #, fuzzy
 msgid "_Append"
 msgstr "Post"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:118
 #, fuzzy
 msgid "_Discard changes"
 msgstr "_Caith uait"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:119
 #, fuzzy
 msgid "_Empty Trash"
 msgstr "Folamh _Buscar"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:121
 #, fuzzy
 msgid "_Open Messages"
 msgstr "_Oscail Scéal"
 
-#: ../mail/mail.error.xml.h:119
-msgid "vFolders automatically updated."
-msgstr ""
-
 #: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr ""
@@ -14288,7 +14427,7 @@ msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:193
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Inniú %l:%M %p"
@@ -14364,7 +14503,7 @@ msgid "For Your Information"
 msgstr ""
 
 # NO
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:41
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr ""
 
@@ -14372,11 +14511,11 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:79
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
 msgid "Reply"
 msgstr "Freagrair"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to All"
 msgstr "Freagrair do gach rud"
 
@@ -14461,7 +14600,8 @@ msgstr ""
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup and restore plugin"
 msgstr ""
 
@@ -14479,34 +14619,34 @@ msgstr ""
 msgid "Restore Settings..."
 msgstr "Albachtaí 'Pilot'..."
 
-#: ../plugins/bbdb/bbdb.c:398
+#: ../plugins/bbdb/bbdb.c:404
 #, fuzzy
 msgid "Automatic Contacts"
 msgstr "Tadhallaí Phoiblí"
 
-#: ../plugins/bbdb/bbdb.c:407
+#: ../plugins/bbdb/bbdb.c:413
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr ""
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:420
+#: ../plugins/bbdb/bbdb.c:426
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:438
+#: ../plugins/bbdb/bbdb.c:444
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr ""
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:451
+#: ../plugins/bbdb/bbdb.c:457
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
 msgstr ""
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:458
+#: ../plugins/bbdb/bbdb.c:464
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
@@ -14578,21 +14718,21 @@ msgstr "Aimsir"
 msgid "Weather: Thunderstorms"
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:268
+#: ../plugins/calendar-weather/calendar-weather.c:267
 #, fuzzy
 msgid "Select a location"
 msgstr "Teip ag oscailt fillteán: %s: %s"
 
-#: ../plugins/calendar-weather/calendar-weather.c:655
+#: ../plugins/calendar-weather/calendar-weather.c:654
 #, fuzzy
 msgid "_Units:"
 msgstr "Aonad"
 
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:661
 msgid "Metric (Celsius, cm, etc)"
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:663
+#: ../plugins/calendar-weather/calendar-weather.c:662
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr ""
 
@@ -14621,96 +14761,762 @@ msgstr "_Seoladh R-phost:"
 msgid "Copy tool"
 msgstr "_Cóip go Fillteán"
 
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr ""
+
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
+msgid "Checks 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 "
+msgstr "Leitheid Fuinneog Loicthe"
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
+msgid "Do you want to make Evolution your default e-mail client?"
+msgstr ""
+
 #: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:108
+#: ../plugins/default-source/default-source.c:109
 #, fuzzy
 msgid "Mark as default folder"
 msgstr "Fillteáin Gnáth"
 
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Roghnaigh Fillteán Tascanna"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "Ainm chuntas:"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "Ainm _Fillteán:"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "Ainm _Úsaideoir:"
+
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:68
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 #, fuzzy
 msgid "Secure Password"
 msgstr "Pasfhocal, le do thoil"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:71
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr ""
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:79
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 #, fuzzy
 msgid "Plaintext Password"
 msgstr "Pasfhocal, le do thoil"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:81
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:194
+#: ../plugins/exchange-operations/exchange-account-setup.c:251
 #, fuzzy
-msgid "Could not read out-of-office state"
-msgstr ""
-"Teip ag cruthaigh comhd '%s':\n"
-"%s"
+msgid "Out Of Office"
+msgstr "As an Oifig"
 
-#. Description section
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:211
+#: ../plugins/exchange-operations/exchange-account-setup.c:258
 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-account-setup/exchange-account-setup.c:239
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:249
+#: ../plugins/exchange-operations/exchange-account-setup.c:270
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
 #, fuzzy
 msgid "I am out of the office"
 msgstr "As an Oifig"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:242
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:246
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
 msgid "I am in the office"
 msgstr ""
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:275
+#. Change Password
+#: ../plugins/exchange-operations/exchange-account-setup.c:321
 #, fuzzy
-msgid "Out of office Message:"
-msgstr "<B>Scéal As an Oifig:</b>"
+msgid "Change the password for Exchange account"
+msgstr "Pasfhocal do %s, le do thoil"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:323
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#, fuzzy
+msgid "Change Password"
+msgstr "Pasfhocal, le do thoil"
+
+#. Delegation Assistant
+#: ../plugins/exchange-operations/exchange-account-setup.c:327
+msgid "Manage the delegate settings for Exchange account"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#, fuzzy
+msgid "Delegation Assitant"
+msgstr "Roghnachais na Leabhar Sheoladh"
+
+#. Miscelleneous settings
+#: ../plugins/exchange-operations/exchange-account-setup.c:339
+msgid "Miscelleneous"
+msgstr ""
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:319
+#. Folder Size
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
+msgid "View the size of all Exchange folders"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:351
+#, fuzzy
+msgid "Folders Size"
+msgstr "Fillteáin"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:358
 #, fuzzy
 msgid "Exchange Settings"
 msgstr "Albachtaí Aimsir"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:507
-#: ../plugins/exchange-account-setup/exchange-ask-password.c:200
+#: ../plugins/exchange-operations/exchange-account-setup.c:601
 msgid "_OWA Url:"
 msgstr ""
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:532
-#: ../plugins/exchange-account-setup/exchange-ask-password.c:193
+#: ../plugins/exchange-operations/exchange-account-setup.c:626
 #, fuzzy
 msgid "A_uthenticate"
 msgstr "Saghas _Udarú :"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:597
+#: ../plugins/exchange-operations/exchange-account-setup.c:814
+#, fuzzy
+msgid "Authentication Type"
+msgstr "Saghas _Udarú :"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
+msgid "Ch_eck for Supported Types"
+msgstr ""
+
+#. User entered a wrong existing
+#. * password. Prompt him again.
+#.
+#: ../plugins/exchange-operations/exchange-change-password.c:115
+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
+msgid "The two passwords do not match. Please re-enter the passwords."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Pasfhocal, le do thoil"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#, fuzzy
+msgid "Current Password:"
+msgstr "Pasfhocal, le do thoil"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#, fuzzy
+msgid "New Password:"
+msgstr "Pasfhocal:"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
+msgid "Your current password has expired. Please change your password now."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:144
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#, fuzzy
+msgid "Custom"
+msgstr "Sainradharc"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#, fuzzy, c-format
+msgid "Permissions for %s"
+msgstr "Albachtaí do \"%s\""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:421
+#, fuzzy
+msgid "Delegate To"
+msgstr "Dealaigh"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:562
+#, c-format
+msgid "Remove the delegate %s?"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:679
+#, fuzzy
+msgid "Could not access Active Directory"
+msgstr ""
+"Teip ag cruthaigh eolaire '%s':\n"
+"%s"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:694
+msgid "Could not find self in Active Directory"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:707
+#, c-format
+msgid "Could not find delegate %s in Active Directory"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:719
+#, fuzzy, c-format
+msgid "Could not remove delegate %s"
+msgstr "Leabhar Sheoladh Evolution"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:779
+#, fuzzy
+msgid "Could not update list of delegates."
+msgstr "Teíp ag dealaigh fillteán: %s"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:797
+#, fuzzy, c-format
+msgid "Could not add delegate %s"
+msgstr "Níorbh fhéidir '%s' a chur i gcrích: %s\n"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:965
+#, fuzzy
+msgid "Error reading delegates list."
+msgstr "Earraidh ag lódáil %s"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+msgid "C_alendar:"
+msgstr "Fé_ilire:"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+msgid "Co_ntacts:"
+msgstr "_Tadhallaí"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
+#, fuzzy
+msgid "Delegate Permissions"
+msgstr "Dealaigh"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#, fuzzy
+msgid "Delegates"
+msgstr "Dealaigh"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Editor (read, create, edit)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#, fuzzy
+msgid "Permissions for"
+msgstr "Ag dealaigh fillteán %s"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+msgid "Reviewer (read-only)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+msgid ""
+"These users will be able to send mail on your behalf\n"
+"and access your folders with the permissions you give them."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#, fuzzy
+msgid "_Delegate can see private items"
+msgstr "Cruthaigh tasc nua"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#, fuzzy
+msgid "_Inbox:"
+msgstr "Imbosca"
+
+# tg
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+msgid "_Tasks:"
+msgstr "_Tascanna:"
+
+#: ../plugins/exchange-operations/exchange-folder-permission.c:58
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
+#, fuzzy
+msgid "Permissions..."
+msgstr "Clódáil..."
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+msgid "Folder Name"
+msgstr "Ainm Fillteán"
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#, fuzzy
+msgid "Folder Size"
+msgstr "Ainm Fillteán"
+
+#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
+#, fuzzy
+msgid "Exchange Folder Tree"
+msgstr "_Fillteán"
+
+#: ../plugins/exchange-operations/exchange-folder.c:62
+#: ../plugins/exchange-operations/exchange-folder.c:223
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#, fuzzy
+msgid "Unsubscribe Folder..."
+msgstr "ag Ssioncronaich Fillteán"
+
+#: ../plugins/exchange-operations/exchange-folder.c:460
+#: ../plugins/exchange-operations/exchange-folder.c:520
+#, fuzzy, c-format
+msgid "Really unsubscribe from folder \"%s\"?"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: ../plugins/exchange-operations/exchange-folder.c:472
+#: ../plugins/exchange-operations/exchange-folder.c:532
+#, fuzzy, c-format
+msgid "Unsubscribe from \"%s\""
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
+msgid "(Permission denied.)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+msgid "Add User:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#, fuzzy
+msgid "Add User"
+msgstr "_Suimigh URL"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Permissions</b>"
+msgstr "<b>Tuarascail</b>"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#, fuzzy
+msgid "Cannot Delete"
+msgstr "_Athdealaigh"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+msgid "Cannot Edit"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#, fuzzy
+msgid "Create items"
+msgstr "Cruthaigh fillteán"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#, fuzzy
+msgid "Create subfolders"
+msgstr "Cruthaigh fillteán"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#, fuzzy
+msgid "Delete Any Items"
+msgstr "Dealaigh fotha nuachtan"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#, fuzzy
+msgid "Delete Own Items"
+msgstr "Dealaigh fotha nuachtan"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#, fuzzy
+msgid "Edit Any Items"
+msgstr "Eagar Coinne"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+msgid "Edit Own Items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#, fuzzy
+msgid "Folder contact"
+msgstr "%d Tadhallaí"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#, fuzzy
+msgid "Folder owner"
+msgstr "Ai_nm Fillteán:"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#, fuzzy
+msgid "Folder visible"
+msgstr "Fillteáin"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+msgid "Read items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
+#, fuzzy
+msgid "Role: "
+msgstr "Fillteán:"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+#, fuzzy
+msgid "Select User"
+msgstr "Roghnaigh Fillteán"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+msgid "Addressbook..."
+msgstr "Leabhar Seoladh..."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
+msgid "Subscribe to Other User's Contacts"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
+#, fuzzy
+msgid "Subscribe to Other User's Calendar"
+msgstr "Roghnaigh Fillteán Tascanna"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot change password due to configuration problems."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+#, fuzzy
+msgid "Cannot display folders."
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+msgid ""
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#, fuzzy
+msgid "Could not authenticate to server."
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#, fuzzy
+msgid "Could not change password."
+msgstr ""
+"Teip ag cruthaigh comhd '%s':\n"
+"%s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+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:9
+#, fuzzy
+msgid "Could not connect to server {0}."
+msgstr ""
+"Teip ag cruthaigh comhd '%s':\n"
+"%s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+msgid "Could not determine folder permissions for delegates."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+msgid "Could not find Exchange Web Storage System."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#, fuzzy
+msgid "Could not locate server {0}."
+msgstr ""
+"Teip ag cruthaigh comhd '%s':\n"
+"%s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+msgid "Could not make {0} a delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#, fuzzy
+msgid "Could not read folder permissions"
+msgstr ""
+"Teip ag cruthaigh comhd '%s':\n"
+"%s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#, fuzzy
+msgid "Could not read folder permissions."
+msgstr ""
+"Teip ag cruthaigh comhd '%s':\n"
+"%s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#, 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:17
+#, fuzzy
+msgid "Could not update folder permissions."
+msgstr "Teip ag oscailt fillteán: %s: %s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 #, fuzzy
 msgid "Could not update out-of-office state"
 msgstr "Teíp ag dealaigh fillteán: %s"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:724
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+msgid "Exchange Account is offline."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+msgid "Exchange Connector access error."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid ""
+"Exchange Connector requires access to certain\n"
+"functionality on the Exchange Server that appears\n"
+"to be disabled or blocked.  (This is usually \n"
+"unintentional.)  Your Exchange Administrator will \n"
+"need to enable this functionality in order for \n"
+"you to be able to use Ximian Connector.\n"
+"\n"
+"For information to provide to your Exchange \n"
+"administrator, please follow the link below:\n"
+"\n"
+"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
+"html\n"
+"  "
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 #, fuzzy
-msgid "Authentication Type"
-msgstr "Saghas _Udarú :"
+msgid "Failed to update delegates:"
+msgstr ""
+"Téip ag cruthaigh comhad aschur: %s\n"
+"%s"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:738
-msgid "Ch_eck for Supported Types"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+msgid "Folder already exists"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#, fuzzy
+msgid "Folder does not exist"
+msgstr "Roghnachais na Leabhar Sheoladh"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#, fuzzy
+msgid "Folder offline"
+msgstr "Ai_nm Fillteán:"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../shell/e-shell.c:1265
+msgid "Generic error"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+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:39
+msgid "Mailbox for {0} is not on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+msgid "Make sure the URL is correct and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+msgid "Make sure the server name is spelled correctly and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+msgid "Make sure the username and password are correct and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+msgid "No Global Catalog server configured for this account."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+msgid "No mailbox for user {0} on {1}."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#, fuzzy
+msgid "No such user {0}"
+msgstr "Níl aon fillteán: %s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+msgid "Password successfully changed."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#, fuzzy
+msgid "Please restart Evolution"
+msgstr ""
+"Go raibh maith agat\n"
+"An Fhoireann Evolution\n"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#, fuzzy
+msgid "Please select a user."
+msgstr "Dealaigh na tadhallaí roghnaithe"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+msgid "Server rejected password because it is too weak."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+msgid "The Exchange account will be disabled when you quit Evolution"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+msgid "The Exchange account will be removed when you quit Evolution"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+msgid "The Exchange server is not compatible with Exchange Connector."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+msgid ""
+"The server is runinng Exchange 5.5. Exchange Connector \n"
+"supports Microsoft Exchange 2000 and 2003 only."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+msgid ""
+"This probably means that your server requires \n"
+"you to specify the Windows domain name \n"
+"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+"\n"
+"Or you might have just typed your password wrong."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+msgid "Try again with a different password."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+msgid "Unable to add user to access control list:"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#, fuzzy
+msgid "Unable to edit delegates."
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#, fuzzy
+msgid "Unknown error looking up {0}"
+msgstr "Earraidh gan fhois"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#, fuzzy
+msgid "Unknown error."
+msgstr "Earraidh gan fhois"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#, fuzzy
+msgid "Unknown type"
+msgstr "Gan fhois"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#, fuzzy
+msgid "Unsupported operation"
+msgstr "Áit"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+msgid "You are nearing your quota available for storing mails on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+msgid "You cannot make yourself your own delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+msgid "You have exceeded your quota for storing mails on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+msgid "You may only configure a single Exchange account."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+msgid ""
+"Your current usage is : {0}KB. Try to clear up some space by deleting some "
+"mails."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid ""
+"Your current usage is : {0}KB. You will not be able to either send or "
+"recieve mails now."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+msgid ""
+"Your current usage is : {0}KB. You will not be able to send mails till you "
+"clear up some space by deleting some mails."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid "Your password has expired."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+msgid "{0} cannot be added to an access control list"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+msgid "{0} is already a delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+msgid "{0} is already in the list"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
+msgid "Subscribe to Other User's Tasks"
 msgstr ""
 
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
+msgid "Check folder permissions"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+#, fuzzy
+msgid "Subscribe to Other User's Folder"
+msgstr "Roghnaigh Fillteán Tascanna"
+
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -14725,11 +15531,63 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "ag Ssioncronaich Fillteán"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:413
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
 #, fuzzy
 msgid "Checklist"
 msgstr "líosta"
 
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
+#, fuzzy
+msgid "Groupwise Account Setup"
+msgstr "Grupa"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:77
+#, fuzzy
+msgid "Junk Settings"
+msgstr "Álbachtaí"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:90
+#, fuzzy
+msgid "<b>Junk Mail Settings</b>"
+msgstr "<b>Roghnachais Líosta Thasc</b>"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#, fuzzy
+msgid "Junk Mail Settings..."
+msgstr "Albachtaí Pi_lot..."
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:1
+#, fuzzy
+msgid "<b>Junk List :</b>"
+msgstr "<b>Líosta Tasc</b>"
+
+# ta
+#: ../plugins/groupwise-features/junk-settings.glade.h:2
+#, fuzzy
+msgid "Email:"
+msgstr "Rpost"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#, fuzzy
+msgid "Junk Mail Settings"
+msgstr "Álbachtaí"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:5
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#, fuzzy
+msgid "_Disable"
+msgstr "Míchumasach"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:6
+msgid "_Enable"
+msgstr "Chumasach"
+
+# GN
+#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#, fuzzy
+msgid "_Junk List"
+msgstr "Meitheamh"
+
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr ""
@@ -14749,6 +15607,11 @@ msgstr ""
 msgid "Groupwise Features"
 msgstr "Grupa"
 
+#: ../plugins/groupwise-features/process-meeting.c:49
+#, fuzzy
+msgid "Accept Tentatively"
+msgstr "Líosta do cuntasaí"
+
 #: ../plugins/groupwise-features/properties.glade.h:2
 #, fuzzy
 msgid "<b>Users :</b>"
@@ -14793,241 +15656,334 @@ msgstr ""
 msgid "_Sharing"
 msgstr "Ag Tosaíocht:"
 
-#: ../plugins/groupwise-features/send-options.c:82
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Name</b>"
+msgstr "<b>Am</b> "
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+msgid "Access Rights"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#, fuzzy
+msgid "Add/Edit"
+msgstr "Eagar"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+#, fuzzy
+msgid "Con_tacts"
+msgstr "Tadhallaí"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+msgid "Modify _folders/options/rules/"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+msgid "Read items marked _private"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#, fuzzy
+msgid "Reminder Notes"
+msgstr "Ag dealaigh fillteán %s"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#, fuzzy
+msgid "Subscribe to my _alarms"
+msgstr "Airde Fuinneog Loicthe"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#, fuzzy
+msgid "Subscribe to my _notifications"
+msgstr "Airde Fuinneog Loicthe"
+
+# IS
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../ui/evolution-mail-message.xml.h:121
+#, fuzzy
+msgid "_Read"
+msgstr "Athlódáil"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
+#, fuzzy
+msgid "_Write"
+msgstr "_Priontáil"
+
+#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#, fuzzy
+msgid "Proxy"
+msgstr "Dea."
+
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
+#: ../smime/gui/smime-ui.glade.h:49
+#: ../widgets/table/e-table-config-no-group.glade.h:20
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "dialog1"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Account Name</b>"
+msgstr "Ainm Chuntas"
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#, fuzzy
+msgid "Proxy Login"
+msgstr "Logann"
+
+#: ../plugins/groupwise-features/proxy-login.c:219
+#: ../plugins/groupwise-features/proxy-login.c:261
+#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPasfhocal do %s, le do thoil (úsáideoir %s)"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/proxy-login.c:484
+#, fuzzy
+msgid "_Proxy Login..."
+msgstr "_Priontáil..."
+
+#: ../plugins/groupwise-features/proxy.c:672
+msgid "The Proxy tab will be available only when the account is enabled."
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder-common.c:318
 #, fuzzy
 msgid "Users"
 msgstr "_Úsaideoir:"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:319
 msgid "Enter the users and set permissions"
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:337
+#: ../plugins/groupwise-features/share-folder-common.c:338
 #, fuzzy
 msgid "New _Shared Folder..."
 msgstr "Fillteán _Nua..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:440
+#: ../plugins/groupwise-features/share-folder-common.c:453
 #, fuzzy
 msgid "Sharing"
 msgstr "Ag Tosaíocht:"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/groupwise-features/status-track.c:235
+#, fuzzy
+msgid "Track Message Status..."
+msgstr "Sábháil Scéala Mar..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:724
 #, fuzzy
 msgid "Unable to parse item"
 msgstr "Sábháil san leabhar seoladh"
 
-#: ../plugins/itip-formatter/itip-formatter.c:741
+#: ../plugins/itip-formatter/itip-formatter.c:780
 #, fuzzy, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:791
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:756
+#: ../plugins/itip-formatter/itip-formatter.c:795
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:761
+#: ../plugins/itip-formatter/itip-formatter.c:800
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:766
+#: ../plugins/itip-formatter/itip-formatter.c:805
 #, c-format
 msgid "Sent to calendar '%s' as cancelled"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:859
+#: ../plugins/itip-formatter/itip-formatter.c:898
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:866
+#: ../plugins/itip-formatter/itip-formatter.c:905
 msgid "Sent a cancellation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Could not send the cancellation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:940
+#: ../plugins/itip-formatter/itip-formatter.c:991
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:966
+#: ../plugins/itip-formatter/itip-formatter.c:1017
 #, fuzzy, c-format
 msgid "Unable to update attendee. %s"
 msgstr ""
 "Téip ag cruthaigh comhad aschur: %s\n"
 "%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:970
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 msgid "Attendee status updated"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1097
+#: ../plugins/itip-formatter/itip-formatter.c:1148
 msgid "The calendar attached is not valid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1098
+#: ../plugins/itip-formatter/itip-formatter.c:1149
 msgid ""
 "The message claims to contain a calendar, but the calendar is not valid "
 "iCalendar."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
-#: ../plugins/itip-formatter/itip-formatter.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:1223
+#: ../plugins/itip-formatter/itip-formatter.c:1183
+#: ../plugins/itip-formatter/itip-formatter.c:1198
+#: ../plugins/itip-formatter/itip-formatter.c:1274
 msgid "The item in the calendar is not valid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
-#: ../plugins/itip-formatter/itip-formatter.c:1148
-#: ../plugins/itip-formatter/itip-formatter.c:1224
+#: ../plugins/itip-formatter/itip-formatter.c:1184
+#: ../plugins/itip-formatter/itip-formatter.c:1199
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 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:1158
+#: ../plugins/itip-formatter/itip-formatter.c:1209
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1159
+#: ../plugins/itip-formatter/itip-formatter.c:1210
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1824
+#: ../plugins/itip-formatter/itip-formatter.c:1968
 msgid "Meetings and Tasks"
 msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1847
+#: ../plugins/itip-formatter/itip-formatter.c:1991
 msgid "_Delete message after acting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1857
+#: ../plugins/itip-formatter/itip-formatter.c:2001
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr ""
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:1870
+#: ../plugins/itip-formatter/itip-formatter.c:2014
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1887
+#: ../plugins/itip-formatter/itip-formatter.c:2031
 msgid "Conflict Search Table"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:179 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
 msgid "Today"
 msgstr "Inniú"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:184
+#: ../plugins/itip-formatter/itip-view.c:189
 #, fuzzy
 msgid "Today %H:%M"
 msgstr "Inniú %l:%M %p"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:188
+#: ../plugins/itip-formatter/itip-view.c:193
 #, fuzzy
 msgid "Today %H:%M:%S"
 msgstr "Inniú %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:202
 #, fuzzy
 msgid "Today %l:%M:%S %p"
 msgstr "Inniú %l:%M %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr ""
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow %H:%M"
 msgstr ""
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:221
 #, fuzzy
 msgid "Tomorrow %H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:226
 #, fuzzy
 msgid "Tomorrow %l:%M %p"
 msgstr "Inniú %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:230
 #, fuzzy
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Inniú %l:%M %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:244
+#: ../plugins/itip-formatter/itip-view.c:249
 #, c-format
 msgid "%A"
 msgstr ""
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:254
 #, fuzzy
 msgid "%A %H:%M"
 msgstr "%H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:253
+#: ../plugins/itip-formatter/itip-view.c:258
 #, fuzzy
 msgid "%A %H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:258
+#: ../plugins/itip-formatter/itip-view.c:263
 #, fuzzy
 msgid "%A %l:%M %p"
 msgstr "%a %l:%M %"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:267
 #, fuzzy
 msgid "%A %l:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:276
 #, fuzzy
 msgid "%A, %B %e"
 msgstr "%A, %B %e %Y"
@@ -15035,232 +15991,236 @@ msgstr "%A, %B %e %Y"
 #. 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:277
+#: ../plugins/itip-formatter/itip-view.c:282
 #, fuzzy
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %Y"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:286
 #, fuzzy
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %Y"
 
 #. 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:286
+#: ../plugins/itip-formatter/itip-view.c:291
 #, fuzzy
 msgid "%A, %B %e %l:%M %p"
 msgstr "%b %d %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:290
+#: ../plugins/itip-formatter/itip-view.c:295
 #, fuzzy
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%b %d %l:%M %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:301
 #, fuzzy
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:306
 #, fuzzy
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:310
 #, fuzzy
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%a %d/%m/%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:310
+#: ../plugins/itip-formatter/itip-view.c:315
 #, fuzzy
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "mar %B %d, %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:319
 #, fuzzy
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "mar %B %d, %Y, %l:%M %p"
 
-#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:341
+#: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:417
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:419
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:425
+#: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:427
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:430
+#: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr ""
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:871
+#: ../plugins/itip-formatter/itip-view.c:892
 #, fuzzy
 msgid "Start time:"
 msgstr "Dáta Breithe"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:880
+#: ../plugins/itip-formatter/itip-view.c:901
 #, fuzzy
 msgid "End time:"
 msgstr "Dáta"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:896
-#: ../plugins/itip-formatter/itip-view.c:946
+#: ../plugins/itip-formatter/itip-view.c:917
+#: ../plugins/itip-formatter/itip-view.c:967
 #, fuzzy
 msgid "Comment:"
 msgstr "Ordú:"
 
-#: ../plugins/itip-formatter/itip-view.c:960
+#: ../plugins/itip-formatter/itip-view.c:981
 msgid "Send u_pdates to attendees"
 msgstr ""
 
+#: ../plugins/itip-formatter/itip-view.c:990
+msgid "A_pply to all instances"
+msgstr ""
+
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr ""
@@ -15284,6 +16244,49 @@ 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
+msgid "Proxy _Logout"
+msgstr ""
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
+#, fuzzy
+msgid "Allows disabling of accounts."
+msgstr "Líosta do cuntasaí"
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+#, fuzzy
+msgid "Disable Account"
+msgstr "Cuntasaí Phoist"
+
+#: ../plugins/mail-remote/client.c:30
+#, fuzzy, c-format
+msgid "System error: %s"
+msgstr "Earraidh Eile"
+
+#: ../plugins/mail-remote/client.c:32
+#, fuzzy, c-format
+msgid "Camel error: %s"
+msgstr "Earraidh gan fhois: %s"
+
+#: ../plugins/mail-remote/evolution-mail-store.c:476
+msgid "Account cannot send e-mail"
+msgstr ""
+
+#: ../plugins/mail-remote/evolution-mail-store.c:605
+#, fuzzy
+msgid "No store available"
+msgstr "Gan coimriú"
+
+#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
+msgid ""
+"A plugin which implements a CORBA interface for accessing mail data remotely."
+msgstr ""
+
+#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
+#, fuzzy
+msgid "Mail Remote"
+msgstr "_Fillteán"
+
 #: ../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 "
@@ -15476,6 +16479,15 @@ msgstr ""
 msgid "_Mark Calendar for offline use"
 msgstr ""
 
+#: ../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
+#, fuzzy
+msgid "Mono Loader"
+msgstr "_Bog go Fillteán"
+
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
 msgid "Generates a D-BUS message when new mail arrives."
 msgstr ""
@@ -15521,6 +16533,8 @@ msgid "Path"
 msgstr "_Slí:"
 
 #: ../plugins/plugin-manager/plugin-manager.c:48
+#: ../widgets/table/e-table-config-no-group.glade.h:6
+#: ../widgets/table/e-table-config.glade.h:5
 msgid "Description"
 msgstr "Tuarascail"
 
@@ -15535,6 +16549,7 @@ msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 
 #: ../plugins/plugin-manager/plugin-manager.c:210
+#: ../plugins/plugin-manager/plugin-manager.c:271
 msgid "Plugin"
 msgstr ""
 
@@ -15576,11 +16591,35 @@ msgstr "Post _HTML"
 msgid "Gives an option to print mail from composer"
 msgstr ""
 
+#: ../plugins/print-message/org-gnome-print-message.xml.h:1
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "Priontáil reamh-taispeántas"
+
+#: ../plugins/print-message/org-gnome-print-message.xml.h:2
+#, fuzzy
+msgid "Prints the message"
+msgstr "Clodaigh scéal seo"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+msgid "Sa junk-plugin"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
+msgid "learns junk messages using spamd."
+msgstr ""
+
 #: ../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."
 msgstr ""
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
+#. the path to the shared library
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
 #, fuzzy
 msgid "Save attachments"
 msgstr "Taispeán iatáni"
@@ -15607,7 +16646,6 @@ msgstr "Saghas"
 
 #: ../plugins/save-attachments/save-attachments.c:359
 #: ../ui/evolution-message-composer.xml.h:18
-#: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Sábháil"
 
@@ -15700,7 +16738,7 @@ msgstr ""
 msgid "Comma separated value format (.csv)"
 msgstr ""
 
-#: ../plugins/save-calendar/ical-format.c:136
+#: ../plugins/save-calendar/ical-format.c:137
 #, fuzzy
 msgid "iCalendar format (.ics)"
 msgstr "Comhaid iCalendar (.ics)"
@@ -15768,15 +16806,15 @@ msgstr ""
 msgid "Startup wizard"
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:255
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:260
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "Fáilte"
 
-#: ../plugins/startup-wizard/startup-wizard.c:261
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -15784,17 +16822,23 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:306
-#: ../shell/e-shell-importer.c:159
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:145
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:321
-#: ../shell/e-shell-importer.c:905
+#: ../plugins/startup-wizard/startup-wizard.c:154
+#: ../shell/e-shell-importer.c:398
 #, c-format
 msgid "From %s:"
 msgstr "Ó %s:"
 
+#: ../plugins/startup-wizard/startup-wizard.c:234
+#: ../shell/e-shell-importer.c:509
+#, fuzzy
+msgid "Importing data."
+msgstr "Comhad Inchur"
+
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
 msgstr ""
@@ -15957,11 +17001,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr "(gan tideál)"
 
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:133
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:136
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -15970,11 +17014,11 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: ../shell/e-shell-importer.c:156
+#: ../shell/e-shell-importer.c:142
 msgid "Choose the destination for this import"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:162
+#: ../shell/e-shell-importer.c:148
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -15982,89 +17026,29 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:233 ../shell/e-shell-importer.c:267
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-
-#: ../shell/e-shell-importer.c:347
-msgid "Select importer"
-msgstr ""
-
-#: ../shell/e-shell-importer.c:468 ../shell/e-shell-importer.c:1092
-#, c-format
-msgid "File %s does not exist"
-msgstr ""
-
-#: ../shell/e-shell-importer.c:476
-msgid "Importing"
-msgstr ""
-
-#: ../shell/e-shell-importer.c:484
-#, c-format
-msgid "Importing %s.\n"
-msgstr ""
-
-#: ../shell/e-shell-importer.c:494 ../shell/e-shell-importer.c:495
-#, c-format
-msgid "Error loading %s"
-msgstr "Earraidh ag lódáil %s"
-
-#: ../shell/e-shell-importer.c:513
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-
-#: ../shell/e-shell-importer.c:589
-msgid "Automatic"
-msgstr "Uathoibríoch"
-
 # vi
-#: ../shell/e-shell-importer.c:645
+#: ../shell/e-shell-importer.c:283
 #, fuzzy
 msgid "F_ilename:"
 msgstr "Ainm chomhaid:"
 
-#: ../shell/e-shell-importer.c:650
+#: ../shell/e-shell-importer.c:288
 msgid "Select a file"
 msgstr "Roghnaigh Comhad"
 
-#: ../shell/e-shell-importer.c:662
+#: ../shell/e-shell-importer.c:300
 msgid "File _type:"
 msgstr "_Saghas comhad:"
 
-#: ../shell/e-shell-importer.c:701
+#: ../shell/e-shell-importer.c:336
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:704
+#: ../shell/e-shell-importer.c:339
 msgid "Import a _single file"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:772
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: ../shell/e-shell-importer.c:779
-msgid "Starting Intelligent Importers"
-msgstr ""
-
-#: ../shell/e-shell-importer.c:1111
-#, c-format
-msgid "No importer available for file %s"
-msgstr ""
-
-#: ../shell/e-shell-importer.c:1125
-msgid "Unable to execute importer"
-msgstr ""
-
-#: ../shell/e-shell-importer.c:1241
+#: ../shell/e-shell-importer.c:698
 msgid "_Import"
 msgstr ""
 
@@ -16072,114 +17056,110 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Roghnachais Evolution"
 
-#: ../shell/e-shell-utils.c:116
+#: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
 msgstr ""
 
-#: ../shell/e-shell-utils.c:123
+#: ../shell/e-shell-utils.c:125
 msgid "Folder name cannot contain the Return character."
 msgstr ""
 
-#: ../shell/e-shell-utils.c:129
+#: ../shell/e-shell-utils.c:131
 msgid "Folder name cannot contain the character \"/\"."
 msgstr ""
 
-#: ../shell/e-shell-utils.c:135
+#: ../shell/e-shell-utils.c:137
 msgid "Folder name cannot contain the character \"#\"."
 msgstr ""
 
-#: ../shell/e-shell-utils.c:141
+#: ../shell/e-shell-utils.c:143
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:69
+#: ../shell/e-shell-window-commands.c:70
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:126
+#: ../shell/e-shell-window-commands.c:127
 msgid "Bug buddy is not installed."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:134
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy could not be run."
 msgstr ""
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:508
+#: ../shell/e-shell-window-commands.c:532
 msgid "translator-credits"
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:522
+#: ../shell/e-shell-window-commands.c:546
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Grupa"
 
-#: ../shell/e-shell-window-commands.c:749
+#: ../shell/e-shell-window-commands.c:774
 msgid "_Work Online"
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:762 ../ui/evolution.xml.h:47
+#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:800
 msgid "Work Offline"
 msgstr ""
 
-#: ../shell/e-shell-window.c:341
+#: ../shell/e-shell-window.c:343
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: ../shell/e-shell-window.c:349
+#: ../shell/e-shell-window.c:351
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: ../shell/e-shell-window.c:356
+#: ../shell/e-shell-window.c:358
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: ../shell/e-shell-window.c:712
+#: ../shell/e-shell-window.c:724
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Post do %s"
 
-#: ../shell/e-shell.c:622
+#: ../shell/e-shell.c:623
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Earraidh gan fhois"
 
-#: ../shell/e-shell.c:824 ../shell/e-shell.c:825
+#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "Ceart go Leor"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1259
 msgid "Invalid arguments"
 msgstr ""
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1261
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1263
 msgid "Configuration Database not found"
 msgstr ""
 
-#: ../shell/e-shell.c:1286
-msgid "Generic error"
-msgstr ""
-
 #: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Nua"
@@ -16199,66 +17179,46 @@ msgstr "Iarthair"
 msgid "Create a new test item"
 msgstr "Cruthaigh tasc nua"
 
-#: ../shell/importer/import.glade.h:1
+#: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
 
-#: ../shell/importer/import.glade.h:2
+#: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
 msgstr ""
 
-#: ../shell/importer/import.glade.h:3
+#: ../shell/import.glade.h:3
 #, fuzzy
 msgid "Import File"
 msgstr "Comhad Inchur"
 
-#: ../shell/importer/import.glade.h:4
+#: ../shell/import.glade.h:4
 #, fuzzy
 msgid "Import Location"
 msgstr "Áit"
 
-#: ../shell/importer/import.glade.h:5
+#: ../shell/import.glade.h:5
 msgid "Importer Type"
 msgstr ""
 
 # FIXME SP?
-#: ../shell/importer/import.glade.h:6
+#: ../shell/import.glade.h:6
 #, fuzzy
 msgid "Select Importers"
 msgstr "Roghnaigh Ainmhí"
 
-#: ../shell/importer/import.glade.h:7
+#: ../shell/import.glade.h:7
 #, fuzzy
 msgid "Select a File"
 msgstr "Roghnaigh Comhad"
 
-#: ../shell/importer/import.glade.h:8
+#: ../shell/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
-#: ../shell/importer/intelligent.c:193
-msgid "Importers"
-msgstr ""
-
-#: ../shell/importer/intelligent.c:195 ../smime/gui/smime-ui.glade.h:29
-msgid "Import"
-msgstr ""
-
-#: ../shell/importer/intelligent.c:199
-msgid "Don't import"
-msgstr ""
-
-#: ../shell/importer/intelligent.c:203
-msgid "Don't ask me again"
-msgstr ""
-
-#: ../shell/importer/intelligent.c:211
-msgid "Evolution can import data from the following files:"
-msgstr ""
-
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:230
 #, no-c-format
@@ -16325,28 +17285,38 @@ msgid ""
 msgstr ""
 
 #: ../shell/shell.error.xml.h:1
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:2
 #, fuzzy
 msgid "Continue"
 msgstr "Áit"
 
-#: ../shell/shell.error.xml.h:2
+#: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 #, fuzzy
 msgid "Evolution can not start."
 msgstr "Evolution"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed. "
+msgstr ""
+
+#: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:8
 msgid "Really delete old data?"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:6
+#: ../shell/shell.error.xml.h:9
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory is about to be be "
 "permanently removed.\n"
@@ -16359,7 +17329,7 @@ msgid ""
 "without manual intervention.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:12
+#: ../shell/shell.error.xml.h:15
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
@@ -16369,11 +17339,11 @@ msgid ""
 "evolution&quot; at your convenience.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:16
+#: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:17
+#: ../shell/shell.error.xml.h:20
 msgid ""
 "Upgrading your data and settings will require upto {0} of disk space, but "
 "you only have {1} available.\n"
@@ -16382,14 +17352,14 @@ msgid ""
 "can continue."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:23
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
 "Click help for details"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:26
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -16398,15 +17368,20 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:28
+#: ../shell/shell.error.xml.h:31
+#, fuzzy
+msgid "_Forget"
+msgstr "Tosaíocht:"
+
+#: ../shell/shell.error.xml.h:32
 msgid "_Keep Data"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:29
+#: ../shell/shell.error.xml.h:33
 msgid "_Remind Me Later"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:30
+#: ../shell/shell.error.xml.h:34
 msgid ""
 "{1}\n"
 "\n"
@@ -16619,6 +17594,10 @@ msgstr ""
 msgid "Expires On"
 msgstr ""
 
+#: ../smime/gui/smime-ui.glade.h:29
+msgid "Import"
+msgstr ""
+
 #: ../smime/gui/smime-ui.glade.h:30
 msgid "Issued On"
 msgstr ""
@@ -16688,12 +17667,8 @@ msgstr ""
 msgid "_Edit CA Trust"
 msgstr ""
 
-#: ../smime/gui/smime-ui.glade.h:49
-msgid "dialog1"
-msgstr ""
-
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:650
+#: ../smime/lib/e-cert-db.c:651
 msgid "Certificate already exists"
 msgstr ""
 
@@ -16955,7 +17930,8 @@ msgid "Shutting down %s (%s)\n"
 msgstr ""
 
 #: ../ui/evolution-addressbook.xml.h:3
-msgid "Copy Contact(s) to Another Folder..."
+#, fuzzy
+msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Cóipeáil Tadhall(aí) do Fillteán Eile..."
 
 #: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
@@ -16975,7 +17951,8 @@ msgid "Delete selected contacts"
 msgstr "Dealaigh na tadhallaí roghnaithe"
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Move Contact(s) to Another Folder..."
+#, fuzzy
+msgid "Move Selected Contacts to Another Folder..."
 msgstr "Bog Tadhall(aí) go Fillteán Eile"
 
 #: ../ui/evolution-addressbook.xml.h:12
@@ -16990,11 +17967,6 @@ msgstr "Greamaigh an ghearrthaisce"
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "Priontáil reamh-taispeántas"
-
 #: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Priontáil an tadhallaí seo"
@@ -17042,7 +18014,7 @@ msgid "View the current contact"
 msgstr ""
 
 #: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-mail-list.xml.h:24 ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "_Gníomhartha"
 
@@ -17050,10 +18022,6 @@ msgstr "_Gníomhartha"
 msgid "_Forward Contact..."
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:36
-msgid "_Move to Folder..."
-msgstr ""
-
 #: ../ui/evolution-addressbook.xml.h:39
 msgid "_Preview Pane"
 msgstr ""
@@ -17111,7 +18079,7 @@ msgstr "Liosta"
 msgid "Month"
 msgstr "Mí"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
 msgid "Next"
 msgstr "Aniar"
 
@@ -17119,7 +18087,7 @@ msgstr "Aniar"
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
 msgid "Previous"
 msgstr "Siar"
 
@@ -17233,19 +18201,19 @@ msgid "Create a new folder for storing mail"
 msgstr "Cruthaigh féilire nua"
 
 #: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit rules for filtering new mail"
-msgstr ""
-
-#: ../ui/evolution-mail-global.xml.h:6
 #, fuzzy
-msgid "Create or edit vFolder definitions"
+msgid "Create or edit Search Folder definitions"
 msgstr "Earraidh ag lódáil leabharsheoladh loicead."
 
+#: ../ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
+
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Folamh _Buscar"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Fillteán"
@@ -17257,61 +18225,51 @@ msgstr "Scríobhóir Scéal"
 
 #: ../ui/evolution-mail-global.xml.h:10
 #, fuzzy
-msgid "Message _List As"
-msgstr "Taispeántas Scéal"
-
-#: ../ui/evolution-mail-global.xml.h:11
-#, fuzzy
 msgid "Message _Preview"
 msgstr "Scríobhóir Scéal"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:11
 #, fuzzy
 msgid "Move the selected folder into another folder"
 msgstr "Post an sceál seo"
 
+#. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Post a message to a Public folder"
-msgstr ""
-
-#: ../ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "Search F_olders"
 msgstr "Roghnaigh Fillteán"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr ""
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "_Copy Folder To..."
 msgstr "_Cóip do Fillteán..."
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Move Folder To..."
 msgstr "Bog go Fillteán..."
 
-#: ../ui/evolution-mail-global.xml.h:20
-#, fuzzy
-msgid "_New Search _Folder (FIXME)"
-msgstr "Sábháil mar _fillteán (FIXME)"
-
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_New..."
 msgstr "Nua..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#.
+#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
+#.
+#: ../ui/evolution-mail-global.xml.h:23
 #, fuzzy
 msgid "_Subscriptions"
 msgstr "Tuarascail:"
@@ -17325,109 +18283,110 @@ msgstr "_Fillteán"
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected message(s) to the clipboard"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:4 ../ui/evolution-mail-message.xml.h:23
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
 msgid "Cut selected message(s) to the clipboard"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:5
+#: ../ui/evolution-mail-list.xml.h:6
 msgid "E_xpunge"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-list.xml.h:8
 msgid "Group By _Threads"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:9
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "Sábháil Scéal...."
+
+#: ../ui/evolution-mail-list.xml.h:10
 msgid "Hide _Deleted Messages"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "(Scéal gan tideál)"
+
+#: ../ui/evolution-mail-list.xml.h:12
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:13
 #, fuzzy
 msgid "Mark Me_ssages as Read"
 msgstr "Scríobhóir Scéal"
 
-#: ../ui/evolution-mail-list.xml.h:11 ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Permanently remove this folder"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:14
+#: ../ui/evolution-mail-list.xml.h:17
+#, fuzzy
+msgid "Select Message _Thread"
+msgstr "Sábháil Scéal...."
+
+#: ../ui/evolution-mail-list.xml.h:18
 #, fuzzy
 msgid "Select _All Messages"
 msgstr "Roghnaigh _Gach rud"
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Select all visible messages"
 msgstr ""
 
 # as 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:22
 #, fuzzy
-msgid "Show _Messages"
+msgid "Sh_ow Hidden Messages"
 msgstr "_Scéalaí"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Temporarily hide the selected messages"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Threaded Message list"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:23
-#, fuzzy
-msgid "Un_read Messages"
-msgstr "(Scéal gan tideál)"
-
-#: ../ui/evolution-mail-list.xml.h:25
-#, fuzzy
-msgid "_All"
-msgstr "Gach Uile"
-
 # as 
-#: ../ui/evolution-mail-list.xml.h:27 ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 #, fuzzy
 msgid "_Message"
 msgstr "_Scéalaí"
 
-#: ../ui/evolution-mail-list.xml.h:30
-#, fuzzy
-msgid "_Selected Messages"
-msgstr "Sábháil Scéal...."
-
 #: ../ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17437,431 +18396,446 @@ msgstr "_Suim do Leabhar Seoladh"
 msgid "A_pply Filters"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:3
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-message.xml.h:4
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "_Suim do Leabhar Seoladh"
 
-#: ../ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:5
 #, fuzzy
 msgid "All Message _Headers"
 msgstr "Scríobhóir Scéal"
 
-#: ../ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
 msgstr "Cruthaigh Scéal _Nua"
 
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-message.xml.h:11
 msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create R_ule"
 msgstr "Cruthaigh fillteán"
 
-#: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a rule to filter messages from this sender"
-msgstr ""
-
 #: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a rule to filter messages to these recipients"
-msgstr ""
+#, fuzzy
+msgid "Create a Search Folder for these recipients"
+msgstr "Cruthaigh liosta tadhaill nua"
 
 #: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a rule to filter messages to this mailing list"
-msgstr ""
+#, fuzzy
+msgid "Create a Search Folder for this mailing list"
+msgstr "Cruthaigh liosta tadhaill nua"
 
 #: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a rule to filter messages with this subject"
-msgstr ""
+#, fuzzy
+msgid "Create a Search Folder for this sender"
+msgstr "Cruthaigh liosta tadhaill nua"
 
 #: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a vFolder for these recipients"
-msgstr ""
-
-#: ../ui/evolution-mail-message.xml.h:20
 #, fuzzy
-msgid "Create a vFolder for this mailing list"
+msgid "Create a Search Folder for this subject"
 msgstr "Cruthaigh liosta tadhaill nua"
 
+#: ../ui/evolution-mail-message.xml.h:20
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
+
 #: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a vFolder for this sender"
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a vFolder for this subject"
+msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:25
 msgid "Decrease the text size"
 msgstr "Laghdaigh an téacs"
 
-#: ../ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next important message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous important message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Display the previous unread message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Filter the selected messages for junk status"
 msgstr "Post sceál do tadhall"
 
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:42
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Méadaigh an téacs"
 
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mar_k as"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as having been read"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as important"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as junk"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not being junk"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as not having been read"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as unimportant"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Message Source"
 msgstr "Clófhoireanna Scéal"
 
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Move"
 msgstr "Bog"
 
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Move selected message(s) to another folder"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Important Message"
 msgstr ""
 
 # NL
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Thread"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Next _Unread Message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Not Junk"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in a new window"
 msgstr "Post an sceál seo"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:67
 #, fuzzy
 msgid "Open the selected message in the composer for editing"
 msgstr "Post an sceál seo"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Pos_t New Message to Folder"
+msgstr "Níl an scéal %s ar fáil: %s"
+
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a Repl_y"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:72
+msgid "Post a message to a Public folder"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Post a reply to a message in a Public folder"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Print this message"
 msgstr "Clodaigh scéal seo"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Re_direct"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:87
+#, fuzzy
+msgid "Search Folder from Mailing _List..."
+msgstr "líosta ríomhphost %s"
+
+#: ../ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "Search Folder from Recipients..."
+msgstr "Freagraí do %s"
+
+#: ../ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "Search Folder from S_ubject..."
+msgstr "Foinse FFillteáin"
+
+#: ../ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "Search Folder from Sen_der..."
+msgstr "Cruthaigh Fillteán _Fhíorúil ó Cuardach..."
+
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Select _All Text"
 msgstr "Roghnaigh gach teacs"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "Select all the text in a message"
 msgstr "Roghnaigh gach teacs"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Uni_mportant"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "VFolder on Mailing _List..."
-msgstr ""
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "VFolder on Recipients..."
-msgstr ""
-
-#: ../ui/evolution-mail-message.xml.h:96
-#, fuzzy
-msgid "VFolder on S_ubject..."
-msgstr "Foinse FFillteáin"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "VFolder on Sen_der..."
-msgstr ""
-
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Caret Mode"
 msgstr "Cruthaigh fillteán"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:105
 #, fuzzy
 msgid "_Delete Message"
 msgstr "_Scrios Fotha"
 
-#: ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Find in Message..."
 msgstr "_Eagar mar Scéal Nua..."
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Go To"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:110
 #, fuzzy
 msgid "_Important"
 msgstr "Áit"
 
 # GN
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Junk"
 msgstr "Bruscar"
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Load Images"
 msgstr "Ag Lódáil íomhanna"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Next Message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:116
 #, fuzzy
 msgid "_Normal Size"
 msgstr "Gnáth"
 
 # GN
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Not Junk"
 msgstr "Bruscar"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:118
 #, fuzzy
 msgid "_Open in New Window"
 msgstr "Oscail 'san Fhuinneog _Nua"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Previous Message"
 msgstr ""
 
-# IS
-#: ../ui/evolution-mail-message.xml.h:118
-#, fuzzy
-msgid "_Read"
-msgstr "Athlódáil"
-
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:123
 #, fuzzy
 msgid "_Save Message..."
 msgstr "Sábháil Scéal...."
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:124
 #, fuzzy
 msgid "_Undelete Message"
 msgstr "(Scéal gan tideál)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Unread"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Zoom In"
 msgstr ""
 
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
 #: ../ui/evolution-mail-messagedisplay.xml.h:1
 #: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:2
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Close"
 msgstr "Dún"
 
@@ -17869,19 +18843,19 @@ msgstr "Dún"
 msgid "Close this window"
 msgstr "Dún an fhuinneog seo"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr ""
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:40 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Dún"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:43
-#: ../ui/evolution-signature-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-signature-editor.xml.h:24
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Comhad"
 
@@ -17897,8 +18871,13 @@ msgstr "Ceangal comhad"
 msgid "Check to get delivery notification when your message is read"
 msgstr ""
 
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
 #: ../ui/evolution-message-composer.xml.h:5
-#: ../ui/evolution-signature-editor.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:13
 msgid "Close the current file"
 msgstr ""
 
@@ -17915,7 +18894,7 @@ msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:9
-#: ../ui/evolution-signature-editor.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:14
 msgid "For_mat"
 msgstr "_Formáid"
 
@@ -17952,114 +18931,123 @@ msgid "Save As"
 msgstr "Sábháil Mar"
 
 #: ../ui/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save Draft"
+msgstr "Dáta"
+
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Sábháil _Mar..."
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:23
+#, fuzzy
+msgid "Save as draft"
+msgstr "Sábháil mar VCard"
+
+#: ../ui/evolution-message-composer.xml.h:24
 msgid "Save in folder..."
 msgstr "Sábháil 'san fillteán..."
 
-#: ../ui/evolution-message-composer.xml.h:23
-#: ../ui/evolution-signature-editor.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:25
 msgid "Save the current file"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save the message in a specified folder"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:27
-#: ../ui/evolution-signature-editor.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-signature-editor.xml.h:22
 msgid "Send the mail in HTML format"
 msgstr "Post an sceál seo i HTML"
 
-#: ../ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Send this message"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your PGP key"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the Post-To field is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the To field is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "_Attachment..."
 msgstr "_Ceangaltán..."
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "_Bcc Field"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "_Cc Field"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "_Delete all"
 msgstr "_Dealaigh gach rud"
 
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-message-composer.xml.h:46
 msgid "_From Field"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:25
 msgid "_Insert"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Open..."
 msgstr "_Oscail..."
 
-#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Post-To Field"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:50
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "_Slándáil"
 
 # FI
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:53
 msgid "_To Field"
 msgstr ""
 
@@ -18067,19 +19055,22 @@ msgstr ""
 msgid "C_lose"
 msgstr "_Dún"
 
-#: ../ui/evolution-signature-editor.xml.h:5
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ../ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:16
 msgid "Save and Close"
 msgstr "Sábháil agus Dún"
 
-#: ../ui/evolution-signature-editor.xml.h:8
+#.
+#. <menuitem name="FileSave" verb="" _label="_Save"/>
+#.
+#: ../ui/evolution-signature-editor.xml.h:20
 msgid "Save and _Close"
 msgstr "Sábháil agus _Dún"
 
-#: ../ui/evolution-signature-editor.xml.h:10
+#: ../ui/evolution-signature-editor.xml.h:21
 msgid "Save the current file and close the window"
 msgstr ""
 
@@ -18151,7 +19142,7 @@ msgstr ""
 msgid "View the selected task"
 msgstr "Taispeán tadhallaí roghnaithe"
 
-#: ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Open Task"
 msgstr "_Oscail Tasc"
 
@@ -18190,144 +19181,144 @@ msgid "Display window buttons with text only"
 msgstr ""
 
 #: ../ui/evolution.xml.h:10
-#, fuzzy
-msgid "Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
-
-#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Éirigh as an ríomhchlár"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:11
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ../ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
 msgstr ""
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
 msgstr ""
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:15
 msgid "Import data from other programs"
 msgstr ""
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 #, fuzzy
 msgid "New _Window"
 msgstr "_Fuinneog"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 #, fuzzy
 msgid "Prefere_nces"
 msgstr "_Roghnachais..."
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr ""
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Set up Pilot configuration"
 msgstr "Socrú cumraíocht Pilot"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 #, fuzzy
 msgid "Show information about Evolution"
 msgstr "Taispeán eolas faoi Ximian Evolution"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ../ui/evolution.xml.h:25
+#. <menuitem name="HelpFAQ" verb=""
+#. _label="Evolution _FAQ"/>
+#.
+#. <separator/>
+#: ../ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:31
 msgid "Tool_bar"
 msgstr ""
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:32
 msgid "Tool_bar style"
 msgstr ""
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:33
 #, fuzzy
 msgid "_About Evolution..."
 msgstr "Faoi Ximian Evolution"
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Close Window"
 msgstr "Dún an fhuinneog seo"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:37
 msgid "_Help"
 msgstr "Cab_hair"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:38
 msgid "_Hide buttons"
 msgstr ""
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:39
 msgid "_Icons only"
 msgstr ""
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:40
 msgid "_Import..."
 msgstr ""
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:41
 msgid "_New"
 msgstr "_Nua"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:42
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Roghnachais Phoist"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Quit"
 msgstr "G_earr"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:44
 msgid "_Send / Receive"
 msgstr ""
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:45
 msgid "_Switcher Appearance"
 msgstr ""
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:46
 msgid "_Synchronization Options..."
 msgstr ""
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
 msgstr ""
 
-#: ../ui/evolution.xml.h:45
-msgid "_Tools"
-msgstr "Uir_lisí"
+#: ../ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Window"
+msgstr "_Fuinneog"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -18430,6 +19421,34 @@ msgid ""
 "Use the right mouse button to zoom out."
 msgstr ""
 
+#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-model.c:188
+#, fuzzy
+msgid "Collection"
+msgstr "_Roghnú:"
+
+#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views.glade.h:4
+#, fuzzy, no-c-format
+msgid "Define Views for %s"
+msgstr "Amharcóir Teastas: %s"
+
+#: ../widgets/menus/gal-define-views-dialog.c:333
+#: ../widgets/menus/gal-define-views-dialog.c:335
+#, fuzzy
+msgid "Define Views"
+msgstr "Amharc Seachtain"
+
+#: ../widgets/menus/gal-define-views.glade.h:2
+#, fuzzy, no-c-format
+msgid "Define Views for \"%s\""
+msgstr "Albachtaí do \"%s\""
+
+#: ../widgets/menus/gal-define-views.glade.h:5
+#, fuzzy
+msgid "_Edit..."
+msgstr "Eagar..."
+
 #: ../widgets/menus/gal-view-factory-etable.c:39
 #: ../widgets/table/e-table-header-item.c:1845
 #: ../widgets/table/e-table-scrolled.c:224
@@ -18437,6 +19456,24 @@ msgstr ""
 msgid "Table"
 msgstr "Tabla"
 
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+msgid "Instance"
+msgstr ""
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#, fuzzy
+msgid "Save Current View"
+msgstr "Amharc Reatha"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#, fuzzy
+msgid "_Create new view"
+msgstr "Cruthaigh fhuinneog nua"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
+msgid "_Replace existing view"
+msgstr ""
+
 #: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr ""
@@ -18453,6 +19490,19 @@ msgstr ""
 msgid "Define New View"
 msgstr ""
 
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+msgid "Name of new view:"
+msgstr ""
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#, fuzzy
+msgid "Type of View"
+msgstr "Amharc Lá"
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
+msgid "Type of view:"
+msgstr ""
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: ../widgets/misc/e-calendar-item.c:415
@@ -18460,7 +19510,7 @@ msgid "MTWTFSS"
 msgstr "LMCDASD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1099
+#: ../widgets/misc/e-calendar-item.c:1097
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -18492,15 +19542,13 @@ msgstr ""
 msgid "GDK fill color"
 msgstr ""
 
-#: ../widgets/misc/e-canvas-background.c:477 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
+#: ../widgets/misc/e-canvas-background.c:477
+#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
+#: ../widgets/text/e-text.c:3563
 msgid "Fill stipple"
 msgstr ""
 
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1306
-msgid "FIll stipple"
-msgstr ""
-
 #: ../widgets/misc/e-canvas-background.c:484
 #: ../widgets/misc/e-canvas-background.c:485
 msgid "X1"
@@ -18522,14 +19570,16 @@ msgid "Y2"
 msgstr ""
 
 #: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
+#: ../widgets/table/e-table-group-container.c:978
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3005
 msgid "Minimum width"
 msgstr ""
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
+#: ../widgets/table/e-table-group-container.c:979
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3002
+#: ../widgets/table/e-table-item.c:3006
 msgid "Minimum Width"
 msgstr ""
 
@@ -18858,7 +19908,7 @@ msgstr ""
 msgid "Cursor Mode"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.c:515
+#: ../widgets/misc/e-send-options.c:521
 #, fuzzy
 msgid "When de_leted:"
 msgstr "Scrioste"
@@ -19003,6 +20053,24 @@ msgstr "%s (%d%% Rinneadh)"
 msgid "click here to go to url"
 msgstr ""
 
+#: ../widgets/misc/gal-categories.glade.h:2
+msgid "Edit Master Category List..."
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:3
+msgid "Item(s) belong to these _categories:"
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:4
+#, fuzzy
+msgid "_Available Categories:"
+msgstr "_Catagóire..."
+
+#: ../widgets/misc/gal-categories.glade.h:5
+#, fuzzy
+msgid "categories"
+msgstr "Ragnanna"
+
 #: ../widgets/table/e-cell-combo.c:177
 msgid "popup list"
 msgstr ""
@@ -19043,28 +20111,98 @@ msgstr ""
 msgid "BG Color Column"
 msgstr ""
 
-#: ../widgets/table/e-table-config-field.c:254
-msgid "Then By"
+#: ../widgets/table/e-table-config-no-group.glade.h:1
+msgid "<- _Remove"
+msgstr "<- _Scríos"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:2
+#: ../widgets/table/e-table-config.glade.h:1
+msgid "A_vailable Fields:"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:3
+#: ../widgets/table/e-table-config.glade.h:2
+msgid "Ascending"
 msgstr ""
 
-#: ../widgets/table/e-table-config-field.c:254
+#: ../widgets/table/e-table-config-no-group.glade.h:4
+#: ../widgets/table/e-table-config.glade.h:3
 #, fuzzy
-msgid "Group By"
+msgid "Clear All"
+msgstr "_Bánaigh Bratach"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:5
+#: ../widgets/table/e-table-config.glade.h:4
+msgid "Descending"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:7
+#, fuzzy
+msgid "Group Items By"
 msgstr "Grupa"
 
-#: ../widgets/table/e-table-config-field.c:254
+#: ../widgets/table/e-table-config-no-group.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:8
+msgid "Move _Down"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:9
+#, fuzzy
+msgid "Move _Up"
+msgstr "Bog"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:11
+msgid "Sh_ow these fields in order:"
+msgstr ""
+
+# FI
+#: ../widgets/table/e-table-config-no-group.glade.h:12
+#: ../widgets/table/e-table-config.c:563
+#: ../widgets/table/e-table-config.glade.h:10
 #, fuzzy
-msgid "Sort By"
+msgid "Show Fields"
+msgstr "Réimse"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show field in View"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:12
+#, fuzzy
+msgid "Sort"
 msgstr "Sort"
 
-#: ../widgets/table/e-table-config-field.c:270
-msgid "Ascending"
+#: ../widgets/table/e-table-config-no-group.glade.h:15
+#: ../widgets/table/e-table-config.glade.h:13
+#, fuzzy
+msgid "Sort Items By"
+msgstr "Sort"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Then By"
 msgstr ""
 
-#: ../widgets/table/e-table-config-field.c:273
-msgid "Descending"
+#: ../widgets/table/e-table-config-no-group.glade.h:17
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Suimigh"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:18
+#: ../widgets/table/e-table-config.glade.h:16
+msgid "_Fields Shown..."
 msgstr ""
 
+#: ../widgets/table/e-table-config-no-group.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:20
+#, fuzzy
+msgid "_Sort..."
+msgstr "Chló_fhoireann..."
+
 #: ../widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "Stád"
@@ -19085,6 +20223,19 @@ msgstr ""
 msgid "No grouping"
 msgstr ""
 
+#: ../widgets/table/e-table-config.c:584
+msgid "Available Fields"
+msgstr ""
+
+#: ../widgets/table/e-table-config.glade.h:17
+#, fuzzy
+msgid "_Group By..."
+msgstr "Grupa"
+
+#: ../widgets/table/e-table-config.glade.h:19
+msgid "_Show these fields in order:"
+msgstr ""
+
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:646
 #: ../widgets/table/e-table-field-chooser.c:79
@@ -19103,66 +20254,115 @@ msgstr ""
 msgid "Add a column..."
 msgstr ""
 
+#: ../widgets/table/e-table-field-chooser.glade.h:1
+#, fuzzy
+msgid "Field Chooser"
+msgstr "Ainm Réimse"
+
+#: ../widgets/table/e-table-field-chooser.glade.h:2
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:350
+#, c-format
+msgid "%s : %s (%d item)"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:351
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:356
+#, fuzzy, c-format
+msgid "%s (%d item)"
+msgstr "%s (%d)"
+
+#: ../widgets/table/e-table-group-container.c:357
+#, fuzzy, c-format
+msgid "%s (%d items)"
+msgstr "%s (%d)"
+
+#: ../widgets/table/e-table-group-container.c:901
+#: ../widgets/table/e-table-group-container.c:902
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
+#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
 msgid "Alternating Row Colors"
 msgstr ""
 
+#: ../widgets/table/e-table-group-container.c:908
+#: ../widgets/table/e-table-group-container.c:909
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
+#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
 #: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Horizontal Draw Grid"
 msgstr ""
 
+#: ../widgets/table/e-table-group-container.c:915
+#: ../widgets/table/e-table-group-container.c:916
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
+#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
 #: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Vertical Draw Grid"
 msgstr ""
 
+#: ../widgets/table/e-table-group-container.c:922
+#: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
+#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
 #: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
 msgid "Draw focus"
 msgstr ""
 
+#: ../widgets/table/e-table-group-container.c:929
+#: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
+#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
 msgid "Cursor mode"
 msgstr ""
 
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
-#: ../widgets/table/e-tree.c:3266
-msgid "Length Threshold"
-msgstr ""
-
+#: ../widgets/table/e-table-group-container.c:936
+#: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
+#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
 msgid "Selection model"
 msgstr ""
 
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
-msgid "Frozen"
+#: ../widgets/table/e-table-group-container.c:943
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-leaf.c:608
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
+#: ../widgets/table/e-tree.c:3266
+msgid "Length Threshold"
 msgstr ""
 
+#: ../widgets/table/e-table-group-container.c:950
+#: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 #: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
 #: ../widgets/table/e-tree.c:3298
 msgid "Uniform row height"
 msgstr ""
 
+#: ../widgets/table/e-table-group-container.c:957
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-leaf.c:644
+msgid "Frozen"
+msgstr ""
+
 #: ../widgets/table/e-table-header-item.c:1472
 msgid "Customize Current View"
 msgstr ""
@@ -19227,17 +20427,17 @@ msgstr "Eolas Sort"
 msgid "Tree"
 msgstr "Crann"
 
-#: ../widgets/table/e-table-item.c:2938 ../widgets/table/e-table-item.c:2939
+#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
 #, fuzzy
 msgid "Table header"
 msgstr "Scríobhóir Scéal"
 
-#: ../widgets/table/e-table-item.c:2945 ../widgets/table/e-table-item.c:2946
+#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
 #, fuzzy
 msgid "Table model"
 msgstr "Tabla"
 
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Cursor row"
 msgstr ""
 
@@ -19407,2032 +20607,3 @@ msgstr ""
 #: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
 msgid "Handle Popup"
 msgstr ""
-
-#, fuzzy
-#~ msgid "have "
-#~ msgstr "Sábháil Mar"
-
-#, fuzzy
-#~ msgid " cards"
-#~ msgstr "cartaí"
-
-#, fuzzy
-#~ msgid " card"
-#~ msgstr "1 carta"
-
-#, fuzzy
-#~ msgid "contact's header: "
-#~ msgstr "Tadhallaí: "
-
-#~ msgid "Remove All"
-#~ msgstr "Scríos Gach Rud"
-
-#~ msgid "View Contact List"
-#~ msgstr "Feach Líosta Tadhall"
-
-#~ msgid "View Contact Info"
-#~ msgstr "Feach Eolas na Tadhall"
-
-#~ msgid "Select Contacts from Address Book"
-#~ msgstr "Roghnaigh Tadhallaí o Leabhar Seoladh"
-
-#~ msgid "<b>Contacts</b>"
-#~ msgstr "<b>Tadhallaî</b>"
-
-#~ msgid "<b>Show Contacts</b>"
-#~ msgstr "<b>Taispeán Tadhallaíi</b>"
-
-#~ msgid "Address _Book:"
-#~ msgstr "_Leabhar Seoladh:"
-
-#~ msgid "_Find"
-#~ msgstr "_Faigh"
-
-#, fuzzy
-#~ msgid "_Search:"
-#~ msgstr "C_uardaigh"
-
-#, fuzzy
-#~ msgid "Address:"
-#~ msgstr "_Seoladh:"
-
-#, fuzzy
-#~ msgid "PO Box:"
-#~ msgstr "Bosca _Phoist:"
-
-#, fuzzy
-#~ msgid "State/Province:"
-#~ msgstr "Seirbhís"
-
-#, fuzzy
-#~ msgid "Title:"
-#~ msgstr "_Tidéal:"
-
-#~ msgid "Go to Folder..."
-#~ msgstr "Téigh go dtí Fillteán..."
-
-#, fuzzy
-#~ msgid "Address Book Sources..."
-#~ msgstr "Leabhar Seoladh..."
-
-#~ msgid "Edit Contact Info"
-#~ msgstr "Eagar na hEolais Thadall"
-
-#, fuzzy
-#~ msgid "Evolution VCard importer"
-#~ msgstr "Amharcóir Féilire Evolution"
-
-#~ msgid "Unnamed List"
-#~ msgstr "Líosta gan ainm"
-
-#, fuzzy
-#~ msgid "Save Appointment"
-#~ msgstr "Coinne Nua"
-
-#~ msgid "Ending:"
-#~ msgstr "Ag Críochnach:"
-
-#~ msgid "Evolution Alarm"
-#~ msgstr "Aláram Evolution"
-
-# ##
-# ## Languages (ISO 639 code in brackets)
-# ## 	The 'msgid' names and spellings for languages are those listed
-# ##     in iso-639.def from glibc
-# aa 
-#~ msgid "Alarm on %s"
-#~ msgstr "Alairm on %s"
-
-#~ msgid "_Edit appointment"
-#~ msgstr "Eagar coinne"
-
-#~ msgid "%A %d %B %Y"
-#~ msgstr "%A, %e %B %Y"
-
-#~ msgid "backend_go_offline(): %s"
-#~ msgstr "backend_go_offline(): %s"
-
-#~ msgid "backend_go_online(): %s"
-#~ msgstr "backend_go_online(): %s"
-
-#~ msgid "open_client(): %s"
-#~ msgstr "open_client(): %s"
-
-#, fuzzy
-#~ msgid "_Destination"
-#~ msgstr "Ag socraigh ffilteán: %s"
-
-#, fuzzy
-#~ msgid "Free/Busy Editor"
-#~ msgstr "Eolas"
-
-#~ msgid "N"
-#~ msgstr "T"
-
-#~ msgid "S"
-#~ msgstr "D"
-
-#~ msgid "W"
-#~ msgstr "I"
-
-#~ msgid "Print Setup"
-#~ msgstr "Socraigh Priontáil "
-
-#, fuzzy
-#~ msgid "Signing message"
-#~ msgstr "Ag Sábháil %d scéal(aí)"
-
-#, fuzzy
-#~ msgid "Verifying message"
-#~ msgstr "Ag Sábháil %d scéal(aí)"
-
-#, fuzzy
-#~ msgid "Decrypting message"
-#~ msgstr "Ag Sábháil %d scéal(aí)"
-
-#, fuzzy
-#~ msgid "Failed to create child process '%s': %s"
-#~ msgstr ""
-#~ "Teip ag cruthaigh eolaire '%s':\n"
-#~ "%s"
-
-#~ msgid "Syncing folder"
-#~ msgstr "Ag Ssioncronaich fillteán"
-
-#~ msgid "Moving messages"
-#~ msgstr "Ag bogadh scéaltaí"
-
-#, fuzzy
-#~ msgid "Learning junk"
-#~ msgstr "Rabhadh"
-
-#~ msgid ""
-#~ "Failed to GPG %s: %s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Teip ar GPG: %s: %s\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Failed to GPG %s: %s\n"
-#~ msgstr "Teip ar GPG: %s: %s\n"
-
-#~ msgid "Could not lock '%s'"
-#~ msgstr "Níorbh fhéidir '%s' a glasáil"
-
-#~ msgid "Could not fork: %s"
-#~ msgstr "Teíp ag fork: %s"
-
-#~ msgid "(Unknown error)"
-#~ msgstr "(Earraidh gan aithne)"
-
-#~ msgid "Anonymous"
-#~ msgstr "Gan ainm"
-
-#~ msgid "CRAM-MD5"
-#~ msgstr "CRAM-MD5"
-
-#~ msgid "DIGEST-MD5"
-#~ msgstr "DIGEST-MD5"
-
-#~ msgid "Kerberos 4"
-#~ msgstr "Kerberos 4"
-
-#~ msgid "Login"
-#~ msgstr "Logann"
-
-#~ msgid "POP before SMTP"
-#~ msgstr "POP riomh SMTP"
-
-#, fuzzy
-#~ msgid "Cannot find certificate for '%s'"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot create CMS message"
-#~ msgstr "Níl an scéal %s ar fáil: %s"
-
-#, fuzzy
-#~ msgid "Cannot attach CMS signedData"
-#~ msgstr "Ní féidir an comhad %s a cheangail: %s"
-
-#, fuzzy
-#~ msgid "Cannot attach CMS data"
-#~ msgstr "Ní féidir an comhad %s a cheangail: %s"
-
-#, fuzzy
-#~ msgid "Cannot add encryption certificate"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot create encoder context"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-# SG
-#~ msgid "Good signature"
-#~ msgstr "Siniú go maith"
-
-# SG
-#~ msgid "Bad signature"
-#~ msgstr "Droch siniú"
-
-# SG
-#, fuzzy
-#~ msgid "No signedData in signature"
-#~ msgstr "Siniú neambhailí."
-
-#, fuzzy
-#~ msgid "Cannot calculate digests"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Certificate import failed"
-#~ msgstr "Sonraí Theastas"
-
-# SG
-#, fuzzy
-#~ msgid "Cannot find signature digests"
-#~ msgstr "Siniú Bhailithe."
-
-#, fuzzy
-#~ msgid "Decoder failed"
-#~ msgstr "Teip oraithe NNTP: %s"
-
-#, fuzzy
-#~ msgid "Cannot find certificate for `%s'"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot create CMS Message"
-#~ msgstr "Níl an scéal %s ar fáil: %s"
-
-#, fuzzy
-#~ msgid "Cannot create CMS EnvelopedData"
-#~ msgstr "Níl an scéal %s ar fáil: %s"
-
-#, fuzzy
-#~ msgid "Cannot attach CMS EnvelopedData"
-#~ msgstr "Ní féidir an comhad %s a cheangail: %s"
-
-#, fuzzy
-#~ msgid "Cannot attach CMS data object"
-#~ msgstr "Ní féidir an comhad %s a cheangail: %s"
-
-#, fuzzy
-#~ msgid "Cannot create CMS RecipientInfo"
-#~ msgstr "Níl an scéal %s ar fáil: %s"
-
-#, fuzzy
-#~ msgid "Cannot create folder `%s': folder exists"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot create folder: %s: folder exists"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#~ msgid "Trash"
-#~ msgstr "Bruscar"
-
-#~ msgid "BAD"
-#~ msgstr "OLC"
-
-#, fuzzy
-#~ msgid "Check new messages for Junk contents"
-#~ msgstr "Post sceál do tadhall"
-
-#, fuzzy
-#~ msgid "Address Book and Calendar"
-#~ msgstr "Leabhar Seoladh:"
-
-#~ msgid "Password"
-#~ msgstr "Pasfhocal"
-
-#~ msgid "Folders"
-#~ msgstr "Fillteáin"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "IMAP server %s"
-#~ msgstr "Freastalaí IMAP %s"
-
-#~ msgid "IMAP service for %s on %s"
-#~ msgstr "Seirbhís IMAP do %s as %s"
-
-#, fuzzy
-#~ msgid "Cannot create folder `%s': folder exists."
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot select folder `%s': Invalid mailbox name"
-#~ msgstr "Níl eolaire maildir '%s' ann."
-
-#, fuzzy
-#~ msgid "Cannot select folder `%s': Bad command"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot sync flags to folder `%s': Unknown"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot sync flags to folder `%s': Bad command"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot expunge folder `%s': Unknown"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot expunge folder `%s': Bad command"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot get message %s from folder `%s': No such message"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot get message %s from folder `%s': Bad command"
-#~ msgstr "Níl an scéal %s ar fáil: %s"
-
-#, fuzzy
-#~ msgid "Cannot append message to folder `%s': Unknown error"
-#~ msgstr "Níl aon Eolaire `%s' ann."
-
-#, fuzzy
-#~ msgid "Cannot append message to folder `%s': Bad command"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "IMAPv4rev1"
-#~ msgstr "IMAPv4"
-
-#, fuzzy
-#~ msgid "%sPlease enter the IMAP password for %s on host %s"
-#~ msgstr "%sPasfhocali POP do %s@%s, le do thoil"
-
-#, fuzzy
-#~ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot create folder `%s': Invalid mailbox name"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot create folder `%s': Bad command"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot delete folder `%s': Special folder"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
-#~ msgstr "Níl eolaire maildir '%s' ann."
-
-#, fuzzy
-#~ msgid "Cannot delete folder `%s': Bad command"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot rename folder `%s' to `%s': Special folder"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot rename folder `%s' to `%s': Bad command"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Bad command"
-#~ msgstr "Ordú:"
-
-#, fuzzy
-#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-#~ msgstr "Níl eolaire maildir '%s' ann."
-
-#, fuzzy
-#~ msgid "Cannot subscribe to folder `%s': Bad command"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "No data"
-#~ msgstr "Gan Tascanna"
-
-#~ msgid "IMAP+"
-#~ msgstr "IMAP+"
-
-#~ msgid "~%s (%s)"
-#~ msgstr "~%s (%s)"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Local mail file %s"
-#~ msgstr "Comhad phoist áitiúl %s"
-
-#~ msgid "Could not rename '%s': %s"
-#~ msgstr "Teip ag athainmigh '%s': %s"
-
-#~ msgid "Could not save summary: %s: %s"
-#~ msgstr "Teip ag sábháil coimriú: %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot get folder `%s': %s"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot create folder `%s': %s"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot get folder `%s': not a maildir directory."
-#~ msgstr "Níl eolaire maildir '%s' ann."
-
-#~ msgid "not a maildir directory"
-#~ msgstr "níl eolaire maildir ann"
-
-#~ msgid "Storing folder"
-#~ msgstr "Ag stoir filtean"
-
-#~ msgid "Cannot create directory `%s': %s."
-#~ msgstr "Teip ag cruthaigh eolaire '%s': %s."
-
-#~ msgid "Cannot create folder: %s: %s"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#~ msgid "The new folder name is illegal."
-#~ msgstr "Is ainm fillteán nua neamhdhlíthe."
-
-#, fuzzy
-#~ msgid "Could not rename `%s': `%s': %s"
-#~ msgstr "Teip ag athainmigh '%s': %s"
-
-#, fuzzy
-#~ msgid "Could not rename '%s' to %s: %s"
-#~ msgstr "Teip ag athainmigh '%s': %s"
-
-#~ msgid "Could not open folder: %s: %s"
-#~ msgstr "Teip ag oscailt fillteán: %s: %s"
-
-#~ msgid "Could not open file: %s: %s"
-#~ msgstr "Níorbh fhéidir an comhad %s a n-oscailt: %s"
-
-#~ msgid "Unknown error: %s"
-#~ msgstr "Earraidh gan fhois: %s"
-
-#, fuzzy
-#~ msgid "Could not create folder `%s': %s"
-#~ msgstr ""
-#~ "Teip ag cruthaigh comhd '%s':\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Cannot get folder `%s': not a directory."
-#~ msgstr "Níl aon Eolaire `%s' ann."
-
-#~ msgid "Cannot open MH directory path: %s: %s"
-#~ msgstr "Teip ag oscailt slí eolaire MH: %s: %s"
-
-#~ msgid ""
-#~ "Could not open folder `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Teip ag oscailt fillteán '%s':\n"
-#~ "%s"
-
-#~ msgid "`%s' is not a mailbox file."
-#~ msgstr "Níl comhad mailbox `%s' ann."
-
-#~ msgid "Please enter the NNTP password for %s@%s"
-#~ msgstr "Pasfhocal NNTP do %s@%s, le do thoil"
-
-#~ msgid "Cannot get message %s: %s"
-#~ msgstr "Níl an scéal %s ar fáil: %s"
-
-#~ msgid "USENET news"
-#~ msgstr "Nuachtain USENET"
-
-#~ msgid "NNTP Command failed: %s"
-#~ msgstr "Teip oraithe NNTP: %s"
-
-#~ msgid "USENET News via %s"
-#~ msgstr "Nuachtain USENET via %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "Error retrieving newsgroups:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Earraidh ag sábhháil scéalaí  do: %s\n"
-#~ " %s"
-
-#, fuzzy
-#~ msgid "Cannot authenticate to server: %s"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Not connected."
-#~ msgstr "Gan Tadhallaí"
-
-#~ msgid "No such folder: %s"
-#~ msgstr "Níl aon fillteán: %s"
-
-#~ msgid "Delete after %s day(s)"
-#~ msgstr "Scrios indiath %s la(e)"
-
-#~ msgid "POP"
-#~ msgstr "POP"
-
-#, fuzzy
-#~ msgid "%sPlease enter the POP password for %s on host %s"
-#~ msgstr "%sPasfhocali POP do %s@%s, le do thoil"
-
-#~ msgid "No such folder `%s'."
-#~ msgstr "Níl aon eolaire `%s' ann."
-
-#~ msgid "Sendmail"
-#~ msgstr "Sendmail"
-
-#~ msgid "sendmail"
-#~ msgstr "sendmail"
-
-#~ msgid "SMTP"
-#~ msgstr "SMTP"
-
-#, fuzzy
-#~ msgid "STARTTLS command failed: %s"
-#~ msgstr "Teip oraithe NNTP: %s"
-
-#, fuzzy
-#~ msgid "STARTTLS command failed"
-#~ msgstr "Teip oraithe NNTP: %s"
-
-#, fuzzy
-#~ msgid "%sPlease enter the SMTP password for %s on host %s"
-#~ msgstr "%sPasfhocali POP do %s@%s, le do thoil"
-
-#~ msgid "SMTP server %s"
-#~ msgstr "SMTP freastalaí %s"
-
-#, fuzzy
-#~ msgid "HELO command failed: %s"
-#~ msgstr "Teip oraithe NNTP: %s"
-
-#, fuzzy
-#~ msgid "HELO command failed"
-#~ msgstr "Teip oraithe NNTP: %s"
-
-#, fuzzy
-#~ msgid "AUTH command failed: %s"
-#~ msgstr "Teip oraithe NNTP: %s"
-
-#, fuzzy
-#~ msgid "AUTH command failed"
-#~ msgstr "Teip oraithe NNTP: %s"
-
-#, fuzzy
-#~ msgid "DATA command failed: %s: mail not sent"
-#~ msgstr "Teip oraithe NNTP: %s"
-
-#, fuzzy
-#~ msgid "DATA command failed"
-#~ msgstr "Teip oraithe NNTP: %s"
-
-#, fuzzy
-#~ msgid "RSET command failed: %s"
-#~ msgstr "Teip oraithe NNTP: %s"
-
-#, fuzzy
-#~ msgid "RSET command failed"
-#~ msgstr "Teip oraithe NNTP: %s"
-
-#, fuzzy
-#~ msgid "QUIT command failed: %s"
-#~ msgstr "Teip oraithe NNTP: %s"
-
-#, fuzzy
-#~ msgid "QUIT command failed"
-#~ msgstr "Teip oraithe NNTP: %s"
-
-#~ msgid "Attach a file to the message"
-#~ msgstr "Ceangal comhad ar an scéal"
-
-#, fuzzy
-#~ msgid "<b>If</b>"
-#~ msgstr "<b>Am</b> "
-
-#~ msgid "Create New Folder"
-#~ msgstr "Cruthaigh Fillteán Nua"
-
-#~ msgid "VFolders"
-#~ msgstr "FFilteáin"
-
-#~ msgid "_Print"
-#~ msgstr "_Priontáil"
-
-#, fuzzy
-#~ msgid "Virtual _Folders"
-#~ msgstr "_Fillteán"
-
-#~ msgid "IMAPv4 "
-#~ msgstr "IMAPv4"
-
-#~ msgid "Kerberos "
-#~ msgstr "Kerberos "
-
-#~ msgid "_Enable"
-#~ msgstr "Chumasach"
-
-#~ msgid "C_ompleted"
-#~ msgstr "Crí_ochnaithe"
-
-#~ msgid "480"
-#~ msgstr "480"
-
-#~ msgid "_Folder"
-#~ msgstr "_Fillteán"
-
-#~ msgid "_Normal Display"
-#~ msgstr "Taispeaín _Gnáth"
-
-#~ msgid "_Undelete"
-#~ msgstr "_Athdealaigh"
-
-#~ msgid "Cancel Task"
-#~ msgstr "Cealaigh Tasc"
-
-#~ msgid "Cancel this task"
-#~ msgstr "Cealaigh Tasc seo"
-
-#~ msgid "E_xit"
-#~ msgstr "_Ealu"
-
-#~ msgid "Pi_lot Settings..."
-#~ msgstr "Albachtaí Pi_lot..."
-
-#, fuzzy
-#~ msgid "_Window"
-#~ msgstr "_Fuinneog"
-
-#~ msgid "_Advanced..."
-#~ msgstr "_Ardmód..."
-
-#, fuzzy
-#~ msgid "_Add Group"
-#~ msgstr "_Cuir Grúpa Leis..."
-
-#, fuzzy
-#~ msgid "New Contacts Group"
-#~ msgstr "Tadhall Nua"
-
-#, fuzzy
-#~ msgid "Contacts Grou_p"
-#~ msgstr "_Tadhallaí"
-
-#, fuzzy
-#~ msgid "Create a new contacts group"
-#~ msgstr "Cruthaigh tadhall nua"
-
-#, fuzzy
-#~ msgid "Add Contacts Group"
-#~ msgstr "_Tadhallaí"
-
-#, fuzzy
-#~ msgid "Timeout:"
-#~ msgstr "Am"
-
-#, fuzzy
-#~ msgid "_Add Contacts Group"
-#~ msgstr "_Tadhallaí"
-
-#, fuzzy
-#~ msgid "_Email address:"
-#~ msgstr "Seoladh Rphost:"
-
-#, fuzzy
-#~ msgid "_Log in:"
-#~ msgstr "Logann"
-
-#, fuzzy
-#~ msgid "Add Tasks Group"
-#~ msgstr "Grupa na Líosta Tasc"
-
-#, fuzzy
-#~ msgid "L_ocation:"
-#~ msgstr "Áit:"
-
-#, fuzzy
-#~ msgid "<b>Organizer</b>"
-#~ msgstr "<b>Am</b> "
-
-#, fuzzy
-#~ msgid "New tasks group"
-#~ msgstr "Tasc nua"
-
-#, fuzzy
-#~ msgid "Tasks Gro_up"
-#~ msgstr "Grupa na Líosta Tasc"
-
-#, fuzzy
-#~ msgid "Create a new tasks group"
-#~ msgstr "Cruthaigh tasc nua"
-
-# ta
-#~ msgid "mail"
-#~ msgstr "post"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "Save List as VCard"
-#~ msgstr "Sábháil Lîosta mar VCard"
-
-#~ msgid "C_alendar"
-#~ msgstr "Fé_ilire"
-
-#
-#~ msgid "Date/Time:"
-#~ msgstr "Dáta/Am:"
-
-#~ msgid "_Options..."
-#~ msgstr "_Roghanna..."
-
-#~ msgid "Addressbook..."
-#~ msgstr "Leabhar Seoladh..."
-
-#
-#, fuzzy
-#~ msgid "Date & Time"
-#~ msgstr "Dáta/Am:"
-
-#~ msgid "F_ree"
-#~ msgstr "_Saor"
-
-#~ msgid "Pri_vate"
-#~ msgstr "Príobhádach"
-
-#, fuzzy
-#~ msgid "Add attendees from addressbook."
-#~ msgstr "_Suim do Leabhar Seoladh"
-
-#, fuzzy
-#~ msgid "Exceptions"
-#~ msgstr "Roghanna"
-
-#, fuzzy
-#~ msgid "Preview"
-#~ msgstr "Réamhthaispeántais:"
-
-#~ msgid "% _Complete"
-#~ msgstr "% _Rinneadh"
-
-#, fuzzy
-#~ msgid "Progress"
-#~ msgstr "Dearbhú"
-
-#~ msgid "Folder:"
-#~ msgstr "Fillteán:"
-
-#~ msgid "<b>Ends:</b> "
-#~ msgstr "<b>Ag Críochnú:</b> "
-
-#~ msgid "<b>Completed:</b> "
-#~ msgstr "<b>Críochnaithe:</b> "
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Ar bith</i>"
-
-#, fuzzy
-#~ msgid "Add attendees from addressbook"
-#~ msgstr "_Suim do Leabhar Seoladh"
-
-#, fuzzy
-#~ msgid ""
-#~ "Error opening %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ " Earráid le %s:\n"
-#~ "  %s"
-
-#, fuzzy
-#~ msgid "Can't find certificate for `%s'"
-#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#, fuzzy
-#~ msgid "Can't create encoder context"
-#~ msgstr "Cruthaigh tadhall nua"
-
-#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-#~ msgstr "Dé %a, %Y-%m-%d ag %H:%M %%+05d, scríobh %%s:"
-
-#~ msgid "Folder Name"
-#~ msgstr "Ainm Fillteán"
-
-#~ msgid "_Properties..."
-#~ msgstr "_Roghanna..."
-
-#~ msgid "C_alendar:"
-#~ msgstr "Fé_ilire:"
-
-#, fuzzy
-#~ msgid "_Contacts:"
-#~ msgstr "Tadhallaí: "
-
-#~ msgid "_Mail:"
-#~ msgstr "_Post:"
-
-# tg
-#~ msgid "_Tasks:"
-#~ msgstr "_Tascanna:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "_Saghas fillteán:"
-
-#, fuzzy
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Roghnaigh Fillteán Tascanna"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "Ainm _Fillteán:"
-
-#~ msgid "1:00"
-#~ msgstr "1:00"
-
-#~ msgid "5:00"
-#~ msgstr "5:00"
-
-#~ msgid "Email address:"
-#~ msgstr "Seoladh Rphost:"
-
-#~ msgid "U_se SSL/TLS:"
-#~ msgstr "Ú_sáid SSL/TLS:"
-
-#~ msgid "_Display name:"
-#~ msgstr "Ainm _taispeáint:"
-
-#~ msgid "_Port number:"
-#~ msgstr "Uimhir _Poirt:"
-
-#~ msgid "_Server name:"
-#~ msgstr "Ainm _Freastalaí:"
-
-#, fuzzy
-#~ msgid "Job title:"
-#~ msgstr "Tideal _Post:"
-
-#, fuzzy
-#~ msgid "Webcam:"
-#~ msgstr "Leathanach Lín:"
-
-#~ msgid "Error saving %s: %s"
-#~ msgstr "Earráid ag sábhháil %s: %s"
-
-# Avoid; either use KR or KP
-#~ msgid "_Source URL:"
-#~ msgstr "URL _Fhoinse:"
-
-#, fuzzy
-#~ msgid "Error posting message: %s: message not posted"
-#~ msgstr ""
-#~ "Earraidh ag sábhháil scéal: %s\n"
-#~ " %s"
-
-#, fuzzy
-#~ msgid "Stream error"
-#~ msgstr "Earraidh Eile"
-
-#, fuzzy
-#~ msgid "Connection error: %s"
-#~ msgstr "Earraidh gan fhois: %s"
-
-#~ msgid "Could not get group: %s"
-#~ msgstr "Ní raibh an grúpa ar fáil: %s"
-
-#, fuzzy
-#~ msgid "Could not get messages: unspecified error"
-#~ msgstr "Níl an scéal %s ar fáil: %s"
-
-#~ msgid "Working"
-#~ msgstr "Ag Obair"
-
-#~ msgid "_Filename:"
-#~ msgstr "_Ainm Chomad:"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Unknown error."
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Earraidh gan fhois."
-
-#~ msgid "View Certificate"
-#~ msgstr "Feach Teastas"
-
-#~ msgid "About Ximian Evolution..."
-#~ msgstr "Faoi Ximian Evolution..."
-
-#~ msgid "_About Ximian Evolution..."
-#~ msgstr "_Faoi Ximian Evolution..."
-
-#, fuzzy
-#~ msgid "Address 2:"
-#~ msgstr "Seoladh _2:"
-
-# PE
-#, fuzzy
-#~ msgid "Blog:"
-#~ msgstr "Blog"
-
-#~ msgid "Evolution Tasks viewer"
-#~ msgstr "Amharcóir Tascanna Evolution"
-
-#~ msgid "Display a message"
-#~ msgstr "Taispeáin scéal"
-
-#~ msgid "Time"
-#~ msgstr "Am"
-
-#~ msgid "_General"
-#~ msgstr "_Giniréal"
-
-#, fuzzy
-#~ msgid "calendar"
-#~ msgstr "Féilire"
-
-#~ msgid "Evolution Mail folder viewer"
-#~ msgstr "Amharcóir fillteáin phost Evolution"
-
-#, fuzzy
-#~ msgid "Address Book Creation Assistant"
-#~ msgstr "Roghnachais na Leabhar Sheoladh"
-
-#~ msgid "Finished"
-#~ msgstr "Críochnaithe"
-
-#~ msgid " B_usiness:"
-#~ msgstr " _Gnó:"
-
-#~ msgid "A_ddress..."
-#~ msgstr "S_eoladh..."
-
-#~ msgid "A_ssistant's name:"
-#~ msgstr "_Ainm Chúntóir:"
-
-#~ msgid "Addressbook:"
-#~ msgstr "Leabhar Seoladh:"
-
-#~ msgid "Blog address:"
-#~ msgstr "Seoladh 'Blog':"
-
-#~ msgid "Business fa_x:"
-#~ msgstr "Fa_cs Ghnó:"
-
-#~ msgid "File a_s:"
-#~ msgstr "Comhdaigh _mar:"
-
-#~ msgid "New phone type"
-#~ msgstr "Cinéal fóin nua"
-
-#~ msgid "Organi_zation:"
-#~ msgstr "_Eagrú:"
-
-#~ msgid "Primary _email:"
-#~ msgstr "R-Phost Thósaiocht"
-
-#~ msgid "_Business:"
-#~ msgstr "_Gnó:"
-
-#~ msgid "_Home:"
-#~ msgstr "_Baile:"
-
-#~ msgid "_Manager's name:"
-#~ msgstr "Ainm _Bainisteoir:"
-
-#~ msgid "_Mobile:"
-#~ msgstr "Fón _Póca:"
-
-#~ msgid "_Public Calendar URL:"
-#~ msgstr "URL do Féilire Poiblí:"
-
-#~ msgid "_Web page address:"
-#~ msgstr "Seoladh leathanach greasán:"
-
-#~ msgid "Account Name"
-#~ msgstr "Ainm Chuntas"
-
-#~ msgid "Save Contact as VCard"
-#~ msgstr "Sábháil Tadhall  mar VCard"
-
-#~ msgid "Business"
-#~ msgstr "Gnó"
-
-#~ msgid ""
-#~ "Error autosaving message: %s\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Earraidh ag sábhháil scéal: %s\n"
-#~ " %s"
-
-#, fuzzy
-#~ msgid "Cannot move folder `%s': illegal operation"
-#~ msgstr "Ní féidir an fillteán a bhogadh: %s"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "Save signature"
-#~ msgstr "Sábháil siniú"
-
-#~ msgid "_Selection:"
-#~ msgstr "_Roghnú:"
-
-#, fuzzy
-#~ msgid "New Addressbook Book"
-#~ msgstr "Leabhar Seoladh Nua"
-
-#~ msgid "_Task List"
-#~ msgstr "Líosta _Tasc"
-
-#, fuzzy
-#~ msgid "_minute(s)"
-#~ msgstr "noimea(i)d"
-
-#~ msgid "Select Default Folder"
-#~ msgstr "Roghnaigh Fillteán Loicead."
-
-#~ msgid "Opening Folder"
-#~ msgstr "Ag Oscailt Fillteán"
-
-#~ msgid "Opening Folder \"%s\""
-#~ msgstr "Ag oscailt Fillteán  \"%s\""
-
-#~ msgid "in \"%s\" ..."
-#~ msgstr "san \"%s\"..."
-
-#~ msgid "Create a new window"
-#~ msgstr "Cruthaigh fhuinneog nua"
-
-#~ msgid "Open a new window"
-#~ msgstr "Oscail fuinneog nua"
-
-#~ msgid "2:30"
-#~ msgstr "2:30"
-
-#, fuzzy
-#~ msgid "Address Book Sources"
-#~ msgstr "Leabhar Seoladh..."
-
-#~ msgid "and %d other contacts."
-#~ msgstr "agus %d tadhallaí eile."
-
-#~ msgid "1 day"
-#~ msgstr "1 lá"
-
-#~ msgid "1 week"
-#~ msgstr "1 seachtain"
-
-#~ msgid "1 hour"
-#~ msgstr "1 uair"
-
-#~ msgid "1 minute"
-#~ msgstr "1 noiméad"
-
-#~ msgid "1 second"
-#~ msgstr "1 soicind"
-
-#~ msgid "URL"
-#~ msgstr "URL"
-
-#~ msgid "Every %d days"
-#~ msgstr "Gach %d lá"
-
-#~ msgid "Every %d weeks"
-#~ msgstr "Gach %d seachtain"
-
-#~ msgid "Every %d weeks on "
-#~ msgstr "Gach %d seachtain dé "
-
-#, fuzzy
-#~ msgid "LDAP Server Name:"
-#~ msgstr "Ainm do Fhreastalaí"
-
-#~ msgid "%d seconds ago"
-#~ msgstr "%d soicind ó shin"
-
-#~ msgid "%d minutes ago"
-#~ msgstr " %d noiméaid ó shin"
-
-#~ msgid "%d hours ago"
-#~ msgstr "%d (h)(n-)uaire ó shin"
-
-#~ msgid "%d days ago"
-#~ msgstr "%d lá ó shin"
-
-#~ msgid "%d weeks ago"
-#~ msgstr "%d seachtain ó shin"
-
-#~ msgid "%d months ago"
-#~ msgstr "%d mí ó shin"
-
-# FIXME : Grammar ? 
-#~ msgid "%d years ago"
-#~ msgstr "%d bliain ó shin"
-
-# so
-#~ msgid "maildir"
-#~ msgstr "maildir"
-
-#~ msgid "mbox"
-#~ msgstr "mbox"
-
-#~ msgid "mh"
-#~ msgstr "mh"
-
-#~ msgid "Account Information"
-#~ msgstr "Eolas Cuntais"
-
-#~ msgid "Composing Messages"
-#~ msgstr "Ag Cruthach Scéaltaí"
-
-#~ msgid "Configuration"
-#~ msgstr "Socrú"
-
-#~ msgid "Default Behavior"
-#~ msgstr "Iompar Loicthe"
-
-#~ msgid "Deleting Mail"
-#~ msgstr "Ag Scrios Post"
-
-#~ msgid "Labels and Colors"
-#~ msgstr "Lipeideanna agus Dathanna"
-
-#~ msgid "Printed Fonts"
-#~ msgstr "Priontáil an tadhallaí seo"
-
-#~ msgid "S_ecurity"
-#~ msgstr "_Slándáil"
-
-#~ msgid "Secure MIME (S/MIME)"
-#~ msgstr "Secure MIME (S/MIME)"
-
-#~ msgid "_Authentication type: "
-#~ msgstr "Saghas _udarú :"
-
-#~ msgid "_Default signature:"
-#~ msgstr "Síniú _gnáth:"
-
-#~ msgid "Search"
-#~ msgstr "Cuardaigh"
-
-#~ msgid ""
-#~ "Could not open file `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Teip ag oscailt comhad '%s':\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Could not create directory `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Teip ag cruthaigh eolaire '%s':\n"
-#~ "%s"
-
-#~ msgid "Copy Folder"
-#~ msgstr "Cóip Fillteán"
-
-#~ msgid "Move Folder"
-#~ msgstr "Bog Fillteán"
-
-#~ msgid "Group name:"
-#~ msgstr "Ainm Grupa:"
-
-#~ msgid "_Remove this Group..."
-#~ msgstr "_Scríos Grupa seo..."
-
-#~ msgid "Re_name this Group..."
-#~ msgstr "_Athainmigh an Grupa seo..."
-
-#~ msgid "Create _Default Shortcuts"
-#~ msgstr "Cruthaigh Aicearraí _Loicthe"
-
-#~ msgid "Create Default Shortcuts"
-#~ msgstr "Cruthaigh Aicearraí Loicthe"
-
-#~ msgid "Rename Shortcut"
-#~ msgstr "Athanimnigh Aicearra"
-
-#~ msgid "Open in New _Window"
-#~ msgstr "Oscail san _Fuinneog Nua"
-
-#~ msgid "Rename this shortcut"
-#~ msgstr "Athainmigh an iaicearra seo"
-
-#~ msgid "Re_move"
-#~ msgstr "_Scríos"
-
-#~ msgid "Shortcuts"
-#~ msgstr "Aicearraí"
-
-#~ msgid "\"%s\" in \"%s\""
-#~ msgstr "\"%s\" san \"%s\""
-
-#~ msgid "Print Summary"
-#~ msgstr "Coimiriú Príont"
-
-#~ msgid "Copy to folder..."
-#~ msgstr "Cóip do Fillteán..."
-
-#~ msgid "Move to folder..."
-#~ msgstr "Bog go fillteán..."
-
-#~ msgid "Error starting %s"
-#~ msgstr "Earriadh ag tosnú %s"
-
-#~ msgid "Create New Shortcut"
-#~ msgstr "Cruthaigh Aicearra Nua"
-
-# vi
-#~ msgid "Rename"
-#~ msgstr "Athainmnigh"
-
-#~ msgid "Edit LDAP Server"
-#~ msgstr "Eagar Freastalaí LDAP"
-
-# YU
-#~ msgid "Yugoslavia"
-#~ msgstr "An Iúglaiv"
-
-#~ msgid "<b>Su_mmary</b>"
-#~ msgstr "<b>Coimriú</b>"
-
-#~ msgid "Adding %s"
-#~ msgstr "Ag Suimigh %s"
-
-#~ msgid "Select Calendar Folder"
-#~ msgstr "Roghnaigh Fillteán Fhéilire"
-
-#~ msgid "Folder Settings"
-#~ msgstr "Albachtaí Fillteáin"
-
-#~ msgid "New _Calendar"
-#~ msgstr "_Féilire Nua"
-
-#~ msgid "Primary"
-#~ msgstr "Tosaíocht"
-
-#~ msgid "Prim"
-#~ msgstr "Tos."
-
-#~ msgid "Bus"
-#~ msgstr "Gnó"
-
-#~ msgid "Comp"
-#~ msgstr "Teor."
-
-#~ msgid "Org"
-#~ msgstr "Eag."
-
-#~ msgid "Mobile"
-#~ msgstr "Guthán Póca"
-
-#~ msgid "Car"
-#~ msgstr "Car"
-
-#~ msgid "Bus Fax"
-#~ msgstr "Facs Ghnó"
-
-#~ msgid "Business 2"
-#~ msgstr "Gnó 2"
-
-#~ msgid "Bus 2"
-#~ msgstr "Gnó 2"
-
-#~ msgid "Home 2"
-#~ msgstr "Baile 2"
-
-#~ msgid "ISDN"
-#~ msgstr "ISDN"
-
-#~ msgid "TTY"
-#~ msgstr "TTY"
-
-#~ msgid "Off"
-#~ msgstr "Oif."
-
-#~ msgid "Prof"
-#~ msgstr "Dea."
-
-#~ msgid "Man"
-#~ msgstr "Bain."
-
-#~ msgid "Ass"
-#~ msgstr "Cnt."
-
-#~ msgid "Calendar URI"
-#~ msgstr "Féilire URI"
-
-#~ msgid "CALUri"
-#~ msgstr "CALUri"
-
-#~ msgid "FBUrl"
-#~ msgstr "FBUrl"
-
-#~ msgid "icsCalendar"
-#~ msgstr "icsFéilire"
-
-#~ msgid "ECard"
-#~ msgstr "RCarta"
-
-#~ msgid "%x"
-#~ msgstr "%x"
-
-#~ msgid "Address Label"
-#~ msgstr "Lipéad Sheoladh"
-
-#~ msgid "ICS Calendar"
-#~ msgstr "Féilire ICS"
-
-#~ msgid "Arbitrary"
-#~ msgstr "Ar Togradh"
-
-#~ msgid "Using Email Address"
-#~ msgstr "Le Seoladh Rpost:"
-
-#~ msgid "Other Contacts"
-#~ msgstr "Tadhallaí Eile"
-
-#~ msgid "Card"
-#~ msgstr "Carta"
-
-#~ msgid "Is New Card"
-#~ msgstr "Is Carta Nua"
-
-# FIXME : Grammar ? 
-#~ msgid "%d cards"
-#~ msgstr "%d cartaí"
-
-#~ msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-#~ msgstr ",123,a,b,c,d,e,f,g,h,ij,k,l,m,Mc,o,p,qr,s,t,u,v,w,xyz"
-
-#~ msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-#~ msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,Mc,n,o,p,q,r,s,t,u,v,w,x,y,z"
-
-#~ msgid "Business Address"
-#~ msgstr "Seoladh Ghnó"
-
-#~ msgid "Print card"
-#~ msgstr "Priontáil carta"
-
-#~ msgid "Public Calendar"
-#~ msgstr "Féilire Poiblí"
-
-#~ msgid "Public Tasks"
-#~ msgstr "Tascanna Poiblí"
-
-#~ msgid "_Save as..."
-#~ msgstr "_Sábháil mar..."
-
-#~ msgid "Print..."
-#~ msgstr "Clódáil..."
-
-#~ msgid "Opening calendar at %s"
-#~ msgstr "Ag oscailt féilire as %s"
-
-#~ msgid "Properties for \"%s\""
-#~ msgstr "Albachtaí do \"%s\""
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "Send anyway?"
-#~ msgstr "Post ar aon nós?"
-
-#~ msgid "Save Messages As..."
-#~ msgstr "Sábháil Scéala Mar..."
-
-#~ msgid "Save Image as..."
-#~ msgstr "Sábháil Iomha le..."
-
-#~ msgid "Bad Address"
-#~ msgstr "Droch Seoladh"
-
-#~ msgid "Local folders/%s"
-#~ msgstr "Fillteán áitiiúl/%s"
-
-#~ msgid "(No subject)"
-#~ msgstr "(Gan ábhar)"
-
-#~ msgid "%s - Message"
-#~ msgstr "%s - Scéal"
-
-#~ msgid "Summary Preferences"
-#~ msgstr "Roghnachais Choimriú"
-
-#~ msgid "Africa"
-#~ msgstr "An Afraic"
-
-# AQ
-#~ msgid "Antartica"
-#~ msgstr "an tAntartach"
-
-# AT
-#~ msgid "Asia"
-#~ msgstr "An Áise"
-
-# AQ
-#~ msgid "Atlantic"
-#~ msgstr "Atlantach"
-
-# CM
-#~ msgid "Cameron"
-#~ msgstr "Camarún"
-
-#~ msgid "Dublin"
-#~ msgstr "Baile Átha Cliath"
-
-# SV
-#~ msgid "El Salvador Int."
-#~ msgstr "An tSalvadóir Idirn."
-
-#~ msgid "Leuchars"
-#~ msgstr "bliana"
-
-#~ msgid "Middle East"
-#~ msgstr "An Meánoirthear"
-
-#~ msgid "Russia"
-#~ msgstr "Rúisis"
-
-#~ msgid "United Arab Emirates "
-#~ msgstr "Aontas na nÉimíríochtaí Arabacha"
-
-#~ msgid "Wien"
-#~ msgstr "Vín"
-
-#~ msgid "%k:%M %d %B"
-#~ msgstr "%k:%M %d %B"
-
-#~ msgid "%l:%M%p %d %B"
-#~ msgstr "%l:%M%p %d %B"
-
-#~ msgid "Mail summary"
-#~ msgstr "Coimriú phoist"
-
-#~ msgid "Dictionary.com Word of the Day"
-#~ msgstr "Dictionary.com Focal do Lae"
-
-#~ msgid "New News Feed"
-#~ msgstr "Bealach Nuachtáin Nua"
-
-#~ msgid "News Feed"
-#~ msgstr "Foth Nuachtáin"
-
-#~ msgid "blue"
-#~ msgstr "gorm"
-
-#~ msgid "(No Description)"
-#~ msgstr "(Gan Tuarascail)"
-
-#~ msgid "My Weather"
-#~ msgstr "Aimsir"
-
-#~ msgid "KBOS"
-#~ msgstr "KBOS"
-
-#~ msgid "Please wait..."
-#~ msgstr "Fán le do thoil..."
-
-#~ msgid " F"
-#~ msgstr " F"
-
-#~ msgid "kph"
-#~ msgstr "kph"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "míle"
-
-#~ msgid "kilometers"
-#~ msgstr "km"
-
-#~ msgid "Scattered clouds"
-#~ msgstr "Scamaill Scaipthe"
-
-#~ msgid "Few clouds"
-#~ msgstr "Beagán Scamallach"
-
-#~ msgid "Overcast"
-#~ msgstr "Dorcha"
-
-#~ msgid "Variable"
-#~ msgstr "Luaineach"
-
-#~ msgid "North"
-#~ msgstr "Tuaisceart"
-
-#~ msgid "South"
-#~ msgstr "Deisceart"
-
-#~ msgid "Rain"
-#~ msgstr "Báisteach"
-
-#~ msgid "Snow"
-#~ msgstr "Sneachta"
-
-#~ msgid "C_elsius"
-#~ msgstr "C_elsius"
-
-#~ msgid "News Feeds"
-#~ msgstr "Fotha Nuachtain"
-
-#~ msgid "Show _all tasks"
-#~ msgstr "Taispeán gach tascanna"
-
-#~ msgid "Show temperatures in:"
-#~ msgstr "Taispeán teocht as:"
-
-#~ msgid "_Five days"
-#~ msgstr "_Cúig lá"
-
-#~ msgid "_New Feed"
-#~ msgstr "Foth _Nua"
-
-#~ msgid "Add a Folder"
-#~ msgstr "Cuir Fillteán Leis"
-
-#~ msgid "%s (%d)"
-#~ msgstr "%s (%d)"
-
-#~ msgid "(None)"
-#~ msgstr "(Ar Bith)"
-
-#~ msgid "No error"
-#~ msgstr "Gan Earraidh"
-
-#~ msgid "I/O error"
-#~ msgstr "Earraidh I/A"
-
-#~ msgid "CORBA error"
-#~ msgstr "Earraidh CORBA"
-
-#~ msgid "No owner"
-#~ msgstr "Gan Úinéar"
-
-#~ msgid "Has subfolders"
-#~ msgstr "Post an sceál seo"
-
-#~ msgid "Create a new shortcut"
-#~ msgstr "Cruthaigh aicearra nua"
-
-#~ msgid "Evolution _Window"
-#~ msgstr "_Fuinneog Evolution"
-
-#~ msgid "_Folder..."
-#~ msgstr "_Fillteán..."
-
-#~ msgid "_New Folder"
-#~ msgstr "Fillteán _Nua"
-
-#~ msgid "Error"
-#~ msgstr "Earraidh"
-
-#~ msgid "De_lete"
-#~ msgstr "_Dealaigh"
-
-#~ msgid "Font Preferences"
-#~ msgstr "Roghnachais Chlôfireann"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "Delete news feed"
-#~ msgstr "Dealaigh fotha nuachtan"
-
-#~ msgid "_every"
-#~ msgstr "_gach"
-
-#~ msgid "_Clear Flag"
-#~ msgstr "_Bánaigh Bratach"
-
-#~ msgid "S_elect server: "
-#~ msgstr "_Roghnaigh freastalaí: "
-
-#~ msgid "Add"
-#~ msgstr "Suimigh"
-
-# SG
-#~ msgid "_Signature editor"
-#~ msgstr "Eagarthóir Siniú"
-
-#~ msgid "Create _New Folder..."
-#~ msgstr "Cruthaigh Fillteán _Nua..."
-
-#~ msgid "1234"
-#~ msgstr "1234"
-
-#~ msgid "<- _Remove"
-#~ msgstr "<- _Scríos"
-
-#~ msgid "Phone Types"
-#~ msgstr "Saghais Guthán"
-
-#~ msgid "Display Cards?"
-#~ msgstr "Taispeán Cartaí?"
-
-#~ msgid "Display Cards"
-#~ msgstr "Taispeán Cartaí"
-
-#~ msgid "rd"
-#~ msgstr "r"
-
-#~ msgid "Warning!"
-#~ msgstr "Rabhadh!"
-
-#~ msgid "hour"
-#~ msgstr "uair"
-
-#~ msgid "week"
-#~ msgstr "seachtain"
-
-#~ msgid "year"
-#~ msgstr "bliain"
-
-#~ msgid "Account %d"
-#~ msgstr "Cuntas %d"
-
-#~ msgid "All folders"
-#~ msgstr "Gach fillteáin"
-
-#~ msgid "Apri file"
-#~ msgstr "Comhad 'Apri'"
-
-#~ msgid "Salve file"
-#~ msgstr "Comhad 'Salve'"
-
-#~ msgid "Host"
-#~ msgstr "Óst"
-
-#~ msgid "Output File"
-#~ msgstr "Comhad Aschur"
-
-#~ msgid "_Configure..."
-#~ msgstr "_Socraigh..."
-
-#~ msgid "_Configure Pilot..."
-#~ msgstr "_Socraigh Pilot..."
-
-#~ msgid " "
-#~ msgstr " "
-
-# FIXME SP?
-#~ msgid "Select PGP program"
-#~ msgstr "Roghnaigh Ríomhchlár PGP"
-
-# SG
-#~ msgid "Signature #1"
-#~ msgstr "Síniú #1"
-
-# SG
-#~ msgid "Signature #2"
-#~ msgstr "Síniú #2"
-
-#~ msgid "&lt;- _Remove"
-#~ msgstr "&lt;- _Scríos"
-
-#~ msgid "_Add -&gt;"
-#~ msgstr "_Suimigh -&gt;"
-
-#~ msgid "1 byte"
-#~ msgstr "1 byte"
-
-#~ msgid "%u bytes"
-#~ msgstr "%u bytanna"
-
-#~ msgid "_Browse..."
-#~ msgstr "_Brábhsáil..."
-
-#~ msgid "I/O Error: %s"
-#~ msgstr "Earraidh I/A: %s"
-
-#~ msgid "NNTP Server:"
-#~ msgstr "Freastalaî NNTP:"
-
-#~ msgid "View messages..."
-#~ msgstr "Feach scéalaí..."
-
-#~ msgid "_Pilot Settings..."
-#~ msgstr "_Álbachtaí Pilot..."
-
-#~ msgid "_End of day:"
-#~ msgstr "_Deireadh an Lá"
-
-#~ msgid "(unknown host)"
-#~ msgstr "(óst gan fhois)"
-
-#~ msgid " Edit "
-#~ msgstr "Eagar "
-
-#~ msgid "_Other"
-#~ msgstr "_Eile"
-
-#~ msgid "Run %s"
-#~ msgstr "Rith %s"
-
-#~ msgid "Close %s"
-#~ msgstr "Dún %s"
-
-#~ msgid "page"
-#~ msgstr "leathanach"
-
-#~ msgid "RDF Summary"
-#~ msgstr "Coimriú RDF"
-
-#~ msgid "Mailbox Format"
-#~ msgstr "Formóid Boscaphoist"
-
-#~ msgid "%s: Inbox"
-#~ msgstr "%s: Inbosca"
-
-#~ msgid "Edit..."
-#~ msgstr "Eagar..."
-
-#~ msgid "News"
-#~ msgstr "Nuacht"
-
-#~ msgid "_Server type: "
-#~ msgstr "Saghas _Freastalaí: "
-
-#~ msgid "seconds."
-#~ msgstr "soicind."
-
-#~ msgid "Mail Summary"
-#~ msgstr "Coimriú Nua"
-
-#~ msgid "(No name)"
-#~ msgstr "(gan ainm)"
-
-#~ msgid "Create a _New Meeting"
-#~ msgstr "Cruthaigh Cruinniú _Nua"
-
-#~ msgid "_Appointment..."
-#~ msgstr "_Coinne..."
-
-#~ msgid "_Calendar Settings..."
-#~ msgstr "Álbachtaí _Féilire..."
-
-#~ msgid "_Task..."
-#~ msgstr "_Tasc..."
-
-#~ msgid "Sear_ch"
-#~ msgstr "_Cuardaigh"
-
-#~ msgid "Card: "
-#~ msgstr "Carta: "
-
-#~ msgid ""
-#~ "\n"
-#~ "Name: "
-#~ msgstr ""
-#~ "\n"
-#~ "Ainm: "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Family:     "
-#~ msgstr ""
-#~ "\n"
-#~ " Clann:       "
-
-#~ msgid ""
-#~ "\n"
-#~ "Address:"
-#~ msgstr ""
-#~ "\n"
-#~ "Seoladh:"
-
-#~ msgid ""
-#~ "\n"
-#~ "  Postal Box:  "
-#~ msgstr ""
-#~ "\n"
-#~ " Bosca Phoist: "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Street:      "
-#~ msgstr ""
-#~ "\n"
-#~ "  Stráid:      "
-
-#~ msgid ""
-#~ "\n"
-#~ "  City:        "
-#~ msgstr ""
-#~ "\n"
-#~ "  Cathair:     "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Region:      "
-#~ msgstr ""
-#~ "\n"
-#~ "  Cuige:      "
-
-#~ msgid ""
-#~ "\n"
-#~ "  Country:     "
-#~ msgstr ""
-#~ "\n"
-#~ " Tír:          "
-
-#~ msgid ""
-#~ "\n"
-#~ "Telephones:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Gutháin:   \n"
-
-#~ msgid ""
-#~ "\n"
-#~ "E-mail:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "R-phost:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "  Name:  "
-#~ msgstr ""
-#~ "\n"
-#~ "  Ainm:  "
-
-#~ msgid "New _Contact"
-#~ msgstr "_Tadhall Nua"
-
-#~ msgid "New _Task"
-#~ msgstr "_Tasc Nua"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Gan fhois)"
-
-#~ msgid "New _Mail Message"
-#~ msgstr "Scéal_Post Nua"
-
-#~ msgid "GnomeCard:"
-#~ msgstr "GnomeCard: "
-
-#~ msgid "%s - Ximian Evolution %s"
-#~ msgstr "%s - Ximian Evolution %s"
-
-#~ msgid "%s - Ximian Evolution %s [%s]"
-#~ msgstr "%s - Ximian Evolution %s [%s]"
-
-#~ msgid "%d"
-#~ msgstr "%d"
-
-#~ msgid "%Y/%m/%d"
-#~ msgstr "%a %d/%m/%Y"
-
-#~ msgid "SASL"
-#~ msgstr "SASL"
-
-#~ msgid "URI"
-#~ msgstr "URI"
-
-#~ msgid "a"
-#~ msgstr "a"
-
-#~ msgid "b"
-#~ msgstr "b"
-
-#~ msgid "c"
-#~ msgstr "c"
-
-#~ msgid "e"
-#~ msgstr "e"
-
-#~ msgid "f"
-#~ msgstr "f"
-
-#~ msgid "g"
-#~ msgstr "g"
-
-#~ msgid "h"
-#~ msgstr "h"
-
-#~ msgid "j"
-#~ msgstr "j"
-
-#~ msgid "k"
-#~ msgstr "k"
-
-#~ msgid "l"
-#~ msgstr "l"
-
-#~ msgid "m"
-#~ msgstr "m"
-
-#~ msgid "o"
-#~ msgstr "o"
-
-#~ msgid "p"
-#~ msgstr "p"
-
-#~ msgid "q"
-#~ msgstr "q"
-
-#~ msgid "t"
-#~ msgstr "t"
-
-#~ msgid "u"
-#~ msgstr "u"
-
-#~ msgid "v"
-#~ msgstr "v"
-
-#~ msgid "w"
-#~ msgstr "w"
-
-#~ msgid "y"
-#~ msgstr "y"
-
-#~ msgid "z"
-#~ msgstr "z"
-
-#~ msgid "%I:%M%p"
-#~ msgstr "%I:%M%p"
-
-#~ msgid "%I:%M:%S %p%n"
-#~ msgstr "%I:%M:%S %p%n"
-
-#~ msgid "%H:%M:%S%n"
-#~ msgstr "%H:%M:%S%n"
-
-#~ msgid "%I:%M %p%n"
-#~ msgstr "%I:%M %p%n"
-
-#~ msgid "%H:%M%n"
-#~ msgstr "%H:%M%n"
-
-#~ msgid "View All"
-#~ msgstr "Feach Gach Rud"
-
-#~ msgid "_Day"
-#~ msgstr "Lá"
-
-#~ msgid "About..."
-#~ msgstr "Faoi..."
-
-#~ msgid "Address _Book... (FIXME)"
-#~ msgstr "Leabhair Sheolaidh"
-
-#~ msgid "Pre_vious"
-#~ msgstr "_Riomh"
-
-#~ msgid "_Note (FIXME)"
-#~ msgstr "_Nota (FIXME)"
-
-#~ msgid "_Task (FIXME)"
-#~ msgstr "_Tasc (FIXME)"
-
-#~ msgid "Reply to all"
-#~ msgstr "Freagrair do Gach rud"
-
-#~ msgid "_Reply"
-#~ msgstr "_Freagrair"
-
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Coinne"
-
-#~ msgid "New Contact _List"
-#~ msgstr "_Líosta Tadhall Nua"
-
-#~ msgid "Co_ntacts:"
-#~ msgstr "_Tadhallaí"