disted

svn path=/trunk/; revision=25711

1 files changed, 2307 insertions, 1821 deletions

diff --git a/po/ga.po b/po/ga.po
index da7f8137ab..1b8a5b13d3 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
-"POT-Creation-Date: 2004-04-19 11:44-0400\n"
+"POT-Creation-Date: 2004-04-29 13:14-0400\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"
@@ -66,8 +66,8 @@ msgstr "Seoladh Shionc. Loicthe:"
 msgid "Could not load addressbook"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1214
-#: addressbook/conduit/address-conduit.c:1217
+#: addressbook/conduit/address-conduit.c:1219
+#: addressbook/conduit/address-conduit.c:1222
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -88,9 +88,8 @@ msgstr ""
 #.
 #. name = e_book_get_name (book);
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/gui/component/addressbook-component.c:522
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:363
+#: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Tadhallaí"
 
@@ -130,141 +129,115 @@ msgstr ""
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:227
-#, c-format
-msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:315
-#: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
-msgid "New Address Book"
-msgstr "Leabhar Seoladh Nua"
-
-#: addressbook/gui/component/addressbook-component.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:368
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Dealaigh"
-
-#: addressbook/gui/component/addressbook-component.c:317
-#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:370
-msgid "Properties..."
-msgstr "Álbachtaí..."
-
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
 msgstr "Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:94
 msgid "_Contact"
 msgstr "_Tadhall"
 
-#: addressbook/gui/component/addressbook-component.c:564
+#: addressbook/gui/component/addressbook-component.c:95
 msgid "Create a new contact"
 msgstr "Cruthaigh tadhall nua"
 
-#: addressbook/gui/component/addressbook-component.c:570
+#: addressbook/gui/component/addressbook-component.c:101
 msgid "New Contact List"
 msgstr "Líosta Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:102
 msgid "Contact _List"
 msgstr "_Liosta Tadhaill"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:103
 msgid "Create a new contact list"
 msgstr "Cruthaigh liosta tadhaill nua"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:109
 #, fuzzy
 msgid "New Contacts Group"
 msgstr "Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
 msgid "_Contacts Group"
 msgstr "_Tadhallaí"
 
-#: addressbook/gui/component/addressbook-component.c:580
+#: addressbook/gui/component/addressbook-component.c:111
 #, fuzzy
 msgid "Create a new contacts group"
 msgstr "Cruthaigh tadhall nua"
 
-#: addressbook/gui/component/addressbook-config.c:407
+#: addressbook/gui/component/addressbook-config.c:466
 msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:431
+#: addressbook/gui/component/addressbook-config.c:490
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:459
+#: addressbook/gui/component/addressbook-config.c:518
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:785
+#: addressbook/gui/component/addressbook-config.c:822
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1217
+#: addressbook/gui/component/addressbook-config.c:1216
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1238
+#: addressbook/gui/component/addressbook-config.c:1237
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1246
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:58
-#: calendar/gui/migration.c:128 mail/em-migrate.c:1072
+#: addressbook/gui/component/addressbook-migrate.c:68
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1070
 msgid "Migrating..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:98
-#: calendar/gui/migration.c:175 mail/em-migrate.c:1113
+#: addressbook/gui/component/addressbook-migrate.c:120
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:408
-#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: addressbook/gui/component/addressbook-migrate.c:438
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:239
+#: mail/mail-component.c:242
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:416
-#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
-#: filter/filter-label.c:123 mail/em-migrate.c:926 mail/mail-config.c:67
+#: addressbook/gui/component/addressbook-migrate.c:446
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
+#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:424
+#: addressbook/gui/component/addressbook-migrate.c:454
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:552
+#: addressbook/gui/component/addressbook-migrate.c:582
 msgid "LDAP Servers"
 msgstr "Freastalaí LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:672
+#: addressbook/gui/component/addressbook-migrate.c:702
 msgid "Autocompletion Settings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:853
+#: addressbook/gui/component/addressbook-migrate.c:1076
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -272,34 +245,42 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:869
+#: addressbook/gui/component/addressbook-migrate.c:1090
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:622
+#: addressbook/gui/component/addressbook-migrate.c:1099
+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:1109
+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.c:89
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:693
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
 msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:699
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPasfhocal do %s, le do thoil (úsáideoir %s)"
 
-#: addressbook/gui/component/addressbook.c:1025
-msgid "UID of the contacts source that the view will display"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:1030
-msgid "The URI that the address book will display"
-msgstr ""
-
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -324,7 +305,7 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
@@ -344,31 +325,69 @@ msgid "*"
 msgstr "*"
 
 #: addressbook/gui/component/ldap-config.glade.h:3
+msgid "1"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "5"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
-msgid "Address Book Creation Assistant"
-msgstr "Roghnachais na Leabhar Sheoladh"
+msgid "<b>Authentication</b>"
+msgstr "Údarú"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<b>Display</b>"
+msgstr "Taispeán"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<b>Downloading</b>"
+msgstr "<b>_Áit</b>"
+
+#: addressbook/gui/component/ldap-config.glade.h:13
+#, fuzzy
+msgid "<b>Searching</b>"
+msgstr "<b>Am</b> "
+
+#: addressbook/gui/component/ldap-config.glade.h:14
+#, fuzzy
+msgid "<b>Server Information</b>"
+msgstr "Ceim 2: Eolas Freastalaí"
+
+#: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
+msgid "<b>Type:</b>"
+msgstr "<b>Am</b> "
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Add Contacts Group"
+msgstr "_Tadhallaí"
+
+#: addressbook/gui/component/ldap-config.glade.h:17
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Roghnachais na Leabhar Sheoladh"
@@ -378,96 +397,125 @@ msgstr "Roghnachais na Leabhar Sheoladh"
 # ## 	The 'msgid' names and spellings for languages are those listed
 # ##     in iso-639.def from glibc
 # aa 
-#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "i gCónaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Anonymously"
 msgstr "Gan ainm"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
-msgid ""
-"Congratulations, you are\n"
-"\t      finished setting up this address book.\n"
-"\n"
-"Please click the \"Apply\" button to save the settings you have entered here."
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:20
+#: calendar/gui/dialogs/task-editor.c:193
+msgid "Basic"
+msgstr "Gnáth"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "_Dathanna"
+
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:23
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
+#: smime/gui/smime-ui.glade.h:19
+msgid "Details"
+msgstr "Sonraí"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:25
+msgid "Distinguished name"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "Download limit:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Email address"
+msgstr "Seoladh Rphost:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Email address:"
 msgstr "Seoladh Rphost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "Finished"
-msgstr "Críochnaithe"
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid "Find Possible Search Bases"
+msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:32
+#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Gnáth"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "Group:"
-msgstr "Grupa:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
-msgid ""
-"Now, you must specify how you want to connect to the LDAP server. The SSL "
-"(Secure Sockets Layer)\n"
-"and TLS (Transport Layer Security) protocols are used by some servers to "
-"cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses "
-"these protocols."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "One"
 msgstr "Aon"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:35
+msgid "Only locations within starting point"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+msgid "Pick a color"
+msgstr "Roghnaigh dath"
+
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:38
+#, fuzzy
+msgid "Search base only"
+msgstr "Cuardaigh"
+
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
+msgid "Search base:"
+msgstr "Cuardaigh"
+
+#: addressbook/gui/component/ldap-config.glade.h:40
+#, fuzzy
+msgid "Search scope:"
+msgstr "Cuardaigh"
+
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -478,7 +526,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -487,56 +535,19 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:41
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editing contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"Specifying a\n"
-"\t\t\t  display name and group is the first step in setting\n"
-"\t\t\t  up an address book."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:46
-#: calendar/gui/dialogs/calendar-setup.glade.h:20
-msgid "Step 1: Folder Characteristics"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid "Step 2: Server Information"
-msgstr "Ceim 2: Eolas Freastalaí"
-
-#: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 3: Connecting to Server"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 4: Searching the Directory"
+#: addressbook/gui/component/ldap-config.glade.h:51
+msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
 msgstr "Fó"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
-msgid ""
-"The options on this page control how many entries should be included in "
-"your\n"
-"searches, and how long a search should take. Ask your system administrator "
-"if you\n"
-"need to change these options."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -544,7 +555,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -554,51 +565,34 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
-msgid ""
-"This assistant will help you\n"
-"\t      create a new address book. \n"
-"\n"
-"Depending on the type of address book you create, additional\n"
-"parameters may be required. Please contact your system\n"
-"administrator if you need help finding this information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:60
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
-#: calendar/gui/dialogs/calendar-setup.glade.h:34
-msgid ""
-"This is the name that will appear in your Evolution folder list. It is for "
-"display purposes only. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -606,77 +600,110 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "This option controls how long a search will be run."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Timeout:"
+msgstr "Am"
+
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "U_se SSL/TLS:"
 msgstr "Ú_sáid SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "Using email address"
 msgstr "Ag Úsáid seoladh r-post:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid ""
-"You have decided to configure an LDAP server. The first step in doing this "
-"is to provide its name and your\n"
-"log in information. Please ask your system administrator if you are unsure "
-"of this information."
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:75
+#, fuzzy
+msgid "_Add Contacts Group"
+msgstr "_Tadhallaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-#: calendar/gui/dialogs/calendar-setup.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:76
+#: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "_Display name:"
 msgstr "Ainm _taispeáint:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:78
+#, fuzzy
+msgid "_Email address:"
+msgstr "Seoladh Rphost:"
+
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:80
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+msgid "_Name:"
+msgstr "_Ainm:"
+
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Port number:"
 msgstr "Uimhir _Poirt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:82
+#, fuzzy
+msgid "_Port:"
+msgstr "Tosaíocht:"
+
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Server name:"
 msgstr "Ainm _Freastalaí:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
+#, fuzzy
+msgid "_Server:"
+msgstr "_Freastalaí:"
+
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:87
+msgid "_Use secure connection:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "cards"
 msgstr "cartaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:91
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:182
+msgid "minutes"
+msgstr "noimeaíd"
+
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "searching-tab"
 msgstr ""
 
@@ -684,35 +711,35 @@ msgstr ""
 msgid "Evolution Addressbook name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:206
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
 msgid "Remove All"
 msgstr "Scríos Gach Rud"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:213
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
-#: calendar/gui/dialogs/cal-prefs-dialog.c:734
+#: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Scríos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:220
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Feach Líosta Tadhall"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:220
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact Info"
 msgstr "Feach Eolas na Tadhall"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:227
-#: addressbook/gui/component/select-names/e-select-names-popup.c:328
+#: addressbook/gui/component/select-names/e-select-names-popup.c:229
+#: addressbook/gui/component/select-names/e-select-names-popup.c:330
 msgid "Send HTML Mail?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:320
+#: addressbook/gui/component/select-names/e-select-names-popup.c:322
 #: addressbook/gui/widgets/eab-popup-control.c:983
 msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:346
+#: addressbook/gui/component/select-names/e-select-names-popup.c:348
 msgid "Unnamed Contact"
 msgstr ""
 
@@ -754,212 +781,268 @@ msgstr ""
 msgid "_Find"
 msgstr "_Faigh"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid " B_usiness:"
-msgstr " _Gnó:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#, fuzzy
+msgid "<b>Email</b>"
+msgstr "<b>Am</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "A_ddress..."
-msgstr "S_eoladh..."
+#, fuzzy
+msgid "<b>Home</b>"
+msgstr "<b>Am</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "A_ssistant's name:"
-msgstr "_Ainm Chúntóir:"
+#, fuzzy
+msgid "<b>Instant Messaging</b>"
+msgstr "<b>Tadhallaî</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "Addressbook:"
-msgstr "Leabhar Seoladh:"
+#, fuzzy
+msgid "<b>Job</b>"
+msgstr "<b>Am</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "Anni_versary:"
+msgid "<b>Miscellaneous</b>"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "Birthda_y:"
-msgstr "Brei_thlá:"
+#, fuzzy
+msgid "<b>Other</b>"
+msgstr "<b>Am</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "Blog address:"
-msgstr "Seoladh 'Blog':"
+#, fuzzy
+msgid "<b>Telephone</b>"
+msgstr "<b>Am</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "Business fa_x:"
-msgstr "Fa_cs Ghnó:"
+#, fuzzy
+msgid "<b>Web Addresses</b>"
+msgstr "<b>Leathanach Lín</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "Collaboration"
-msgstr ""
+#, fuzzy
+msgid "<b>Work</b>"
+msgstr "<b>Seachtain Oibre</b>"
 
-#. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:1202
-#: addressbook/gui/contact-editor/e-contact-editor.c:2019
-msgid "Contact Editor"
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/widgets/eab-contact-display.c:302
+#: addressbook/gui/widgets/eab-contact-display.c:321
+msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "D_epartment:"
-msgstr "_Roinn:"
+#, fuzzy
+msgid "Address 2:"
+msgstr "Seoladh _2:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
-msgid "Details"
-msgstr "Sonraí"
+#, fuzzy
+msgid "Address:"
+msgstr "_Seoladh:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-msgid "Enter the person's instant messenger accounts here."
+msgid "Anniversary:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "F_ree/Busy URL:"
-msgstr ""
+#, fuzzy
+msgid "Assistant:"
+msgstr "Cúntóir"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "File a_s:"
-msgstr "Comhdaigh _mar:"
+#, fuzzy
+msgid "Birthday:"
+msgstr "Brei_thlá:"
 
+# PE
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Full _Name..."
-msgstr "Ainm _Fhada..."
+#, fuzzy
+msgid "Blog:"
+msgstr "Blog"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: calendar/gui/dialogs/event-page.glade.h:5
+msgid "Calendar:"
+msgstr "Féilire:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-msgid ""
-"If this person has the ability to participate in a video conference, enter "
-"their address here."
-msgstr ""
+#, fuzzy
+msgid "City:"
+msgstr "_Cathair:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid ""
-"If this person publishes free/busy or other calendar information on the "
-"Internet, enter the address\n"
-"of that information here."
-msgstr ""
+#, fuzzy
+msgid "Company:"
+msgstr "Teoranta"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: addressbook/gui/widgets/e-minicard.c:181
+msgid "Contact"
+msgstr "Tadhall"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "Instant Messaging"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+msgid "Contact Editor"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "New phone type"
-msgstr "Cinéal fóin nua"
+#, fuzzy
+msgid "Country:"
+msgstr "_Tír:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
-msgid "No_tes:"
-msgstr "_Notaí:"
+#, fuzzy
+msgid "Department:"
+msgstr "_Roinn:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Organi_zation:"
-msgstr "_Eagrú:"
+#, fuzzy
+msgid "Free/Busy:"
+msgstr "Eolas"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "P_rofession:"
-msgstr "_Dearbhú:"
+msgid "Full _Name..."
+msgstr "Ainm _Fhada..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Primary _email:"
-msgstr "R-Phost Thósaiocht"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:194
+msgid "Home"
+msgstr "Baile"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "S_pouse:"
-msgstr "_Céile:"
+#, fuzzy
+msgid "Job title:"
+msgstr "Tideal _Post:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "Wants to receive _HTML mail"
-msgstr ""
+#: calendar/gui/e-itip-control.c:936
+msgid "Location:"
+msgstr "Áit:"
 
+# mt
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "_Add"
-msgstr "_Suimigh"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Business:"
-msgstr "_Gnó:"
+#, fuzzy
+msgid "Mailing Address"
+msgstr "Seoladh R-Post:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Categories..."
-msgstr "_Catagóire..."
+#, fuzzy
+msgid "Manager:"
+msgstr "Bainisteoir"
 
-#. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651
-#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
-#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
-#: mail/em-folder-tree.c:2570 mail/em-folder-view.c:794
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Dealaigh"
+#, fuzzy
+msgid "Ni_ckname:"
+msgstr "_Leasainm:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22
-msgid "_Edit"
-msgstr "_Eagar"
+#, fuzzy
+msgid "Notes:"
+msgstr "_Notaí:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-msgid "_Home:"
-msgstr "_Baile:"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+msgid "Novell Groupwise"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Job title:"
-msgstr "Tideal _Post:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Manager's name:"
-msgstr "Ainm _Bainisteoir:"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
+msgid "Other"
+msgstr "Eile"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "_Mobile:"
-msgstr "Fón _Póca:"
+#, fuzzy
+msgid "Personal Information"
+msgstr "Gan Eolas"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:39
-msgid "_Nickname:"
-msgstr "_Leasainm:"
+#, fuzzy
+msgid "Profession:"
+msgstr "_Dearbhú:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:40
-msgid "_Office:"
-msgstr "_Oifig:"
+#, fuzzy
+msgid "State/Province:"
+msgstr "Seirbhís"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
-msgid "_Public Calendar URL:"
-msgstr "URL do Féilire Poiblí:"
+msgid "Wants to receive HTML mail"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "_This is the mailing address"
-msgstr ""
+#, fuzzy
+msgid "Webcam:"
+msgstr "Leathanach Lín:"
 
+#. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-msgid "_Video Conferencing URL:"
-msgstr ""
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:193
+#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
+msgid "Work"
+msgstr "Obair"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:44
-msgid "_Web page address:"
-msgstr "Seoladh leathanach greasán:"
+#, fuzzy
+msgid "Zip/Postal Code:"
+msgstr ""
+"\n"
+"  Cód Phoist:  "
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#, fuzzy
+msgid "_Categories"
+msgstr "_Catagóire..."
+
+# vi
+#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#, fuzzy
+msgid "_File under:"
+msgstr "Ainm chomhaid:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#, fuzzy
+msgid "_Where:"
+msgstr "_Freastalaí:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:48
+msgid "item7"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:49
+msgid "item8"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "Address"
 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:252
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:173
+#: addressbook/gui/contact-editor/e-contact-editor.c:281
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:173
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr ""
 
@@ -2148,14 +2231,10 @@ msgstr "An tSiombáib"
 msgid "AOL Instant Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-msgid "Novell Groupwise"
-msgstr ""
-
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2835
-#: addressbook/gui/widgets/eab-contact-display.c:308
-#: addressbook/gui/widgets/eab-contact-display.c:327
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:305
+#: addressbook/gui/widgets/eab-contact-display.c:324
 msgid "Jabber"
 msgstr ""
 
@@ -2163,26 +2242,19 @@ msgstr ""
 msgid "Yahoo Messenger"
 msgstr ""
 
-# mt
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2838
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/widgets/eab-contact-display.c:304
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "ICQ"
 msgstr "ICQ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:704
 msgid "Service"
 msgstr "Seirbhís"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:727
-#: calendar/gui/dialogs/cal-prefs-dialog.c:580
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
 #: calendar/gui/e-cal-list-view.etspec.h:2
 msgid "Location"
 msgstr "Áit"
@@ -2191,99 +2263,54 @@ msgstr "Áit"
 msgid "Username"
 msgstr "Ainm Úsaideoir"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2503
-#: addressbook/gui/contact-editor/e-contact-editor.c:2799
-msgid "Home"
-msgstr "Baile"
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
+msgid "Yahoo"
+msgstr ""
 
-#. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2803
-#: filter/filter-label.c:122 mail/em-migrate.c:925 mail/mail-config.c:66
-#: mail/mail-config.glade.h:155
-msgid "Work"
-msgstr "Obair"
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/widgets/eab-contact-display.c:306
+#: addressbook/gui/widgets/eab-contact-display.c:325
+msgid "MSN"
+msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2504
-#: addressbook/gui/contact-editor/e-contact-editor.c:2807
-msgid "Other"
-msgstr "Eile"
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#, fuzzy
+msgid "GroupWise"
+msgstr "Grupa"
 
 # Avoid; either use KR or KP
-#: addressbook/gui/contact-editor/e-contact-editor.c:217
+#: addressbook/gui/contact-editor/e-contact-editor.c:246
 msgid "Source Book"
 msgstr "Leabhar Foinse"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:224
+#: addressbook/gui/contact-editor/e-contact-editor.c:253
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:231
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:159
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:180
-msgid "Contact"
-msgstr "Tadhall"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:238
+#: addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Is New Contact"
 msgstr "Is Tadhall Nua"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:245
+#: addressbook/gui/contact-editor/e-contact-editor.c:274
 msgid "Writable Fields"
 msgstr ""
 
 # FR
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:288
 msgid "Changed"
 msgstr "Athraithe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:718
-msgid "Account Name"
-msgstr "Ainm Chuntas"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1485
+#: addressbook/gui/contact-editor/e-contact-editor.c:1656
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1493
+#: addressbook/gui/contact-editor/e-contact-editor.c:1664
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-msgid "Save Contact as VCard"
-msgstr "Sábháil Tadhall  mar VCard"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2502
-msgid "Business"
-msgstr "Gnó"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2834
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
-msgid "AIM"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2836
-#: addressbook/gui/widgets/eab-contact-display.c:310
-#: addressbook/gui/widgets/eab-contact-display.c:329
-msgid "Yahoo"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2837
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:328
-msgid "MSN"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2839
-#, fuzzy
-msgid "GroupWise"
-msgstr "Grupa"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: addressbook/gui/contact-editor/e-contact-editor.c:2495
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2461,7 +2488,7 @@ msgstr ""
 msgid "contact-list-editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:152
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:215
@@ -2470,17 +2497,17 @@ msgstr ""
 msgid "Book"
 msgstr "Leabhar"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:166
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
 msgid "Is New List"
 msgstr "Is Líosta Nua"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:214
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:756
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
 msgid "Contact List Editor"
 msgstr "Eagarthôir Líosta Tadhall"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:434
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
 msgid "Save List as VCard"
 msgstr "Sábháil Lîosta mar VCard"
 
@@ -2518,8 +2545,8 @@ msgid ""
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
-#: widgets/misc/e-filter-bar.c:154
+#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Cuardach Ardmód"
 
@@ -2564,13 +2591,13 @@ msgid "Email begins with"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:57
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Any field contains"
 msgstr ""
 
@@ -2665,7 +2692,7 @@ msgid "Cut"
 msgstr "Gearr"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:366
+#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2676,8 +2703,18 @@ msgstr "Cóip"
 msgid "Paste"
 msgstr "Greamaigh"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
+#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Dealaigh"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1248
+#: calendar/gui/e-calendar-view.c:1262
 msgid "Current View"
 msgstr "Amharc Reatha"
 
@@ -2691,7 +2728,7 @@ msgstr ""
 
 #. All, unmatched, separator
 #: addressbook/gui/widgets/e-addressbook-view.c:1657
-#: calendar/gui/cal-search-bar.c:359
+#: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr ""
 
@@ -2733,7 +2770,7 @@ msgstr "Fón Ghnó"
 
 # ta
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:515 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Rpost"
 
@@ -2785,7 +2822,7 @@ msgid "Manager"
 msgstr "Bainisteoir"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Mobile Phone"
 msgstr "Fón Phóca"
 
@@ -2794,7 +2831,7 @@ msgid "Nickname"
 msgstr "Leasainm"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Note"
 msgstr "Nota"
 
@@ -2803,7 +2840,7 @@ msgid "Office"
 msgstr "Oifig"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:303
+#: addressbook/gui/widgets/eab-contact-display.c:300
 msgid "Organization"
 msgstr "Eagrú"
 
@@ -2859,17 +2896,17 @@ msgid "Web Site"
 msgstr "Idirlíon"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:136
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Leitheid"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:143
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Airde"
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:151
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
@@ -2915,181 +2952,212 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptar"
 
-#: addressbook/gui/widgets/e-minicard.c:159
+#: addressbook/gui/widgets/e-minicard.c:160
 msgid "Selected"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:166
+#: addressbook/gui/widgets/e-minicard.c:167
 msgid "Has Cursor"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
-#: addressbook/gui/widgets/eab-contact-display.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:114
+#: addressbook/gui/widgets/eab-contact-display.c:177
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
-#: addressbook/gui/widgets/eab-contact-display.c:193
+#: addressbook/gui/widgets/eab-contact-display.c:124
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:496
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:493
 msgid "List Members"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:296
+#: addressbook/gui/widgets/eab-contact-display.c:293
 msgid "E-mail"
 msgstr "R-phost"
 
-#: addressbook/gui/widgets/eab-contact-display.c:304
+#: addressbook/gui/widgets/eab-contact-display.c:301
 #, fuzzy
 msgid "Position"
 msgstr "sonraí"
 
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: addressbook/gui/widgets/eab-contact-display.c:303
+#: addressbook/gui/widgets/eab-contact-display.c:322
 #, fuzzy
 msgid "Groupwise"
 msgstr "Grupa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:308
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:312
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:330
 #, fuzzy
 msgid "Phone"
 msgstr "Fón Char"
 
-#: addressbook/gui/widgets/eab-contact-display.c:313
+#: addressbook/gui/widgets/eab-contact-display.c:310
 #, fuzzy
 msgid "Fax"
 msgstr "Facs Ghnó"
 
-#: addressbook/gui/widgets/eab-contact-display.c:317
+#: addressbook/gui/widgets/eab-contact-display.c:314
 #, fuzzy
 msgid "work"
 msgstr "Obair"
 
-#: addressbook/gui/widgets/eab-contact-display.c:330
+#: addressbook/gui/widgets/eab-contact-display.c:327
 msgid "WWW"
 msgstr ""
 
 # PE
-#: addressbook/gui/widgets/eab-contact-display.c:331
-#: addressbook/gui/widgets/eab-contact-display.c:550
+#: addressbook/gui/widgets/eab-contact-display.c:328
+#: addressbook/gui/widgets/eab-contact-display.c:547
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:335
 #, fuzzy
 msgid "personal"
 msgstr "Leagan"
 
-#: addressbook/gui/widgets/eab-contact-display.c:511
+#: addressbook/gui/widgets/eab-contact-display.c:508
 msgid "Job Title"
 msgstr "Tideal Post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:542
+#: addressbook/gui/widgets/eab-contact-display.c:539
 msgid "Home page"
 msgstr "Leathanach Baile"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
-msgid "Unknown error"
-msgstr "Earraidh gan fhois"
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Roghnachais na Leabhar Sheoladh"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Líosta Tadhall Nua"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact not found"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
-#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:212
-#: calendar/gui/print.c:2349 camel/camel-service.c:728
-#: camel/camel-service.c:766 camel/camel-service.c:850
-#: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:728 camel/camel-service.c:766
+#: camel/camel-service.c:850 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:451
 #: camel/providers/pop3/camel-pop3-store.c:532
 msgid "Cancelled"
 msgstr "Ceangailte"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Teip ag oscailt '%s': %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Failed"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
 #, fuzzy
-msgid "Address Book does not exist"
-msgstr "Roghnachais na Leabhar Sheoladh"
+msgid "No such source"
+msgstr "Níl aon fillteán: %s"
 
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Earraidh Eile"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: addressbook/gui/widgets/eab-gui-util.c:102
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:97
+#: addressbook/gui/widgets/eab-gui-util.c:109
 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:102
+#: addressbook/gui/widgets/eab-gui-util.c:114
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution you must compile the program from the CVS "
 "sources after retrieving OpenLDAP from the link below."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:111
+#: addressbook/gui/widgets/eab-gui-util.c:123
 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:128
+#: addressbook/gui/widgets/eab-gui-util.c:140
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:149
+#: addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3097,7 +3165,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:155
+#: addressbook/gui/widgets/eab-gui-util.c:167
 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"
@@ -3105,110 +3173,110 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:161
+#: addressbook/gui/widgets/eab-gui-util.c:173
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:164
+#: addressbook/gui/widgets/eab-gui-util.c:176
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:167
+#: addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:195
+#: addressbook/gui/widgets/eab-gui-util.c:207
 msgid "_Discard"
 msgstr "_Caith uait"
 
-#: addressbook/gui/widgets/eab-gui-util.c:214
+#: addressbook/gui/widgets/eab-gui-util.c:228
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:214
-#: addressbook/gui/widgets/eab-gui-util.c:632
+#: addressbook/gui/widgets/eab-gui-util.c:228
+#: addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error adding contact"
 msgstr "Earraidh ag suimigh tadhall"
 
-#: addressbook/gui/widgets/eab-gui-util.c:223
+#: addressbook/gui/widgets/eab-gui-util.c:239
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:223
+#: addressbook/gui/widgets/eab-gui-util.c:239
 msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:251
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:233
-#: addressbook/gui/widgets/eab-gui-util.c:590
+#: addressbook/gui/widgets/eab-gui-util.c:251
+#: addressbook/gui/widgets/eab-gui-util.c:608
 msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:315
+#: addressbook/gui/widgets/eab-gui-util.c:333
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:341
+#: addressbook/gui/widgets/eab-gui-util.c:359
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:345
+#: addressbook/gui/widgets/eab-gui-util.c:363
 msgid "Overwrite"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:381
+#: addressbook/gui/widgets/eab-gui-util.c:399
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Earráid ag sábhháil %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:418
+#: addressbook/gui/widgets/eab-gui-util.c:436
 msgid "card.vcf"
 msgstr "carta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:551
+#: addressbook/gui/widgets/eab-gui-util.c:569
 msgid "list"
 msgstr "líosta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:686
+#: addressbook/gui/widgets/eab-gui-util.c:704
 msgid "Move contact to"
 msgstr "Bog tadhall go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:688
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Copy contact to"
 msgstr "Cóip tadhall go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:691
+#: addressbook/gui/widgets/eab-gui-util.c:709
 msgid "Move contacts to"
 msgstr "Bog tadhallaí go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:693
+#: addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Copy contacts to"
 msgstr "Cóip tadhallaî go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:696
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Roghnaigh Tadhallaí o Leabhar Seoladh"
 
-#: addressbook/gui/widgets/eab-gui-util.c:869
+#: addressbook/gui/widgets/eab-gui-util.c:887
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:872
+#: addressbook/gui/widgets/eab-gui-util.c:890
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard do %s"
@@ -3604,18 +3672,18 @@ msgstr "Pasfhocal, le do thoil"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1320
-#: calendar/conduits/todo/todo-conduit.c:857
+#: calendar/conduits/calendar/calendar-conduit.c:1313
+#: calendar/conduits/todo/todo-conduit.c:849
 msgid "Could not start wombat server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1321
-#: calendar/conduits/todo/todo-conduit.c:858
+#: calendar/conduits/calendar/calendar-conduit.c:1314
+#: calendar/conduits/todo/todo-conduit.c:850
 msgid "Could not start wombat"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1436
-#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1422
+#: calendar/conduits/calendar/calendar-conduit.c:1425
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -3623,8 +3691,8 @@ msgstr ""
 msgid "Default Priority:"
 msgstr "Tosaíocht Loicthe:"
 
-#: calendar/conduits/todo/todo-conduit.c:945
-#: calendar/conduits/todo/todo-conduit.c:948
+#: calendar/conduits/todo/todo-conduit.c:929
+#: calendar/conduits/todo/todo-conduit.c:932
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -3633,7 +3701,7 @@ msgid "Calendar and Tasks"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:847
+#: calendar/gui/calendar-component.c:944
 msgid "Calendars"
 msgstr "Féilirí"
 
@@ -3675,10 +3743,10 @@ msgstr "Comhpháirt Tascanna Evolution"
 
 # tg
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1155 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:500 calendar/gui/tasks-control.c:516
+#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
 #: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:709
+#: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Tascanna"
 
@@ -3694,7 +3762,7 @@ msgstr "Ag Tosaíocht:"
 msgid "Ending:"
 msgstr "Ag Críochnach:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
 msgid "Evolution Alarm"
 msgstr "Aláram Evolution"
 
@@ -3703,7 +3771,7 @@ msgstr "Aláram Evolution"
 # ## 	The 'msgid' names and spellings for languages are those listed
 # ##     in iso-639.def from glibc
 # aa 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alairm on %s"
@@ -3727,24 +3795,24 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "Eagar coinne"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:872
+#: calendar/gui/alarm-notify/alarm-queue.c:873
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Oscail"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:876
+#: calendar/gui/alarm-notify/alarm-queue.c:877
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:941
+#: calendar/gui/alarm-notify/alarm-queue.c:944
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:959
+#: calendar/gui/alarm-notify/alarm-queue.c:964
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3753,12 +3821,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1055
-#: calendar/gui/alarm-notify/alarm-queue.c:1079
+#: calendar/gui/alarm-notify/alarm-queue.c:1060
+#: calendar/gui/alarm-notify/alarm-queue.c:1084
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1059
+#: calendar/gui/alarm-notify/alarm-queue.c:1064
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3766,7 +3834,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1085
+#: calendar/gui/alarm-notify/alarm-queue.c:1090
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3777,23 +3845,23 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1099
+#: calendar/gui/alarm-notify/alarm-queue.c:1104
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:164
 msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:166
+#: calendar/gui/alarm-notify/notify-main.c:167
 msgid "Could not initialize gnome-vfs"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:178
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:114
+#: calendar/gui/alarm-notify/util.c:37
 msgid "invalid time"
 msgstr "am neamhbhailí"
 
@@ -3921,30 +3989,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:53
+#: calendar/gui/cal-search-bar.c:56
 #, fuzzy
 msgid "Location contains"
 msgstr "Áit"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1005
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1606
-#: camel/providers/groupwise/camel-gw-listener.c:302
-#: camel/providers/groupwise/camel-gw-listener.c:326
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: camel/providers/groupwise/camel-gw-listener.c:304
+#: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Calendar"
 msgstr "Féilire"
 
@@ -3960,7 +4028,8 @@ msgid "Purge events older than"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-options.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
 msgid "days"
 msgstr "lae"
 
@@ -3970,8 +4039,8 @@ msgstr "%A, %e %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1590 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3993,79 +4062,82 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:373
+#: calendar/gui/calendar-component.c:367
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:432
-#: calendar/gui/dialogs/calendar-setup.glade.h:13
+#: calendar/gui/calendar-component.c:423
 msgid "New Calendar"
 msgstr "Féilire Nua"
 
-#: calendar/gui/calendar-component.c:932
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+msgid "Properties..."
+msgstr "Álbachtaí..."
+
+#: calendar/gui/calendar-component.c:790
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:802
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:836
+msgid ""
+"Selected calendar is read-only, events cannot be created. Please select a "
+"read-write calendar."
+msgstr ""
+
+#: calendar/gui/calendar-component.c:1095
 msgid "New appointment"
 msgstr "Coinne nua"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1096
 msgid "_Appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/calendar-component.c:934
+#: calendar/gui/calendar-component.c:1097
 msgid "Create a new appointment"
 msgstr "Cruthaigh coinne nua"
 
-#: calendar/gui/calendar-component.c:940
+#: calendar/gui/calendar-component.c:1103
 msgid "New meeting"
 msgstr "Cruinniú Nua"
 
-#: calendar/gui/calendar-component.c:941
+#: calendar/gui/calendar-component.c:1104
 msgid "M_eeting"
 msgstr "_Cruinniú"
 
-#: calendar/gui/calendar-component.c:942
+#: calendar/gui/calendar-component.c:1105
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:948
+#: calendar/gui/calendar-component.c:1111
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:949
+#: calendar/gui/calendar-component.c:1112
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:950
+#: calendar/gui/calendar-component.c:1113
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:956
+#: calendar/gui/calendar-component.c:1119
 msgid "New calendar"
 msgstr "Féilire nua"
 
-#: calendar/gui/calendar-component.c:957
+#: calendar/gui/calendar-component.c:1120
 msgid "C_alendar"
 msgstr "Fé_ilire"
 
-#: calendar/gui/calendar-component.c:958
+#: calendar/gui/calendar-component.c:1121
 msgid "Create a new calendar"
 msgstr "Cruthaigh féilire nua"
 
-#: calendar/gui/calendar-component.c:1026
-#, c-format
-msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1038
-msgid "There is no calendar available for creating events and meetings"
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1072
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
 #: calendar/gui/calendar-offline-handler.c:192
 #, c-format
 msgid "backend_go_offline(): %s"
@@ -4183,15 +4255,11 @@ msgid "extra times every"
 msgstr ""
 
 # xh
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
+#: calendar/gui/dialogs/alarm-options.glade.h:13
+#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
 msgid "hours"
 msgstr "uair"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
-msgid "minutes"
-msgstr "noimeaíd"
-
 #: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
 msgstr ""
@@ -4234,8 +4302,7 @@ msgstr "Post ríomhphost"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:167
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Coimriú:"
 
@@ -4265,7 +4332,7 @@ msgid "hour(s)"
 msgstr "uair"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40
+#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "noimea(i)d"
 
@@ -4275,34 +4342,34 @@ msgstr ""
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:569 mail/em-account-prefs.c:492
-#: mail/em-composer-prefs.c:670 mail/em-composer-prefs.c:898
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:463
+#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
 msgid "Enabled"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:731
+#: calendar/gui/dialogs/cal-prefs-dialog.c:721
 msgid "Are you sure you want to remove this URL?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:739
+#: calendar/gui/dialogs/cal-prefs-dialog.c:729
 msgid "Don't Remove"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:789
-#: calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: calendar/gui/dialogs/cal-prefs-dialog.c:857 mail/em-account-prefs.c:314
-#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
-#: mail/em-composer-prefs.c:589 mail/em-composer-prefs.c:647
-#: mail/em-composer-prefs.c:677
+#: calendar/gui/dialogs/cal-prefs-dialog.c:778
+#: calendar/gui/dialogs/cal-prefs-dialog.c:811
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:285
+#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
+#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
+#: mail/em-composer-prefs.c:670
 msgid "Disable"
 msgstr "Míchumasach"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:789
-#: calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: calendar/gui/dialogs/cal-prefs-dialog.c:859 mail/em-account-prefs.c:314
-#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
-#: mail/em-composer-prefs.c:589 mail/em-composer-prefs.c:647
-#: mail/em-composer-prefs.c:677
+#: calendar/gui/dialogs/cal-prefs-dialog.c:778
+#: calendar/gui/dialogs/cal-prefs-dialog.c:811
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:285
+#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
+#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
+#: mail/em-composer-prefs.c:670
 msgid "Enable"
 msgstr "Chumasach"
 
@@ -4358,7 +4425,7 @@ msgstr "_Cumasach"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:563
 msgid "Friday"
 msgstr "Aoine"
 
@@ -4372,7 +4439,7 @@ msgstr "Noimeaíd"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Luain"
 
@@ -4382,7 +4449,7 @@ msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Sathairn"
 
@@ -4396,7 +4463,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Domhnaigh"
 
@@ -4414,7 +4481,7 @@ msgstr "Líosta Tasc"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Deardaoin"
 
@@ -4432,7 +4499,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Mairt"
 
@@ -4442,7 +4509,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Ceádaoin"
 
@@ -4483,6 +4550,16 @@ msgstr ""
 msgid "_Display"
 msgstr "_Taispeaín"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr "_Eagar"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Free/Busy Publishing"
 msgstr ""
@@ -4531,26 +4608,26 @@ msgstr "_Cea"
 msgid "before every appointment"
 msgstr "roimh gach coinne"
 
-#: calendar/gui/dialogs/calendar-setup.c:156
+#: calendar/gui/dialogs/calendar-setup.c:166
 msgid "You must specify a location to get the calendar from."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:164
+#: calendar/gui/dialogs/calendar-setup.c:174
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:179
+#: calendar/gui/dialogs/calendar-setup.c:189
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:216
+#: calendar/gui/dialogs/calendar-setup.c:234
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:229
+#: calendar/gui/dialogs/calendar-setup.c:247
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4558,94 +4635,64 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Calendar Creation Assistant"
-msgstr ""
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Suimigh Féilire Nua"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Grupa na Líosta Tasc"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5
 msgid "Calendar Properties"
 msgstr "Roghnachais na Fheilire"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid ""
-"Congratulations, you are finished setting up this calendar.\n"
-"\n"
-"Please click the \"Apply\" button to save the settings you have entered here."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid ""
-"Congratulations, you are finished setting up this task list.\n"
-"\n"
-"Please click the \"Apply\" button to save the settings you have entered here."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:364
-msgid "New Task List"
-msgstr "Líosta Tasc Nua"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:8
 msgid "Remote"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid ""
-"Specifying a display name and group is the first step in setting up a "
-"calendar."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:19
-msgid ""
-"Specifying a display name and group is the first step in setting up a task "
-"list."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
-msgid "Step 2: Remote Folder Parameters"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:22
-msgid "Task List Creation Assistant"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "Task List Properties"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:24
-msgid ""
-"This assistant will help you create a new calendar. \n"
-"\n"
-"Depending on the type of calendar you create, additional\n"
-"parameters may be required. Please contact your system\n"
-"administrator if you need help finding this information."
-msgstr ""
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Suimigh Féilire Nua"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:29
-msgid ""
-"This assistant will help you create a new task list.\n"
-"\n"
-"Depending on the type of task list you create, additional\n"
-"parameters may be required. Please contact your system\n"
-"administrator if you need help finding this information."
-msgstr ""
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Cuir Grúpa Leis..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:35
-msgid ""
-"You're creating a folder in a group that's stored in a remote location. This "
-"requires you\n"
-"to specify additional parameters."
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+msgid "_Refresh Interval:"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:38
-msgid "_Refresh Interval:"
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+msgid "_Refresh:"
 msgstr ""
 
 # Avoid; either use KR or KP
-#: calendar/gui/dialogs/calendar-setup.glade.h:39
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid "_Source URL:"
 msgstr "URL _Fhoinse:"
 
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#, fuzzy
+msgid "_Type:"
+msgstr "Saghas:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URL:"
+
+# el 
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "seachtanna"
+
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4745,51 +4792,51 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:424
+#: calendar/gui/dialogs/comp-editor.c:431
 msgid "Could not update object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:899
-#: calendar/gui/dialogs/comp-editor.c:936
+#: calendar/gui/dialogs/comp-editor.c:904
+#: calendar/gui/dialogs/comp-editor.c:941
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:909
+#: calendar/gui/dialogs/comp-editor.c:946
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:907
-#: calendar/gui/dialogs/comp-editor.c:944
+#: calendar/gui/dialogs/comp-editor.c:912
+#: calendar/gui/dialogs/comp-editor.c:949
 #, c-format
 msgid "Task - %s"
 msgstr "Tasc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:910
-#: calendar/gui/dialogs/comp-editor.c:947
+#: calendar/gui/dialogs/comp-editor.c:915
+#: calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:921
-#: calendar/gui/dialogs/comp-editor.c:957
+#: calendar/gui/dialogs/comp-editor.c:926
+#: calendar/gui/dialogs/comp-editor.c:962
 msgid "No summary"
 msgstr "Gan coimriú"
 
-#: calendar/gui/dialogs/comp-editor.c:1382
-#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
-#: composer/e-msg-composer.c:1193
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
+#: composer/e-msg-composer.c:1183
 msgid "Save as..."
 msgstr "Sábháil mar..."
 
-#: calendar/gui/dialogs/comp-editor.c:1485
-#: calendar/gui/dialogs/comp-editor.c:1509
-#: calendar/gui/dialogs/comp-editor.c:1535
+#: calendar/gui/dialogs/comp-editor.c:1480
+#: calendar/gui/dialogs/comp-editor.c:1515
+#: calendar/gui/dialogs/comp-editor.c:1541
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1574
+#: calendar/gui/dialogs/comp-editor.c:1577
 msgid "Unable to use current version!"
 msgstr ""
 
@@ -4981,10 +5028,6 @@ msgstr ""
 msgid "Ca_tegories..."
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:5
-msgid "Calendar:"
-msgstr "Féilire:"
-
 #: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Classification"
@@ -5042,32 +5085,43 @@ msgstr ""
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2168
-#: mail/em-account-prefs.c:453 mail/em-folder-view.c:803
-#: mail/mail-account-gui.c:1390 mail/mail-account-gui.c:1884
+#: calendar/gui/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
+#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
+#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
 #: mail/mail-config.glade.h:100
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Ar Bith"
 
-#: calendar/gui/dialogs/meeting-page.c:418
+#: calendar/gui/dialogs/meeting-page.c:420
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:426
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:439
+#: calendar/gui/dialogs/meeting-page.c:441
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:647
+#: calendar/gui/dialogs/meeting-page.c:650
 msgid "_Delegate To..."
 msgstr ""
 
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/dialogs/meeting-page.c:654
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1295 calendar/gui/e-calendar-view.c:1327
+#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Dealaigh"
+
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:240
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
@@ -5105,7 +5159,7 @@ msgid "Member"
 msgstr "Ball"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -5285,7 +5339,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:450
 msgid "_Remove"
 msgstr "_Scríos"
 
@@ -5325,7 +5379,7 @@ msgid ""
 "Do you wish to save your changes?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1610
+#: calendar/gui/dialogs/save-comp.c:57
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5381,42 +5435,38 @@ msgid "% _Complete"
 msgstr "% _Rinneadh"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
-#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Críochnaithe"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:230
-#: mail/message-list.c:945
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
 msgid "High"
 msgstr "Ard"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
-#: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:206 calendar/gui/print.c:2343
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
+#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:234
-#: mail/message-list.c:943
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
 msgid "Low"
 msgstr "Bun"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:232 mail/message-list.c:944
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
+#: mail/message-list.c:922
 msgid "Normal"
 msgstr "Gnáth"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
-#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:216
-#: calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr ""
 
@@ -5426,7 +5476,7 @@ msgid "Progress"
 msgstr "Dearbhú"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:394
+#: calendar/gui/e-calendar-table.c:377
 msgid "Undefined"
 msgstr ""
 
@@ -5447,10 +5497,6 @@ msgstr "_Stádas:"
 msgid "_Web Page:"
 msgstr "Leathanach _Lín:"
 
-#: calendar/gui/dialogs/task-editor.c:193
-msgid "Basic"
-msgstr "Gnáth"
-
 #: calendar/gui/dialogs/task-editor.c:207
 #: calendar/gui/dialogs/task-editor.c:270
 #: calendar/gui/dialogs/task-editor.c:407
@@ -5461,12 +5507,7 @@ msgstr "Coinne"
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:547 calendar/gui/e-cal-model-tasks.c:738
-#: calendar/gui/e-cal-model-tasks.c:766
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.c:840
+#: calendar/gui/dialogs/task-page.c:824
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
@@ -5475,8 +5516,8 @@ msgstr ""
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:246
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
+#: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Tuarascail:"
@@ -5629,17 +5670,17 @@ msgid "%s for an unknown trigger type"
 msgstr ""
 
 #: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
 msgid "Public"
 msgstr ""
 
 #: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:370
+#: calendar/gui/e-calendar-table.c:353
 msgid "Private"
 msgstr "Priobhdach"
 
 #: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:354
 msgid "Confidential"
 msgstr ""
 
@@ -5657,60 +5698,60 @@ msgstr ""
 msgid "Summary"
 msgstr "Coimriú"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
 msgid "Free"
 msgstr "Saor"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
 #: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:275
+#: calendar/gui/e-cal-model-tasks.c:302
 msgid "N"
 msgstr "T"
 
-#: calendar/gui/e-cal-model-tasks.c:275
+#: calendar/gui/e-cal-model-tasks.c:302
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
 msgid "E"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:304
 msgid "W"
 msgstr "I"
 
-#: calendar/gui/e-cal-model-tasks.c:545
+#: calendar/gui/e-cal-model-tasks.c:573
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
+#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Tá"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
+#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Níl"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2134
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Gan fhois"
 
@@ -5722,130 +5763,130 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:396
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:397
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:398
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:399
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:400
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:418
+#: calendar/gui/e-calendar-table.c:401
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:402
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:403
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:404
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/e-calendar-table.c:405
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:406
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
 msgid "Deleting selected objects"
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
-#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
-#: mail/em-folder-view.c:769 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
+#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Oscail"
 
-#: calendar/gui/e-calendar-table.c:1041
+#: calendar/gui/e-calendar-table.c:1023
 msgid "Open _Web Page"
 msgstr "_Oscail Leathanach _Lín"
 
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1087
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1334
-#: mail/em-folder-view.c:771 mail/em-popup.c:689 mail/em-popup.c:804
+#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1361
+#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Sábháil Mar..."
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1085
-#: calendar/gui/e-calendar-view.c:1240 calendar/gui/e-calendar-view.c:1263
-#: calendar/gui/e-calendar-view.c:1332 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
+#: calendar/gui/e-calendar-view.c:1254 calendar/gui/e-calendar-view.c:1277
+#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Priontáil..."
 
-#: calendar/gui/e-calendar-table.c:1047 calendar/gui/e-calendar-table.c:1076
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1310
+#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "G_earr"
 
-#: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
-#: mail/em-folder-tree.c:2563 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1323
+#: mail/em-folder-tree.c:2534 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:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Cóip"
 
 # PS
-#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1083
-#: calendar/gui/e-calendar-view.c:1244 calendar/gui/e-calendar-view.c:1270
-#: calendar/gui/e-calendar-view.c:1330 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
+#: calendar/gui/e-calendar-view.c:1258 calendar/gui/e-calendar-view.c:1284
+#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Greamaigh"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Assign Task"
 msgstr ""
 
 # ln
-#: calendar/gui/e-calendar-table.c:1054
+#: calendar/gui/e-calendar-table.c:1036
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-table.c:1037
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-table.c:1038
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1061 calendar/gui/e-calendar-table.c:1079
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1371
+#: calendar/gui/e-calendar-table.c:1353
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Click to add a task"
 msgstr ""
@@ -5856,7 +5897,7 @@ msgid "% Complete"
 msgstr "% Rinneadh"
 
 #: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr ""
 
@@ -5883,71 +5924,71 @@ msgstr "Dáta Breithe"
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
 msgid "New _Appointment..."
 msgstr "_Coinne Nua..."
 
-#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
 msgid "New Meeting"
 msgstr "Cruinniú Nua"
 
-#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
 msgid "New Task"
 msgstr "Tasc Nua"
 
-#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Roghnaigh fillteán"
 
-#: calendar/gui/e-calendar-view.c:1251
+#: calendar/gui/e-calendar-view.c:1265
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Roghnaigh..."
 
-#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1274
+#: calendar/gui/e-calendar-view.c:1288
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Cóip do Fillteán..."
 
-#: calendar/gui/e-calendar-view.c:1275
+#: calendar/gui/e-calendar-view.c:1289
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Bog go Fillteán..."
 
-#: calendar/gui/e-calendar-view.c:1276
+#: calendar/gui/e-calendar-view.c:1290
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1277
+#: calendar/gui/e-calendar-view.c:1291
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1316
+#: calendar/gui/e-calendar-view.c:1331
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1318
+#: calendar/gui/e-calendar-view.c:1333
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Álbachtaí..."
 
@@ -5978,440 +6019,435 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1573
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1572
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1606
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:823 calendar/gui/e-week-view.c:596
+#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "rn"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:826 calendar/gui/e-week-view.c:599
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "in"
 
-#: calendar/gui/e-itip-control.c:591
+#: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:603
 #, 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:607
+#: calendar/gui/e-itip-control.c:608
 #, 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:609
+#: calendar/gui/e-itip-control.c:610
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:618
 msgid " and "
 msgstr " agus "
 
-#: calendar/gui/e-itip-control.c:624
+#: calendar/gui/e-itip-control.c:625
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:637
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:645
 #, 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:648
+#: calendar/gui/e-itip-control.c:649
 #, 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:659
+#: calendar/gui/e-itip-control.c:660
 #, 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:668
+#: calendar/gui/e-itip-control.c:669
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:693
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:702
+#: calendar/gui/e-itip-control.c:703
 msgid "<b>Ends:</b> "
 msgstr "<b>Ag Críochnú:</b> "
 
-#: calendar/gui/e-itip-control.c:722
+#: calendar/gui/e-itip-control.c:723
 msgid "<b>Completed:</b> "
 msgstr "<b>Críochnaithe:</b> "
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:733
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
 msgid "iCalendar Information"
 msgstr "Eolas iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:788
 msgid "iCalendar Error"
 msgstr "Féilire"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
 msgid "An unknown person"
 msgstr "Duine anaithnid"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:910
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:925
 msgid "<i>None</i>"
 msgstr "<i>Ar bith</i>"
 
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "Áit:"
-
-#. write status
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:202
+#: calendar/gui/e-itip-control.c:950
 msgid "Status:"
 msgstr "Stádas:"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
+#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
 msgid "Choose an action:"
 msgstr "Roghnaigh gníomh:"
 
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1023
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
+#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
 #: shell/e-shell.c:1079 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ceart go Leor"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1051
 msgid "Accept"
 msgstr "Glac Leis"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1052
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1053
 msgid "Decline"
 msgstr "Diúltaigh Dó"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1077
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1090
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1103
 msgid "Send Latest Information"
 msgstr ""
 
 # FR
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1192
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1193
 msgid "Meeting Information"
 msgstr "Eolas cruinniú"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1200
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1201
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1205
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1206
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1210
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1211
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1218
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1219
 msgid "Meeting Reply"
 msgstr "Freagra Cruinniú"
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1227
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
+#: calendar/gui/e-itip-control.c:1337
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1235
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1260
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1261
 msgid "Task Information"
 msgstr "Eolas Thasc"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1268
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1269
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1273
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1274
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1278
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1279
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1286
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1287
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1294
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1295
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1303
 msgid "Bad Task Message"
 msgstr "Droch Scéal Tasc"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1322
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1323
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1327
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1328
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1332
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1333
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1338
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1413
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1472
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1503
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1527
+#: calendar/gui/e-itip-control.c:1535
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1766
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1768
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
+#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1816
+#: calendar/gui/e-itip-control.c:1824
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1828
+#: calendar/gui/e-itip-control.c:1836
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1855
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1858
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1861
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1864
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1867
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1890
+#: calendar/gui/e-itip-control.c:1898
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1965
+#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6614,30 +6650,7 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:180
-msgid "Start Date:"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:196
-msgid "Due Date:"
-msgstr ""
-
-#. write priority
-#: calendar/gui/e-tasks.c:224
-msgid "Priority:"
-msgstr "Tosaíocht:"
-
-#. URL
-#: calendar/gui/e-tasks.c:280
-msgid "Web Page:"
-msgstr "Leathanach Lín:"
-
-#: calendar/gui/e-tasks.c:313 mail/em-folder-view.c:2213
-#, c-format
-msgid "Click to open %s"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:789 calendar/gui/gnome-cal.c:1909
+#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6647,7 +6660,7 @@ msgstr ""
 "  %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:808
+#: calendar/gui/e-tasks.c:544
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6655,12 +6668,12 @@ msgid ""
 " has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:888
+#: calendar/gui/e-tasks.c:624
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ag oscailt tascanna as %s"
 
-#: calendar/gui/e-tasks.c:909
+#: calendar/gui/e-tasks.c:645
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6669,50 +6682,50 @@ msgstr ""
 " Earráid le %s:\n"
 "  %s"
 
-#: calendar/gui/e-tasks.c:928
+#: calendar/gui/e-tasks.c:664
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Ag Lódáil íomhanna"
 
-#: calendar/gui/e-tasks.c:1030
+#: calendar/gui/e-tasks.c:766
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1053
+#: calendar/gui/e-tasks.c:789
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1079
+#: calendar/gui/e-tasks.c:816
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1770
+#: calendar/gui/gnome-cal.c:1773
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Gan coinní."
 
-#: calendar/gui/gnome-cal.c:1789
+#: calendar/gui/gnome-cal.c:1792
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Ag Lódáil íomhanna"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1812
 #, c-format
 msgid "Opening %s"
 msgstr "Ag Oscailt %s"
 
-#: calendar/gui/gnome-cal.c:1938
+#: calendar/gui/gnome-cal.c:1941
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1950
+#: calendar/gui/gnome-cal.c:1953
 #, c-format
 msgid "The task backend for '%s' has crashed."
 msgstr ""
 
 # tr
-#: calendar/gui/gnome-cal.c:2763
+#: calendar/gui/gnome-cal.c:2757
 msgid "Purging"
 msgstr ""
 
@@ -6832,7 +6845,7 @@ msgstr "Eeolas iCalendar"
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/migration.c:137
+#: calendar/gui/migration.c:146
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -6840,7 +6853,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:141
+#: calendar/gui/migration.c:150
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -6848,12 +6861,12 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: calendar/gui/migration.c:366
+#: calendar/gui/migration.c:376
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
+#: calendar/gui/migration.c:462 calendar/gui/migration.c:544
 msgid "On The Web"
 msgstr ""
 
@@ -7090,47 +7103,57 @@ msgstr ""
 msgid "Print Setup"
 msgstr "Socraigh Priontáil "
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:299
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:570
+#: calendar/gui/tasks-component.c:357
+msgid "New Task List"
+msgstr "Líosta Tasc Nua"
+
+#: calendar/gui/tasks-component.c:464
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:476
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:514
+msgid ""
+"Selected task list is read-only, events cannot be created. Please select a "
+"read-write calendar."
+msgstr ""
+
+#: calendar/gui/tasks-component.c:722
 msgid "New task"
 msgstr "Tasc nua"
 
-#: calendar/gui/tasks-component.c:571
+#: calendar/gui/tasks-component.c:723
 msgid "_Task"
 msgstr "_Tasc"
 
-#: calendar/gui/tasks-component.c:572
+#: calendar/gui/tasks-component.c:724
 msgid "Create a new task"
 msgstr "Cruthaigh tasc nua"
 
-#: calendar/gui/tasks-component.c:578
+#: calendar/gui/tasks-component.c:730
 #, fuzzy
 msgid "New tasks group"
 msgstr "Tasc nua"
 
-#: calendar/gui/tasks-component.c:579
+#: calendar/gui/tasks-component.c:731
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Grupa na Líosta Tasc"
 
-#: calendar/gui/tasks-component.c:580
+#: calendar/gui/tasks-component.c:732
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Cruthaigh tasc nua"
 
-#: calendar/gui/tasks-component.c:648
-#, c-format
-msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-
-#: calendar/gui/tasks-component.c:660
-msgid "There is no calendar available for creating tasks"
-msgstr ""
-
 #: calendar/gui/tasks-control.c:152
 msgid "The URI of the tasks folder to display"
 msgstr ""
@@ -7185,21 +7208,21 @@ msgstr "Comhaid vCalendar (.vcf)"
 msgid "Appointments and Meetings"
 msgstr "Coinne - %s"
 
-#: calendar/importers/icalendar-importer.c:494
+#: calendar/importers/icalendar-importer.c:490
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:702
+#: calendar/importers/icalendar-importer.c:698
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:727
+#: calendar/importers/icalendar-importer.c:723
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:734
+#: calendar/importers/icalendar-importer.c:730
 msgid "Gnome Calendar"
 msgstr "Féilire Gnome"
 
@@ -8815,16 +8838,16 @@ msgstr ""
 msgid "Copy folder content locally for offline operation"
 msgstr ""
 
-#: camel/camel-disco-folder.c:101
+#: camel/camel-disco-folder.c:103
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:441
+#: camel/camel-disco-folder.c:449
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr ""
 
-#: camel/camel-disco-store.c:377
+#: camel/camel-disco-store.c:404
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -8991,8 +9014,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
 #: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:697
-#: mail/mail-send-recv.c:598
+#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Ceangailte."
 
@@ -9490,6 +9513,76 @@ msgstr ""
 msgid "Enter security pass-phrase for `%s'"
 msgstr ""
 
+#: camel/camel-smime-context.c:261
+#, fuzzy, c-format
+msgid "Cannot find certificate for '%s'"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/camel-smime-context.c:267
+#, fuzzy
+msgid "Cannot create CMS message"
+msgstr "Níl an scéal %s ar fáil: %s"
+
+#: camel/camel-smime-context.c:272
+msgid "Cannot create CMS signedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:278
+#, fuzzy
+msgid "Cannot attach CMS signedData"
+msgstr "Ní féidir an comhad %s a cheangail: %s"
+
+#: camel/camel-smime-context.c:285
+#, fuzzy
+msgid "Cannot attach CMS data"
+msgstr "Ní féidir an comhad %s a cheangail: %s"
+
+#: camel/camel-smime-context.c:291
+msgid "Cannot create CMS SignerInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:297
+msgid "Cannot find cert chain"
+msgstr ""
+
+#: camel/camel-smime-context.c:303
+msgid "Cannot add CMS SigningTime"
+msgstr ""
+
+#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
+#, c-format
+msgid "Encryption cert for '%s' does not exist"
+msgstr ""
+
+#: camel/camel-smime-context.c:344
+msgid "Cannot add SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+#: camel/camel-smime-context.c:349
+msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+#: camel/camel-smime-context.c:354
+msgid "Cannot add add encryption certificate"
+msgstr ""
+
+#: camel/camel-smime-context.c:360
+msgid "Cannot add CMS SignerInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:430
+#, fuzzy
+msgid "Cannot create encoder context"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/camel-smime-context.c:436
+msgid "Failed to add data to CMS encoder"
+msgstr ""
+
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+msgid "Failed to encode data"
+msgstr ""
+
 #: camel/camel-smime-context.c:514
 msgid "Unverified"
 msgstr ""
@@ -9521,7 +9614,7 @@ msgid "Signature algorithm unknown"
 msgstr ""
 
 #: camel/camel-smime-context.c:528
-msgid "Siganture algorithm unsupported"
+msgid "Signature algorithm unsupported"
 msgstr ""
 
 # SG
@@ -9533,11 +9626,119 @@ msgstr "Siniú neambhailí"
 msgid "Processing error"
 msgstr ""
 
+# SG
+#: camel/camel-smime-context.c:569
+#, fuzzy
+msgid "No signedData in signature"
+msgstr "Siniú neambhailí."
+
+#: camel/camel-smime-context.c:576
+msgid "Digests missing from enveloped data"
+msgstr ""
+
+#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+#, fuzzy
+msgid "Cannot calculate digests"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/camel-smime-context.c:604
+#, fuzzy
+msgid "Cannot set message digests"
+msgstr "Níl an scéal %s ar fáil: %s"
+
+#: camel/camel-smime-context.c:614
+#, fuzzy
+msgid "Certificate import failed"
+msgstr "Sonraí Theastas"
+
+#: camel/camel-smime-context.c:624
+msgid "Certficate only message, cannot verify certificates"
+msgstr ""
+
+#: camel/camel-smime-context.c:627
+msgid "Certficate only message, certificates imported and verified"
+msgstr ""
+
+# SG
+#: camel/camel-smime-context.c:631
+#, fuzzy
+msgid "Can't find signature digests"
+msgstr "Siniú Bhailithe."
+
 #: camel/camel-smime-context.c:647
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
+#: camel/camel-smime-context.c:748
+#, fuzzy
+msgid "Decoder failed"
+msgstr "Teip oraithe NNTP: %s"
+
+#: camel/camel-smime-context.c:800
+#, fuzzy, c-format
+msgid "Can't find certificate for `%s'"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/camel-smime-context.c:807
+msgid "Can't find common bulk encryption algorithm"
+msgstr ""
+
+#. PORT_GetError(); ??
+#: camel/camel-smime-context.c:816
+msgid "Can't allocate slot for encryption bulk key"
+msgstr ""
+
+#: camel/camel-smime-context.c:827
+msgid "Can't create CMS Message"
+msgstr ""
+
+#: camel/camel-smime-context.c:833
+msgid "Can't create CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:839
+msgid "Can't attach CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:845
+msgid "Can't attach CMS data object"
+msgstr ""
+
+#: camel/camel-smime-context.c:854
+msgid "Can't create CMS RecipientInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:859
+msgid "Can't add CMS RecipientInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:873
+#, fuzzy
+msgid "Can't create encoder context"
+msgstr "Cruthaigh tadhall nua"
+
+#: camel/camel-smime-context.c:884
+msgid "Failed to add data to encoder"
+msgstr ""
+
+#: camel/camel-smime-context.c:970
+#, c-format
+msgid "Decoder failed, error %d"
+msgstr ""
+
+#: camel/camel-smime-context.c:977
+msgid "S/MIME Decrypt: No encrypted content found"
+msgstr ""
+
+#: camel/camel-smime-context.c:1004
+msgid "import keys: unimplemented"
+msgstr ""
+
+#: camel/camel-smime-context.c:1012
+msgid "export keys: unimplemented"
+msgstr ""
+
 #: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
@@ -9841,8 +10042,8 @@ msgstr "Pasfhocal"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:303
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: camel/providers/groupwise/camel-gw-listener.c:305
+#: camel/providers/groupwise/camel-gw-listener.c:328
 #, fuzzy
 msgid "Checklist"
 msgstr "líosta"
@@ -9860,6 +10061,13 @@ msgstr ""
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/pop3/camel-pop3-store.c:538
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
+msgid "Unknown error"
+msgstr "Earraidh gan fhois"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -9892,31 +10100,31 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:226
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:323
+#: camel/providers/imap/camel-imap-folder.c:326
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:566
+#: camel/providers/imap/camel-imap-folder.c:569
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1960
+#: camel/providers/imap/camel-imap-folder.c:1963
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2007
+#: camel/providers/imap/camel-imap-folder.c:2010
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9930,25 +10138,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2007
+#: camel/providers/imap/camel-imap-folder.c:2010
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2041
-#: camel/providers/imap/camel-imap-folder.c:2643
-#: camel/providers/nntp/camel-nntp-folder.c:205
+#: camel/providers/imap/camel-imap-folder.c:2044
+#: camel/providers/imap/camel-imap-folder.c:2646
+#: camel/providers/nntp/camel-nntp-folder.c:233
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2307
-#: camel/providers/imap/camel-imap-folder.c:2377
+#: camel/providers/imap/camel-imap-folder.c:2310
+#: camel/providers/imap/camel-imap-folder.c:2380
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2681
+#: camel/providers/imap/camel-imap-folder.c:2684
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -10515,7 +10723,7 @@ msgstr ""
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2523
+#: camel/providers/local/camel-mbox-summary.c:592
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
@@ -10677,8 +10885,8 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
-#: camel/providers/nntp/camel-nntp-folder.c:230
+#: camel/providers/nntp/camel-nntp-folder.c:168
+#: camel/providers/nntp/camel-nntp-folder.c:258
 #: camel/providers/pop3/camel-pop3-folder.c:262
 #: camel/providers/pop3/camel-pop3-folder.c:430
 #: camel/providers/pop3/camel-pop3-folder.c:491
@@ -10686,9 +10894,9 @@ msgstr ""
 msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:142
-#: camel/providers/nntp/camel-nntp-folder.c:226
-#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:170
+#: camel/providers/nntp/camel-nntp-folder.c:254
+#: camel/providers/nntp/camel-nntp-folder.c:260
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10697,48 +10905,48 @@ msgstr ""
 msgid "Cannot get message %s: %s"
 msgstr "Níl an scéal %s ar fáil: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/nntp/camel-nntp-folder.c:195
+#: camel/providers/nntp/camel-nntp-folder.c:185
+#: camel/providers/nntp/camel-nntp-folder.c:223
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:170
+#: camel/providers/nntp/camel-nntp-folder.c:198
 #, c-format
 msgid "Could not get article %s from NNTP server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:353
+#: camel/providers/nntp/camel-nntp-folder.c:381
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:364
+#: camel/providers/nntp/camel-nntp-folder.c:392
 #, c-format
 msgid "Failed to send newsgroups header: %s: message not posted"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:404
-#: camel/providers/nntp/camel-nntp-folder.c:417
+#: camel/providers/nntp/camel-nntp-folder.c:432
+#: camel/providers/nntp/camel-nntp-folder.c:445
 #, c-format
 msgid "Error posting to newsgroup: %s: message not posted"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:429
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "Error reading response to posted message: message not posted"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:432
+#: camel/providers/nntp/camel-nntp-folder.c:460
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Earraidh ag sábhháil scéal: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:448
+#: camel/providers/nntp/camel-nntp-folder.c:476
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:459
+#: camel/providers/nntp/camel-nntp-folder.c:487
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
@@ -10906,7 +11114,8 @@ msgstr ""
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
+#: composer/e-msg-composer.c:1236
 msgid "Unknown reason"
 msgstr ""
 
@@ -11327,34 +11536,34 @@ msgstr "Teip oraithe NNTP: %s"
 msgid "QUIT command failed"
 msgstr "Teip oraithe NNTP: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:109
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:111
+#: composer/e-msg-composer-attachment-bar.c:112
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1486
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
 msgid "attachment"
 msgstr "ceangaltáin"
 
-#: composer/e-msg-composer-attachment-bar.c:453
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:491
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:494
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Attach a file to the message"
 msgstr "Ceangal comhad ar an scéal"
 
@@ -11383,14 +11592,10 @@ msgid "MIME type:"
 msgstr ""
 
 #: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:66
+#: composer/e-msg-composer-select-file.c:74
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:308
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr ""
@@ -11467,144 +11672,75 @@ msgstr ""
 msgid "Click here to select folders to post to"
 msgstr ""
 
-#: composer/e-msg-composer-select-file.c:119
+#: composer/e-msg-composer-select-file.c:127
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:694
+#: composer/e-msg-composer.c:695
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:701
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:831
-#, c-format
-msgid ""
-"Error while reading file %s:\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:1208
-msgid "File exists, overwrite?"
-msgstr ""
-
-#: composer/e-msg-composer.c:1219 composer/e-msg-composer.c:1235
-#, c-format
-msgid "Error saving file: %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:1259
-#, c-format
-msgid "Error loading file: %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:1297
-#, c-format
-msgid "Error accessing file: %s"
-msgstr ""
+#: composer/e-msg-composer.c:1273
+#, fuzzy
+msgid "Could not open file"
+msgstr "Níorbh fhéidir an comhad %s a n-oscailt: %s"
 
-#: composer/e-msg-composer.c:1305
+#: composer/e-msg-composer.c:1281
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1312
-#, c-format
-msgid ""
-"Unable to seek on file: %s\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:1319
-#, c-format
-msgid ""
-"Unable to truncate file: %s\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:1328
-#, c-format
-msgid ""
-"Unable to copy file descriptor: %s\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:1337
-#, c-format
-msgid ""
-"Error autosaving message: %s\n"
-" %s"
-msgstr ""
-"Earraidh ag sábhháil scéal: %s\n"
-" %s"
-
-#: composer/e-msg-composer.c:1441
-msgid ""
-"Ximian Evolution has found unsaved messages from a previous session.\n"
-"Would you like to try to recover them?"
-msgstr ""
-
-#: composer/e-msg-composer.c:1605
-#, c-format
-msgid ""
-"The message \"%s\" has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: composer/e-msg-composer.c:1607
+#: composer/e-msg-composer.c:1551
 #, fuzzy
 msgid "Untitled Message"
 msgstr "(Scéal gan tideál)"
 
-#: composer/e-msg-composer.c:1614
-msgid "Warning: Modified Message"
-msgstr ""
-
-#: composer/e-msg-composer.c:1647
+#: composer/e-msg-composer.c:1581
 msgid "Open file"
 msgstr "Oscail Comhad"
 
-#: composer/e-msg-composer.c:2054 mail/mail-account-gui.c:1311
+#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
 msgid "Autogenerated"
 msgstr "Uathcruthach"
 
 # SG
-#: composer/e-msg-composer.c:2153
+#: composer/e-msg-composer.c:2087
 msgid "Signature:"
 msgstr "Siniú:"
 
-#: composer/e-msg-composer.c:2353
+#: composer/e-msg-composer.c:2288
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2382
+#: composer/e-msg-composer.c:2317
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2385 composer/e-msg-composer.c:3284
+#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2402 composer/e-msg-composer.c:3167
-#: composer/e-msg-composer.c:3168
+#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
+#: composer/e-msg-composer.c:3104
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:3197
+#: composer/e-msg-composer.c:3137
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:3225
+#: composer/e-msg-composer.c:3165
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11612,18 +11748,129 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:3329
+#: composer/e-msg-composer.c:3269
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:4334
+#: composer/e-msg-composer.c:4274
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
+#: composer/mail-composer-errors.xml.in.h:1
+msgid "${1}"
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:2
+msgid "All accounts have been removed."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:3
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:4
+msgid "Because \"${0}\", you may need to select different mail options."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:5
+msgid "Because \"${1}\"."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:6
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:7
+#, fuzzy
+msgid "Could not create message."
+msgstr ""
+"Teip ag cruthaigh comhd '%s':\n"
+"%s"
+
+#: composer/mail-composer-errors.xml.in.h:8
+#, fuzzy
+msgid "Could not read signature file \"{0}\"."
+msgstr "Teip ag sábháil comhad siniú: %s"
+
+#: composer/mail-composer-errors.xml.in.h:9
+#, fuzzy
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "Teip ag sábháil comhad siniú: %s"
+
+#: composer/mail-composer-errors.xml.in.h:10
+msgid "Directories can not be attached to Messages."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:11
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Caith uait"
+
+#: composer/mail-composer-errors.xml.in.h:12
+msgid "Do you want to recover unfinished messages?"
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:13
+msgid "Don't Recover"
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:14
+msgid "Error saving to autosave because \"{1}\"."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:15
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:16
+#, fuzzy
+msgid "Recover"
+msgstr "Scríos"
+
+#: composer/mail-composer-errors.xml.in.h:17
+#, fuzzy
+msgid "Save Message"
+msgstr "Sábháil Scéal...."
+
+#: composer/mail-composer-errors.xml.in.h:18
+msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:19
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:20
+#, fuzzy
+msgid "Unfinished messages found"
+msgstr "(Scéal gan tideál)"
+
+#: composer/mail-composer-errors.xml.in.h:21
+msgid "Warning: Modified Message"
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:22
+#, fuzzy
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Ceangal comhad ar an scéal"
+
+#: composer/mail-composer-errors.xml.in.h:23
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr ""
@@ -11893,24 +12140,20 @@ msgid_plural "%d years ago"
 msgstr[0] "1 bliain ó shin"
 msgstr[1] "1 bliain ó shin"
 
-#: filter/filter-datespec.c:187
-msgid "You must choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:287
+#: filter/filter-datespec.c:280
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
+#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
 msgid "now"
 msgstr "anois"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:297
+#: filter/filter-datespec.c:290
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: filter/filter-datespec.c:413
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr ""
 
@@ -11919,16 +12162,76 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "Sábháil Mar"
 
-#: filter/filter-file.c:166
+#: filter/filter-errors.xml.in.h:1
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:2
+msgid "Could not compile regular expression \"{1}\"."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:3
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:4
+msgid "Missing date."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:5
+msgid "Missing file name."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:6
+#, fuzzy
+msgid "Missing folder."
+msgstr "Ag dealaigh fillteán %s"
+
+#: filter/filter-errors.xml.in.h:7
+#, fuzzy
+msgid "Missing name."
+msgstr "Coinne"
+
+#: filter/filter-errors.xml.in.h:8
+msgid "Name \"{0}\" already used."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:9
+msgid "No sources selected."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:10
+msgid "Please choose another name."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:11
+msgid "You must choose a date."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:12
+msgid "You must name this filter."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:13
+msgid "You must name this vFolder."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:14
 msgid "You must specify a file name."
 msgstr ""
 
-#: filter/filter-file.c:185
-#, c-format
-msgid "File '%s' does not exist or is not a regular file."
+#: filter/filter-errors.xml.in.h:15
+msgid "You must specify a folder."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:16
+msgid ""
+"You must specify at least one folder as a source. Either by selecting the "
+"folders individually, and/or by selecting all local folders, all remote "
+"folders, or both."
 msgstr ""
 
-#: filter/filter-file.c:301
+#: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Roghnaigh comhad"
 
@@ -11938,36 +12241,25 @@ msgstr "Roghnaigh comhad"
 msgid "<b>Then</b>"
 msgstr "<b>Am</b> "
 
-#: filter/filter-folder.c:153
-msgid "You must specify a folder."
-msgstr ""
-
-#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
-#: mail/mail-account-gui.c:1177
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
+#: mail/mail-account-gui.c:1327
 msgid "Select Folder"
 msgstr "Roghnaigh Fillteán"
 
-#: filter/filter-input.c:193
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-
 # IR
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:924
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
 #: mail/mail-config.c:65 mail/mail-config.glade.h:90
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:927 mail/mail-config.c:68
+#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
 #: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:928 mail/mail-config.c:69
+#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
 #: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr ""
@@ -11976,42 +12268,38 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr ""
-
 # vi
-#: filter/filter-rule.c:752
+#: filter/filter-rule.c:746
 #, fuzzy
 msgid "Rule name:"
 msgstr "Ainm chomhaid:"
 
-#: filter/filter-rule.c:756
+#: filter/filter-rule.c:750
 msgid "Untitled"
 msgstr "Gan Tidéal"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:773
 #, fuzzy
 msgid "<b>If</b>"
 msgstr "<b>Am</b> "
 
-#: filter/filter-rule.c:810
+#: filter/filter-rule.c:804
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:814
+#: filter/filter-rule.c:808
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:819
+#: filter/filter-rule.c:813
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:910
+#: filter/filter-rule.c:904
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:910
+#: filter/filter-rule.c:904
 msgid "outgoing"
 msgstr ""
 
@@ -12083,11 +12371,6 @@ msgstr ""
 msgid "the time you specify"
 msgstr ""
 
-# el 
-#: filter/filter.glade.h:23
-msgid "weeks"
-msgstr "seachtanna"
-
 #: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr ""
@@ -12237,7 +12520,7 @@ msgid "Junk Test"
 msgstr ""
 
 # PE
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:802
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Lipéid"
@@ -12348,9 +12631,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1539
-#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
+#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Ábhar"
@@ -12360,22 +12643,16 @@ msgstr "Ábhar"
 msgid "Unset Status"
 msgstr ""
 
-#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1008
-#, c-format
-msgid "Rule name '%s' is not unique, choose another."
-msgstr ""
-
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:375
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr ""
 
 # vi
-#: filter/rule-editor.c:699
+#: filter/rule-editor.c:685
 msgid "Rule name"
 msgstr ""
 
@@ -12420,15 +12697,7 @@ msgstr ""
 msgid "Virtual _Folders"
 msgstr "_Fillteán"
 
-#: filter/vfolder-rule.c:215
-msgid "You must name this vfolder."
-msgstr ""
-
-#: filter/vfolder-rule.c:230
-msgid "You need to to specify at least one folder as a source."
-msgstr ""
-
-#: filter/vfolder-rule.c:587
+#: filter/vfolder-rule.c:572
 msgid "VFolder source"
 msgstr "Foinse FFillteáin"
 
@@ -12477,10 +12746,10 @@ msgstr "Amharcóir fillteáin phost Evolution"
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:828
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:495
-#: mail/mail-component.c:540
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
+#: mail/mail-component.c:582
 msgid "Mail"
 msgstr "Post"
 
@@ -12492,91 +12761,38 @@ msgstr "Cuntasaí Phoist"
 msgid "Mail Preferences"
 msgstr "Roghnachais Phoist"
 
-#: mail/em-account-prefs.c:232
-msgid "Are you sure you want to delete this account?"
-msgstr ""
-
-#: mail/em-account-prefs.c:240
-msgid "Don't delete"
-msgstr ""
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:444
+#: mail/em-account-prefs.c:415
 msgid "[Default]"
 msgstr "[Gnáth]"
 
-#: mail/em-account-prefs.c:498
+#: mail/em-account-prefs.c:469
 msgid "Account name"
 msgstr "Ainm chuntas"
 
-#: mail/em-account-prefs.c:500
+#: mail/em-account-prefs.c:471
 msgid "Protocol"
 msgstr ""
 
-#: mail/em-composer-prefs.c:295 mail/em-composer-prefs.c:418
-#: mail/mail-config.c:1037
+#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
+#: mail/mail-config.c:1038
 msgid "Unnamed"
 msgstr ""
 
-#: mail/em-composer-prefs.c:402
-msgid "You must specify a valid script name."
-msgstr ""
-
-#: mail/em-composer-prefs.c:902
+#: mail/em-composer-prefs.c:895
 msgid "Language(s)"
 msgstr "Teang(ach)a"
 
-#: mail/em-composer-prefs.c:948
+#: mail/em-composer-prefs.c:941
 #, fuzzy
 msgid "Add signature script"
 msgstr "Suimigh Siniú"
 
-#: mail/em-composer-prefs.c:968
+#: mail/em-composer-prefs.c:961
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/em-composer-utils.c:124
-#, c-format
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-"%sSend anyway?"
-msgstr ""
-
-#: mail/em-composer-utils.c:138
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-
-#: mail/em-composer-utils.c:153
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-
-#: mail/em-composer-utils.c:157
-msgid "This message contains only Bcc recipients."
-msgstr ""
-
-#: mail/em-composer-utils.c:162
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-
-#: mail/em-composer-utils.c:305
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/em-composer-utils.c:574
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: mail/em-folder-browser.c:138
+#: mail/em-folder-browser.c:139
 msgid "Create _Virtual Folder From Search..."
 msgstr "Cruthaigh Fillteán _Fhíorúil ó Cuardach..."
 
@@ -12612,8 +12828,8 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Cruthaigh Fillteán Nua"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2277
-#: mail/mail-component.c:704
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
+#: mail/mail-component.c:731
 msgid "Specify where to create the folder:"
 msgstr ""
 
@@ -12622,413 +12838,375 @@ msgid "Folder _name:"
 msgstr "Ai_nm Fillteán:"
 
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:856
+#: mail/mail-vfolder.c:852
 msgid "VFolders"
 msgstr "FFilteáin"
 
-#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
 msgid "UNMATCHED"
 msgstr ""
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
+#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
 msgid "Inbox"
 msgstr "Imbosca"
 
-#: mail/em-folder-tree-model.c:493 mail/em-folder-tree-model.c:802
+#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
 msgid "Loading..."
 msgstr "Ag Lódáil..."
 
-#: mail/em-folder-tree.c:922
+#: mail/em-folder-tree.c:924
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Ag dealaigh fillteán %s"
 
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:926
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/em-folder-tree.c:931
+#: mail/em-folder-tree.c:933
 #, 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/em-folder-tree.c:935
 #, 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:951
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:1997
-#, fuzzy, c-format
-msgid "Cannot move folder `%s': illegal operation"
-msgstr "Ní féidir an fillteán a bhogadh: %s"
-
-#: mail/em-folder-tree.c:2026 mail/em-folder-tree.c:2203
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: mail/em-folder-tree.c:2042 mail/em-folder-tree.c:2055
-#: mail/em-folder-view.c:671 mail/em-folder-view.c:685
+#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
+#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Roghnaigh fillteán"
 
-#: mail/em-folder-tree.c:2082
+#: mail/em-folder-tree.c:2080
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/em-folder-tree.c:2277 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
 msgid "Create folder"
 msgstr "Cruthaigh fillteán"
 
-#: mail/em-folder-tree.c:2396
-#, c-format
-msgid "Could not delete folder: %s"
-msgstr "Teíp ag dealaigh fillteán: %s"
-
-#: mail/em-folder-tree.c:2423
-#, fuzzy, c-format
-msgid "Cannot delete local %s folder."
-msgstr ""
-"Teip ag dealaigh fillteán:\n"
-"%s"
-
-#: mail/em-folder-tree.c:2429
-#, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr ""
-
-#: mail/em-folder-tree.c:2439
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Dealaigh \"%s\""
-
-#: mail/em-folder-tree.c:2475
-#, fuzzy, c-format
-msgid "Cannot rename local %s folder."
-msgstr ""
-"Teip ag athainmigh fillteán:\n"
-"%s"
-
-#: mail/em-folder-tree.c:2484
+#: mail/em-folder-tree.c:2458
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2486
+#: mail/em-folder-tree.c:2460
 msgid "Rename Folder"
 msgstr "Athainmigh Fillteán"
 
-#: mail/em-folder-tree.c:2510
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-
-#: mail/em-folder-tree.c:2558 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Feach"
 
-#: mail/em-folder-tree.c:2559
+#: mail/em-folder-tree.c:2530
 msgid "Open in _New Window"
 msgstr "Oscail 'san Fhuinneog _Nua"
 
-#: mail/em-folder-tree.c:2564
+#: mail/em-folder-tree.c:2535
 msgid "_Move"
 msgstr "_Bog"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2568
+#: mail/em-folder-tree.c:2539
 msgid "_New Folder..."
 msgstr "Fillteán _Nua..."
 
-#: mail/em-folder-tree.c:2571
+#: mail/em-folder-tree.c:2542
 msgid "_Rename"
 msgstr "_Athainmigh"
 
-#: mail/em-folder-tree.c:2574 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Roghanna..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:770 mail/em-popup.c:688
+#: mail/em-folder-view.c:771 mail/em-popup.c:689
 msgid "_Edit as New Message..."
 msgstr "_Eagar mar Scéal Nua..."
 
-#: mail/em-folder-view.c:772
+#: mail/em-folder-view.c:773
 msgid "_Print"
 msgstr "_Priontáil"
 
-#: mail/em-folder-view.c:775 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:776 mail/em-popup.c:808
+#: mail/em-folder-view.c:777 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Freagrair do Líosta"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:778 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Freagrair do _Gach rud"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:811
+#: mail/em-folder-view.c:779 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Seol ar aghaidh"
 
-#: mail/em-folder-view.c:781
+#: mail/em-folder-view.c:782
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:783
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:784
 msgid "Cl_ear Flag"
 msgstr "_Bánaigh Brat"
 
-#: mail/em-folder-view.c:786 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:787 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:787
+#: mail/em-folder-view.c:788
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:789
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:790
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:790 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:796
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:799
 msgid "Mo_ve to Folder..."
 msgstr "_Bog go Fillteán..."
 
-#: mail/em-folder-view.c:799 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Cóip do Fillteán..."
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:808
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:810
+#: mail/em-folder-view.c:811
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:812
 msgid "F_ilter Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:814
+#: mail/em-folder-view.c:815
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:816
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:817
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:818
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:819
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:820
+#: mail/em-folder-view.c:821
 msgid "VFolder on Thread"
 msgstr ""
 
-#: mail/em-folder-view.c:824
+#: mail/em-folder-view.c:825
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:826
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:827
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:828
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:829
+#: mail/em-folder-view.c:830
 msgid "Filter on Thread"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1612 mail/em-folder-view.c:1650
+#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Gnáth"
 
-#: mail/em-folder-view.c:1686
+#: mail/em-folder-view.c:1687
 msgid "Print Message"
 msgstr "Priontáil Scéal"
 
-#: mail/em-folder-view.c:1949
+#: mail/em-folder-view.c:1950
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2208
+#: mail/em-folder-view.c:2209
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
+#: mail/em-folder-view.c:2214
+#, c-format
+msgid "Click to open %s"
+msgstr ""
+
 #. message-search popup match count string
-#: mail/em-format-html-display.c:409
+#: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html-display.c:645 mail/em-format-html.c:568
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
 msgid "Unsigned"
 msgstr "Gan Siniú"
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:646
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 
 # SG
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
 msgid "Valid signature"
 msgstr "Siniú Bhailithe."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:647
 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:647 mail/em-format-html.c:570
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
 msgid "Invalid signature"
 msgstr "Siniú neambhailí."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:648
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:649
 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:654 mail/em-format-html.c:577
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
 msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
-"the Internet."
+"The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:656
 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:656 mail/em-format-html.c:579
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
 msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:657
 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:657 mail/em-format-html.c:580
+#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:657
+#: mail/em-format-html-display.c:658
 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:754
+#: mail/em-format-html-display.c:755
 msgid "_View Certificate"
 msgstr "_Feach Teastas"
 
-#: mail/em-format-html-display.c:769
+#: mail/em-format-html-display.c:770
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format-html-display.c:1001
+#: mail/em-format-html-display.c:1002
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "mar %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1009
+#: mail/em-format-html-display.c:1010
 msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html-display.c:1012
+#: mail/em-format-html-display.c:1013
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "mar %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1082
+#: mail/em-format-html-display.c:1083
 msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1084
 msgid "_Hide"
 msgstr ""
 
@@ -13037,136 +13215,125 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Leathanach %d as %d"
 
-#: mail/em-format-html.c:461 mail/em-format-html.c:463
+#: mail/em-format-html.c:462 mail/em-format-html.c:464
 #, c-format
 msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html.c:840
+#: mail/em-format-html.c:843
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:870
+#: mail/em-format-html.c:873
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:881
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:883
+#: mail/em-format-html.c:886
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:904
+#: mail/em-format-html.c:907
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:915
+#: mail/em-format-html.c:918
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1157
+#: mail/em-format-html.c:1160
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:304
+#: mail/message-tag-followup.c:314
 msgid "From"
 msgstr "Ó"
 
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Freagrair-Do"
 
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Do"
 
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1433 mail/em-format-quote.c:191 mail/em-format.c:747
+#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
 #: mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: mail/em-format-html.c:1543 mail/em-format-quote.c:308
+#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
 #: mail/em-mailer-prefs.c:918
 msgid "Mailer"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1570
+#: mail/em-format-html.c:1573
 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:1573
+#: mail/em-format-html.c:1576
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1583 mail/em-format-quote.c:315 mail/em-format.c:749
+#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dáta"
 
-#: mail/em-format-html.c:1604 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
 msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format.c:987
+#: mail/em-format.c:986
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format.c:1066 mail/em-format.c:1188
+#: mail/em-format.c:1065 mail/em-format.c:1184
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
-#: mail/em-format.c:1223
-#, c-format
-msgid "Internal error: expecting CamelMultipart, got \"%s\""
-msgstr ""
-
-#: mail/em-format.c:1178
+#: mail/em-format.c:1174
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1325
+#: mail/em-format.c:1320
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format.c:1344
+#: mail/em-format.c:1339
 msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format.c:1352
+#: mail/em-format.c:1347
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Sábháil siniú"
 
-#: mail/em-format.c:1352
+#: mail/em-format.c:1347
 msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-format.c:1372
-#, c-format
-msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
-msgstr ""
-
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr ""
@@ -13190,7 +13357,7 @@ msgstr "Aon _seachtain"
 msgid "Once per month"
 msgstr "Aon _mhí"
 
-#: mail/em-migrate.c:1080
+#: mail/em-migrate.c:1078
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13198,57 +13365,57 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1935 mail/em-migrate.c:1950
+#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr ""
 
-#: mail/em-migrate.c:2038 mail/em-migrate.c:2139
+#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr ""
 
-#: mail/em-migrate.c:2263 mail/em-migrate.c:2435
+#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2275
+#: mail/em-migrate.c:2350
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr ""
 
-#: mail/em-popup.c:698
+#: mail/em-popup.c:699
 msgid "Save As..."
 msgstr "Sábháil Mar..."
 
 # US
-#: mail/em-popup.c:716
+#: mail/em-popup.c:717
 #, c-format
 msgid "untitled_image.%s"
 msgstr "íomhá_gan_tideál.%s"
 
-#: mail/em-popup.c:805
+#: mail/em-popup.c:806
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:855
+#: mail/em-popup.c:856
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:857
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:858
 msgid "_Add to Addressbook"
 msgstr "_Suim do Leabhar Seoladh"
 
-#: mail/em-popup.c:963
+#: mail/em-popup.c:964
 #, c-format
 msgid "Open in %s..."
 msgstr "Oscail san %s..."
@@ -13275,96 +13442,46 @@ msgstr ""
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:100
+#: mail/em-utils.c:95
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:282
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-
-#: mail/em-utils.c:291
+#: mail/em-utils.c:285
 msgid "Filters"
 msgstr ""
 
-#: mail/em-utils.c:536
+#: mail/em-utils.c:530
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-utils.c:1143
+#: mail/em-utils.c:1137
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1153
+#: mail/em-utils.c:1147
 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:"
 
-#: mail/em-utils.c:1436 mail/em-utils.c:1520 mail/em-utils.c:1529
-#, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-" Ní féidir sábháil go `%s'\n"
-"  %s"
-
-#: mail/em-utils.c:1441
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/em-utils.c:1484
+#: mail/em-utils.c:1476
 msgid "message"
 msgstr "scéal"
 
-#: mail/em-utils.c:1536
-#, c-format
-msgid "Error: '%s' exists and is not a regular file"
-msgstr ""
-
-#: mail/em-utils.c:1590
+#: mail/em-utils.c:1579
 msgid "Save Message..."
 msgstr "Sábháil Scéal...."
 
-#: mail/em-utils.c:1639
+#: mail/em-utils.c:1628
 msgid "Add address"
 msgstr "Suimigh seoladh"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2074
+#: mail/em-utils.c:2063
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Scéal ó %s"
 
-#: mail/em-utils.c:2125
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr ""
-
-#: mail/em-utils.c:2456
-#, c-format
-msgid ""
-"This operation will permanently remove all deleted messages in the folder `%"
-"s'. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-
-#: mail/em-utils.c:2481
-msgid ""
-"This operation will permanently remove all deleted messages in all folders. "
-"If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr ""
@@ -13946,19 +14063,19 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1678
+#: mail/importers/netscape-importer.c:1677
 msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1878
+#: mail/importers/netscape-importer.c:1877
 msgid "Settings"
 msgstr "Álbachtaí"
 
-#: mail/importers/netscape-importer.c:1883
+#: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1904
+#: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13988,31 +14105,23 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-account-editor.c:110
-msgid "You have not filled in all of the required information."
-msgstr ""
-
 #. give our dialog an OK button and title
 #: mail/mail-account-editor.c:153
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Óst:"
 
-#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Ainm _Úsaideoir:"
 
-#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Slí:"
 
-#: mail/mail-account-gui.c:2119
-msgid "You may not create two accounts with the same name."
-msgstr ""
-
 #: mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
@@ -14042,130 +14151,119 @@ msgstr "Freagraí do %s"
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:430
-msgid "The following filter rule(s):\n"
-msgstr ""
-
-#: mail/mail-autofilter.c:436
-#, c-format
-msgid ""
-"Used the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-msgstr ""
-
-#: mail/mail-component.c:472
+#: mail/mail-component.c:492
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "Scrioste"
 
-#: mail/mail-component.c:474
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d nua"
 
-#: mail/mail-component.c:477
+#: mail/mail-component.c:517
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d la(e)"
 
-#: mail/mail-component.c:479
+#: mail/mail-component.c:519
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d soicínd"
 
-#: mail/mail-component.c:481
+#: mail/mail-component.c:521
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d nua"
 
-#: mail/mail-component.c:485
+#: mail/mail-component.c:525
 #, c-format
 msgid "%d total"
 msgstr "%d íomlán"
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:527
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:583
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr ""
+#: mail/mail-component.c:531
+#, fuzzy, c-format
+msgid ", %d selected"
+msgstr "Scrioste"
 
-#: mail/mail-component.c:651
+#: mail/mail-component.c:683
 msgid "New Mail Message"
 msgstr "Scéal Post Nua"
 
 # mt
-#: mail/mail-component.c:652
+#: mail/mail-component.c:684
 msgid "_Mail Message"
 msgstr "_Scéal Ríomhphost"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:685
 msgid "Compose a new mail message"
 msgstr "Cruthaigh scéal phost nua"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:691
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Fillteán Nua"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:692
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_Fillteán"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:693
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Cruthaigh féilire nua"
 
-#: mail/mail-component.c:824
+#: mail/mail-component.c:871
 msgid "URI of the mail source that the view will display"
 msgstr ""
 
-#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:368
+#: mail/mail-config-druid.c:366
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:376
+#: mail/mail-config-druid.c:374
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:383
+#: mail/mail-config-druid.c:381
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:388
+#: mail/mail-config-druid.c:386
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Bainisteoireacht Chuntas"
 
-#: mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:393
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -14174,11 +14272,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:887
+#: mail/mail-config.c:888
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:965 mail/mail-config.c:969
+#: mail/mail-config.c:966 mail/mail-config.c:970
 msgid "Connecting to server..."
 msgstr ""
 
@@ -14537,10 +14635,6 @@ msgstr "_Eagrú:"
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Eochar PGP:"
 
-#: mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Roghnaigh dath"
-
 #: mail/mail-config.glade.h:108
 msgid "Play sound file when new mail arri_ves"
 msgstr ""
@@ -14747,10 +14841,6 @@ msgstr ""
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
-msgid "_Name:"
-msgstr "_Ainm:"
-
 #: mail/mail-config.glade.h:171
 msgid "_Never load images from the Internet"
 msgstr ""
@@ -14791,26 +14881,405 @@ msgstr "dath"
 msgid "description"
 msgstr "sonraí"
 
-#: mail/mail-folder-cache.c:786
-#, c-format
-msgid "Pinging %s"
+#: mail/mail-errors.xml.in.h:1
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/mail-mt.c:261
-#, c-format
+#: mail/mail-errors.xml.in.h:2
 msgid ""
-"Error while '%s':\n"
-"%s"
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr ""
 
-#: mail/mail-mt.c:264
-#, c-format
+#: mail/mail-errors.xml.in.h:3
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:4
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:5
 msgid ""
-"Error while performing operation:\n"
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:6
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:7
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:8
+msgid "Are you sure you want to send a message without a subject?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:9
+msgid "Because \"{0}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:10
+msgid "Because \"{1}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:11
+msgid "Because \"{2}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:12
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:13
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Ní féidir cóip a dhéanamh don fillteán: %s"
+
+#: mail/mail-errors.xml.in.h:14
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: mail/mail-errors.xml.in.h:15
+#, fuzzy
+msgid "Cannot create temporary save directory."
+msgstr "Teip ag cruthaigh eolaire '%s': %s."
+
+#: mail/mail-errors.xml.in.h:16
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
+"Teip ag cruthaigh eolaire\n"
+"%s\n"
+"Earraidh: %s"
+
+#: mail/mail-errors.xml.in.h:17
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr ""
+"Teip ag dealaigh fillteán:\n"
 "%s"
+
+#: mail/mail-errors.xml.in.h:18
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr ""
+"Teip ag dealaigh fillteán:\n"
+"%s"
+
+#: mail/mail-errors.xml.in.h:19
+#, fuzzy
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: mail/mail-errors.xml.in.h:20
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr ""
+"Teip ag scŕios fillteán:\n"
+"%s"
+
+#: mail/mail-errors.xml.in.h:21
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Teip ag oscailt '%s': %s"
+
+#: mail/mail-errors.xml.in.h:22
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "Teip ag oscailt '%s': %s"
+
+#: mail/mail-errors.xml.in.h:23
+msgid "Cannot open target \"{2}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:24
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:25
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr ""
+"Teip ag athainmigh fillteán:\n"
+"%s"
+
+#: mail/mail-errors.xml.in.h:26
+msgid "Cannot save changes to account."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:27
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Teip ag cruthaigh eolaire '%s': %s."
+
+#: mail/mail-errors.xml.in.h:28
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
+msgstr ""
+" Ní féidir sábháil go `%s'\n"
+"  %s"
+
+#: mail/mail-errors.xml.in.h:29
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Suimigh Siniú"
+
+#: mail/mail-errors.xml.in.h:30
+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-errors.xml.in.h:31
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "Teip ag sábháil comhad siniú: %s"
+
+#: mail/mail-errors.xml.in.h:32
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Dealaigh \"%s\""
+
+#: mail/mail-errors.xml.in.h:33
+#, fuzzy
+msgid "Delete account?"
+msgstr "Dealaigh Tadhall?"
+
+#: mail/mail-errors.xml.in.h:34
+msgid "Discard changed?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:35
+msgid "Do you wish to save your changes?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:36
+msgid "Don't delete"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:37
+#, fuzzy
+msgid "Enter password."
+msgstr "Pasfhocal, le do thoil"
+
+#: mail/mail-errors.xml.in.h:38
+#, fuzzy
+msgid "Error loading filter definitions."
+msgstr "Earraidh ag lódáil leabharsheoladh loicead."
+
+#: mail/mail-errors.xml.in.h:39
+msgid "Error while performing operation."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:40
+msgid "Error while {0}."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:41
+msgid "File exists but cannot overwrite it."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:42
+msgid "File exists but is not a regular file."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:43
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:44
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:45
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:46
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:47
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Údarú"
+
+#: mail/mail-errors.xml.in.h:48
+msgid "Mail filters automatically updated."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:49
+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 "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:50
+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-errors.xml.in.h:51
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email: {0} Send anyway?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:52
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:53
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:54
+msgid ""
+"The contact list you are sending to is configured to hide list recipients. "
+"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 in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:55
+msgid ""
+"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
+"have been updated."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:56
+msgid ""
+"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
+"been updated."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:57
+msgid ""
+"The message was sent via the \"sendmail\" external application. Sendmail "
+"reports the following error: status 67: mail not sent. The message is stored "
+"in the Outbox folder. Check the message for errors and resend."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:58
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:59
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:60
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:61
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:62
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:63
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:64
+#, fuzzy
+msgid "Use _Default"
+msgstr "Gnáth"
+
+#: mail/mail-errors.xml.in.h:65
+msgid "Use default drafts folder?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:66
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:67
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:68
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-mt.c:903
+#: mail/mail-errors.xml.in.h:69
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:70
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:71
+msgid "_Discard changes"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:72
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "Folamh _Buscar"
+
+#: mail/mail-errors.xml.in.h:73
+msgid "_Expunge"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:74
+#, fuzzy
+msgid "_Send"
+msgstr "Post"
+
+#: mail/mail-errors.xml.in.h:75
+msgid "vFolders automatically updated."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:76
+msgid "{0}"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:77
+msgid "{0}."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:78
+msgid "{1}"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:79
+msgid "{1}."
+msgstr ""
+
+#: mail/mail-folder-cache.c:786
+#, c-format
+msgid "Pinging %s"
+msgstr ""
+
+#: mail/mail-mt.c:897
 msgid "Working"
 msgstr "Ag Obair"
 
@@ -14822,127 +15291,127 @@ msgstr ""
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:534
+#: mail/mail-ops.c:532
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:559
+#: mail/mail-ops.c:557
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:566
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:664
+#: mail/mail-ops.c:662
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:693
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:699
+#: mail/mail-ops.c:697
 msgid "Complete."
 msgstr "Críochnaithe."
 
-#: mail/mail-ops.c:796
+#: mail/mail-ops.c:794
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:879
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:879
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:994
+#: mail/mail-ops.c:992
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1123
+#: mail/mail-ops.c:1105
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1166
+#: mail/mail-ops.c:1148
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1238
+#: mail/mail-ops.c:1220
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1316
+#: mail/mail-ops.c:1298
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ag dealaigh fillteán %s"
 
-#: mail/mail-ops.c:1410
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1475
+#: mail/mail-ops.c:1457
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1476
+#: mail/mail-ops.c:1458
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Líosta do cuntasaí"
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1513
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1567 mail/mail-ops.c:1618
+#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1615
+#: mail/mail-ops.c:1597
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1616
+#: mail/mail-ops.c:1598
 msgid "Local Folders"
 msgstr "Fillteáin Áitiúl"
 
-#: mail/mail-ops.c:1699
+#: mail/mail-ops.c:1681
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1771
+#: mail/mail-ops.c:1753
 #, 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:1857
+#: mail/mail-ops.c:1839
 #, 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:1907
+#: mail/mail-ops.c:1889
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14951,7 +15420,7 @@ msgstr ""
 "Téip ag cruthaigh comhad aschur: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1917
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14960,11 +15429,11 @@ msgstr ""
 "Earraidh ag sábhháil scéalaí  do: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:1988
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2023
+#: mail/mail-ops.c:2005
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14973,17 +15442,17 @@ msgstr ""
 "Teip ag cruthaigh comhad aschur: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2053
+#: mail/mail-ops.c:2035
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2201
+#: mail/mail-ops.c:2183
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2201
+#: mail/mail-ops.c:2183
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
@@ -15012,92 +15481,72 @@ msgstr ""
 msgid "Security Information"
 msgstr "Eolas Slándáil"
 
-#: mail/mail-send-recv.c:156
+#: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Ag Cealaigh..."
 
-#: mail/mail-send-recv.c:263
+#: mail/mail-send-recv.c:264
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Freastalaí: %s, Saghas: %s"
 
-#: mail/mail-send-recv.c:265
+#: mail/mail-send-recv.c:266
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Slí: %s, Saghas: %s"
 
-#: mail/mail-send-recv.c:267
+#: mail/mail-send-recv.c:268
 #, c-format
 msgid "Type: %s"
 msgstr "Saghas: %s"
 
-#: mail/mail-send-recv.c:317
+#: mail/mail-send-recv.c:320
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:320
+#: mail/mail-send-recv.c:323
 msgid "Cancel _All"
 msgstr "Cealaigh _Gach Uile"
 
-#: mail/mail-send-recv.c:401
+#: mail/mail-send-recv.c:412
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
+#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
 msgid "Waiting..."
 msgstr "Ag Fanacht..."
 
-#: mail/mail-session.c:236
+#: mail/mail-session.c:237
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:269
+#: mail/mail-session.c:270
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 msgid "Enter Password"
 msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:295
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:299
+#: mail/mail-session.c:296
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-signature-editor.c:86
-#, c-format
-msgid "Could not save signature file: %s"
-msgstr "Teip ag sábháil comhad siniú: %s"
-
-#: mail/mail-signature-editor.c:233
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: mail/mail-signature-editor.c:236
-msgid "_Discard changes"
-msgstr ""
-
-#: mail/mail-signature-editor.c:240
-msgid "Save signature"
-msgstr "Sábháil siniú"
-
 # SG
-#: mail/mail-signature-editor.c:388
+#: mail/mail-signature-editor.c:371
 msgid "Edit signature"
 msgstr "Eagar síniú"
 
-#: mail/mail-signature-editor.c:428
+#: mail/mail-signature-editor.c:411
 msgid "Enter a name for this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:431
+#: mail/mail-signature-editor.c:414
 msgid "Name:"
 msgstr "Ainm:"
 
@@ -15137,93 +15586,79 @@ msgstr "Ag socraigh ffilteán: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:525
-#, c-format
-msgid ""
-"The following vFolder(s):\n"
-"%sUsed the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-msgstr ""
-
-#: mail/mail-vfolder.c:926
+#: mail/mail-vfolder.c:922
 msgid "vFolders"
 msgstr "fFillteáin"
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:961
 msgid "Edit VFolder"
 msgstr "Eagar FFilteán"
 
-#: mail/mail-vfolder.c:985
-#, c-format
-msgid "Trying to edit a vfolder '%s' which doesn't exist."
-msgstr ""
-
-#: mail/mail-vfolder.c:1057
+#: mail/mail-vfolder.c:1045
 msgid "New VFolder"
 msgstr "Fillteán Nua"
 
-#: mail/message-list.c:933
+#: mail/message-list.c:911
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:934
+#: mail/message-list.c:912
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:935
+#: mail/message-list.c:913
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:936
+#: mail/message-list.c:914
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:937
+#: mail/message-list.c:915
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:941
+#: mail/message-list.c:919
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:942
+#: mail/message-list.c:920
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:946
+#: mail/message-list.c:924
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:947
+#: mail/message-list.c:925
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1268
+#: mail/message-list.c:1244
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1275
+#: mail/message-list.c:1251
 msgid "Today %l:%M %p"
 msgstr "Inniú %l:%M %p"
 
-#: mail/message-list.c:1284
+#: mail/message-list.c:1260
 msgid "Yesterday %l:%M %p"
 msgstr "Inné %l:%M %p"
 
-#: mail/message-list.c:1296
+#: mail/message-list.c:1272
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %"
 
-#: mail/message-list.c:1304
+#: mail/message-list.c:1280
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1306
+#: mail/message-list.c:1282
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3103
+#: mail/message-list.c:3109
 msgid "Generating message list"
 msgstr ""
 
@@ -15292,7 +15727,7 @@ msgstr "Freagrair do gach rud"
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:281 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -15458,11 +15893,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr "(gan tideál)"
 
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:146
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:148
+#: shell/e-shell-importer.c:149
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -15471,15 +15906,15 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:154
+#: shell/e-shell-importer.c:155
 msgid "Choose the destination for this import"
 msgstr ""
 
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
+#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:748
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:160
+#: shell/e-shell-importer.c:161
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -15487,92 +15922,92 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:228 shell/e-shell-importer.c:259
+#: shell/e-shell-importer.c:229 shell/e-shell-importer.c:260
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:332
+#: shell/e-shell-importer.c:333
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:457
+#: shell/e-shell-importer.c:459
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:465
+#: shell/e-shell-importer.c:467
 #, c-format
 msgid "Importing %s.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:475 shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:477 shell/e-shell-importer.c:478
 #, c-format
 msgid "Error loading %s"
 msgstr "Earraidh ag lódáil %s"
 
-#: shell/e-shell-importer.c:492
+#: shell/e-shell-importer.c:495
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:546
+#: shell/e-shell-importer.c:549
 msgid "Automatic"
 msgstr "Uathoibríoch"
 
-#: shell/e-shell-importer.c:595
+#: shell/e-shell-importer.c:598
 msgid "_Filename:"
 msgstr "_Ainm Chomad:"
 
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:603
 msgid "Select a file"
 msgstr "Roghnaigh Comhad"
 
-#: shell/e-shell-importer.c:610
+#: shell/e-shell-importer.c:613
 msgid "File _type:"
 msgstr "_Saghas comhad:"
 
-#: shell/e-shell-importer.c:649
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:655
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:724
+#: shell/e-shell-importer.c:727
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
+#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Ó %s:"
 
-#: shell/e-shell-importer.c:1037
+#: shell/e-shell-importer.c:1044
 #, c-format
 msgid "No importer available for file %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1049
+#: shell/e-shell-importer.c:1056
 msgid "Unable to execute importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:1159
+#: shell/e-shell-importer.c:1169
 msgid "_Import"
 msgstr ""
 
@@ -15580,15 +16015,15 @@ msgstr ""
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:327
+#: shell/e-shell-settings-dialog.c:323
 msgid "Evolution Settings"
 msgstr "Roghnachais Evolution"
 
-#: shell/e-shell-startup-wizard.c:570
+#: shell/e-shell-startup-wizard.c:575
 msgid "Starting import"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:785
+#: shell/e-shell-startup-wizard.c:795
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -15650,16 +16085,16 @@ msgstr ""
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-window.c:327
+#: shell/e-shell-window.c:338
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-window.c:334
+#: shell/e-shell-window.c:345
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-window.c:340
+#: shell/e-shell-window.c:351
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -15692,11 +16127,11 @@ msgstr ""
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-user-creatable-items-handler.c:683
+#: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "Nua"
 
-#: shell/evolution-shell-component-utils.c:124
+#: shell/evolution-shell-component-utils.c:115
 #, c-format
 msgid ""
 "%s\n"
@@ -15707,7 +16142,7 @@ msgstr ""
 "\n"
 "Earraidh gan fhois."
 
-#: shell/evolution-shell-component-utils.c:127
+#: shell/evolution-shell-component-utils.c:118
 #, c-format
 msgid ""
 "%s\n"
@@ -15716,7 +16151,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:134
+#: shell/evolution-shell-component-utils.c:125
 #, c-format
 msgid ""
 "%s\n"
@@ -15847,7 +16282,7 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:230
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15867,7 +16302,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:254
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -15875,43 +16310,43 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:261
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:392
+#: shell/main.c:391
 #, fuzzy
 msgid "Cannot register the Ximian Evolution shell."
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:401
+#: shell/main.c:400
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:497
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:500
+#: shell/main.c:499
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:502
+#: shell/main.c:501
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:505
+#: shell/main.c:504
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:509
+#: shell/main.c:508
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:512
+#: shell/main.c:511
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
@@ -16707,13 +17142,6 @@ msgstr ""
 msgid "_File"
 msgstr "_Comhad"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Sábháil"
-
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr ""
@@ -16751,6 +17179,13 @@ msgstr ""
 msgid "Send _Message to Contact..."
 msgstr ""
 
+#: ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Sábháil"
+
 #: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete this list"
 msgstr "Scríos an líosta seo"
@@ -17852,30 +18287,32 @@ msgstr "_Stádas:"
 msgid "_Tasks"
 msgstr "_Tascanna"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
 msgstr "UTC"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "Select a Time Zone"
-msgstr "Roghnaigh Am Criosc"
+#, fuzzy
+msgid "<b>Time Zones</b>"
+msgstr "Am Crioscanna"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "Am Crioscanna"
+#, fuzzy
+msgid "<b>_Selection</b>"
+msgstr "<b>_Áit</b>"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid "Select a Time Zone"
+msgstr "Roghnaigh Am Criosc"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-msgid "_Selection:"
-msgstr "_Roghnú:"
-
 #: widgets/menus/gal-view-menus.c:292
 msgid "_Current View"
 msgstr ""
@@ -17917,93 +18354,93 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Baltic"
 msgstr "Baltach"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Central European"
 msgstr "Lár-Eorpach"
 
 # zh
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Chinese"
 msgstr "Sínis"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Cyrillic"
 msgstr "Cirilleach"
 
 # el 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Greek"
 msgstr "Gréigis"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Hebrew"
 msgstr "Eabhrais"
 
 # ja
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Japanese"
 msgstr "Seapáinis"
 
 # ko
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Korean"
 msgstr "Coiréis"
 
 # tr
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Turkish"
 msgstr "Tuircis"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Unicode"
 msgstr "Uincód"
 
-#: widgets/misc/e-charset-picker.c:72
+#: widgets/misc/e-charset-picker.c:73
 msgid "Western European"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:73
+#: widgets/misc/e-charset-picker.c:74
 #, fuzzy
 msgid "Western European, New"
 msgstr "Lár-Eorpach"
 
-#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
-#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
+#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr ""
 
 # uk
-#: widgets/misc/e-charset-picker.c:99
+#: widgets/misc/e-charset-picker.c:100
 msgid "Ukrainian"
 msgstr "Úcráinis"
 
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:103
 msgid "Visual"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:170
+#: widgets/misc/e-charset-picker.c:171
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:215 widgets/misc/e-charset-picker.c:444
+#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:224
+#: widgets/misc/e-charset-picker.c:231
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:320
+#: widgets/misc/e-charset-picker.c:338
 msgid "Other..."
 msgstr "Eile..."
 
@@ -18066,17 +18503,17 @@ msgstr ""
 msgid "Spacing around expander arrow"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:191
+#: widgets/misc/e-filter-bar.c:195
 #, fuzzy
 msgid "_Searches"
 msgstr "C_uardaigh"
 
-#: widgets/misc/e-filter-bar.c:193
+#: widgets/misc/e-filter-bar.c:197
 msgid "Search Editor"
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:214
+#: widgets/misc/e-filter-bar.c:220
 msgid "Save Search"
 msgstr ""
 
@@ -18136,6 +18573,112 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% Rinneadh)"
 
 #, fuzzy
+#~ msgid "New Address Book"
+#~ msgstr "Leabhar Seoladh Nua"
+
+#, fuzzy
+#~ msgid "Address Book Creation Assistant"
+#~ msgstr "Roghnachais na Leabhar Sheoladh"
+
+#~ msgid "Finished"
+#~ msgstr "Críochnaithe"
+
+#~ msgid "Group:"
+#~ msgstr "Grupa:"
+
+#~ 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 "S_pouse:"
+#~ msgstr "_Céile:"
+
+#~ msgid "_Add"
+#~ msgstr "_Suimigh"
+
+#~ msgid "_Business:"
+#~ msgstr "_Gnó:"
+
+#~ msgid "_Home:"
+#~ msgstr "_Baile:"
+
+#~ msgid "_Manager's name:"
+#~ msgstr "Ainm _Bainisteoir:"
+
+#~ msgid "_Mobile:"
+#~ msgstr "Fón _Póca:"
+
+#~ msgid "_Office:"
+#~ msgstr "_Oifig:"
+
+#~ 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 "Priority:"
+#~ msgstr "Tosaíocht:"
+
+#~ 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 "Could not delete folder: %s"
+#~ msgstr "Teíp ag dealaigh fillteán: %s"
+
+#~ msgid "Save signature"
+#~ msgstr "Sábháil siniú"
+
+#~ msgid "_Selection:"
+#~ msgstr "_Roghnú:"
+
+#, fuzzy
 #~ msgid "New Addressbook Book"
 #~ msgstr "Leabhar Seoladh Nua"
 
@@ -18254,10 +18797,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "LDAP Server Name:"
 #~ msgstr "Ainm do Fhreastalaí"
 
-#, fuzzy
-#~ msgid "Search base:"
-#~ msgstr "Cuardaigh"
-
 #~ msgid "%d seconds ago"
 #~ msgstr "%d soicind ó shin"
 
@@ -18293,9 +18832,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Account Information"
 #~ msgstr "Eolas Cuntais"
 
-#~ msgid "Authentication"
-#~ msgstr "Údarú"
-
 #~ msgid "Composing Messages"
 #~ msgstr "Ag Cruthach Scéaltaí"
 
@@ -18358,28 +18894,15 @@ msgstr "%s (%d%% Rinneadh)"
 #~ "Teip ag cruthaigh eolaire '%s':\n"
 #~ "%s"
 
-#~ msgid "Cannot copy folder: %s"
-#~ msgstr "Ní féidir cóip a dhéanamh don fillteán: %s"
-
 #~ msgid "Copy Folder"
 #~ msgstr "Cóip Fillteán"
 
 #~ msgid "Move Folder"
 #~ msgstr "Bog Fillteán"
 
-#~ msgid ""
-#~ "Cannot remove folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Teip ag scŕios fillteán:\n"
-#~ "%s"
-
 #~ msgid "Group name:"
 #~ msgstr "Ainm Grupa:"
 
-#~ msgid "_Add Group..."
-#~ msgstr "_Cuir Grúpa Leis..."
-
 #~ msgid "_Remove this Group..."
 #~ msgstr "_Scríos Grupa seo..."
 
@@ -18455,36 +18978,18 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "<b>Task List</b>"
 #~ msgstr "<b>Líosta Tasc</b>"
 
-#~ msgid "<b>Work Week</b>"
-#~ msgstr "<b>Seachtain Oibre</b>"
-
 #~ msgid "<b>Date &amp; Time</b>"
 #~ msgstr "<b>Data &amp; Am</b>"
 
 #~ msgid "<b>Description</b>"
 #~ msgstr "<b>Tuarascail</b>"
 
-#~ msgid "<b>L_ocation</b>"
-#~ msgstr "<b>_Áit</b>"
-
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Coimriú</b>"
 
-#~ msgid "<b>Web Page</b>"
-#~ msgstr "<b>Leathanach Lín</b>"
-
 #~ msgid "Adding %s"
 #~ msgstr "Ag Suimigh %s"
 
-#~ msgid ""
-#~ "Cannot create the directory\n"
-#~ "%s\n"
-#~ "Error: %s"
-#~ msgstr ""
-#~ "Teip ag cruthaigh eolaire\n"
-#~ "%s\n"
-#~ "Earraidh: %s"
-
 #~ msgid "Select Calendar Folder"
 #~ msgstr "Roghnaigh Fillteán Fhéilire"
 
@@ -18503,9 +19008,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Bus"
 #~ msgstr "Gnó"
 
-#~ msgid "Company"
-#~ msgstr "Teoranta"
-
 #~ msgid "Comp"
 #~ msgstr "Teor."
 
@@ -18743,9 +19245,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "New News Feed"
 #~ msgstr "Bealach Nuachtáin Nua"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
-
 #~ msgid "News Feed"
 #~ msgstr "Foth Nuachtáin"
 
@@ -18954,9 +19453,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Phone Types"
 #~ msgstr "Saghais Guthán"
 
-#~ msgid "Delete Contact?"
-#~ msgstr "Dealaigh Tadhall?"
-
 #~ msgid "Display Cards?"
 #~ msgstr "Taispeán Cartaí?"
 
@@ -19092,9 +19588,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Inbosca"
 
-#~ msgid "Display"
-#~ msgstr "Taispeán"
-
 #~ msgid "Edit..."
 #~ msgstr "Eagar..."
 
@@ -19188,13 +19681,6 @@ msgstr "%s (%d%% Rinneadh)"
 
 #~ msgid ""
 #~ "\n"
-#~ "  Postal Code: "
-#~ msgstr ""
-#~ "\n"
-#~ "  Cód Phoist:  "
-
-#~ msgid ""
-#~ "\n"
 #~ "  Country:     "
 #~ msgstr ""
 #~ "\n"