[evolution-data-server] Updated Irish translation.

From: Seán de Búrca <sdeburca src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated Irish translation.
Date: Mon, 23 May 2011 12:09:13 +0000 (UTC)
commit b87d528088178a72b62aa7610747ffeaa3ae008a
Author: SeÃ¡n de BÃºrca <leftmostcat gmail com>
Date:   Mon May 23 06:07:13 2011 -0600

    Updated Irish translation.

 po/ga.po | 5009 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 2457 insertions(+), 2552 deletions(-)
---
diff --git a/po/ga.po b/po/ga.po
index 3449d71..af5afb2 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,189 +1,278 @@
 # Irish translations for evolution-data-server package.
-# Copyright (C) 2001-2009 Free Software Foundation, Inc.
+# Copyright (C) 2001-2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution-data-server package.
 # Alastair McKinstry <mckinstry computer org>, 2001.
-# SeÃ¡n de BÃºrca <leftmostcat gmail com>, 2007, 2009.
+# SeÃ¡n de BÃºrca <leftmostcat gmail com>, 2007-2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 06:49-0600\n"
-"PO-Revision-Date: 2009-08-19 04:54-0600\n"
+"POT-Creation-Date: 2011-05-23 04:43-0600\n"
+"PO-Revision-Date: 2011-05-23 04:46-0600\n"
 "Last-Translator: SeÃ¡n de BÃºrca <leftmostcat gmail com>\n"
 "Language-Team: Irish <gaeilge-gnulinux lists sourceforge net>\n"
+"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n%"
-"10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n"
+"%10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2329
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/file/e-book-backend-file.c:570
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "Ã? LuchtÃº..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2260
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2282
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2327
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/file/e-book-backend-file.c:573
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4501
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "Ã? Chuardach..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2695
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
-#, c-format
-msgid "Downloading contacts (%d)... "
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:591
+msgid "Querying for updated contactsâ?¦"
 msgstr ""
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2844
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
-#, c-format
-msgid "Updating contacts cache (%d)... "
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+#: ../calendar/libecal/e-cal.c:1329 ../libedataserver/e-client.c:1660
+msgid "Personal"
+msgstr "Pearsanta"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+msgid "Friends"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+#, fuzzy
+msgid "Family"
+msgstr "Sloinne"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:632
+msgid "Coworkers"
+msgstr ""
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:709
+msgid "Querying for updated groupsâ?¦"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:892
+msgid "Creating new contactâ?¦"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contactâ?¦"
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
+#: ../addressbook/backends/google/e-book-backend-google.c:1091
+msgid "Modifying contactâ?¦"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1201
+msgid "Loadingâ?¦"
+msgstr "Ã? LuchtÃº..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1348
+msgid "Authenticating with the serverâ?¦"
+msgstr ""
+
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+#, fuzzy
+msgid "Not connected"
+msgstr "Gan cheangal."
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:776
 msgid "Using Distinguished Name (DN)"
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:779
 msgid "Using Email Address"
 msgstr "Seoladh RÃomhphost Ã¡ Ã?sÃ¡id"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1044
 msgid "Reconnecting to LDAP server..."
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1169
+msgid "Invalid DN syntax"
+msgstr ""
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1684
 msgid "Adding contact to LDAP server..."
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1814
 msgid "Removing contact from LDAP server..."
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2246
 msgid "Modifying contact from LDAP server..."
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4352
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4522
 msgid "Error performing search"
 msgstr ""
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:287 ../addressbook/libebook/e-book.c:291
-#: ../addressbook/libebook/e-book.c:495 ../addressbook/libebook/e-book.c:499
-#: ../addressbook/libebook/e-book.c:637 ../addressbook/libebook/e-book.c:641
-#: ../addressbook/libebook/e-book.c:727 ../addressbook/libebook/e-book.c:731
-#: ../addressbook/libebook/e-book.c:1024 ../addressbook/libebook/e-book.c:1029
-#: ../addressbook/libebook/e-book.c:1206 ../addressbook/libebook/e-book.c:1210
-#: ../addressbook/libebook/e-book.c:1365 ../addressbook/libebook/e-book.c:1369
-#: ../addressbook/libebook/e-book.c:1570 ../addressbook/libebook/e-book.c:1574
-#: ../addressbook/libebook/e-book.c:1813 ../addressbook/libebook/e-book.c:1817
-#: ../addressbook/libebook/e-book.c:2050 ../addressbook/libebook/e-book.c:2054
-#: ../addressbook/libebook/e-book.c:2257 ../addressbook/libebook/e-book.c:2261
-#: ../addressbook/libebook/e-book.c:3445
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "\"%s\" ar leabhar roimh \"%s\""
-
-#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:508
-#: ../addressbook/libebook/e-book.c:650 ../addressbook/libebook/e-book.c:740
-#: ../addressbook/libebook/e-book.c:1039 ../addressbook/libebook/e-book.c:1220
-#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1583
-#: ../addressbook/libebook/e-book.c:1826 ../addressbook/libebook/e-book.c:2064
-#: ../addressbook/libebook/e-book.c:2270 ../addressbook/libebook/e-book.c:2679
-#: ../addressbook/libebook/e-book.c:2877
-#, c-format
-msgid "book busy"
-msgstr "leabhar gnÃ³thach"
-
-#: ../addressbook/libebook/e-book.c:331 ../addressbook/libebook/e-book.c:335
-#: ../addressbook/libebook/e-book.c:539 ../addressbook/libebook/e-book.c:543
-#: ../addressbook/libebook/e-book.c:677 ../addressbook/libebook/e-book.c:681
-#: ../addressbook/libebook/e-book.c:767 ../addressbook/libebook/e-book.c:771
-#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069
-#: ../addressbook/libebook/e-book.c:1250 ../addressbook/libebook/e-book.c:1253
-#: ../addressbook/libebook/e-book.c:1406 ../addressbook/libebook/e-book.c:1410
-#: ../addressbook/libebook/e-book.c:1619 ../addressbook/libebook/e-book.c:1623
-#: ../addressbook/libebook/e-book.c:1873 ../addressbook/libebook/e-book.c:1877
-#: ../addressbook/libebook/e-book.c:2094 ../addressbook/libebook/e-book.c:2098
-#: ../addressbook/libebook/e-book.c:2296 ../addressbook/libebook/e-book.c:2300
-#: ../addressbook/libebook/e-book.c:2531 ../addressbook/libebook/e-book.c:2705
-#: ../addressbook/libebook/e-book.c:2709 ../addressbook/libebook/e-book.c:2903
-#: ../addressbook/libebook/e-book.c:2907 ../addressbook/libebook/e-book.c:3454
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr ""
-
-#: ../addressbook/libebook/e-book.c:2520
-#, c-format
-msgid "%s: there is no current operation"
-msgstr ""
-
-#: ../addressbook/libebook/e-book.c:2549 ../addressbook/libebook/e-book.c:2594
-#: ../addressbook/libebook/e-book.c:2633
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: nÃorbh fhÃ©idir cealÃº"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4642
+#, c-format
+msgid "Downloading contacts (%d)... "
+msgstr ""
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:879
+#: ../addressbook/libedata-book/e-data-book.c:433
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:519
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:548
+#: ../calendar/backends/http/e-cal-backend-http.c:422
+#: ../calendar/libecal/e-cal.c:4409
+#: ../camel/providers/imap/camel-imap-command.c:492
+#: ../camel/providers/imap/camel-imap-store.c:436
+#: ../camel/providers/pop3/camel-pop3-store.c:513
+#: ../camel/providers/smtp/camel-smtp-transport.c:526
+msgid "Unknown error"
+msgstr "EarrÃ¡id anaithnid"
 
-#: ../addressbook/libebook/e-book.c:2665 ../addressbook/libebook/e-book.c:2669
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:334
 #, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "\"%s\" ar leabhar i ndiadh \"%s\""
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:2733
+#: ../addressbook/libebook/e-book.c:3246
 #, c-format
-msgid "%s: canceled"
-msgstr "%s: cealaithe"
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr ""
+
+#: ../addressbook/libebook/e-book.c:3612
+#: ../addressbook/libebook/e-book-client.c:599
+#: ../addressbook/libedata-book/e-data-book.c:303
+msgid "Address book does not exist"
+msgstr ""
+
+#: ../addressbook/libebook/e-book-client.c:86
+#, fuzzy
+msgctxt "BookClientError"
+msgid "No such book"
+msgstr "NÃl a leithÃ©id d'fhillteÃ¡n %s ann"
+
+#: ../addressbook/libebook/e-book-client.c:88
+msgctxt "BookClientError"
+msgid "Contact not found"
+msgstr ""
+
+#: ../addressbook/libebook/e-book-client.c:90
+#, fuzzy
+msgctxt "BookClientError"
+msgid "Contact ID already exists"
+msgstr "TÃ¡ an fillteÃ¡n ann cheana"
+
+#: ../addressbook/libebook/e-book-client.c:92
+#, fuzzy
+msgctxt "BookClientError"
+msgid "TLS not available"
+msgstr "NÃl TLS ar fÃ¡il"
+
+#: ../addressbook/libebook/e-book-client.c:94
+#, fuzzy
+msgctxt "BookClientError"
+msgid "No such source"
+msgstr "NÃl a leithÃ©id de theachtaireacht ann"
+
+#: ../addressbook/libebook/e-book-client.c:96
+#, fuzzy
+msgctxt "BookClientError"
+msgid "Offline unavailable"
+msgstr "nÃl an tseirbhÃs ar fÃ¡il"
+
+#: ../addressbook/libebook/e-book-client.c:98
+msgctxt "BookClientError"
+msgid "Unsupported authentication method"
+msgstr ""
+
+#: ../addressbook/libebook/e-book-client.c:100
+msgctxt "BookClientError"
+msgid "No space"
+msgstr "Gan spÃ¡s"
+
+#: ../addressbook/libebook/e-book-client.c:103
+msgctxt "BookClientError"
+msgid "Unknown error"
+msgstr "EarrÃ¡id anaithnid"
+
+#: ../addressbook/libebook/e-book-client.c:157
+msgid "D-Bus book proxy gone"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3310
+#: ../addressbook/libebook/e-book-client.c:416
+msgid "Failed to run book factory"
+msgstr ""
+
+#: ../addressbook/libebook/e-book-client.c:425
+#: ../addressbook/libedata-book/e-data-book-factory.c:328
+#: ../addressbook/libedata-book/e-data-book-factory.c:378
+#: ../calendar/libecal/e-cal-client.c:524
+#: ../calendar/libedata-cal/e-data-cal-factory.c:373
 #, c-format
-msgid "%s: Invalid source."
-msgstr "%s: Foinse neamhbhailÃ."
+msgid "Invalid source"
+msgstr "Foinse neamhbhailÃ"
+
+#: ../addressbook/libebook/e-book-client.c:524
+#: ../calendar/libecal/e-cal-client.c:633
+#, c-format
+msgid "Incorrect uri '%s'"
+msgstr ""
+
+#: ../addressbook/libebook/e-book-client.c:562
+msgid "Failed to find system book"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3318 ../addressbook/libebook/e-book.c:3383
+#: ../addressbook/libebook/e-book-client.c:669
+#: ../calendar/libecal/e-cal-client.c:781
 #, c-format
-msgid "%s: no factories available for URI `%s'"
+msgid "There was no source for UID '%s' stored in a source list."
 msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3329
+#: ../addressbook/libebook/e-book-client.c:1860
+#: ../calendar/libecal/e-cal-client.c:3469
+#, fuzzy
+msgid "Cannot get connection to view"
+msgstr "Ceangal le FreastalaÃ"
+
+#: ../addressbook/libebook/e-book-client-view.c:218
+#: ../calendar/libecal/e-cal-client-view.c:455
 #, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: NÃorbh fhÃ©idir EBookListener a chruthÃº"
+msgid "Cannot start view, D-Bus proxy gone"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3595
+#: ../addressbook/libebook/e-book-client-view.c:247
+#: ../calendar/libecal/e-cal-client-view.c:484
 #, c-format
-msgid "%s: there was no self contact UID stored in gconf"
+msgid "Cannot stop view, D-Bus proxy gone"
 msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3727
+#: ../addressbook/libebook/e-book-client-view.c:288
+#: ../calendar/libecal/e-cal-client-view.c:525
 #, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
+msgid "Cannot set fields of interest, D-Bus proxy gone"
 msgstr ""
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "CA UathÃºil"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "Comhdaigh Faoi"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "URI Leabhair"
 
@@ -191,806 +280,1054 @@ msgstr "URI Leabhair"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "Ainm IomlÃ¡n"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "Ainm"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "Sloinne"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "Leasainm"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
 msgstr "RÃomhphost 1"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
 msgstr "RÃomhphost 2"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
 msgstr "RÃomhphost 3"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
 msgstr "RÃomhphost 4"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "SeoltÃ³ir RÃomhphoist"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "LipÃ©ad Seolta Baile"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "LipÃ©ad Seolta Oibre"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "LipÃ©ad Seolta Eile"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "FÃ³n CÃºntÃ³ra"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "FÃ³n GnÃ³"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
 msgstr "FÃ³n GnÃ³ 2"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "Facs GnÃ³"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "FÃ³n Aisghlaoigh"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "FÃ³n Cairr"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "FÃ³n Comhlachta"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "FÃ³n Baile"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
 msgstr "FÃ³n Baile 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "Facs Baile"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "FÃ³n PÃ³ca"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "FÃ³n Eile"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "Facs Eile"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "Glaoire"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "PrÃomhfhÃ³n"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "RaidiÃ³"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "Eagras"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "RannÃ³g"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "Oifig"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "Teideal"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "RÃ³l"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "Bainisteoir"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "CÃºntÃ³ir"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "URL Leathanaigh Baile"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "URL Loga GrÃ©asÃ¡in"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:609
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "CatagÃ³irÃ"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "URI FÃ©ilire"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "URL Saor/GnÃ³thach"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "FÃ©ilire ICS"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "URL FÃschomhdhÃ¡la"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "Ainm CÃ©ile"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "NÃ³ta"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
-msgid "AIM Home Screen Name 1"
-msgstr ""
-
-#: ../addressbook/libebook/e-contact.c:190
-msgid "AIM Home Screen Name 2"
-msgstr ""
-
 #: ../addressbook/libebook/e-contact.c:191
-msgid "AIM Home Screen Name 3"
+msgid "AIM Home Screen Name 1"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:192
-msgid "AIM Work Screen Name 1"
+msgid "AIM Home Screen Name 2"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:193
-msgid "AIM Work Screen Name 2"
+msgid "AIM Home Screen Name 3"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:194
-msgid "AIM Work Screen Name 3"
+msgid "AIM Work Screen Name 1"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:195
-msgid "GroupWise Home Screen Name 1"
+msgid "AIM Work Screen Name 2"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:196
-msgid "GroupWise Home Screen Name 2"
+msgid "AIM Work Screen Name 3"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:197
-msgid "GroupWise Home Screen Name 3"
+msgid "GroupWise Home Screen Name 1"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:198
-msgid "GroupWise Work Screen Name 1"
+msgid "GroupWise Home Screen Name 2"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:199
-msgid "GroupWise Work Screen Name 2"
+msgid "GroupWise Home Screen Name 3"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:200
-msgid "GroupWise Work Screen Name 3"
+msgid "GroupWise Work Screen Name 1"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
+msgid "GroupWise Work Screen Name 2"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
+msgid "GroupWise Work Screen Name 3"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
+msgid "Jabber Home ID 1"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
+msgid "Jabber Home ID 2"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
+msgid "Jabber Home ID 3"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
+msgid "Jabber Work ID 1"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:207
-msgid "Yahoo! Home Screen Name 1"
+msgid "Jabber Work ID 2"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:208
-msgid "Yahoo! Home Screen Name 2"
+msgid "Jabber Work ID 3"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:209
-msgid "Yahoo! Home Screen Name 3"
+msgid "Yahoo! Home Screen Name 1"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:210
-msgid "Yahoo! Work Screen Name 1"
+msgid "Yahoo! Home Screen Name 2"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:211
-msgid "Yahoo! Work Screen Name 2"
+msgid "Yahoo! Home Screen Name 3"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:212
-msgid "Yahoo! Work Screen Name 3"
+msgid "Yahoo! Work Screen Name 1"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:213
-msgid "MSN Home Screen Name 1"
+msgid "Yahoo! Work Screen Name 2"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:214
-msgid "MSN Home Screen Name 2"
+msgid "Yahoo! Work Screen Name 3"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:215
-msgid "MSN Home Screen Name 3"
+msgid "MSN Home Screen Name 1"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:216
-msgid "MSN Work Screen Name 1"
+msgid "MSN Home Screen Name 2"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:217
-msgid "MSN Work Screen Name 2"
+msgid "MSN Home Screen Name 3"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:218
-msgid "MSN Work Screen Name 3"
+msgid "MSN Work Screen Name 1"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
+msgid "MSN Work Screen Name 2"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
+msgid "MSN Work Screen Name 3"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
+msgid "ICQ Home ID 1"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
+msgid "ICQ Home ID 2"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
+msgid "ICQ Home ID 3"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
+msgid "ICQ Work ID 1"
+msgstr ""
+
+#: ../addressbook/libebook/e-contact.c:225
+msgid "ICQ Work ID 2"
+msgstr ""
+
+#: ../addressbook/libebook/e-contact.c:226
+msgid "ICQ Work ID 3"
 msgstr ""
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr ""
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "Liosta SeoltaÃ"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "Seoladh Baile"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "Seoladh Oibre"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "Seoladh Eile"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
 msgstr "Liosta CatagÃ³irÃ"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "Ainm"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
 msgstr "Liosta RÃomhphoist"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr ""
+#: ../addressbook/libebook/e-contact.c:250
+#, fuzzy
+msgid "GroupWise ID List"
+msgstr "FreastalaÃ GroupWise %s"
 
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
+#: ../addressbook/libebook/e-contact.c:251
+msgid "Jabber ID List"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:253
 msgid "MSN Screen Name List"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
+#: ../addressbook/libebook/e-contact.c:254
+msgid "ICQ ID List"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
 msgstr "Liosta"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "DÃ¡ta Breithe"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:45
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:722
 msgid "Anniversary"
 msgstr "Cothrom Lae"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "Teastas X.509"
 
-#: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
-msgstr ""
-
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr ""
-
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
+msgid "Gadu-Gadu Home ID 1"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
+msgid "Gadu-Gadu Home ID 2"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
+msgid "Gadu-Gadu Home ID 3"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
+msgid "Gadu-Gadu Work ID 1"
 msgstr ""
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
+msgid "Gadu-Gadu Work ID 2"
+msgstr ""
+
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Work ID 3"
+msgstr ""
+
+#: ../addressbook/libebook/e-contact.c:273
+msgid "Gadu-Gadu ID List"
 msgstr ""
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "TeileafÃ³n"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
 msgstr ""
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "Seoladh SIP"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1517
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "Liosta Gan Ainm"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:46
-msgid "Birthday"
-msgstr "BreithlÃ¡"
+#: ../addressbook/libedata-book/e-book-backend.c:19
+msgid "Cannot process, book backend is opening"
+msgstr ""
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
-#, c-format
-msgid "Birthday: %s"
-msgstr "BreithlÃ¡: %s"
+#: ../addressbook/libedata-book/e-book-backend.c:93
+#, fuzzy, c-format
+msgid "Unknown book property '%s'"
+msgstr "EarrÃ¡id anaithnid: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
-#, c-format
-msgid "Anniversary: %s"
-msgstr "Cothrom Lae: %s"
+#: ../addressbook/libedata-book/e-book-backend.c:105
+#, fuzzy, c-format
+msgid "Cannot change value of book property '%s'"
+msgstr "NÃ fÃ©idir fillteÃ¡n '%s' a chruthÃº: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:234
-msgid "Cannot save calendar data: Malformed URI."
+#: ../addressbook/libedata-book/e-data-book-factory.c:315
+#: ../addressbook/libedata-book/e-data-book-factory.c:342
+#: ../calendar/libedata-cal/e-data-cal-factory.c:387
+#, c-format
+msgid "Empty URI"
 msgstr ""
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#: ../calendar/backends/file/e-cal-backend-file.c:247
-msgid "Cannot save calendar data"
-msgstr "NÃ fÃ©idir sonraÃ fÃ©ilire a shÃ¡bhÃ¡il"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../addressbook/libedata-book/e-data-book.c:202
+#: ../addressbook/libedata-book/e-data-book.c:663
+#, fuzzy
+msgid "Invalid query: "
+msgstr "RÃ©ad neamhbhailÃ"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
-msgid "Could not create thread for getting deltas"
+#: ../addressbook/libedata-book/e-data-book.c:292
+#: ../calendar/libedata-cal/e-data-cal.c:414
+msgid "Success"
 msgstr ""
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
-#: ../calendar/backends/google/e-cal-backend-google.c:1189
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
-#: ../calendar/backends/http/e-cal-backend-http.c:659
-#: ../calendar/backends/weather/e-cal-backend-weather.c:486
-msgid "Could not create cache file"
+#: ../addressbook/libedata-book/e-data-book.c:293
+#: ../calendar/libecal/e-cal.c:4377 ../calendar/libedata-cal/e-data-cal.c:415
+msgid "Backend is busy"
 msgstr ""
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
-msgid "Could not create thread for populating cache"
+#: ../addressbook/libedata-book/e-data-book.c:294
+#: ../calendar/libedata-cal/e-data-cal.c:416
+msgid "Repository offline"
 msgstr ""
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
-msgid "Reply Requested: by "
+#: ../addressbook/libedata-book/e-data-book.c:295
+#: ../calendar/libecal/e-cal.c:4391 ../calendar/libedata-cal/e-data-cal.c:417
+msgid "Permission denied"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:296
+msgid "Contact not found"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:297
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "TÃ¡ an fillteÃ¡n ann cheana"
+
+#: ../addressbook/libedata-book/e-data-book.c:298
+#: ../calendar/libedata-cal/e-data-cal.c:422
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Theip ar fhÃordheimhniÃº"
+
+#: ../addressbook/libedata-book/e-data-book.c:299
+#: ../calendar/libedata-cal/e-data-cal.c:423
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Theip ar fhÃordheimhniÃº"
+
+#: ../addressbook/libedata-book/e-data-book.c:300
+#: ../calendar/libedata-cal/e-data-cal.c:424
+msgid "Unsupported field"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:301
+#: ../calendar/libedata-cal/e-data-cal.c:426
+msgid "Unsupported authentication method"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libedata-cal/e-data-cal.c:427
+msgid "TLS not available"
+msgstr "NÃl TLS ar fÃ¡il"
+
+#: ../addressbook/libedata-book/e-data-book.c:304
+msgid "Book removed"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libedata-cal/e-data-cal.c:430
+msgid "Not available in offline mode"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../calendar/libedata-cal/e-data-cal.c:431
+msgid "Search size limit exceeded"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:307
+#: ../calendar/libedata-cal/e-data-cal.c:432
+msgid "Search time limit exceeded"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../calendar/libedata-cal/e-data-cal.c:433
+msgid "Invalid query"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../calendar/libedata-cal/e-data-cal.c:434
+msgid "Query refused"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:435
+#, fuzzy
+msgid "Could not cancel"
+msgstr "%s: nÃorbh fhÃ©idir cealÃº"
+
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:437
+msgid "Invalid server version"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:313
+#, fuzzy
+msgid "No space"
+msgstr "AinmspÃ¡s"
+
+#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../calendar/libecal/e-cal.c:4375 ../calendar/libedata-cal/e-data-cal.c:438
+msgid "Invalid argument"
+msgstr ""
+
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../calendar/libecal/e-cal.c:4414 ../calendar/libedata-cal/e-data-cal.c:440
+#, fuzzy
+msgid "Not supported"
+msgstr "OibrÃocht gan tacaÃocht"
+
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libecal/e-cal-client.c:531
+#: ../calendar/libedata-cal/e-data-cal.c:448
+#, fuzzy
+msgid "Other error"
+msgstr "EarrÃ¡id I/A"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:527
+#: ../addressbook/libedata-book/e-data-book.c:835
+#, fuzzy
+msgid "Cannot get contact: "
+msgstr "NÃ fÃ©idir teachtaireacht %s a fhÃ¡il: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:549
+msgid "Empty query: "
+msgstr ""
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:571
+#: ../addressbook/libedata-book/e-data-book.c:877
+msgid "Cannot add contact: "
+msgstr ""
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:593
+#: ../addressbook/libedata-book/e-data-book.c:896
+msgid "Cannot modify contact: "
+msgstr ""
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:686
+#: ../calendar/libedata-cal/e-data-cal.c:824
+#, fuzzy
+msgid "Cannot authenticate user: "
+msgstr "Theip ar fhÃordheimhniÃº.\n"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:748
+msgid "Cannot open book: "
+msgstr ""
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:762
+msgid "Cannot remove book: "
+msgstr ""
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:787
+msgid "Cannot refresh address book: "
 msgstr ""
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
-msgid "Reply Requested: When convenient"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:803
+msgid "Cannot get backend property: "
 msgstr ""
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:819
+#: ../calendar/libedata-cal/e-data-cal.c:1001
+msgid "Cannot set backend property: "
+msgstr ""
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:850
+#, fuzzy
+msgid "Cannot get contact list: "
+msgstr "NÃ fÃ©idir teachtaireacht %s a fhÃ¡il: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:914
+msgid "Cannot remove contacts: "
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:517
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:545
 #, c-format
-msgid "Loading %s items"
+msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr ""
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
-msgid "Calendar"
-msgstr "FÃ©ilire"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2094
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2442
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
-msgid "Invalid server URI"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4182
+msgid "Calendar doesn't support Free/Busy"
 msgstr ""
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
-#: ../calendar/libecal/e-cal.c:5117
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
-msgid "Authentication failed"
-msgstr "Theip ar fhÃordheimhniÃº"
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:724
+msgid "Birthday"
+msgstr "BreithlÃ¡"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:316
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:753
+#, c-format
+msgid "Birthday: %s"
+msgstr "BreithlÃ¡: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:777
+#, c-format
+msgid "Anniversary: %s"
+msgstr "Cothrom Lae: %s"
+
+#: ../calendar/backends/file/e-cal-backend-file.c:241
+msgid "Cannot save calendar data: Malformed URI."
+msgstr ""
+
+#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:254
+msgid "Cannot save calendar data"
+msgstr "NÃ fÃ©idir sonraÃ fÃ©ilire a shÃ¡bhÃ¡il"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:405
 msgid "Redirected to Invalid URI"
 msgstr ""
 
-#: ../calendar/backends/http/e-cal-backend-http.c:339
+#: ../calendar/backends/http/e-cal-backend-http.c:443
 msgid "Bad file format."
 msgstr ""
 
-#: ../calendar/backends/http/e-cal-backend-http.c:346
+#: ../calendar/backends/http/e-cal-backend-http.c:450
 msgid "Not a calendar."
 msgstr "NÃ fÃ©ilire Ã© sin."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
+#: ../calendar/backends/http/e-cal-backend-http.c:760
+#: ../calendar/backends/http/e-cal-backend-http.c:761
+#: ../calendar/backends/weather/e-cal-backend-weather.c:511
+msgid "Could not create cache file"
+msgstr ""
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:183
 msgid "Could not retrieve weather data"
 msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Fog"
 msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+msgid "Weather: Cloudy Night"
 msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-msgid "Weather: Cloudy Night"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+msgid "Weather: Cloudy"
 msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Overcast"
 msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Showers"
 msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Snow"
 msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Sunny"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+msgid "Weather: Clear Night"
 msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
-msgid "Weather: Clear Night"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+msgid "Weather: Sunny"
 msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Thunderstorms"
 msgstr ""
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:400
+#: ../calendar/backends/weather/e-cal-backend-weather.c:437
 msgid "Forecast"
 msgstr ""
 
-#: ../calendar/libecal/e-cal-component.c:1320
+#: ../calendar/libecal/e-cal-client.c:128
+#, fuzzy
+msgctxt "CalClientError"
+msgid "No such calendar"
+msgstr "NÃl a leithÃ©id d'fhÃ©ilire ann"
+
+#: ../calendar/libecal/e-cal-client.c:130
+msgctxt "CalClientError"
+msgid "Object not found"
+msgstr ""
+
+#: ../calendar/libecal/e-cal-client.c:132
+#, fuzzy
+msgctxt "CalClientError"
+msgid "Invalid object"
+msgstr "RÃ©ad neamhbhailÃ"
+
+#: ../calendar/libecal/e-cal-client.c:134
+#, fuzzy
+msgctxt "CalClientError"
+msgid "Unknown user"
+msgstr "Ã?sÃ¡ideoir Anaithnid"
+
+#: ../calendar/libecal/e-cal-client.c:136
+#, fuzzy
+msgctxt "CalClientError"
+msgid "Object ID already exists"
+msgstr "TÃ¡ an fillteÃ¡n ann cheana"
+
+#: ../calendar/libecal/e-cal-client.c:139
+#, fuzzy
+msgctxt "CalClientError"
+msgid "Unknown error"
+msgstr "EarrÃ¡id anaithnid"
+
+#: ../calendar/libecal/e-cal-client.c:195
+msgid "D-Bus calendar proxy gone"
+msgstr ""
+
+#: ../calendar/libecal/e-cal-client.c:515
+msgid "Failed to run calendar factory"
+msgstr ""
+
+#: ../calendar/libecal/e-cal-client.c:672
+msgid "Failed to find system calendar"
+msgstr ""
+
+#: ../calendar/libecal/e-cal-client.c:710
+#: ../calendar/libedata-cal/e-data-cal.c:428
+msgid "Calendar does not exist"
+msgstr ""
+
+#: ../calendar/libecal/e-cal-client.c:820
+#, fuzzy
+msgid "Invalid source type"
+msgstr "%s: Foinse neamhbhailÃ."
+
+#: ../calendar/libecal/e-cal-component.c:1299
 msgid "Untitled appointment"
 msgstr ""
 
-#: ../calendar/libecal/e-cal-recur.c:3945
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "1st"
 msgstr "1Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3946
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "2nd"
 msgstr "2Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3947
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "3rd"
 msgstr "3Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3948
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "4th"
 msgstr "4Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3949
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "5th"
 msgstr "5Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3950
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "6th"
 msgstr "6Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "7th"
 msgstr "7Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "8th"
 msgstr "8Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "9th"
 msgstr "9Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "10th"
 msgstr "10Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "11th"
 msgstr "11Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "12th"
 msgstr "12Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "13th"
 msgstr "13Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "14th"
 msgstr "14Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "15th"
 msgstr "15Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "16th"
 msgstr "16Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "17th"
 msgstr "17Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "18th"
 msgstr "18Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "19th"
 msgstr "19Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "20th"
 msgstr "20Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "21st"
 msgstr "21Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "22nd"
 msgstr "22Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "23rd"
 msgstr "23Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "24th"
 msgstr "24Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "25th"
 msgstr "25Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "26th"
 msgstr "26Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "27th"
 msgstr "27Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "28th"
 msgstr "28Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "29th"
 msgstr "29Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "30th"
 msgstr "30Ãº"
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "31st"
 msgstr "31Ãº"
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
 msgid "High"
 msgstr "Ard"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
 msgid "Normal"
 msgstr "GnÃ¡th"
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
 msgid "Low"
 msgstr "Ã?seal"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:710
+#: ../calendar/libecal/e-cal-util.c:703
 msgid "Undefined"
 msgstr ""
 
-#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:860 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:440
+#: ../libedataserverui/e-client-utils.c:663
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "IontrÃ¡il focal faire do %s (ÃºsÃ¡ideoir %s)"
@@ -999,151 +1336,112 @@ msgstr "IontrÃ¡il focal faire do %s (ÃºsÃ¡ideoir %s)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1707
+#: ../calendar/libecal/e-cal.c:874
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr ""
 "IontrÃ¡il focal faire do %s chun an seachfhreastalaÃ a chumasÃº d'ÃºsÃ¡ideoir %s"
 
-#: ../calendar/libecal/e-cal.c:5089
-msgid "Invalid argument"
-msgstr ""
-
-#: ../calendar/libecal/e-cal.c:5091
-msgid "Backend is busy"
-msgstr ""
+#: ../calendar/libecal/e-cal.c:1309 ../libedataserver/e-client.c:1655
+msgid "On This Computer"
+msgstr "Ar an RÃomhaire Seo"
 
-#: ../calendar/libecal/e-cal.c:5093
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4379
 msgid "Repository is offline"
 msgstr ""
 
-#: ../calendar/libecal/e-cal.c:5095
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4381
 msgid "No such calendar"
 msgstr "NÃl a leithÃ©id d'fhÃ©ilire ann"
 
-#: ../calendar/libecal/e-cal.c:5097
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:4383 ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Object not found"
 msgstr ""
 
-#: ../calendar/libecal/e-cal.c:5099
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4385 ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Invalid object"
 msgstr "RÃ©ad neamhbhailÃ"
 
-#: ../calendar/libecal/e-cal.c:5101
+#: ../calendar/libecal/e-cal.c:4387
 msgid "URI not loaded"
 msgstr "URI gan luchtÃº"
 
-#: ../calendar/libecal/e-cal.c:5103
+#: ../calendar/libecal/e-cal.c:4389
 msgid "URI already loaded"
 msgstr "URI luchtaithe cheana"
 
-#: ../calendar/libecal/e-cal.c:5105
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Permission denied"
-msgstr ""
-
-#: ../calendar/libecal/e-cal.c:5107
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4393
 msgid "Unknown User"
 msgstr "Ã?sÃ¡ideoir Anaithnid"
 
-#: ../calendar/libecal/e-cal.c:5109
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4395 ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Object ID already exists"
 msgstr ""
 
-#: ../calendar/libecal/e-cal.c:5111
+#: ../calendar/libecal/e-cal.c:4397
 msgid "Protocol not supported"
 msgstr ""
 
-#: ../calendar/libecal/e-cal.c:5113
+#: ../calendar/libecal/e-cal.c:4399
 msgid "Operation has been canceled"
 msgstr ""
 
-#: ../calendar/libecal/e-cal.c:5115
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4401
 msgid "Could not cancel operation"
 msgstr ""
 
-#: ../calendar/libecal/e-cal.c:5119
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../calendar/libecal/e-cal.c:4403
+msgid "Authentication failed"
+msgstr "Theip ar fhÃordheimhniÃº"
+
+#: ../calendar/libecal/e-cal.c:4405
+#: ../camel/providers/smtp/camel-smtp-transport.c:802
 msgid "Authentication required"
 msgstr ""
 
-#: ../calendar/libecal/e-cal.c:5121
-msgid "A CORBA exception has occurred"
-msgstr ""
-
-#: ../calendar/libecal/e-cal.c:5123
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1585
-#: ../camel/providers/imap4/camel-imap4-engine.c:1629
-#: ../camel/providers/imap4/camel-imap4-engine.c:1684
-#: ../camel/providers/imap4/camel-imap4-store.c:311
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:552
-#: ../camel/providers/pop3/camel-pop3-store.c:559
-#: ../camel/providers/pop3/camel-pop3-store.c:565
-#: ../servers/exchange/storage/e-storage.c:587
-#: ../servers/groupwise/e-gw-connection.c:241
-msgid "Unknown error"
-msgstr "EarrÃ¡id anaithnid"
+#: ../calendar/libecal/e-cal.c:4407
+msgid "A D-Bus exception has occurred"
+msgstr ""
 
-#: ../calendar/libecal/e-cal.c:5125
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:555
+#: ../calendar/libecal/e-cal.c:4411
 msgid "No error"
 msgstr "Gan earrÃ¡id"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1048
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
@@ -1151,23 +1449,23 @@ msgstr ""
 msgid "\"%s\" expects two arguments"
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1092
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
 #, c-format
@@ -1187,116 +1485,228 @@ msgid ""
 "\"classification\""
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:937
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-msgid "Invalid range"
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+msgid "Cannot process, calendar backend is opening"
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
+#: ../calendar/libedata-cal/e-cal-backend.c:207
+#, fuzzy, c-format
+msgid "Unknown calendar property '%s'"
+msgstr "EarrÃ¡id anaithnid: %s"
+
+#: ../calendar/libedata-cal/e-cal-backend.c:219
+#, fuzzy, c-format
+msgid "Cannot change value of calendar property '%s'"
+msgstr "NÃ fÃ©idir sonraÃ fÃ©ilire a shÃ¡bhÃ¡il"
+
+#: ../calendar/libedata-cal/e-data-cal.c:418
+msgid "Invalid range"
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported method"
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr ""
+#: ../calendar/libedata-cal/e-data-cal.c:429
+#, fuzzy
+msgid "Unknown user"
+msgstr "Ã?sÃ¡ideoir Anaithnid"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "NÃl TLS ar fÃ¡il"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:909
+#, fuzzy
+msgid "Cannot open calendar: "
+msgstr "NÃ fÃ©idir sonraÃ fÃ©ilire a shÃ¡bhÃ¡il"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr ""
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:930
+#, fuzzy
+msgid "Cannot remove calendar: "
+msgstr "NÃ fÃ©idir sonraÃ fÃ©ilire a shÃ¡bhÃ¡il"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr ""
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:955
+#, fuzzy
+msgid "Cannot refresh calendar: "
+msgstr "NÃ fÃ©idir sonraÃ fÃ©ilire a shÃ¡bhÃ¡il"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:979
+msgid "Cannot retrieve backend property: "
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr ""
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1025
+#, fuzzy
+msgid "Cannot retrieve calendar object path: "
+msgstr "NÃ fÃ©idir sonraÃ fÃ©ilire a shÃ¡bhÃ¡il"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1050
+#, fuzzy
+msgid "Cannot retrieve calendar object list: "
+msgstr "NÃ fÃ©idir sonraÃ fÃ©ilire a shÃ¡bhÃ¡il"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1075
+#, fuzzy
+msgid "Cannot retrieve calendar free/busy list: "
+msgstr "NÃ fÃ©idir sonraÃ fÃ©ilire a shÃ¡bhÃ¡il"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1101
+#, fuzzy
+msgid "Cannot create calendar object: "
+msgstr "NÃ fÃ©idir sonraÃ fÃ©ilire a shÃ¡bhÃ¡il"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1128
+#, fuzzy
+msgid "Cannot modify calendar object: "
+msgstr "NÃ fÃ©idir sonraÃ fÃ©ilire a shÃ¡bhÃ¡il"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1156
+#, fuzzy
+msgid "Cannot remove calendar object: "
+msgstr "NÃ fÃ©idir sonraÃ fÃ©ilire a shÃ¡bhÃ¡il"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1179
+#, fuzzy
+msgid "Cannot receive calendar objects: "
+msgstr "NÃ fÃ©idir sonraÃ fÃ©ilire a shÃ¡bhÃ¡il"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1204
+#, fuzzy
+msgid "Cannot send calendar objects: "
+msgstr "NÃ fÃ©idir sonraÃ fÃ©ilire a shÃ¡bhÃ¡il"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1231
+#, fuzzy
+msgid "Could not retrieve attachment uris: "
+msgstr "NÃorbh fhÃ©idir '%s' a athainmniÃº: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1255
+#, fuzzy
+msgid "Could not discard alarm: "
+msgstr "NÃorbh fhÃ©idir teachtaireacht a sheoladh: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1279
+#, fuzzy
+msgid "Could not get calendar view path: "
+msgstr "NÃorbh fhÃ©idir teachtaireacht a fhÃ¡il"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1304
+msgid "Could not retrieve calendar time zone: "
 msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1326
+#, fuzzy
+msgid "Could not add calendar time zone: "
+msgstr "NÃorbh fhÃ©idir teachtaireacht a sheoladh: %s"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
+#, fuzzy, c-format
+msgid "Invalid call"
+msgstr "RÃ©ad neamhbhailÃ"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:400
+#, fuzzy, c-format
+msgid "Invalid URI"
+msgstr "RÃ©ad neamhbhailÃ"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:418
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:102
-msgid "Signing is not supported by this cipher"
+#: ../calendar/libedata-cal/e-data-cal-factory.c:468
+#, c-format
+msgid "Could not instantiate backend"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
+#: ../camel/camel-cipher-context.c:200
+#, c-format
+msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:213
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
+#: ../camel/camel-cipher-context.c:229
+#, c-format
+msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:189
-msgid "Encryption is not supported by this cipher"
+#: ../camel/camel-cipher-context.c:243
+#, c-format
+msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
+#: ../camel/camel-cipher-context.c:256
+#, c-format
+msgid "You may not import keys with this cipher"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:232
-msgid "Decryption is not supported by this cipher"
+#: ../camel/camel-cipher-context.c:270
+#, c-format
+msgid "You may not export keys with this cipher"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
+#: ../camel/camel-cipher-context.c:812
+msgid "Signing message"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:271
-msgid "You may not import keys with this cipher"
+#: ../camel/camel-cipher-context.c:1053
+msgid "Encrypting message"
 msgstr ""
 
-#: ../camel/camel-cipher-context.c:301
-msgid "You may not export keys with this cipher"
+#: ../camel/camel-cipher-context.c:1180
+msgid "Decrypting message"
 msgstr ""
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:178
+#, c-format
 msgid "Unable to create cache path"
 msgstr ""
 
-#: ../camel/camel-data-cache.c:402
+#: ../camel/camel-data-cache.c:495
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
 
-#: ../camel/camel-db.c:412
+#: ../camel/camel-data-wrapper.c:143
+#, fuzzy, c-format
+msgid "No stream available"
+msgstr "nÃl an tseirbhÃs ar fÃ¡il"
+
+#: ../camel/camel-db.c:455
+#, c-format
 msgid "Insufficient memory"
 msgstr ""
 
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1305,7 +1715,7 @@ msgid ""
 msgstr ""
 
 #: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/providers/imap/camel-imap-journal.c:300
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1313,200 +1723,215 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:304
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
-msgid "Copy folder content locally for offline operation"
-msgstr "CÃ³ipeÃ¡il Ã¡bhar an fhillteÃ¡in go logÃ¡nta le haghaidh oibrithe as lÃne"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:71 ../camel/camel-offline-folder.c:89
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:406
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr ""
 
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:223
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:3014
+#: ../camel/camel-disco-folder.c:472 ../camel/camel-offline-folder.c:321
+msgid "Copy folder content locally for offline operation"
+msgstr "CÃ³ipeÃ¡il Ã¡bhar an fhillteÃ¡in go logÃ¡nta le haghaidh oibrithe as lÃne"
+
+#: ../camel/camel-disco-store.c:436
+#: ../camel/providers/imap/camel-imap-store.c:1192
+#: ../camel/providers/imap/camel-imap-store.c:1844
+#: ../camel/providers/imap/camel-imap-store.c:2327
+#: ../camel/providers/imap/camel-imap-store.c:3147
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:258
+#: ../camel/providers/imapx/camel-imapx-store.c:1276
+#: ../camel/providers/imapx/camel-imapx-store.c:1364
+#: ../camel/providers/imapx/camel-imapx-store.c:1404
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr ""
+#: ../camel/camel-file-utils.c:722
+#, c-format
+msgid "Canceled"
+msgstr "Cealaithe"
 
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:818 ../camel/camel-filter-search.c:586
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr ""
 
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:865
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1052 ../camel/camel-filter-driver.c:1061
 msgid "Syncing folders"
 msgstr "FillteÃ¡in Ã¡ sioncronÃº"
 
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1149 ../camel/camel-filter-driver.c:1446
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1160 ../camel/camel-filter-driver.c:1457
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: ../camel/camel-filter-driver.c:1216
-msgid "Unable to open spool folder"
-msgstr ""
-
-#: ../camel/camel-filter-driver.c:1225
-msgid "Unable to process spool folder"
-msgstr ""
-
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1248
 #, c-format
-msgid "Getting message %d (%d%%)"
-msgstr ""
-
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
+msgid "Getting message %d of %d"
 msgstr ""
 
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1266
 #, c-format
-msgid "Failed on message %d"
+msgid "Failed at message %d of %d"
 msgstr ""
 
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1284
 msgid "Syncing folder"
 msgstr "FillteÃ¡n Ã¡ shioncronÃº"
 
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1290
 msgid "Complete"
 msgstr ""
 
-#: ../camel/camel-filter-driver.c:1338
-#, c-format
-msgid "Getting message %d of %d"
-msgstr ""
-
-#: ../camel/camel-filter-driver.c:1353
-#, c-format
-msgid "Failed at message %d of %d"
-msgstr ""
-
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
+#: ../camel/camel-filter-search.c:748 ../camel/camel-filter-search.c:757
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:624
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:636
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:935
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) expects an array result"
 msgstr ""
 
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr ""
 
-#: ../camel/camel-folder.c:683
+#: ../camel/camel-folder.c:236
 #, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
-#: ../camel/camel-folder.c:1388
+#: ../camel/camel-folder.c:271
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
-#: ../camel/camel-folder.c:1429
+#: ../camel/camel-folder.c:312
 #, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr ""
-
-#: ../camel/camel-folder.c:1468
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr ""
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:870
+#: ../camel/providers/local/camel-maildir-folder.c:318
 msgid "Moving messages"
 msgstr "TeachtaireachtaÃ Ã¡ mbogadh"
 
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:873
 msgid "Copying messages"
 msgstr "TeachtaireachtaÃ Ã¡ gcÃ³ipeÃ¡il"
 
-#: ../camel/camel-folder.c:1922
-msgid "Learning junk"
+#: ../camel/camel-folder.c:1128
+#, c-format
+msgid "Quota information not supported for folder '%s'"
 msgstr ""
 
-#: ../camel/camel-folder.c:1939
-msgid "Learning non-junk"
+#: ../camel/camel-folder.c:3235
+#, fuzzy, c-format
+msgid "Retrieving message '%s' in %s"
+msgstr "NÃl a leithÃ©id de theachtaireacht %s ann i %s"
+
+#: ../camel/camel-folder.c:3359
+#, c-format
+msgid "Retrieving quota information for '%s'"
 msgstr ""
 
-#: ../camel/camel-folder.c:1958
-msgid "Filtering new message(s)"
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
+#, c-format
+msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:752
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
+#: ../camel/providers/smtp/camel-smtp-transport.c:805
+msgid "Unknown"
+msgstr "Anaithnid"
+
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1514,162 +1939,153 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:767
+#: ../camel/camel-gpg-context.c:728
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:791 ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:825
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:829
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:834
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:859 ../camel/camel-gpg-context.c:1068
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "Cealaithe."
+#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:5012
+#: ../camel/providers/imapx/camel-imapx-server.c:5029
+#: ../camel/providers/imapx/camel-imapx-store.c:179
+#: ../camel/providers/nntp/camel-nntp-summary.c:409
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:506
+#: ../camel/providers/pop3/camel-pop3-store.c:505
+#: ../libedataserverui/e-book-auth-util.c:229
+#, fuzzy, c-format
+msgid "Cancelled"
+msgstr "Cealaithe"
 
-#: ../camel/camel-gpg-context.c:873
+#: ../camel/camel-gpg-context.c:846
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:944
-msgid "Failed to encrypt: No valid recipients specified."
-msgstr ""
-
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1206 ../camel/camel-gpg-context.c:1331
-#: ../camel/camel-gpg-context.c:1853 ../camel/camel-gpg-context.c:1898
+#: ../camel/camel-gpg-context.c:989
 #, c-format
-msgid "Failed to execute gpg: %s"
+msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:1299 ../camel/camel-smime-context.c:602
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr ""
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+#, fuzzy
+msgid "Could not generate signing data: "
+msgstr "NÃorbh fhÃ©idir '%s' a athainmniÃº go %s: %s"
 
-#: ../camel/camel-gpg-context.c:1346 ../camel/camel-gpg-context.c:1547
-#: ../camel/camel-gpg-context.c:1563 ../camel/camel-gpg-context.c:1643
-#: ../camel/camel-gpg-context.c:1658 ../camel/camel-gpg-context.c:1774
-#: ../camel/camel-gpg-context.c:1789 ../camel/camel-gpg-context.c:1869
-#: ../camel/camel-gpg-context.c:1914
+#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
+#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:1365
-msgid "This is a digitally signed message part"
-msgstr ""
-
-#: ../camel/camel-gpg-context.c:1451 ../camel/camel-gpg-context.c:1457
-#: ../camel/camel-gpg-context.c:1463 ../camel/camel-gpg-context.c:1478
-#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
+#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
+#: ../camel/camel-smime-context.c:971
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:1517
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr ""
+#: ../camel/camel-gpg-context.c:1737
+#, fuzzy
+msgid "Cannot verify message signature: "
+msgstr "NÃ fÃ©idir teachtaireacht %s a fhÃ¡il: %s"
 
-#: ../camel/camel-gpg-context.c:1626
-#, c-format
-msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1858
+msgid "Could not generate encrypting data: "
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:1676
+#: ../camel/camel-gpg-context.c:1911
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:1729 ../camel/camel-gpg-context.c:1737
-#: ../camel/camel-gpg-context.c:1756
+#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
+#: ../camel/camel-gpg-context.c:2001
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:1746
+#: ../camel/camel-gpg-context.c:1989
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:1811 ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
 msgid "Encrypted content"
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:1830
-msgid "Unable to parse message content"
-msgstr ""
-
-#: ../camel/camel-gpg-context.c:1854 ../camel/camel-gpg-context.c:1899
-#: ../camel/camel-tcp-stream-openssl.c:627
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
-msgid "Unknown"
-msgstr "Anaithnid"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "NÃorbh fhÃ©idir '%s' a chur fhaoi ghlas"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr ""
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
@@ -1679,728 +2095,678 @@ msgstr ""
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "NÃorbh fhÃ©idir dÃ©anamh foirc: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(EarrÃ¡id anaithnid)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: ../camel/camel-multipart-signed.c:592
-msgid "parse error"
-msgstr ""
+#: ../camel/camel-multipart-signed.c:327
+#, fuzzy, c-format
+msgid "No content available"
+msgstr "NÃl TLS ar fÃ¡il"
 
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:806
-#: ../camel/providers/pop3/camel-pop3-store.c:446
-#: ../camel/providers/pop3/camel-pop3-store.c:546
-msgid "Canceled"
-msgstr "Cealaithe"
+#: ../camel/camel-multipart-signed.c:335
+#, fuzzy, c-format
+msgid "No signature available"
+msgstr "NÃl TLS ar fÃ¡il"
 
-#: ../camel/camel-net-utils.c:522
-msgid "cannot create thread"
+#: ../camel/camel-multipart-signed.c:663
+#, c-format
+msgid "parse error"
 msgstr ""
 
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:718
 msgid "Host lookup failed"
 msgstr ""
 
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr ""
 
-#: ../camel/camel-net-utils.c:810
+#: ../camel/camel-net-utils.c:845
 msgid "Resolving address"
 msgstr ""
 
-#: ../camel/camel-net-utils.c:830
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
 msgstr ""
 
-#: ../camel/camel-net-utils.c:833
+#: ../camel/camel-net-utils.c:872
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr ""
 
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:198
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr ""
 
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr ""
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:192
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:201
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:210
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:391 ../camel/camel-session.c:332
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr ""
 
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Gan ainm"
 
-#: ../camel/camel-sasl-anonymous.c:38
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr ""
 
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
 msgid "Authentication failed."
 msgstr "Theip ar fhÃordheimhniÃº."
 
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
 
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
 
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
 msgstr ""
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
 
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:820
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr ""
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:831
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:839
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
 
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:873
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr ""
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:894
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr ""
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:907
+#, c-format
 msgid "Server response does not match"
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:63
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:65
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:137
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:171
+#: ../camel/camel-sasl-gssapi.c:141
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:150
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:188
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
-#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
-#: ../camel/camel-sasl-kerberos4.c:230
-#: ../camel/providers/imap/camel-imap-store.c:1274
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:312
+#: ../camel/camel-sasl-gssapi.c:356 ../camel/camel-sasl-gssapi.c:373
+#: ../camel/providers/smtp/camel-smtp-transport.c:1277
+#, c-format
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:309
-msgid "Unsupported security layer."
-msgstr ""
-
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr ""
-
-#: ../camel/camel-sasl-kerberos4.c:173
+#: ../camel/camel-sasl-gssapi.c:385
 #, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
+msgid "Unsupported security layer."
 msgstr ""
 
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "LogÃ¡il Isteach"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:92
+#, c-format
 msgid "Unknown authentication state."
 msgstr ""
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:42
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:44
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr ""
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "POP roimh SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 
-#: ../camel/camel-sasl-popb4smtp.c:106
-msgid "POP Source URI"
+#: ../camel/camel-sasl-popb4smtp.c:80
+msgid "POP Source UID"
 msgstr ""
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
+#: ../camel/camel-sasl-popb4smtp.c:92
+#, c-format
+msgid "POP Before SMTP authentication using an unknown transport"
 msgstr ""
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
+#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#, c-format
+msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr ""
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:487
 #, c-format
-msgid "URL '%s' needs a username component"
+msgid "URL '%s' needs a user component"
 msgstr ""
 
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:498
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:509
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: ../camel/camel-session.c:307
+#: ../camel/camel-session.c:342
 #, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
+msgid "Invalid GType registered for protocol '%s'"
 msgstr ""
 
-#: ../camel/camel-session.c:479
+#: ../camel/camel-session.c:856
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "IontrÃ¡il an focal faire %s do %s ar Ã³strÃomhaire %s, le do thoil."
 
-#: ../camel/camel-session.c:817
-msgid "Camel session doesn't support forwarding of a message."
-msgstr ""
-
-#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1048
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
 msgstr "NÃ fÃ©idir teachtaireacht CMS a chruthÃº"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
-msgid "Cannot create encoder context"
-msgstr ""
-
-#: ../camel/camel-smime-context.c:619
-msgid "Failed to add data to CMS encoder"
-msgstr ""
-
-#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
-msgid "Failed to encode data"
-msgstr ""
-
-#: ../camel/camel-smime-context.c:697
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "SÃniÃº maith"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "DrochshÃniÃº"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "SÃniÃº mÃchumtha"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "SÃnitheoir: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
+msgid "Cannot create encoder context"
+msgstr ""
+
+#: ../camel/camel-smime-context.c:841
+msgid "Failed to add data to CMS encoder"
+msgstr ""
+
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
+msgid "Failed to encode data"
+msgstr ""
+
+#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
 msgid "Decoder failed"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1064
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1075
 msgid "Cannot create CMS Message"
 msgstr "NÃ fÃ©idir Teachtaireacht CMS a chruthÃº"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1081
 msgid "Cannot create CMS Enveloped data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot attach CMS Enveloped data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot attach CMS data object"
 msgstr "NÃ fÃ©idir rÃ©ad sonraÃ CMS a cheangal"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Recipient information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot add CMS Recipient information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1132
 msgid "Failed to add data to encoder"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1240
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1200
-msgid "import keys: unimplemented"
-msgstr ""
-
-#: ../camel/camel-smime-context.c:1208
-msgid "export keys: unimplemented"
-msgstr ""
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr ""
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:2090
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr ""
 
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr ""
-
-#: ../camel/camel-store.c:423
-#, c-format
-msgid "Cannot create folder: %s: folder exists"
-msgstr ""
-
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
-#, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr ""
+#: ../camel/camel-store.c:2115
+#, fuzzy, c-format
+msgid "Opening folder '%s'"
+msgstr "FillteÃ¡in Ã¡ sioncronÃº"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr ""
+#: ../camel/camel-store.c:2280
+#, fuzzy, c-format
+msgid "Scanning folders in '%s'"
+msgstr "FillteÃ¡in Ã¡ sioncronÃº"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-store.c:2292 ../camel/camel-store.c:2302
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Bruscar"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:2295 ../camel/camel-store.c:2306
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Dramhphost"
 
-#: ../camel/camel-tcp-stream-openssl.c:564
-msgid "Unable to get issuer's certificate"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:566
-msgid "Unable to get Certificate Revocation List"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to decrypt certificate signature"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decode issuer's public key"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Certificate signature failure"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Certificate Revocation List signature failure"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate not yet valid"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate has expired"
+#: ../camel/camel-store.c:2757
+#, c-format
+msgid "Cannot create folder: %s: folder exists"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate Revocation List (CRL) not yet valid"
+#: ../camel/camel-store.c:2884 ../camel/camel-vee-store.c:346
+#: ../camel/providers/local/camel-maildir-store.c:272
+#, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List (CRL) has expired"
+#: ../camel/camel-store.c:3025 ../camel/camel-vee-store.c:396
+#: ../camel/providers/local/camel-maildir-store.c:704
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:589
-msgid "Error in Certificate Revocation List (CRL)"
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#, c-format
+msgid "The proxy host does not support SOCKS4"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:591
-msgid "Out of memory"
-msgstr "Cuimhne Ãdithe"
-
-#: ../camel/camel-tcp-stream-openssl.c:593
-msgid "Zero-depth self-signed certificate"
+#: ../camel/camel-tcp-stream-raw.c:771
+#, c-format
+msgid "The proxy host denied our request: code %d"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:595
-msgid "Self-signed certificate in chain"
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#, c-format
+msgid "The proxy host does not support SOCKS5"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Unable to get issuer's certificate locally"
+#: ../camel/camel-tcp-stream-raw.c:879
+#, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Unable to verify leaf signature"
+#: ../camel/camel-tcp-stream-raw.c:891
+msgid "General SOCKS server failure"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Certificate chain too long"
+#: ../camel/camel-tcp-stream-raw.c:892
+msgid "SOCKS server's rules do not allow connection"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Certificate Revoked"
+#: ../camel/camel-tcp-stream-raw.c:893
+msgid "Network is unreachable from SOCKS server"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Invalid Certificate Authority (CA)"
+#: ../camel/camel-tcp-stream-raw.c:894
+msgid "Host is unreachable from SOCKS server"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Path length exceeded"
-msgstr ""
+#: ../camel/camel-tcp-stream-raw.c:895
+#, fuzzy
+msgid "Connection refused"
+msgstr "CealaÃodh an ceangal"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid purpose"
+#: ../camel/camel-tcp-stream-raw.c:896
+msgid "Time-to-live expired"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate untrusted"
+#: ../camel/camel-tcp-stream-raw.c:897
+msgid "Command not supported by SOCKS server"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Certificate rejected"
+#: ../camel/camel-tcp-stream-raw.c:898
+msgid "Address type not supported by SOCKS server"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:616
-msgid "Subject/Issuer mismatch"
-msgstr ""
+#: ../camel/camel-tcp-stream-raw.c:899
+#, fuzzy
+msgid "Unknown error from SOCKS server"
+msgstr "EarrÃ¡id anaithnid: %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:618
-msgid "AKID/SKID mismatch"
+#: ../camel/camel-tcp-stream-raw.c:932
+#, c-format
+msgid "Got unknown address type from SOCKS server"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:620
-msgid "AKID/Issuer serial mismatch"
+#: ../camel/camel-tcp-stream-raw.c:950
+#, c-format
+msgid "Incomplete reply from SOCKS server"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:622
-msgid "Key usage does not support certificate signing"
+#: ../camel/camel-tcp-stream-raw.c:970
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:625
-msgid "Error in application verification"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
+#, c-format
+msgid "Invalid reply from proxy server"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2413,35 +2779,16 @@ msgstr ""
 "MÃ©arlorg:       %s\n"
 "SÃniÃº:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "MAITH"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "OLC"
 
-#: ../camel/camel-tcp-stream-openssl.c:700
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"Drochtheastas Ã³ %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Ar mhaith leat glacadh leis mar sin fÃ©in?"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:883
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2451,1090 +2798,645 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "NÃorbh fhÃ©idir URL '%s' a pharsÃ¡il"
 
-#: ../camel/camel-vee-folder.c:580
+#: ../camel/camel-vee-folder.c:1233 ../camel/camel-vee-folder.c:1396
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "EarrÃ¡id agus '%s' Ã¡ stÃ³rÃ¡il: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr ""
 
-#: ../camel/camel-vee-folder.c:657
+#: ../camel/camel-vee-folder.c:1269
 #, c-format
 msgid "No such message %s in %s"
 msgstr "NÃl a leithÃ©id de theachtaireacht %s ann i %s"
 
-#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr ""
+#: ../camel/camel-vee-folder.c:1337
+#, fuzzy, c-format
+msgid "Error storing '%s': "
+msgstr "EarrÃ¡id agus '%s' Ã¡ stÃ³rÃ¡il: %s"
 
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:125 ../camel/camel-vee-store.c:130
+#: ../camel/camel-vee-store.c:297
 msgid "Unmatched"
 msgstr "Gan ChomhoiriÃºnÃº"
 
-#: ../camel/camel-vee-store.c:400
+#: ../camel/camel-vee-store.c:372
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "NÃ fÃ©idir fillteÃ¡n a scriosadh: %s: NÃl a leithÃ©id d'fhillteÃ¡n ann"
 
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:406
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "NÃ fÃ©idir fillteÃ¡n a athainmniÃº: %s: NÃl a leithÃ©id d'fhillteÃ¡n ann"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "NÃ fÃ©idir teachtaireachtaÃ a chÃ³ipeÃ¡il go dtÃ an fillteÃ¡n Bruscair"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "NÃ fÃ©idir teachtaireachtaÃ a chÃ³ipeÃ¡il go dtÃ an fillteÃ¡n Dramhphoist"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
+msgid "No output stream"
 msgstr ""
-"NÃ fÃ©idir teachtaireacht a fhÃ¡il: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:265
-#: ../camel/providers/local/camel-maildir-folder.c:298
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:233
-msgid "No such message"
-msgstr "NÃl a leithÃ©id de theachtaireacht ann"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "CealaÃodh an t-ÃºsÃ¡ideoir"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:252
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "NÃ fÃ©idir teachtaireacht %s a fhÃ¡il: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
-msgid "This message is not available in offline mode."
+msgid "No input stream"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
-msgid "Could not get message"
-msgstr "NÃorbh fhÃ©idir teachtaireacht a fhÃ¡il"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
-#: ../camel/providers/imap/camel-imap-folder.c:296
+#: ../camel/providers/imap/camel-imap-command.c:255
 #, c-format
-msgid "Could not load summary for %s"
+msgid "Operation cancelled"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
-msgid "Checking for deleted messages %s"
-msgstr ""
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
-msgid "Trash Folder Full. Please Empty."
+msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3421
-#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../camel/providers/imap/camel-imap-command.c:403
 #, c-format
-msgid "Fetching summary information for new messages in %s"
+msgid ""
+"Alert from IMAP server %s %s:\n"
+"%s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/imap/camel-imap-command.c:479
 #, c-format
-msgid "Cannot append message to folder '%s': %s"
+msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
+#: ../camel/providers/imap/camel-imap-command.c:491
 #, c-format
-msgid "Cannot create message: %s"
-msgstr ""
+msgid "IMAP command failed: %s"
+msgstr "Theip ordÃº IMAP: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/imap/camel-imap-command.c:571
 #, c-format
-msgid "Cannot get folder container %s"
+msgid "Server response ended too soon."
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
-msgid "Cannot append message in offline mode: cache unavailable"
+#: ../camel/providers/imap/camel-imap-command.c:782
+#, c-format
+msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
+#: ../camel/providers/imap/camel-imap-command.c:820
 #, c-format
-msgid "Cannot append message in offline mode: %s"
+msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
-msgid "Checking for new mail"
-msgstr "Lorg poist nua"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/hula/camel-hula-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
-msgid "C_heck for new messages in all folders"
-msgstr "_Lorg teachtaireachtaÃ nua i ngach fillteÃ¡n"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
-msgid "Options"
-msgstr "Roghanna"
+#: ../camel/providers/imap/camel-imap-folder.c:295
+msgid "Always check for new mail in this folder"
+msgstr "Lorg post nua san fhillteÃ¡n seo i gcÃ³naÃ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
-msgid "_Apply filters to new messages in Inbox on this server"
+#: ../camel/providers/imap/camel-imap-folder.c:372
+#, c-format
+msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
-msgid "Check new messages for J_unk contents"
+#: ../camel/providers/imap/camel-imap-folder.c:395
+#, c-format
+msgid "Could not load summary for %s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "Lorg teachtaireachtaÃ Dramhphoist sa _Bhosca Isteach amhÃ¡in"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
-msgid "Automatically synchroni_ze account locally"
-msgstr "Sioncrona_igh cuntas go logÃ¡nta go huathoibrÃoch"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "SOAP Settings"
-msgstr "Socruithe SOAP"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
-msgid "Post Office Agent SOAP _Port:"
+#: ../camel/providers/imap/camel-imap-folder.c:999
+#: ../camel/providers/imapx/camel-imapx-server.c:4015
+#, c-format
+msgid "Scanning for changed messages in %s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
-msgid "Novell GroupWise"
-msgstr "GroupWise Novell"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
-msgid "For accessing Novell GroupWise servers"
-msgstr "Le haghaidh rochtana freastalaithe GroupWise Novell"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
-#: ../camel/providers/hula/camel-hula-provider.c:93
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
-msgid "Password"
-msgstr "Focal Faire"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-msgid ""
-"This option will connect to the GroupWise server using a plaintext password."
+#: ../camel/providers/imap/camel-imap-folder.c:3379
+msgid "Unable to retrieve message: "
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
-msgid "Host or user not available in url"
+#: ../camel/providers/imap/camel-imap-folder.c:3414
+#: ../camel/providers/imapx/camel-imapx-server.c:5345
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1358
-msgid "You did not enter a password."
+#: ../camel/providers/imap/camel-imap-folder.c:3415
+#: ../camel/providers/imapx/camel-imapx-server.c:5346
+msgid "No such message available."
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
-msgid "Some features may not work correctly with your current server version"
+#: ../camel/providers/imap/camel-imap-folder.c:3490
+#: ../camel/providers/imap/camel-imap-folder.c:4387
+#: ../camel/providers/nntp/camel-nntp-folder.c:402
+#, c-format
+msgid "This message is not currently available"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/imap/camel-imap-folder.c:3974
+#: ../camel/providers/imap/camel-imap-folder.c:4056
+#: ../camel/providers/imapx/camel-imapx-server.c:3971
+#: ../camel/providers/imapx/camel-imapx-server.c:4113
 #, c-format
-msgid "No such folder %s"
-msgstr "NÃl a leithÃ©id d'fhillteÃ¡n %s ann"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
-msgid "Cannot create GroupWise folders in offline mode."
+msgid "Fetching summary information for new messages in %s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
-msgid "The parent folder is not allowed to contain subfolders"
+#: ../camel/providers/imap/camel-imap-folder.c:4188
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
+#: ../camel/providers/imap/camel-imap-folder.c:4198
 #, c-format
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
+msgid "Incomplete server response: no UID provided for message %d"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/imap/camel-imap-folder.c:4427
 #, c-format
-msgid "GroupWise server %s"
-msgstr "FreastalaÃ GroupWise %s"
+msgid "Could not find message body in FETCH response."
+msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
-#, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "SeirbhÃs GroupWise do %s ar %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+#, fuzzy
+msgid "Could not open cache directory: "
+msgstr "NÃorbh fhÃ©idir fillteÃ¡n a oscailt: %s: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
-msgid "GroupWise mail delivery via %s"
+msgid "Failed to cache message %s: %s"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
-msgid "Sending Message"
-msgstr "Teachtaireacht Ã¡ Seoladh"
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
+#, fuzzy, c-format
+msgid "Failed to cache message %s: "
+msgstr "NÃ fÃ©idir teachtaireacht %s a fhÃ¡il: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
-msgid ""
-"You have exceeded this account's storage limit. Your messages are queued in "
-"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
-"of your mail.\n"
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#, c-format
+msgid "Failed to cache %s: "
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
-#, c-format
-msgid "Could not send message: %s"
-msgstr "NÃorbh fhÃ©idir teachtaireacht a sheoladh: %s"
-
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "Checking for New Mail"
 msgstr "Lorg Poist Nua"
 
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "C_heck for new messages in all folders"
+msgstr "_Lorg teachtaireachtaÃ nua i ngach fillteÃ¡n"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
+msgid "Ch_eck for new messages in subscribed folders"
+msgstr "L_org teachtaireachtaÃ nua i bhfillteÃ¡in liostÃ¡ilte"
+
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
 msgid "Connection to Server"
 msgstr "Ceangal le FreastalaÃ"
 
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "_Use custom command to connect to server"
 msgstr "Ã?sÃ¡id o_rdÃº saincheaptha chun nasc leis an bhfreastalaÃ"
 
-#: ../camel/providers/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
+#: ../camel/providers/imap/camel-imap-provider.c:52
+#, fuzzy
+msgid "Co_mmand:"
 msgstr "OrdÃº:"
 
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "FillteÃ¡in"
 
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
 msgid "_Show only subscribed folders"
 msgstr "_TaispeÃ¡in fillteÃ¡in liostÃ¡ilte amhÃ¡in"
 
-#: ../camel/providers/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "O_verride server-supplied folder namespace"
 msgstr "SÃ¡raig_h ainmspÃ¡s fillteÃ¡in a solÃ¡thraÃodh an freastalaÃ"
 
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "AinmspÃ¡s"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr ""
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
-msgid "No output stream"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
-msgid "No input stream"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-command.c:229
-#: ../camel/providers/imap/camel-imap-command.c:278
-#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3051
-msgid "Operation cancelled"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3056
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr ""
-
-#. for imap ALERT codes, account user host
-#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:352
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s:\n"
-"%s"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-command.c:421
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-command.c:431
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "Theip ordÃº IMAP: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:506
-msgid "Server response ended too soon."
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-command.c:712
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-command.c:748
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:91
-msgid "Always check for new mail in this folder"
-msgstr "Lorg post nua san fhillteÃ¡n seo i gcÃ³naÃ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:277
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr ""
-
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:919
-#, c-format
-msgid "Scanning for changed messages in %s"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:1987
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:2002
-msgid "No response on continuation after APPEND command"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:2047
-msgid "Unknown error occurred during APPEND command!"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:2878
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:2913
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:2914
-msgid "No such message available."
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:2975
-#: ../camel/providers/imap/camel-imap-folder.c:3808
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
-msgid "This message is not currently available"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:3624
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:3632
-#, c-format
-msgid "Incomplete server response: no UID provided for message %d"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:3846
-msgid "Could not find message body in FETCH response."
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:330
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#: ../camel/providers/imap/camel-imap-message-cache.c:450
-#, c-format
-msgid "Failed to cache message %s: %s"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
-#, c-format
-msgid "Failed to cache %s: %s"
-msgstr ""
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#, fuzzy
+msgid "Names_pace:"
+msgstr "AinmspÃ¡s:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-msgid "Ch_eck for new messages in subscribed folders"
-msgstr "L_org teachtaireachtaÃ nua i bhfillteÃ¡in liostÃ¡ilte"
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:105
+msgid "Options"
+msgstr "Roghanna"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-msgid "Namespace:"
-msgstr "AinmspÃ¡s:"
-
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-msgid "_Apply filters to new messages in INBOX on this server"
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
+msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
-"Cuir _scagairÃ i bhfeidhm ar theachtaireachtaÃ nua sa Bhosca Isteach ar an "
-"bhfreastalaÃ seo"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "Lorg Ã¡bhar _Dramhphoist i dteachtaireachtaÃ nua"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr "Lorg teachtaireachtaÃ Dramhphoist sa _Bhosca Isteach amhÃ¡in"
+
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Sioncrona_igh post cianda go logÃ¡nta go huathoibrÃoch"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:78
+msgid "IMAP default port"
+msgstr ""
+
+#: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#, fuzzy
+msgid "IMAP over SSL"
+msgstr "FreastalaÃ IMAP %s"
+
+#: ../camel/providers/imap/camel-imap-provider.c:85
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:87
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Le haghaidh lÃ©imh agus stÃ³rÃ¡la poist ar fhreastalaithe IMAP."
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imap/camel-imap-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:113
+#: ../camel/providers/nntp/camel-nntp-provider.c:80
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "Password"
+msgstr "Focal Faire"
+
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:115
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:210
-#, c-format
-msgid "IMAP server %s"
-msgstr "FreastalaÃ IMAP %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:212
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "SeirbhÃs IMAP do %s ar %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:247
-#: ../camel/providers/imap4/camel-imap4-store.c:262
-#: ../camel/providers/nntp/camel-nntp-store.c:182
-#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/pop3/camel-pop3-store.c:184
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
+#: ../camel/providers/imap/camel-imap-store.c:255
+#: ../camel/providers/nntp/camel-nntp-store.c:360
+#: ../camel/providers/pop3/camel-pop3-store.c:139
+#: ../camel/providers/smtp/camel-smtp-transport.c:155
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "NÃorbh fhÃ©idir nasc le %s: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:171
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../camel/providers/imap/camel-imap-store.c:256
+#: ../camel/providers/nntp/camel-nntp-store.c:361
+#: ../camel/providers/pop3/camel-pop3-store.c:140
+#: ../camel/providers/smtp/camel-smtp-transport.c:156
 msgid "SSL unavailable"
 msgstr "NÃl SSL ar fÃ¡il"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "CealaÃodh an ceangal"
+#: ../camel/providers/imap/camel-imap-store.c:275
+#: ../camel/providers/nntp/camel-nntp-store.c:379
+#, fuzzy, c-format
+msgid "Could not connect to %s: "
+msgstr "NÃorbh fhÃ©idir nasc le %s: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:310
-#: ../camel/providers/imap4/camel-imap4-store.c:325
-#: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../camel/providers/imap/camel-imap-store.c:381
+#: ../camel/providers/imap/camel-imap-store.c:401
+#: ../camel/providers/imap/camel-imap-store.c:408
+#: ../camel/providers/imap/camel-imap-store.c:435
+#: ../camel/providers/imapx/camel-imapx-server.c:2991
+#: ../camel/providers/imapx/camel-imapx-server.c:3031
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:382
+#: ../camel/providers/imapx/camel-imapx-server.c:2992
+#: ../camel/providers/smtp/camel-smtp-transport.c:241
 msgid "STARTTLS not supported"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:402
+#: ../camel/providers/imapx/camel-imapx-server.c:3032
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/smtp/camel-smtp-transport.c:288
 msgid "SSL is not available in this build"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:563
+#: ../camel/providers/imapx/camel-imapx-server.c:2819
+#, c-format
+msgid "Connection cancelled"
+msgstr "CealaÃodh an ceangal"
+
+#: ../camel/providers/imap/camel-imap-store.c:568
+#: ../camel/providers/imapx/camel-imapx-server.c:2824
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/local/camel-maildir-folder.c:80
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:463
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
-msgid "Inbox"
-msgstr "Bosca Isteach"
-
-#: ../camel/providers/imap/camel-imap-store.c:1305
+#: ../camel/providers/imap/camel-imap-store.c:769
+#: ../camel/providers/imapx/camel-imapx-server.c:3116
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:1315
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:780
+#: ../camel/providers/imapx/camel-imapx-server.c:3128
+#: ../camel/providers/smtp/camel-smtp-transport.c:434
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-store.c:1389
+#: ../camel/providers/imap/camel-imap-store.c:791
+#: ../camel/providers/smtp/camel-smtp-transport.c:447
 #, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"NÃ fÃ©idir fÃordheimniÃº le freastalaÃ IMAP.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:954
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-store.c:1978
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "NÃ fÃ©idir fillteÃ¡n '%s' a chruthÃº: tÃ¡ an fillteÃ¡n ann cheana."
-
-#: ../camel/providers/imap/camel-imap-store.c:2253
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-store.c:3053
-msgid "Server unexpectedly disconnected"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
+msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
+#: ../camel/providers/imap/camel-imap-store.c:839
+#: ../camel/providers/imapx/camel-imapx-server.c:3174
 #, c-format
-msgid "Cannot select folder '%s': Bad command"
+msgid "You did not enter a password."
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
+#: ../camel/providers/imap/camel-imap-store.c:880
+#: ../camel/providers/imapx/camel-imapx-server.c:3219
 #, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "nÃl an tseirbhÃs ar fÃ¡il"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
 msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "NÃ fÃ©idir fillteÃ¡n '%s' a rochtain: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
 msgstr ""
+"NÃ fÃ©idir fÃordheimniÃº le freastalaÃ IMAP.\n"
+"%s\n"
+"\n"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
+#: ../camel/providers/imap/camel-imap-store.c:940
+#: ../camel/providers/imapx/camel-imapx-store.c:162
 #, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr ""
+msgid "IMAP server %s"
+msgstr "FreastalaÃ IMAP %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
+#: ../camel/providers/imap/camel-imap-store.c:943
+#: ../camel/providers/imapx/camel-imapx-store.c:165
 #, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "Lorg Ã¡bhar _Dramhphoist i dteachtaireachtaÃ nua"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Lo_rg teachtaireachtaÃ Dramhphoist sa Bhosca Isteach amhÃ¡in"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
+msgid "IMAP service for %s on %s"
+msgstr "SeirbhÃs IMAP do %s ar %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:194
-#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:181
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr ""
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1414
+#: ../camel/providers/imap/camel-imap-store.c:2498
+#: ../camel/providers/imapx/camel-imapx-store.c:353
+#: ../camel/providers/imapx/camel-imapx-store.c:772
+#: ../camel/providers/local/camel-maildir-folder.c:434
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:619
+#: ../camel/providers/local/camel-maildir-store.c:625
+#: ../camel/providers/local/camel-maildir-store.c:705
+#: ../camel/providers/local/camel-spool-store.c:293
+msgid "Inbox"
+msgstr "Bosca Isteach"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:296
+#: ../camel/providers/imap/camel-imap-store.c:1881
+#: ../camel/providers/imap/camel-imap-store.c:2083
+#: ../camel/providers/imapx/camel-imapx-store.c:329
 #, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-msgid "TLS negotiations failed"
-msgstr ""
+msgid "No such folder %s"
+msgstr "NÃl a leithÃ©id d'fhillteÃ¡n %s ann"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:411
+#: ../camel/providers/imap/camel-imap-store.c:1895
+#: ../camel/providers/imap/camel-imap-store.c:2342
+#: ../camel/providers/imapx/camel-imapx-store.c:1297
 #, c-format
 msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:964
-msgid "Cannot create IMAP folders in offline mode."
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "DrochordÃº"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:897
+#: ../camel/providers/imap/camel-imap-store.c:1959
+#: ../camel/providers/imap/camel-imap-store.c:2406
+#: ../camel/providers/imapx/camel-imapx-store.c:1318
 #, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:902
+#: ../camel/providers/imap/camel-imap-store.c:2012
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:409
+#: ../camel/providers/local/camel-mh-store.c:494
 #, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr ""
+msgid "Cannot create folder '%s': folder exists."
+msgstr "NÃ fÃ©idir fillteÃ¡n '%s' a chruthÃº: tÃ¡ an fillteÃ¡n ann cheana."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
+#: ../camel/providers/imap/camel-imap-store.c:2355
+#: ../camel/providers/imapx/camel-imapx-store.c:1308
 #, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
+msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
+#: ../camel/providers/imap/camel-imap-store.c:3190
 #, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
+msgid "Server unexpectedly disconnected"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
+#: ../camel/providers/imap/camel-imap-store.c:3193
+msgid "Server unexpectedly disconnected: "
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr ""
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
+#, fuzzy, c-format
+msgid "Could not create folder summary for %s"
+msgstr "NÃ fÃ©idir fillteÃ¡n a chruthÃº: %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr ""
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
+#, fuzzy, c-format
+msgid "Could not create cache for %s: "
+msgstr "NÃorbh fhÃ©idir '%s' a athainmniÃº go %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+msgid "Use _Quick Resync if the server supports it"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
 msgstr ""
 
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1572
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr ""
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "OrdÃº:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr ""
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "AinmspÃ¡s:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
+#: ../camel/providers/imapx/camel-imapx-provider.c:86
+msgid "Default IMAP port"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr ""
+#: ../camel/providers/imapx/camel-imapx-provider.c:94
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#: ../camel/providers/imapx/camel-imapx-server.c:1462
+msgid "Error writing to cache stream: "
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr ""
+#: ../camel/providers/imapx/camel-imapx-server.c:2145
+#, fuzzy, c-format
+msgid "Not authenticated"
+msgstr "Theip ar fhÃordheimhniÃº.\n"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr ""
+#: ../camel/providers/imapx/camel-imapx-server.c:2914
+#, fuzzy, c-format
+msgid "Could not connect to %s (port %s): "
+msgstr "NÃorbh fhÃ©idir nasc le %s (port %s): %s"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
+#: ../camel/providers/imapx/camel-imapx-server.c:3401
+msgid "Closing tmp stream failed: "
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr ""
+#: ../camel/providers/imapx/camel-imapx-server.c:5491
+#: ../camel/providers/imapx/camel-imapx-server.c:5506
+#, fuzzy
+msgid "Cannot create spool file: "
+msgstr "NÃ fÃ©idir fillteÃ¡n a chruthÃº: %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
+#: ../camel/providers/imapx/camel-imapx-store.c:1093
+#: ../camel/providers/nntp/camel-nntp-store.c:1686
 #, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "Gan sonraÃ"
+msgid "No such folder: %s"
+msgstr "NÃl a leithÃ©id d'fhillteÃ¡n ann: %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr ""
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-msgid "Message storage"
+msgid "Source stream returned no data"
 msgstr ""
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-
-#: ../camel/providers/imapp/camel-imapp-store.c:252
-#, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "NÃorbh fhÃ©idir nasc le %s (port %s): %s"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:348
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "NÃorbh fhÃ©idir nasc le freastalaÃ POP ar %s"
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
+#, fuzzy, c-format
+msgid "Source stream unavailable"
+msgstr "nÃl an tseirbhÃs ar fÃ¡il"
 
 #: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "InnÃ©acsaigh sonraÃ chorp teachtaireachta"
-
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "bosca poist: %s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:466
+msgid "Index message body data"
+msgstr "InnÃ©acsaigh sonraÃ chorp teachtaireachta"
+
+#: ../camel/providers/local/camel-local-folder.c:700
+#, fuzzy, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"NÃ fÃ©idir teachtaireacht a fhÃ¡il: %s\n"
+"  %s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "Comhadlanna poist MH-fhormÃ¡ide"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Le haghaidh stÃ³rÃ¡la poist logÃ¡nta i gcomhadlanna poist cosÃºil le MH."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid "Local delivery"
 msgstr "Seachadadh logÃ¡nta"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:71
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr ""
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:86
+#: ../camel/providers/local/camel-local-provider.c:106
 msgid "_Apply filters to new messages in INBOX"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
 msgstr "Comhadlanna poist maildir-fhormÃ¡ide"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:94
 msgid "For storing local mail in maildir directories."
 msgstr "Le haghaidh stÃ³rÃ¡la poist logÃ¡nta i gcomhadlanna maildir."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:114
 msgid "Standard Unix mbox spool file"
 msgstr "Comhad spÃ³lÃ¡la mbox Unix caighdeÃ¡nach"
 
-#: ../camel/providers/local/camel-local-provider.c:116
+#: ../camel/providers/local/camel-local-provider.c:115
 #: ../camel/providers/local/camel-local-provider.c:127
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
@@ -3545,493 +3447,552 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "Comhadlann spÃ³lÃ¡la mbox Unix chaighdeÃ¡nach"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:128
+#: ../camel/providers/local/camel-local-store.c:177
+#: ../camel/providers/local/camel-local-store.c:322
+#: ../camel/providers/local/camel-maildir-store.c:92
+#: ../camel/providers/local/camel-mbox-store.c:519
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:197
+#: ../camel/providers/local/camel-local-store.c:207
+#: ../camel/providers/local/camel-local-store.c:335
+#: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:223
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:284
 #, c-format
 msgid "Local mail file %s"
 msgstr "Comhad poist logÃ¡nta %s"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:396
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:470
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "NÃorbh fhÃ©idir '%s' a athainmniÃº: %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:501
+#: ../camel/providers/local/camel-mbox-store.c:688
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:529
+#: ../camel/providers/local/camel-mbox-store.c:717
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:548
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: ../camel/providers/local/camel-maildir-folder.c:231
-msgid "Maildir append message canceled"
-msgstr ""
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:332
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "NÃl a leithÃ©id de theachtaireacht ann"
 
-#: ../camel/providers/local/camel-maildir-folder.c:234
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr ""
+#: ../camel/providers/local/camel-maildir-folder.c:223
+#, fuzzy, c-format
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "NÃ fÃ©idir teachtaireachtaÃ a chÃ³ipeÃ¡il go dtÃ an fillteÃ¡n Bruscair"
 
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-maildir-folder.c:311
-#: ../camel/providers/local/camel-maildir-folder.c:319
-#: ../camel/providers/local/camel-mbox-folder.c:362
-#: ../camel/providers/local/camel-mbox-folder.c:413
-#: ../camel/providers/local/camel-mbox-folder.c:434
-#: ../camel/providers/local/camel-mbox-folder.c:465
-#: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:232
-#: ../camel/providers/local/camel-mh-folder.c:243
-#: ../camel/providers/local/camel-mh-folder.c:251
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+#: ../camel/providers/local/camel-maildir-folder.c:271
+#: ../camel/providers/local/camel-maildir-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder %s: "
 msgstr ""
+"NÃ fÃ©idir teachtaireacht a fhÃ¡il: %s\n"
+"  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:320
-msgid "Invalid message contents"
-msgstr ""
+#: ../camel/providers/local/camel-maildir-folder.c:351
+#, fuzzy, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "NÃ fÃ©idir teachtaireachtaÃ a chÃ³ipeÃ¡il go dtÃ an fillteÃ¡n Dramhphoist"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, fuzzy, c-format
+msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgstr "NÃ fÃ©idir fillteÃ¡n '%s' a chruthÃº: tÃ¡ an fillteÃ¡n ann cheana."
+
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:722
+#, fuzzy, c-format
+msgid "Folder %s already exists"
+msgstr "TÃ¡ an fillteÃ¡n ann cheana"
+
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mbox-store.c:391
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "NÃ fÃ©idir fillteÃ¡n '%s' a chruthÃº: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:343
+#: ../camel/providers/local/camel-mh-store.c:454
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "NÃ fÃ©idir fillteÃ¡n '%s' a fhÃ¡il: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:353
+#: ../camel/providers/local/camel-mh-store.c:463
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr ""
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:239
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr ""
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:572
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
 msgstr "nÃ comhadlann maildir Ã© sin"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:330
-#: ../camel/providers/local/camel-spool-store.c:344
+#: ../camel/providers/local/camel-maildir-store.c:510
+#: ../camel/providers/local/camel-maildir-store.c:874
+#: ../camel/providers/local/camel-spool-store.c:144
+#: ../camel/providers/local/camel-spool-store.c:160
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-maildir-summary.c:437
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-store.c:713
+#, fuzzy, c-format
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "NÃ fÃ©idir fillteÃ¡n '%s' a chruthÃº: tÃ¡ an fillteÃ¡n ann cheana."
+
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
 msgstr ""
 
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
 msgstr ""
 
-#: ../camel/providers/local/camel-maildir-summary.c:748
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:842
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
 msgstr "FillteÃ¡n Ã¡ stÃ³rÃ¡il"
 
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr ""
-
-#: ../camel/providers/local/camel-mbox-folder.c:231
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr ""
-
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr ""
+#: ../camel/providers/local/camel-mbox-folder.c:183
+#, fuzzy, c-format
+msgid "Cannot open mailbox: %s: "
+msgstr "NÃorbh fhÃ©idir comhad a oscailt: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:300
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr ""
+#: ../camel/providers/local/camel-mbox-folder.c:249
+#, fuzzy, c-format
+msgid "Cannot append message to mbox file: %s: "
+msgstr "NÃ fÃ©idir teachtaireacht %s a fhÃ¡il: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:252
-msgid "Message construction failed."
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-store.c:166
 #: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:527
+#, c-format
 msgid "Cannot create a folder by this name."
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:402
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:543
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr ""
+
+#: ../camel/providers/local/camel-mbox-store.c:559
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "NÃ fÃ©idir fillteÃ¡n a chruthÃº: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:561
+msgid "Folder already exists"
+msgstr "TÃ¡ an fillteÃ¡n ann cheana"
+
+#: ../camel/providers/local/camel-mbox-store.c:602
+#: ../camel/providers/local/camel-mbox-store.c:615
+#: ../camel/providers/local/camel-mbox-store.c:644
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
 "%s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:625
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:634
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:660
+#: ../camel/providers/local/camel-mbox-store.c:674
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-store.c:378
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr ""
-
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:753
 #, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "NÃ fÃ©idir fillteÃ¡n a chruthÃº: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:394
-msgid "Folder already exists"
-msgstr "TÃ¡ an fillteÃ¡n ann cheana"
-
-#: ../camel/providers/local/camel-mbox-store.c:485
 msgid "The new folder name is illegal."
 msgstr "TÃ¡ an t-ainm fillteÃ¡in nua neamhcheadaithe."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:768
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "NÃorbh fhÃ©idir '%s' a athainmniÃº: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:851
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "NÃorbh fhÃ©idir '%s' a athainmniÃº go %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:532
+#: ../camel/providers/local/camel-mbox-summary.c:476
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "NÃorbh fhÃ©idir fillteÃ¡n a oscailt: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:582
+#: ../camel/providers/local/camel-mbox-summary.c:537
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
+msgid "Fatal mail parser error near position %s in folder %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:622
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:697
+#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "NÃorbh fhÃ©idir comhad a oscailt: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:949
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:776
+#: ../camel/providers/local/camel-mbox-summary.c:756
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1083
+#: ../camel/providers/local/camel-mbox-summary.c:846
+#: ../camel/providers/local/camel-mbox-summary.c:1099
 #, c-format
 msgid "Could not store folder: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:897
-#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1113
-#: ../camel/providers/local/camel-mbox-summary.c:1121
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:1131
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+
+#: ../camel/providers/local/camel-mbox-summary.c:895
+#: ../camel/providers/local/camel-mbox-summary.c:1140
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:1046
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1052
+#: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "EarrÃ¡id anaithnid: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1189
-#: ../camel/providers/local/camel-mbox-summary.c:1215
+#: ../camel/providers/local/camel-mbox-summary.c:1210
+#: ../camel/providers/local/camel-mbox-summary.c:1240
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mbox-summary.c:1206
+#: ../camel/providers/local/camel-mbox-summary.c:1229
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mh-folder.c:183
-msgid "MH append message canceled"
-msgstr ""
-
-#: ../camel/providers/local/camel-mh-folder.c:186
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr ""
+#: ../camel/providers/local/camel-mh-folder.c:115
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: "
+msgstr "NÃ fÃ©idir teachtaireachtaÃ a chÃ³ipeÃ¡il go dtÃ an fillteÃ¡n Dramhphoist"
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:473
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:487
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr ""
 
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "NÃ fÃ©idir conair comhadlainne MH a oscailt: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:134
+#: ../camel/providers/local/camel-spool-store.c:314
 #, c-format
-msgid "Spool '%s' cannot be opened: %s"
+msgid "Spool mail file %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:146
+#: ../camel/providers/local/camel-spool-store.c:315
 #, c-format
-msgid "Spool '%s' is not a regular file or directory"
+msgid "Spool folder tree %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:165
+#: ../camel/providers/local/camel-spool-store.c:352
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:175
+#: ../camel/providers/local/camel-spool-store.c:364
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
 "%s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:370
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:184
+#: ../camel/providers/local/camel-spool-store.c:377
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
 "%s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:192
+#: ../camel/providers/local/camel-spool-store.c:387
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:423
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:437
 #, c-format
-msgid "Spool mail file %s"
+msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:452
 #, c-format
-msgid "Spool folder tree %s"
-msgstr ""
-
-#: ../camel/providers/local/camel-spool-store.c:229
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-store.c:237
-msgid "Spool folders cannot be deleted"
-msgstr ""
-
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
+#: ../camel/providers/local/camel-spool-store.c:516
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
+msgid "Spool '%s' cannot be opened: %s"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-store.c:530
 #, c-format
-msgid "Could not sync spool folder %s: %s"
+msgid "Spool '%s' is not a regular file or directory"
 msgstr ""
 
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:169
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:193
+#, fuzzy, c-format
+msgid "Could not synchronize temporary folder %s: %s"
+msgstr "NÃorbh fhÃ©idir fillteÃ¡n a oscailt: %s: %s"
+
+#: ../camel/providers/local/camel-spool-summary.c:211
+#, fuzzy, c-format
+msgid "Could not synchronize spool folder %s: %s"
+msgstr "NÃorbh fhÃ©idir fillteÃ¡n a oscailt: %s: %s"
+
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
 #, c-format
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:194
-#: ../camel/providers/nntp/camel-nntp-folder.c:226
+#: ../camel/providers/nntp/camel-nntp-folder.c:195
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:367
-#: ../camel/providers/nntp/camel-nntp-folder.c:370
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:240
+#: ../camel/providers/pop3/camel-pop3-folder.c:371
+#: ../camel/providers/pop3/camel-pop3-folder.c:436
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:697
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "NÃ fÃ©idir teachtaireacht %s a fhÃ¡il: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:246
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
+#, fuzzy, c-format
+msgid "Cannot get message %s: "
+msgstr "NÃ fÃ©idir teachtaireacht %s a fhÃ¡il: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:472
+#: ../camel/providers/nntp/camel-nntp-folder.c:478
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 #, c-format
 msgid "Posting failed: %s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:520
+#, fuzzy
+msgid "Posting failed: "
+msgstr "Theip oibrÃocht: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:549
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:443
+#: ../camel/providers/nntp/camel-nntp-folder.c:569
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:52
+msgid "Default NNTP port"
+msgstr ""
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
+msgid "NNTP over SSL"
+msgstr ""
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:59
 msgid "USENET news"
 msgstr "Nuacht USENET"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:86
 #, c-format
-msgid "Could not read greeting from %s: %s"
+msgid "Authentication requested but no username provided"
+msgstr ""
+
+#: ../camel/providers/nntp/camel-nntp-store.c:98
+#, c-format
+msgid "Cannot authenticate to server: %s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:392
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: "
+msgstr "NÃorbh fhÃ©idir '%s' a athainmniÃº go %s: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:405
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:605
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nuacht USENET trÃ %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:1112
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4039,206 +4000,223 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1227
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1269
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1302
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1318
+#, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:986
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
-msgid "Authentication requested but no username provided"
-msgstr ""
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1335
 #, c-format
-msgid "Cannot authenticate to server: %s"
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
-#, c-format
-msgid "NNTP Command failed: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1555
+#, fuzzy
+msgid "NNTP Command failed: "
 msgstr "Theip OrdÃº NNTP: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
+#: ../camel/providers/nntp/camel-nntp-store.c:1629
+#, c-format
 msgid "Not connected."
 msgstr "Gan cheangal."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-msgid "No such folder: %s"
-msgstr "NÃl a leithÃ©id d'fhillteÃ¡n ann: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:235
+#: ../camel/providers/nntp/camel-nntp-summary.c:353
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:251
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:369
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr ""
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr ""
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Theip oibrÃocht: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:277
+#: ../camel/providers/pop3/camel-pop3-folder.c:336
+#, c-format
+msgid "No message with UID %s"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
+msgid "Unknown reason"
+msgstr "CÃºis anaithnid"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:488
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:511
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
 msgid "Expunging old messages"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:577
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
-#, c-format
-msgid "No message with UID %s"
-msgstr ""
-
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
-#, c-format
-msgid "Retrieving POP message %d"
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-msgid "Unknown reason"
-msgstr "CÃºis anaithnid"
-
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "_FÃ¡g teachtaireachtaÃ ar an bhfreastalaÃ"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_Scrios i ndiaidh %s lÃ¡"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
+msgid "POP3 over SSL"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Le haghaidh naisc le agus post a ÃosluchtÃº Ã³ fhreastalaithe POP."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../camel/providers/pop3/camel-pop3-provider.c:93
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:207
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-store.c:184
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:224
-#: ../camel/providers/pop3/camel-pop3-store.c:238
-#: ../camel/providers/pop3/camel-pop3-store.c:248
-#: ../camel/providers/pop3/camel-pop3-store.c:254
+#: ../camel/providers/pop3/camel-pop3-store.c:202
+#: ../camel/providers/pop3/camel-pop3-store.c:233
+#: ../camel/providers/pop3/camel-pop3-store.c:240
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:203
 msgid "STLS not supported by server"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:255
-msgid "TLS is not available in this build"
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:221
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr ""
+"NÃ fÃ©idir nasc le freastalaÃ POP %s.\n"
+"EarrÃ¡id agus ainm ÃºsÃ¡ideora Ã¡ sheoladh: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:361
-#, c-format
-msgid "Could not connect to POP server %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:234
+msgid "TLS negotiations failed"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:402
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../camel/providers/pop3/camel-pop3-store.c:241
+msgid "TLS is not available in this build"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-store.c:328
+#: ../camel/providers/pop3/camel-pop3-store.c:490
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:418
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:351
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:430
+#: ../camel/providers/pop3/camel-pop3-store.c:367
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:449
-#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:384
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: "
 msgstr ""
+"NÃ fÃ©idir fÃordheimniÃº le freastalaÃ IMAP.\n"
+"%s\n"
+"\n"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:508
+#: ../camel/providers/pop3/camel-pop3-store.c:456
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:549
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:510
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4247,25 +4225,56 @@ msgstr ""
 "NÃ fÃ©idir nasc le freastalaÃ POP %s.\n"
 "EarrÃ¡id agus focal faire Ã¡ sheoladh: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:556
-#, c-format
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:523
+#, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
 msgstr ""
 "NÃ fÃ©idir nasc le freastalaÃ POP %s.\n"
 "EarrÃ¡id agus ainm ÃºsÃ¡ideora Ã¡ sheoladh: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:669
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:535
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password%s"
+msgstr ""
+"NÃ fÃ©idir nasc le freastalaÃ POP %s.\n"
+"EarrÃ¡id agus focal faire Ã¡ sheoladh: %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:578
+#, fuzzy, c-format
+msgid "POP3 server %s"
+msgstr "FreastalaÃ IMAP %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:581
+#, fuzzy, c-format
+msgid "POP3 server for %s on %s"
+msgstr "SeirbhÃs IMAP do %s ar %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:711
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-store.c:738
 #, c-format
 msgid "No such folder '%s'."
 msgstr "NÃl a leithÃ©id d'fhillteÃ¡n '%s' ann."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:755
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr ""
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -4273,385 +4282,511 @@ msgstr ""
 "Le haghaidh seachadadh poist trÃna chur chuig an gclÃ¡r \"sendmail\" ar an "
 "gcÃ³ras logÃ¡nta."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr ""
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
 msgid "Could not parse recipient list"
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#, fuzzy
+msgid "Could not send message: "
+msgstr "NÃorbh fhÃ©idir teachtaireacht a sheoladh: %s"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
-msgid "sendmail"
-msgstr "sendmail"
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "Mail delivery via the sendmail program"
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#, fuzzy
+msgid "SMTP over SSL"
+msgstr "FreastalaÃ SMTP %s"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Le haghaidh seachadadh poist trÃ cheangal le mol poist cianda trÃ SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Syntax error, command unrecognized"
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:203
+msgid "Welcome response error: "
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
-msgid "Syntax error in parameters or arguments"
+#: ../camel/providers/smtp/camel-smtp-transport.c:240
+#: ../camel/providers/smtp/camel-smtp-transport.c:280
+#: ../camel/providers/smtp/camel-smtp-transport.c:287
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
-msgid "Command not implemented"
-msgstr ""
+#: ../camel/providers/smtp/camel-smtp-transport.c:249
+#: ../camel/providers/smtp/camel-smtp-transport.c:262
+#: ../camel/providers/smtp/camel-smtp-transport.c:269
+#, fuzzy
+msgid "STARTTLS command failed: "
+msgstr "Theip ordÃº STARTTLS: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Command parameter not implemented"
-msgstr ""
+#: ../camel/providers/smtp/camel-smtp-transport.c:367
+#, c-format
+msgid "SMTP server %s"
+msgstr "FreastalaÃ SMTP %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
-msgid "System status, or system help reply"
+#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#, c-format
+msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Help message"
+#: ../camel/providers/smtp/camel-smtp-transport.c:422
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Service ready"
+#: ../camel/providers/smtp/camel-smtp-transport.c:524
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Service closing transmission channel"
+#: ../camel/providers/smtp/camel-smtp-transport.c:640
+#, c-format
+msgid "Cannot send message: service not connected."
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
-msgid "Service not available, closing transmission channel"
+#: ../camel/providers/smtp/camel-smtp-transport.c:647
+#, c-format
+msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
-msgid "Requested mail action okay, completed"
-msgstr ""
+#: ../camel/providers/smtp/camel-smtp-transport.c:651
+msgid "Sending message"
+msgstr "Teachtaireacht Ã¡ seoladh"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
-msgid "User not local; will forward to <forward-path>"
+#: ../camel/providers/smtp/camel-smtp-transport.c:676
+#, c-format
+msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
-msgid "Requested mail action not taken: mailbox unavailable"
+#: ../camel/providers/smtp/camel-smtp-transport.c:689
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
-msgid "Requested action not taken: mailbox unavailable"
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
+msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
-msgid "Requested action aborted: error in processing"
+#: ../camel/providers/smtp/camel-smtp-transport.c:754
+msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
-msgid "User not local; please try <forward-path>"
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
+msgid "Command not implemented"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
-msgid "Requested action not taken: insufficient system storage"
+#: ../camel/providers/smtp/camel-smtp-transport.c:758
+msgid "Command parameter not implemented"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
-msgid "Requested mail action aborted: exceeded storage allocation"
+#: ../camel/providers/smtp/camel-smtp-transport.c:760
+msgid "System status, or system help reply"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
-msgid "Requested action not taken: mailbox name not allowed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:762
+msgid "Help message"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
-msgid "Start mail input; end with <CRLF>.<CRLF>"
+#: ../camel/providers/smtp/camel-smtp-transport.c:764
+msgid "Service ready"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
-msgid "Transaction failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:766
+msgid "Service closing transmission channel"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
-msgid "A password transition is needed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:768
+msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
-msgid "Authentication mechanism is too weak"
+#: ../camel/providers/smtp/camel-smtp-transport.c:770
+msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
-msgid "Encryption required for requested authentication mechanism"
+#: ../camel/providers/smtp/camel-smtp-transport.c:772
+msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
-msgid "Temporary authentication failure"
+#: ../camel/providers/smtp/camel-smtp-transport.c:774
+msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-msgid "Welcome response error"
+#: ../camel/providers/smtp/camel-smtp-transport.c:776
+msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
+msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "Theip ordÃº STARTTLS: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-msgid "STARTTLS command failed"
-msgstr "Theip ordÃº STARTTLS"
+#: ../camel/providers/smtp/camel-smtp-transport.c:780
+msgid "User not local; please try <forward-path>"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
+#: ../camel/providers/smtp/camel-smtp-transport.c:782
+msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:567
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
+#: ../camel/providers/smtp/camel-smtp-transport.c:784
+msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
-#, c-format
-msgid "SMTP server %s"
-msgstr "FreastalaÃ SMTP %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:786
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
-#, c-format
-msgid "SMTP mail delivery via %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:788
+msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
-msgid "Cannot send message: service not connected."
+#: ../camel/providers/smtp/camel-smtp-transport.c:790
+msgid "Transaction failed"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
-msgid "Cannot send message: sender address not valid."
+#: ../camel/providers/smtp/camel-smtp-transport.c:794
+msgid "A password transition is needed"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
-msgid "Sending message"
-msgstr "Teachtaireacht Ã¡ seoladh"
+#: ../camel/providers/smtp/camel-smtp-transport.c:796
+msgid "Authentication mechanism is too weak"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
-msgid "Cannot send message: no recipients defined."
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
+msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
-msgid "Cannot send message: one or more invalid recipients"
+#: ../camel/providers/smtp/camel-smtp-transport.c:800
+msgid "Temporary authentication failure"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "SMTP Greeting"
 msgstr "Beannacht SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1084
+#: ../camel/providers/smtp/camel-smtp-transport.c:1101
+#: ../camel/providers/smtp/camel-smtp-transport.c:1109
+#, fuzzy
+msgid "HELO command failed: "
 msgstr "Theip ordÃº HELO: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "Theip ordÃº HELO"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1178
 msgid "SMTP Authentication"
 msgstr "FÃordheimhniÃº SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
-msgid "Error creating SASL authentication object."
-msgstr ""
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1197
+#: ../camel/providers/smtp/camel-smtp-transport.c:1208
+#: ../camel/providers/smtp/camel-smtp-transport.c:1217
+#, fuzzy
+msgid "AUTH command failed: "
 msgstr "Theip ordÃº AUTH: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-msgid "AUTH command failed"
-msgstr "Theip ordÃº AUTH"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr ""
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr ""
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
-msgstr ""
+#: ../camel/providers/smtp/camel-smtp-transport.c:1325
+#: ../camel/providers/smtp/camel-smtp-transport.c:1339
+#: ../camel/providers/smtp/camel-smtp-transport.c:1348
+#, fuzzy
+msgid "MAIL FROM command failed: "
+msgstr "Theip ordÃº IMAP: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr ""
+#: ../camel/providers/smtp/camel-smtp-transport.c:1375
+#, fuzzy
+msgid "RCPT TO command failed: "
+msgstr "Theip ordÃº RSET: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#, c-format
-msgid "RCPT TO <%s> failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1391
+#: ../camel/providers/smtp/camel-smtp-transport.c:1400
+#, fuzzy, c-format
+msgid "RCPT TO <%s> failed: "
 msgstr "Theip RCPT TO <%s>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "Theip ordÃº DATA: %s: nÃor seoladh post"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-msgid "DATA command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1442
+#: ../camel/providers/smtp/camel-smtp-transport.c:1452
+#: ../camel/providers/smtp/camel-smtp-transport.c:1462
+#: ../camel/providers/smtp/camel-smtp-transport.c:1521
+#: ../camel/providers/smtp/camel-smtp-transport.c:1540
+#: ../camel/providers/smtp/camel-smtp-transport.c:1553
+#: ../camel/providers/smtp/camel-smtp-transport.c:1561
+#, fuzzy
+msgid "DATA command failed: "
 msgstr "Theip ordÃº DATA"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
-#, c-format
-msgid "RSET command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1586
+#: ../camel/providers/smtp/camel-smtp-transport.c:1600
+#: ../camel/providers/smtp/camel-smtp-transport.c:1608
+#, fuzzy
+msgid "RSET command failed: "
 msgstr "Theip ordÃº RSET: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "Theip ordÃº RSET"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
-#, c-format
-msgid "QUIT command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
+#: ../camel/providers/smtp/camel-smtp-transport.c:1647
+#: ../camel/providers/smtp/camel-smtp-transport.c:1654
+#, fuzzy
+msgid "QUIT command failed: "
 msgstr "Theip ordÃº QUIT: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "Theip ordÃº QUIT"
-
 #: ../libedataserver/e-categories.c:47
+#, fuzzy
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "Cothrom Lae"
+
+#: ../libedataserver/e-categories.c:48
+#, fuzzy
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "BreithlÃ¡"
+
+#: ../libedataserver/e-categories.c:49
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Business"
 msgstr "GnÃ³"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "ComÃ³rtas"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "CeanÃ¡in"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Bronntanais"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Spriocanna/Aidhmeanna"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:54
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "LÃ¡ Saoire"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "CartaÃ Laethanta Saoire"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:57
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "TeagmhÃ¡lacha TÃ¡bhachtacha"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Smaoinimh"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
+#, fuzzy
+msgctxt "CategoryName"
 msgid "International"
 msgstr "IdirnÃ¡isiÃºnta"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "PrÃomhchustaimÃ©ir"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "EagsÃºil"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:62
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Pearsanta"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Glaonna TeileafÃ³in"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:65
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "StÃ¡das"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "StraitÃ©isÃ"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "SolÃ¡thraithe"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Am & Costais"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:69
+#, fuzzy
+msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:70
+#, fuzzy
+msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Ag Fanacht"
 
+#: ../libedataserver/e-client.c:109
+#, fuzzy
+msgctxt "ClientError"
+msgid "Invalid argument"
+msgstr "RÃ©ad neamhbhailÃ"
+
+#: ../libedataserver/e-client.c:111
+msgctxt "ClientError"
+msgid "Backend is busy"
+msgstr ""
+
+#: ../libedataserver/e-client.c:113
+#, fuzzy
+msgctxt "ClientError"
+msgid "Source not loaded"
+msgstr "URI gan luchtÃº"
+
+#: ../libedataserver/e-client.c:115
+#, fuzzy
+msgctxt "ClientError"
+msgid "Source already loaded"
+msgstr "URI luchtaithe cheana"
+
+#: ../libedataserver/e-client.c:117
+msgctxt "ClientError"
+msgid "Authentication failed"
+msgstr "Theip ar fhÃordheimhniÃº"
+
+#: ../libedataserver/e-client.c:119
+#, fuzzy
+msgctxt "ClientError"
+msgid "Authentication required"
+msgstr "Theip ar fhÃordheimhniÃº"
+
+#: ../libedataserver/e-client.c:121
+msgctxt "ClientError"
+msgid "Repository offline"
+msgstr ""
+
+#: ../libedataserver/e-client.c:123
+msgctxt "ClientError"
+msgid "Permission denied"
+msgstr ""
+
+#: ../libedataserver/e-client.c:125
+msgctxt "ClientError"
+msgid "Cancelled"
+msgstr "Cealaithe"
+
+#: ../libedataserver/e-client.c:127
+msgctxt "ClientError"
+msgid "Could not cancel"
+msgstr "NÃorbh fhÃ©idir cealÃº"
+
+#: ../libedataserver/e-client.c:129
+msgctxt "ClientError"
+msgid "Not supported"
+msgstr "Gan tacaÃocht"
+
+#: ../libedataserver/e-client.c:131
+msgctxt "ClientError"
+msgid "D-Bus error"
+msgstr "EarrÃ¡id D-Bus"
+
+#: ../libedataserver/e-client.c:133
+msgctxt "ClientError"
+msgid "Other error"
+msgstr "EarrÃ¡id eile"
+
+#: ../libedataserver/e-client.c:136
+msgctxt "ClientError"
+msgid "Unknown error"
+msgstr "EarrÃ¡id anaithnid"
+
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1900
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -4659,7 +4794,7 @@ msgstr "%a %d/%m/%Y %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1922
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -4667,7 +4802,7 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1896
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -4675,7 +4810,7 @@ msgstr "%a %d/%m/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1887
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1918
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
@@ -4693,8 +4828,8 @@ msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1763
-#: ../libedataserver/e-time-utils.c:1882
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1783
+#: ../libedataserver/e-time-utils.c:1913
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -4734,19 +4869,19 @@ msgstr "%d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1766
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1786
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1824 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1855 ../libedataserver/e-time-utils.c:1975
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1828 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1859 ../libedataserver/e-time-utils.c:1967
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4754,200 +4889,168 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
+#: ../libedataserver/e-time-utils.c:1864 ../libedataserver/e-time-utils.c:1972
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1837 ../libedataserver/e-time-utils.c:1933
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1964
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1840
+#: ../libedataserver/e-time-utils.c:1871
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1844
+#: ../libedataserver/e-time-utils.c:1875
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:673
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:435
 msgid "Failed to authenticate.\n"
 msgstr "Theip ar fhÃordheimhniÃº.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:327
+#: ../libedataserverui/e-category-completion.c:294
 #, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr ""
-
-#: ../libedataserverui/e-categories-dialog.c:618
-msgid "Icon"
-msgstr "DeilbhÃn"
+msgid "Create category \"%s\""
+msgstr "Cruthaigh catagÃ³ir \"%s\""
 
-#: ../libedataserverui/e-categories-dialog.c:623
-msgid "Category"
-msgstr "CatagÃ³ir"
+#: ../libedataserverui/e-client-utils.c:661
+#, fuzzy, c-format
+msgid ""
+"Enter password for %s (user %s)\n"
+"Reason: %s"
+msgstr "IontrÃ¡il focal faire do %s (ÃºsÃ¡ideoir %s)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "DeilbhÃn CatagÃ³ire"
+#: ../libedataserverui/e-client-utils.c:749
+#, fuzzy
+msgid "Enter Passphrase"
+msgstr "IontrÃ¡il focal faire"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:2
-msgid "Category Properties"
-msgstr "AirÃonna CatagÃ³ire"
+#: ../libedataserverui/e-client-utils.c:751
+msgid "Enter Password"
+msgstr "IontrÃ¡il Focal Faire"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
-msgid "Category _Icon"
-msgstr "_DeilbhÃn CatagÃ³ire"
+#: ../libedataserverui/e-name-selector-dialog.c:176
+msgid "Show Contacts"
+msgstr "TaispeÃ¡in TeagmhÃ¡lacha"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
-msgid "Category _Name"
-msgstr "_Ainm CatagÃ³ire"
+#: ../libedataserverui/e-name-selector-dialog.c:198
+msgid "Address B_ook:"
+msgstr "_Leabhar SeoltaÃ:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr ""
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Cate_gory:"
+msgstr "Cata_gÃ³ir"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
-msgid "_Available Categories:"
-msgstr "CatagÃ³irÃ ar _FÃ¡il:"
+#: ../libedataserverui/e-name-selector-dialog.c:224
+msgid "_Search:"
+msgstr "Cuar_daigh:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
-msgid "_Edit"
-msgstr "_Eagar"
+#: ../libedataserverui/e-name-selector-dialog.c:242
+#: ../libedataserverui/e-name-selector-dialog.c:977
+msgid "Any Category"
+msgstr "CatagÃ³ir ar Bith"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
-msgid "categories"
-msgstr "catagÃ³irÃ"
+#: ../libedataserverui/e-name-selector-dialog.c:244
+msgid "Co_ntacts"
+msgstr "_TeagmhÃ¡lacha"
 
-#: ../libedataserverui/e-category-completion.c:290
-#, c-format
-msgid "Create category \"%s\""
-msgstr "Cruthaigh catagÃ³ir \"%s\""
+#: ../libedataserverui/e-name-selector-dialog.c:289
+msgid "Search"
+msgstr "Cuardaigh"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "Eolas Datha"
+#: ../libedataserverui/e-name-selector-dialog.c:292
+msgid "Address Book"
+msgstr "Leabhar SeoltaÃ"
 
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr ""
+#: ../libedataserverui/e-name-selector-dialog.c:295
+msgid "Contacts"
+msgstr "TeagmhÃ¡lacha"
 
-#: ../libedataserverui/e-name-selector-dialog.c:276
+#: ../libedataserverui/e-name-selector-dialog.c:412
 msgid "Select Contacts from Address Book"
 msgstr "Roghnaigh TadhallaÃ o Leabhar Seoladh"
 
-#: ../libedataserverui/e-name-selector-dialog.c:563
+#: ../libedataserverui/e-name-selector-dialog.c:747
 msgid "_Add"
 msgstr "Cuir _Leis"
 
-#: ../libedataserverui/e-name-selector-dialog.c:588
+#: ../libedataserverui/e-name-selector-dialog.c:751
 msgid "_Remove"
 msgstr "_Bain"
 
-#: ../libedataserverui/e-name-selector-dialog.c:765
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
-msgid "Any Category"
-msgstr "CatagÃ³ir ar Bith"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>Teag_mhÃ¡lacha</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>TaispeÃ¡in TeagmhÃ¡lacha</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
-msgid "Address B_ook:"
-msgstr "_Leabhar SeoltaÃ:"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
-msgid "Address Book"
-msgstr "Leabhar SeoltaÃ"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
-msgid "Cate_gory:"
-msgstr "Cata_gÃ³ir"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
-msgid "Contacts"
-msgstr "TeagmhÃ¡lacha"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
-msgid "Search"
-msgstr "Cuardaigh"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
-msgid "_Search:"
-msgstr "Cuar_daigh:"
+#: ../libedataserverui/e-name-selector-dialog.c:891
+#, fuzzy, c-format
+msgid "Error loading address book: %s"
+msgstr "EarrÃ¡id agus '%s' Ã¡ stÃ³rÃ¡il: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2455
+#: ../libedataserverui/e-name-selector-entry.c:2661
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr ""
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2470
+#: ../libedataserverui/e-name-selector-entry.c:2676
 #, c-format
 msgid "Cop_y %s"
 msgstr "_CÃ³ipeÃ¡il %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2480
+#: ../libedataserverui/e-name-selector-entry.c:2686
 #, c-format
 msgid "C_ut %s"
 msgstr "_Gearr %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2497
+#: ../libedataserverui/e-name-selector-entry.c:2703
 #, c-format
 msgid "_Edit %s"
 msgstr "Cuir %s in _Eagar"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:509
 #, c-format
 msgid "_Delete %s"
 msgstr "_Scrios %s"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:127
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr ""
 
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "TÃ¡ Caps Lock gnÃomhachtaithe agat."
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "_Meabhraigh an frÃ¡sa faire seo"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr ""
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "_Meabhraigh an focal faire seo"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -4956,204 +5059,6 @@ msgstr ""
 msgid "Select destination"
 msgstr "Roghnaigh sprioc"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:170
 msgid "_Destination"
 msgstr "_Sprioc"
-
-#: ../servers/exchange/lib/e2k-autoconfig.c:1694
-#: ../servers/exchange/storage/exchange-account.c:955
-#, c-format
-msgid "Enter password for %s"
-msgstr "IontrÃ¡il focal faire do %s"
-
-#: ../servers/exchange/lib/e2k-autoconfig.c:1695
-#: ../servers/exchange/storage/exchange-account.c:960
-msgid "Enter password"
-msgstr "IontrÃ¡il focal faire"
-
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:844
-msgid "Owner"
-msgstr "Ã?inÃ©ir"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:854
-msgid "Publishing Editor"
-msgstr ""
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:862
-msgid "Editor"
-msgstr "EagarthÃ³ir"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:869
-msgid "Publishing Author"
-msgstr ""
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:875
-msgid "Author"
-msgstr "Ã?dar"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:880
-msgid "Non-editing Author"
-msgstr ""
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:884
-msgid "Reviewer"
-msgstr ""
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:886
-msgid "Contributor"
-msgstr ""
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:888
-msgid "None"
-msgstr "NeamhnÃ"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:903
-msgid "Custom"
-msgstr "Saincheaptha"
-
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "Generic error"
-msgstr "EarrÃ¡id ginearÃ¡lta"
-
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "A folder with the same name already exists"
-msgstr ""
-
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "The specified folder type is not valid"
-msgstr ""
-
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "I/O error"
-msgstr "EarrÃ¡id I/A"
-
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "Not enough space to create the folder"
-msgstr ""
-
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The folder is not empty"
-msgstr ""
-
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "The specified folder was not found"
-msgstr ""
-
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Function not implemented in this storage"
-msgstr ""
-
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "Operation not supported"
-msgstr "OibrÃocht gan tacaÃocht"
-
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified type is not supported in this storage"
-msgstr ""
-
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "The specified folder cannot be modified or removed"
-msgstr ""
-
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "Cannot create a folder with that name"
-msgstr ""
-
-#: ../servers/exchange/storage/e-storage.c:585
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
-
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:640
-#, c-format
-msgid "%s's Folders"
-msgstr "FillteÃ¡in %s"
-
-#: ../servers/exchange/storage/exchange-account.c:1260
-msgid "Personal Folders"
-msgstr "FillteÃ¡in Pearsanta"
-
-#: ../servers/exchange/storage/exchange-account.c:1275
-msgid "Favorite Public Folders"
-msgstr ""
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1292
-msgid "All Public Folders"
-msgstr ""
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1306
-msgid "Global Address List"
-msgstr "Liosta SeoltaÃ Comhchoiteann"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "MÃreanna Scriosta"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "DrÃ©achtaÃ"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "Dialann"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "NÃ³taÃ"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "Bosca Amach"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "MÃreanna Seolta"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "Tascanna"
-
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "Ceangal neamhbhailÃ"
-
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr ""
-
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr ""
-
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "DrochpharaimÃ©adar"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr ""
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr ""
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr ""
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr ""
-
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "Ar an RÃomhaire Seo"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]