[evolution-data-server] Updated Gujarati Translations

From: Sweta Kothari <swkothar src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated Gujarati Translations
Date: Thu, 17 Mar 2011 09:52:55 +0000 (UTC)
commit 75ee59c625182ebc1fbf841ef1b81284a260ec0a
Author: Sweta Kothari <swkothar redhat com>
Date:   Thu Mar 17 15:22:45 2011 +0530

    Updated Gujarati Translations

 po/gu.po | 5097 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 2578 insertions(+), 2519 deletions(-)
---
diff --git a/po/gu.po b/po/gu.po
index 23468ee..a693ba6 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,13 +1,13 @@
-# translation of evolution-data-server.gnome-2-28.gu.po to Gujarati
+# translation of gu.po to Gujarati
 # Ankit Patel <ankit644 yahoo com>, 2005, 2006.
 # Ankit Patel <ankit redhat com>, 2007, 2008, 2009.
-# Sweta Kothari <swkothar redhat com>, 2009.
+# Sweta Kothari <swkothar redhat com>, 2009, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server.gnome-2-28.gu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=general\n";
-"POT-Creation-Date: 2009-09-07 14:12+0000\n"
-"PO-Revision-Date: 2009-09-08 13:43+0530\n"
+"Project-Id-Version: gu\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=Misc.\n";
+"POT-Creation-Date: 2011-02-16 16:36+0000\n"
+"PO-Revision-Date: 2011-03-17 15:22+0530\n"
 "Last-Translator: Sweta Kothari <swkothar redhat com>\n"
 "Language-Team: Gujarati\n"
 "MIME-Version: 1.0\n"
@@ -43,172 +43,171 @@ msgstr ""
 "\n"
 "\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/groupwise/e-book-backend-groupwise.c:2330
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "àª²àª¾àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?..."
 
-#: ../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/groupwise/e-book-backend-groupwise.c:2261
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "àª¶à«?àª§à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2695
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+msgid "Querying for updated contactsâ?¦"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:624
+msgid "Personal"
+msgstr "àª?àª¾àª¨àª?à«?"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+#| msgid "Favorites"
+msgid "Friends"
+msgstr "àª®àª¿àª¤à«?àª°à«?"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+#| msgid "Family Name"
+msgid "Family"
+msgstr "àª?à«?àª?à«?àª?àª¬"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr ""
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groupsâ?¦"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+msgid "Creating new contactâ?¦"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contactâ?¦"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+msgid "Modifying contactâ?¦"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1199
+#| msgid "Loading..."
+msgid "Loadingâ?¦"
+msgstr "àª²àª¾àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1346
+#| msgid "Authentication required"
+msgid "Authenticating with the serverâ?¦"
+msgstr "àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?..."
+
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "àª¸àª?àªªàª°à«?àª?à«? àª¡àª¾àª?àª¨àª²à«?àª¡ àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª? (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2844
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3075
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "àª¸àª?àªªàª°à«?àª?à«? àª?à«?àª¶ àª¸à«?àª§àª¾àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª? (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
+#. 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
+#| msgid "Not connected."
+msgid "Not connected"
+msgstr "àª?à«?àª¡àª¾àª¯à«?àª² àª¨àª¥à«?"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
 msgid "Using Distinguished Name (DN)"
 msgstr "àªµàª¿àª¸à«?àª¤à«?àª¤ àª¨àª¾àª® (DN) àªµàª¾àªªàª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
 msgid "Using Email Address"
 msgstr "àª?àª®à«?àª?àª² àª¸àª°àª¨àª¾àª®à«?àª? àªµàª¾àªªàª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª«àª°à«?àª¥à«? àª?à«?àª¡àª¾àª? àª°àª¹à«?àª¯àª¾ àª?à«?àª?..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
+#| msgid "Invalid argument"
+msgid "Invalid DN syntax"
+msgstr "àª?àª¯à«?àª?à«?àª¯ DN àª¸àª¿àª¨à«?àª?à«?àª?à«?àª·"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP àª¸àª°à«?àªµàª°àª®àª¾àª? àª¸àª?àªªàª°à«?àª? àª?àª®à«?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP àª¸àª°à«?àªµàª°àª®àª¾àª?àª¥à«? àª¸àª?àªªàª°à«?àª? àª¦à«?àª° àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP àª¸àª°à«?àªµàª°àª®àª¾àª? àª¸àª?àªªàª°à«?àª? àª¸à«?àª§àª¾àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
 msgid "Receiving LDAP search results..."
 msgstr "LDAP àª¶à«?àª§àª¨àª¾àª? àªªàª°àª¿àª£àª¾àª®à«? àª®à«?àª³àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
 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\" àªªàª¹à«?àª²àª¾ \"%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 "àª?à«?àªªàª¡à«? àªµà«?àª¯àª¸à«?àª¤ àª?à«?"
-
-#: ../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 "CORBA àª?àªªàªµàª¾àª¦ \"%s\" àª¨à«? àª¬à«?àª²àª¾àªµà«? àª?à«?"
-
-#: ../addressbook/libebook/e-book.c:2520
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: àª¤à«?àª¯àª¾àª? àª?à«?àª? àªµàª°à«?àª¤àª®àª¾àª¨ àª?à«?àª°àª¿àª¯àª¾ àª¨àª¥à«?"
-
-#: ../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: àª°àª¦ àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?"
-
-#: ../addressbook/libebook/e-book.c:2665 ../addressbook/libebook/e-book.c:2669
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "\"%s\" àªªàª?à«? àª?à«?àªªàª¡à«?àª®àª¾àª? \"%s\" àª?à«?"
-
-#: ../addressbook/libebook/e-book.c:2733
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: àª°àª¦ àª?àª°à«?àª² àª?à«?"
-
-#: ../addressbook/libebook/e-book.c:3310
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: àª?àª¯à«?àª?à«?àª¯ àª¸à«?àª°à«?àª¤."
-
-#: ../addressbook/libebook/e-book.c:3318 ../addressbook/libebook/e-book.c:3383
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: URI `%s' àª®àª¾àª?à«? àª?à«?àª? àª«à«?àª?à«?àª?àª°à«?àª? àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
-
-#: ../addressbook/libebook/e-book.c:3329
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: EBookListener àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¥à«?"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
+#: ../calendar/backends/http/e-cal-backend-http.c:435
+#: ../calendar/libecal/e-cal.c:4177
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "àª?àª?àª¾àª£à«? àªà«?àª²"
 
-#: ../addressbook/libebook/e-book.c:3595
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
 #, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: gconf àª®àª¾àª? àª?à«?àª? àª¸à«?àªµàª¯àª? àª¸àª?àªªàª°à«?àª? UID àª¸àª?àª?à«?àª°àª¹àª¾àª¯à«?àª² àª¨àª¥à«?"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3727
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
+#: ../addressbook/libebook/e-book.c:3064
+#, fuzzy, c-format
+#| msgid "%s: there was no source for uid `%s' stored in gconf."
+msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: àª?à«?àª?à«?àª¨à«?àª«àª®àª¾àª? àª¸àª?àª?à«?àª°àª¹àª¿àª¤ uid `%s' àª®àª¾àª?à«? àª¤à«?àª¯àª¾àª? àª?à«?àª? àª¸à«?àª°à«?àª¤ àª¨ àª¹àª¤à«?."
 
+#: ../addressbook/libebook/e-book.c:3420
+#: ../addressbook/libedata-book/e-data-book.c:183
+#| msgid "Folder '%s/%s' does not exist."
+msgid "Address book does not exist"
+msgstr "àª¸àª°àª¨àª¾àª®àª¾àª? àªªà«?àª¸à«?àª¤àª¿àª?àª¾ àª?àª¸à«?àª¤àª¿àª¤à«?àªµàª®àª¾àª? àª¨àª¥à«?"
+
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "àª?àª¨àª¨à«?àª¯ ID"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "àª«àª¾àª?àª² àª¹à«?àª àª³"
 
 #. 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"
 
@@ -216,806 +215,1092 @@ msgstr "àªªà«?àª¸à«?àª¤àª? URI"
 #. 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 "àªªà«?àª°à«? àª¨àª¾àª®"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "àª?àªªà«?àª² àª¨àª¾àª®"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "àªªàª°àª¿àªµàª¾àª°àª¨à«?àª? àª¨àª¾àª®"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "àª²àª¾àª¡àª?à«?àª? àª¨àª¾àª®"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
 msgstr "àª?-àª®à«?àª?àª² à«§"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
 msgstr "àª?-àª®à«?àª?àª² à«¨"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
 msgstr "àª?-àª®à«?àª?àª² à«©"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
 msgstr "àª?-àª®à«?àª?àª² à«ª"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "àª®à«?àª?àª² àª?àª°àª¨àª¾àª°"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "àª?àª°àª¨àª¾ àª¸àª°àª¨àª¾àª®àª¾àª¨à«?àª? àª²à«?àª¬àª²"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "àª?àª¾àª® àª?àª°àªµàª¾àª¨àª¾ àª¸àª°àª¨àª¾àª®àª¾àª¨à«?àª? àª²à«?àª¬àª²"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "àª¬à«?àª?àª¾ àª¸àª°àª¨àª¾àª®àª¾àª?àª¨à«?àª? àª²à«?àª¬àª²"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "àª®àª¦àª¦àª?àª¾àª° àª«à«?àª¨"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "àª§àª?àª§àª¾ àª®àª¾àª?à«?àª¨à«? àª«à«?àª¨"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
 msgstr "àª§àª?àª§àª¾ àª®àª¾àª?à«?àª¨à«? àª«à«?àª¨ à«¨"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "àª§àª?àª§àª¾ àª®àª¾àª?à«?àª¨à«? àª«à«?àª?à«?àª¸"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "àª?à«?àª²àª¬à«?àª? àª«à«?àª¨"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "àª?àª¾àª¡à«?àª¨à«? àª«à«?àª¨"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "àª?àª?àªªàª¨à«?àª¨à«? àª«à«?àª¨"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "àª?àª°àª¨à«? àª«à«?àª¨"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
 msgstr "àª?àª°àª¨à«? àª«à«?àª¨ à«¨"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "àª?àª°àª¨à«? àª«à«?àª?à«?àª¸"
 
-#: ../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 "àª®à«?àª¬àª¾àª?àª² àª«à«?àª¨"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "àª¬à«?àª?àª¾ àª«à«?àª¨"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "àª¬à«?àª?àª¾ àª«à«?àª?à«?àª¸"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "àªªà«?àª?àª°"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "àªªà«?àª°àª¾àª¥àª®àª¿àª? àª«à«?àª¨"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "àª°à«?àª¡àª¿àª¯à«?"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "àª?à«?àª²à«?àª?à«?àª¸"
 
 #. 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 "àª¸àª?àª¸à«?àª¥àª¾"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "àª¸àª?àª¸à«?àª¥àª¾àª¨à«? àª?àª?àª®"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "àª?àª«àª¿àª¸"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "àª¶à«?àª°à«?àª·àª?"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "àªà«?àª®àª¿àª?àª¾"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "àªµà«?àª¯àªµàª¸à«?àª¥àª¾àªªàª?"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "àª¸àª¹àª¾àª¯àª?"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "àª?àª°àªªàª¾àª¨à«?àª? URL"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "àªµà«?àª¬àª²à«?àª? URL"
 
 #. 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:756
 msgid "Categories"
 msgstr "àªµàª°à«?àª?à«?"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° URI"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "àª®à«?àª?à«?àª¤/àªµà«?àª¯àª¸à«?àª¤ URL"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "ICS àª?à«?àª²à«?àª¨à«?àª¡àª°"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "àªµàª¿àª¡à«?àª¯à«? àª®àª?àª¤à«?àª°àª£àª¾ URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "àªªàª¤à«?àª¨à«?àª¨à«?àª? àª¨àª¾àª®"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "àª¨à«?àª?àª§"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
 msgstr "AIM àª?àª°àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«§"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "AIM àª?àª°àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«¨"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "AIM àª?àª°àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«©"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "AIM àª?àª¾àª® àª?àª°àªµàª¾àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«§"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "AIM àª?àª¾àª® àª?àª°àªµàª¾àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«¨"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "AIM àª?àª¾àª® àª?àª°àªµàª¾àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«©"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
 msgstr "àª?à«?àª¥ àªªà«?àª°àª®àª¾àª£à«? àª?àª°àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«§"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
 msgstr "àª?à«?àª¥ àªªà«?àª°àª®àª¾àª£à«? àª?àª°àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«¨"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
 msgstr "àª?à«?àª¥ àªªà«?àª°àª®àª¾àª£à«? àª?àª°àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«©"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
 msgstr "àª?à«?àª¥ àªªà«?àª°àª®àª¾àª£à«? àª?àª¾àª® àª?àª°àªµàª¾àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«§"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
 msgstr "àª?à«?àª¥ àªªà«?àª°àª®àª¾àª£à«? àª?àª¾àª® àª?àª°àªµàª¾àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«¨"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
 msgstr "àª?à«?àª¥ àªªà«?àª°àª®àª¾àª£à«? àª?àª¾àª® àª?àª°àªµàª¾àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«©"
 
-#: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "àª?à«?àª¬àª° àª?àª° Id à«§"
-
-#: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "àª?à«?àª¬àª° àª?àª° Id à«¨"
-
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "àª?à«?àª¬àª° àª?àª° Id à«©"
+#| msgid "Jabber Home Id 1"
+msgid "Jabber Home ID 1"
+msgstr "Jabber àª?àª° ID 1"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "àª?à«?àª¬àª° àª?àª¾àª® àª?àª°àªµàª¾àª¨à«?àª? Id à«§"
+#| msgid "Jabber Home Id 2"
+msgid "Jabber Home ID 2"
+msgstr "Jabber àª?àª° ID 2"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "àª?à«?àª¬àª° àª?àª¾àª® àª?àª°àªµàª¾àª¨à«?àª? Id à«¨"
+#| msgid "Jabber Home Id 3"
+msgid "Jabber Home ID 3"
+msgstr "Jabber àª?àª° ID 3"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "àª?à«?àª¬àª° àª?àª¾àª® àª?àª°àªµàª¾àª¨à«?àª? Id à«©"
+#| msgid "Jabber Work Id 1"
+msgid "Jabber Work ID 1"
+msgstr "Jabber àª?àª¾àª°à«?àª¯ ID 1"
 
 #: ../addressbook/libebook/e-contact.c:207
+#| msgid "Jabber Work Id 2"
+msgid "Jabber Work ID 2"
+msgstr "Jabber àª?àª¾àª°à«?àª¯ ID 2"
+
+#: ../addressbook/libebook/e-contact.c:208
+#| msgid "Jabber Work Id 3"
+msgid "Jabber Work ID 3"
+msgstr "Jabber àª?àª¾àª°à«?àª¯ ID 3"
+
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
 msgstr "àª¯àª¾àª¹à«?! àª?àª° àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«§"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "àª¯àª¾àª¹à«?! àª?àª° àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«¨"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "àª¯àª¾àª¹à«?! àª?àª° àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«©"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "àª¯àª¾àª¹à«?! àª?àª¾àª® àª?àª°àªµàª¾àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«§"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "àª¯àª¾àª¹à«?! àª?àª¾àª® àª?àª°àªµàª¾àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«¨"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "àª¯àª¾àª¹à«?! àª?àª¾àª® àª?àª°àªµàª¾àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«©"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
 msgstr "MSN àª?àª° àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«§"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
 msgstr "MSN àª?àª° àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«¨"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
 msgstr "MSN àª?àª° àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«©"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
 msgstr "MSN àª?àª¾àª® àª?àª°àªµàª¾àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«§"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
 msgstr "MSN àª?àª¾àª® àª?àª°àªµàª¾àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«¨"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
 msgstr "MSN àª?àª¾àª® àª?àª°àªµàª¾àª¨à«? àª¸à«?àª?à«?àª°à«?àª¨àª¨à«?àª? àª¨àª¾àª® à«©"
 
-#: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "ICQ àª?àª° Id à«§"
-
-#: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "ICQ àª?àª° Id à«¨"
-
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "ICQ àª?àª° Id à«©"
+#| msgid "ICQ Home Id 1"
+msgid "ICQ Home ID 1"
+msgstr "ICQ àª?àª° ID 1"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "ICQ àª?àª¾àª® àª?àª°àªµàª¾àª¨à«?àª? Id à«§"
+#| msgid "ICQ Home Id 2"
+msgid "ICQ Home ID 2"
+msgstr "ICQ àª?àª° ID 2"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "ICQ àª?àª¾àª® àª?àª°àªµàª¾àª¨à«?àª? Id à«¨"
+#| msgid "ICQ Home Id 3"
+msgid "ICQ Home ID 3"
+msgstr "ICQ àª?àª° ID 3"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "ICQ àª?àª¾àª® àª?àª°àªµàª¾àª¨à«?àª? Id à«©"
+#| msgid "ICQ Work Id 1"
+msgid "ICQ Work ID 1"
+msgstr "ICQ àª?àª¾àª°à«?àª¯ ID 1"
+
+#: ../addressbook/libebook/e-contact.c:225
+#| msgid "ICQ Work Id 2"
+msgid "ICQ Work ID 2"
+msgstr "ICQ àª?àª¾àª°à«?àª¯ ID 2"
+
+#: ../addressbook/libebook/e-contact.c:226
+#| msgid "ICQ Work Id 3"
+msgid "ICQ Work ID 3"
+msgstr "ICQ àª?àª¾àª°à«?àª¯ ID 3"
 
 #. 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 "àª¸àª°àª¨àª¾àª®àª¾àª¨à«? àª¯àª¾àª¦à«?"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "àª?àª°àª¨à«?àª? àª¸àª°àª¨àª¾àª®à«?àª?"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "àª?àª¾àª® àª?àª°àªµàª¾àª¨à«?àª? àª¸àª°àª¨àª¾àª®à«?àª?"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "àª¬à«?àª?àª¾ àª¸àª°àª¨àª¾àª®àª¾àª?"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
 msgstr "àªµàª°à«?àª?àª¨à«? àª¯àª¾àª¦à«?"
 
 #. 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 "àª¨àª¾àª®"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
 msgstr "àª?àª®à«?àª?àª²àª¨à«? àª¯àª¾àª¦à«?"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr "AIM àª¸à«?àª?à«?àª°à«?àª¨àª¨àª¾ àª¨àª¾àª®àª¨à«? àª¯àª¾àª¦à«?"
 
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "àª?à«?àª¥ àªªà«?àª°àª®àª¾àª£à«? Id àª¨à«? àª¯àª¾àª¦à«?"
+#: ../addressbook/libebook/e-contact.c:250
+#| msgid "GroupWise Id List"
+msgid "GroupWise ID List"
+msgstr "GroupWise ID àª¯àª¾àª¦à«?"
 
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "àª?à«?àª¬àª° Id àª¨à«? àª¯àª¾àª¦à«?"
+#: ../addressbook/libebook/e-contact.c:251
+#| msgid "Jabber Id List"
+msgid "Jabber ID List"
+msgstr "Jabber ID àª¯àª¾àª¦à«?"
 
-#: ../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 "MSN àª¸à«?àª?à«?àª°à«?àª¨àª¨àª¾ àª¨àª¾àª®àª¨à«? àª¯àª¾àª¦à«?"
 
-#: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
-msgstr "ICQ Id àª¯àª¾àª¦à«?"
-
 #: ../addressbook/libebook/e-contact.c:254
+#| msgid "ICQ Id List"
+msgid "ICQ ID List"
+msgstr "ICQ ID àª¯àª¾àª¦à«?"
+
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "àª¨à«? HTML àª®à«?àª?àª²àª¨à«? àª?àª°à«?àª° àª?à«?"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
 msgstr "àª¯àª¾àª¦à«?"
 
-#: ../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 "àª?àª¨à«?àª® àª¤àª¾àª°à«?àª?"
 
-#: ../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:723
 msgid "Anniversary"
 msgstr "àª¸àª¾àª²àª?à«?àª°à«?"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "X.509 àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª°"
 
-#: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu Home Id 1"
-
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu Home Id 2"
-
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu Home Id 3"
+#| msgid "Gadu-Gadu Home Id 1"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "Gadu-Gadu àª?àª° ID 1"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu Work Id 1"
+#| msgid "Gadu-Gadu Home Id 2"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "Gadu-Gadu àª?àª° ID 2"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu Work Id 2"
+#| msgid "Gadu-Gadu Home Id 3"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "Gadu-Gadu àª?àª° ID 3"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu Work Id 3"
+#| msgid "Gadu-Gadu Work Id 1"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "Gadu-Gadu àª?àª¾àª°à«?àª¯ ID 1"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu Id List"
+#| msgid "Gadu-Gadu Work Id 2"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "Gadu-Gadu àª?àª¾àª°à«?àª¯ ID 2"
+
+#: ../addressbook/libebook/e-contact.c:272
+#| msgid "Gadu-Gadu Work Id 3"
+msgid "Gadu-Gadu Work ID 3"
+msgstr "Gadu-Gadu àª?àª¾àª°à«?àª¯ Id 3"
+
+#: ../addressbook/libebook/e-contact.c:273
+#| msgid "Gadu-Gadu Id List"
+msgid "Gadu-Gadu ID List"
+msgstr "Gadu-Gadu ID àª¯àª¾àª¦à«?"
 
 #. 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 "àª?à«?àª²à«?àª«à«?àª¨"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
 msgstr "Skype àª?àª°àª¨à«?àª? àª¨àª¾àª® à«§"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
 msgstr "MSN àª?àª°àª¨à«?àª? àª¨àª¾àª® à«¨"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
 msgstr "Skype àª?àª°àª¨à«?àª? àª¨àª¾àª® à«©"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
 msgstr "Skype àª?àª¾àª®àª¨à«?àª? àª¨àª¾àª® à«§"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
 msgstr "Skype àª?àª¾àª®àª¨à«?àª? àª¨àª¾àª® à«¨"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
 msgstr "Skype àª?àª¾àª®àª¨à«?àª? àª¨àª¾àª® à«©"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
 msgstr "Skype àª¨àª¾àª® àª¨à«? àª¯àª¾àª¦à«?"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "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 "àª¨àª¾àª® àªµàª?àª°àª¨à«? àª¯àª¾àª¦à«?"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:46
-msgid "Birthday"
-msgstr "àª?àª¨à«?àª® àª¦àª¿àªµàª¸"
-
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../addressbook/libedata-book/e-data-book-factory.c:304
 #, c-format
-msgid "Birthday: %s"
-msgstr "àª?àª¨à«?àª® àª¦àª¿àªµàª¸: %s"
+msgid "Empty URI"
+msgstr ""
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../addressbook/libedata-book/e-data-book-factory.c:323
+#: ../addressbook/libedata-book/e-data-book-factory.c:361
+#: ../calendar/libedata-cal/e-data-cal-factory.c:352
+#: ../calendar/libedata-cal/e-data-cal-factory.c:364
 #, c-format
-msgid "Anniversary: %s"
-msgstr "àª¸àª¾àª²àª?à«?àª°à«?: %s"
+#| msgid "%s: Invalid source."
+msgid "Invalid source"
+msgstr "àª?àª¯à«?àª?à«?àª¯ àª¸à«?àª°à«?àª¤"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:234
-msgid "Cannot save calendar data: Malformed URI."
-msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª®àª¾àª¹àª¿àª¤à«? àª¸àª?àª?à«?àª°àª¹à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª®àª²à«?àª¨ URI."
-
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#: ../calendar/backends/file/e-cal-backend-file.c:247
-msgid "Cannot save calendar data"
-msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª®àª¾àª¹àª¿àª¤à«? àª¸àª?àª?à«?àª°àª¹à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:110
+msgid "Success"
+msgstr ""
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
-msgid "Could not create thread for getting deltas"
-msgstr "deltas àª®à«?àª³àªµàªµàª¾ àª®àª¾àª?à«? àª¥à«?àª°à«?àª¡ àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?"
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:111
+#| msgid "Repository is offline"
+msgid "Repository offline"
+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"
-msgstr "àª?à«?àª¶ àª«àª¾àª?àª² àª¬àª¨àª¾àªµà«? àª¶àª?àª¾àª? àª¨àª¹àª¿"
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libecal/e-cal.c:4159 ../calendar/libedata-cal/e-data-cal.c:112
+msgid "Permission denied"
+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"
-msgstr "àª?à«?àª¶ àª¬àª¨àª¾àªµàªµàª¾ àª®àª¾àª?à«? àª¥à«?àª°à«?àª¡ àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¥à«?"
+#: ../addressbook/libedata-book/e-data-book.c:176
+#| msgid "Object not found"
+msgid "Contact not found"
+msgstr "àª¸àª?àªªàª°à«?àª? àª®àª³à«?àª¯à«? àª¨àª¥à«?"
+
+#: ../addressbook/libedata-book/e-data-book.c:177
+#| msgid "Object ID already exists"
+msgid "Contact ID already exists"
+msgstr "àª¸àª?àªªàª°à«?àª? ID àªªàª¹à«?àª²àª¾àª¥à«? àª? àª¹àª¾àª?àª° àª?à«?"
+
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:117
+#| msgid "Authentication failed"
+msgid "Authentication Failed"
+msgstr "àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª¨àª¿àª·à«?àª«àª³"
+
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:118
+#| msgid "Authentication required"
+msgid "Authentication Required"
+msgstr "àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª?àª°à«?àª°à«?"
+
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:119
+msgid "Unsupported field"
+msgstr "àª¬àª¿àª¨-àª?àª§àª¾àª°àªà«?àª¤ àª?à«?àª·à«?àª¤à«?àª°"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
-msgid "Reply Requested: by "
-msgstr "àªªà«?àª°àª¤à«?àª¯à«?àª¤à«?àª¤àª°àª¨à«? àª®àª¾àª?àª?àª£à«? àª¥àª¯à«?àª² àª?à«?: àª?àª®àª¨àª¾ àª¦à«?àªµàª¾àª°àª¾ "
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Unsupported authentication method"
+msgstr "àª¬àª¿àª¨àª?àª§àª¾àª°àªà«?àª¤ àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àªªàª¦à«?àª¦àª¤àª¿"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
-msgid "Reply Requested: When convenient"
-msgstr "àªªà«?àª°àª¤à«?àª¯à«?àª¤à«?àª¤àª°àª¨à«? àª®àª¾àª?àª?àª£à«? àª¥àª¯à«?àª² àª?à«?: àª?à«?àª¯àª¾àª°à«? àª¯à«?àª?à«?àª¯ àª¹à«?àª¯"
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "TLS not available"
+msgstr "TLS àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
-#, c-format
-msgid "Loading %s items"
-msgstr "%s àªµàª¸à«?àª¤à«?àª? àª²àª¾àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+#: ../addressbook/libedata-book/e-data-book.c:184
+msgid "Book removed"
+msgstr ""
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
-msgid "Calendar"
-msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª°"
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:125
+#| msgid "This message is not available in offline mode."
+msgid "Not available in offline mode"
+msgstr "àª?àª«àª²àª¾àª?àª¨ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
-msgid "Invalid server URI"
-msgstr "àª?àª¯à«?àª?à«?àª¯ àª¸àª°à«?àªµàª° URI"
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Search size limit exceeded"
+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 "àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª¾àª° àª¨àª¿àª·à«?àª«àª³"
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Search time limit exceeded"
+msgstr "àªµàª§àª¾àª°à«?àª² àª¸àª®àª¯ àª®àª°à«?àª¯àª¾àª¦àª¾ àª¨à«? àª¶à«?àª§à«?"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:316
-msgid "Redirected to Invalid URI"
-msgstr "àª?àª¯à«?àª?à«?àª¯ URI àª«àª°à«?àª¥à«? àª¦àª¿àª¶àª¾àª®àª¾àª¨ àª?àª°àª¾àª¯à«?àª?"
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Invalid query"
+msgstr "àª?àª®àª¾àª¨à«?àª¯ àªªà«?àª°àª¶à«?àª°à«?àª¨"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:339
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:129
+msgid "Query refused"
+msgstr "àªªà«?àª°àª¶à«?àª¨ àª¨àª?àª¾àª°àª¾àª? àª?àª¯à«?"
+
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:130
+#| msgid "%s: could not cancel"
+msgid "Could not cancel"
+msgstr "àª°àª¦ àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?"
+
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:132
+msgid "Invalid server version"
+msgstr "àª?àª¯à«?àª?à«?àª¯ àª¸àª°à«?àªµàª° àª?àªµà«?àª¤à«?àª¤àª¿"
+
+#: ../addressbook/libedata-book/e-data-book.c:193
+#| msgid "Namespace"
+msgid "No space"
+msgstr "àª?àª?à«?àª¯àª¾ àª¨àª¥à«?"
+
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4143 ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Invalid argument"
+msgstr "àª?àª¯à«?àª?à«?àª¯ àª¦àª²à«?àª²"
+
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libecal/e-cal.c:4182 ../calendar/libedata-cal/e-data-cal.c:135
+#| msgid "Protocol not supported"
+msgid "Not supported"
+msgstr "àª?àª§àª¾àª°àªà«?àª¤ àª¨àª¥à«?"
+
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:143
+#| msgid "I/O error"
+msgid "Other error"
+msgstr "àª¬à«?àª?à«? àªà«?àª²"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:325
+#, c-format
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot open book: %s"
+msgstr "àªªà«?àª¸à«?àª¤àª¿àª?àª¾àª¨à«? àª?à«?àª²à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:347
+#, c-format
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot remove book: %s"
+msgstr "àªªà«?àª¸à«?àª¤àª¿àª?àª¾àª¨à«? àª¦à«?àª° àª?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
+#, c-format
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact: %s"
+msgstr "àª¸àª?àªªàª°à«?àª?àª¨à«? àª®à«?àª³àªµà«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:402
+#, c-format
+msgid "Empty query: %s"
+msgstr ""
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:418
+#, c-format
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact list: %s"
+msgstr "àª¸àª?àªªàª°à«?àª? àª¯àª¾àª¦à«?àª¨à«? àª®à«?àª³àªµà«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:457
+#, c-format
+#| msgid "Cannot authenticate to server: %s"
+msgid "Cannot authenticate user: %s"
+msgstr "àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾àª¨à«?àª? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:472
+#: ../addressbook/libedata-book/e-data-book.c:491
+#, c-format
+#| msgid "Cannot get folder container %s"
+msgid "Cannot add contact: %s"
+msgstr "àª¸àª?àªªàª°à«?àª?àª¨à«? àª?àª®à«?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:513
+#: ../addressbook/libedata-book/e-data-book.c:532
+#, c-format
+#| msgid "Cannot get folder container %s"
+msgid "Cannot modify contact: %s"
+msgstr "àª¸àª?àªªàª°à«?àª?àª¨à«? àª¬àª¦àª²à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:571
+#, c-format
+#| msgid "Cannot get folder container %s"
+msgid "Cannot remove contacts: %s"
+msgstr "àª¸àª?àªªàª°à«?àª?à«?àª¨à«? àª¦à«?àª° àª?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, fuzzy, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get supported fields: %s"
+msgstr "àª¸àª?àª¦à«?àª¶à«? %s àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:625
+#, fuzzy, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get required fields: %s"
+msgstr "àª¸àª?àª¦à«?àª¶à«? %s àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:640
+#, fuzzy, c-format
+#| msgid "Unsupported authentication method"
+msgid "Cannot get supported authentication methods: %s"
+msgstr "àª¬àª¿àª¨àª?àª§àª¾àª°àªà«?àª¤ àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àªªàª¦à«?àª¦àª¤àª¿"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:666
+#: ../addressbook/libedata-book/e-data-book.c:677
+#, c-format
+#| msgid "Invalid query"
+msgid "Invalid query: %s"
+msgstr "àª?àª®àª¾àª¨à«?àª¯ àªªà«?àª°àª¶à«?àª°à«?àª¨: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:713
+#, fuzzy, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get changes: %s"
+msgstr "àª¸àª?àª¦à«?àª¶à«? %s àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:755
+#, fuzzy, c-format
+#| msgid "Operation failed: %s"
+msgid "Cancel operation failed: %s"
+msgstr "àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾ àª¨àª¿àª·à«?àª«àª³: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, fuzzy, c-format
+#| msgid ""
+#| "Unexpected GnuPG status message encountered:\n"
+#| "\n"
+#| "%s"
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr ""
+"àª?àª¨àª¿àª?à«?àª?àª¨àª¿àª¯ GnuPG àª¸à«?àª¥àª¿àª¤àª¿ àª¸àª?àª¦à«?àª¶à«? àª®àª³à«? àª?àªµà«?àª¯à«?:\n"
+"\n"
+"%s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2090
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2490
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4241
+msgid "Calendar doesn't support Free/Busy"
+msgstr ""
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
+msgid "Birthday"
+msgstr "àª?àª¨à«?àª® àª¦àª¿àªµàª¸"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
+#, c-format
+msgid "Birthday: %s"
+msgstr "àª?àª¨à«?àª® àª¦àª¿àªµàª¸: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
+#, c-format
+msgid "Anniversary: %s"
+msgstr "àª¸àª¾àª²àª?à«?àª°à«?: %s"
+
+#: ../calendar/backends/file/e-cal-backend-file.c:251
+msgid "Cannot save calendar data: Malformed URI."
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª®àª¾àª¹àª¿àª¤à«? àª¸àª?àª?à«?àª°àª¹à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª®àª²à«?àª¨ URI."
+
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
+msgid "Cannot save calendar data"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª®àª¾àª¹àª¿àª¤à«? àª¸àª?àª?à«?àª°àª¹à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2105
+msgid "Reply Requested: by "
+msgstr "àªªà«?àª°àª¤à«?àª¯à«?àª¤à«?àª¤àª°àª¨à«? àª®àª¾àª?àª?àª£à«? àª¥àª¯à«?àª² àª?à«?: àª?àª®àª¨àª¾ àª¦à«?àªµàª¾àª°àª¾ "
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2110
+msgid "Reply Requested: When convenient"
+msgstr "àªªà«?àª°àª¤à«?àª¯à«?àª¤à«?àª¤àª°àª¨à«? àª®àª¾àª?àª?àª£à«? àª¥àª¯à«?àª² àª?à«?: àª?à«?àª¯àª¾àª°à«? àª¯à«?àª?à«?àª¯ àª¹à«?àª¯"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
+#, fuzzy
+#| msgid "Loading %s items"
+msgid "Loading Appointment items"
+msgstr "%s àªµàª¸à«?àª¤à«?àª? àª²àª¾àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
+#, fuzzy
+#| msgid "Loading %s items"
+msgid "Loading Task items"
+msgstr "%s àªµàª¸à«?àª¤à«?àª? àª²àª¾àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
+#, fuzzy
+#| msgid "Loading %s items"
+msgid "Loading Note items"
+msgstr "%s àªµàª¸à«?àª¤à«?àª? àª²àª¾àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
+#| msgid "Loading %s items"
+msgid "Loading items"
+msgstr "àªµàª¸à«?àª¤à«?àª?àª¨à«? àª²àª¾àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
+msgid "Calendar"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª°"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
+msgid "Invalid server URI"
+msgstr "àª?àª¯à«?àª?à«?àª¯ àª¸àª°à«?àªµàª° URI"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
+#: ../calendar/backends/http/e-cal-backend-http.c:783
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
+msgid "Could not create cache file"
+msgstr "àª?à«?àª¶ àª«àª¾àª?àª² àª¬àª¨àª¾àªµà«? àª¶àª?àª¾àª? àª¨àª¹àª¿"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
+msgid "Could not create thread for populating cache"
+msgstr "àª?à«?àª¶ àª¬àª¨àª¾àªµàªµàª¾ àª®àª¾àª?à«? àª¥à«?àª°à«?àª¡ àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¥à«?"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:423
+msgid "Redirected to Invalid URI"
+msgstr "àª?àª¯à«?àª?à«?àª¯ URI àª«àª°à«?àª¥à«? àª¦àª¿àª¶àª¾àª®àª¾àª¨ àª?àª°àª¾àª¯à«?àª?"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:456
 msgid "Bad file format."
 msgstr "àª«àª¾àª?àª²àª¨à«?àª? àª¬àª?àª§àª¾àª°àª£ àª?àª°àª¾àª¬ àª?à«?."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:346
+#: ../calendar/backends/http/e-cal-backend-http.c:463
 msgid "Not a calendar."
 msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª¨àª¥à«?."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
 msgid "Could not retrieve weather data"
 msgstr "àª¹àªµàª¾àª®àª¾àª¨ àª®àª¾àª¹àª¿àª¤à«? àª®à«?àª³àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¥à«?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Fog"
 msgstr "àª¹àªµàª¾àª®àª¾àª¨: àª§à«?àª®à«?àª®àª¸"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy"
-msgstr "àª¹àªµàª¾àª®àª¾àª¨: àªµàª¾àª¦àª³àª¿àª¯à«?àª?"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy Night"
 msgstr "àª¹àªµàª¾àª®àª¾àª¨: àªµàª¾àª¦àª³àª¿àª¯à«? àª°àª¾àª¤"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+msgid "Weather: Cloudy"
+msgstr "àª¹àªµàª¾àª®àª¾àª¨: àªµàª¾àª¦àª³àª¿àª¯à«?àª?"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Overcast"
 msgstr "àª¹àªµàª¾àª®àª¾àª¨: àªµàª¾àª¦àª³àª¾àª¥à«? àª¢àª?àª?àª¾àª¯à«?àª²à«?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Showers"
 msgstr "àª¹àªµàª¾àª®àª¾àª¨: àª¬àª°àª«à«?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Snow"
 msgstr "àª¹àªµàª¾àª®àª¾àª¨: àª¬àª°àª«"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Sunny"
-msgstr "àª¹àªµàª¾àª®àª¾àª¨: àª?àª?àªµàª¾àª³àª¿àª¯à«?àª?"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Clear Night"
 msgstr "àª¹àªµàª¾àª®àª¾àª¨: àª¸à«?àªµàª?à«?àª? àª°àª¾àª¤"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+msgid "Weather: Sunny"
+msgstr "àª¹àªµàª¾àª®àª¾àª¨: àª?àª?àªµàª¾àª³àª¿àª¯à«?àª?"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
 msgid "Weather: Thunderstorms"
 msgstr "àª¹àªµàª¾àª®àª¾àª¨: àªµàª¾àªµàª¾àª?à«?àª¡àª¿àª¯à«?àª?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:400
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
 msgid "Forecast"
 msgstr "àª?àª?àª¦àª¾àª?"
 
-#: ../calendar/libecal/e-cal-component.c:1320
+#: ../calendar/libecal/e-cal-component.c:1299
 msgid "Untitled appointment"
 msgstr "àª¶à«?àª°à«?àª·àª? àªµàª?àª°àª¨à«? àª®à«?àª³àª¾àªª"
 
-#: ../calendar/libecal/e-cal-recur.c:3945
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "1st"
 msgstr "àªªàª¹à«?àª²à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3946
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "2nd"
 msgstr "àª¬à«?àª?à«?"
 
-#: ../calendar/libecal/e-cal-recur.c:3947
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "3rd"
 msgstr "àª¤à«?àª°à«?àª?à«?"
 
-#: ../calendar/libecal/e-cal-recur.c:3948
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "4th"
 msgstr "àª?à«?àª¥à«?"
 
-#: ../calendar/libecal/e-cal-recur.c:3949
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "5th"
 msgstr "àªªàª¾àª?àª?àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3950
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "6th"
 msgstr "àª?àª à«?àª à«?"
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "7th"
 msgstr "àª¸àª¾àª¤àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "8th"
 msgstr "àª?àª àª®à«?"
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "9th"
 msgstr "àª¨àªµàª®à«?"
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "10th"
 msgstr "àª¦àª¸àª®à«?"
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "11th"
 msgstr "àª?àª?àª¿àª¯àª¾àª°àª®à«?"
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "12th"
 msgstr "àª¬àª¾àª°àª®à«?"
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "13th"
 msgstr "àª¤à«?àª°àª®à«?"
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "14th"
 msgstr "àª?à«?àª¦àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "15th"
 msgstr "àªªàª?àª¦àª°àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "16th"
 msgstr "àª¸à«?àª³àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "17th"
 msgstr "àª¸àª¤à«?àª¤àª°àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "18th"
 msgstr "àª?àª¢àª¾àª°àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "19th"
 msgstr "àª?àª?àª£à«?àª¸àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "20th"
 msgstr "àªµà«?àª¸àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "21st"
 msgstr "àª?àª?àªµà«?àª¸àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "22nd"
 msgstr "àª¬àª¾àªµà«?àª¸àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "23rd"
 msgstr "àª¤à«?àª°à«?àªµà«?àª¸àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "24th"
 msgstr "àª?à«?àªµà«?àª¸àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "25th"
 msgstr "àªªàª?à«?àª?à«?àª¸àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "26th"
 msgstr "àª?àªµà«?àªµà«?àª¸àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "27th"
 msgstr "àª¸àª¤à«?àª¤àª¾àªµà«?àª¸àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "28th"
 msgstr "àª?àª à«?àª àª¾àªµà«?àª¸àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "29th"
 msgstr "àª?àª?àª£àª¤à«?àª°à«?àª¸àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "30th"
 msgstr "àª¤à«?àª°à«?àª¸àª®à«?àª?"
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "31st"
 msgstr "àª?àª?àª¤à«?àª°à«?àª¸àª®à«?àª?"
 
-#: ../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 "àª?àª?àª?à«?"
 
-#: ../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 "àª¸àª¾àª®àª¾àª¨à«?àª¯"
 
-#: ../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 "àª¨à«?àª?à«?"
 
 #. 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:1236 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:440
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾ %s) àª®àª¾àª?à«? àªªàª¾àª¸àªµàª°à«?àª¡ àª¦àª¾àª?àª² àª?àª°à«?"
@@ -1024,186 +1309,158 @@ msgstr "%s (àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾ %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:1250
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾ %s àª®àª¾àª?à«? àªªà«?àª°à«?àª?à«?àª¸à«? àª¸àª?à«?àª°àª¿àª¯ àª?àª°àªµàª¾ àª®àª¾àª?à«? %s àª®àª¾àª?à«? àªªàª¾àª¸àªµàª°à«?àª¡ àª¦àª¾àª?àª² àª?àª°à«?"
 
-#: ../calendar/libecal/e-cal.c:5089
-msgid "Invalid argument"
-msgstr "àª?àª¯à«?àª?à«?àª¯ àª¦àª²à«?àª²"
-
-#: ../calendar/libecal/e-cal.c:5091
+#: ../calendar/libecal/e-cal.c:4145
 msgid "Backend is busy"
 msgstr "àªªàª¾àª¶à«?àªµ àªàª¾àª? àªµà«?àª¯àª¸à«?àª¤ àª?à«?"
 
-#: ../calendar/libecal/e-cal.c:5093
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4147
 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:4149
 msgid "No such calendar"
 msgstr "àª?àªµà«? àª?à«?àª? àª?à«?àª²à«?àª¨à«?àª¡àª° àª? àª¨àª¥à«?"
 
-#: ../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:4151 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../servers/groupwise/e-gw-connection.c:235
 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:4153 ../calendar/libedata-cal/e-data-cal.c:115
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "àª?àª¯à«?àª?à«?àª¯ àª?àª¬à«?àª?à«?àª?à«?àª?"
 
-#: ../calendar/libecal/e-cal.c:5101
+#: ../calendar/libecal/e-cal.c:4155
 msgid "URI not loaded"
 msgstr "URI àª²àªµàª¾àª? àª¨àª¥à«?"
 
-#: ../calendar/libecal/e-cal.c:5103
+#: ../calendar/libecal/e-cal.c:4157
 msgid "URI already loaded"
 msgstr "URI àªªàª¹à«?àª²à«?àª¥à«? àª? àª²àªµàª¾àª? àª?àª? àª?à«?"
 
-#: ../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:4161 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "àª?àª?à«?àª?àª¾àª¤ àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾"
 
-#: ../calendar/libecal/e-cal.c:5109
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4163 ../calendar/libedata-cal/e-data-cal.c:116
 msgid "Object ID already exists"
 msgstr "àª?àª¬à«?àª?à«?àª?à«?àª? ID àªªàª¹à«?àª²àª¾àª¥à«? àª? àª¹àª¾àª?àª° àª?à«?"
 
-#: ../calendar/libecal/e-cal.c:5111
+#: ../calendar/libecal/e-cal.c:4165
 msgid "Protocol not supported"
 msgstr "àªªà«?àª°à«?àª?à«?àª?à«?àª²àª¨à«? àª?àª§àª¾àª° àª¨àª¥à«?"
 
-#: ../calendar/libecal/e-cal.c:5113
+#: ../calendar/libecal/e-cal.c:4167
 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:4169
 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:4171
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1310
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1328
+#: ../camel/providers/groupwise/camel-groupwise-store.c:632
+#: ../camel/providers/groupwise/camel-groupwise-store.c:814
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#, c-format
+msgid "Authentication failed"
+msgstr "àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª¾àª° àª¨àª¿àª·à«?àª«àª³"
+
+#: ../calendar/libecal/e-cal.c:4173
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 msgid "Authentication required"
 msgstr "àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª¾àª°àª¨à«? àª?àª°à«?àª°àª¿àª¯àª¾àª¤ àª?à«?"
 
-#: ../calendar/libecal/e-cal.c:5121
-msgid "A CORBA exception has occurred"
+#: ../calendar/libecal/e-cal.c:4175
+#, fuzzy
+#| msgid "A CORBA exception has occurred"
+msgid "A D-Bus exception has occurred"
 msgstr "CORBA àª¨à«? àª?àªªàªµàª¾àª¦ àª?àªà«? àª¥àª¯à«? àª?à«?"
 
-#: ../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 "àª?àª?àª¾àª£à«? àªà«?àª²"
-
-#: ../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:4179
 msgid "No error"
 msgstr "àª?à«?àª? àªà«?àª² àª¨àª¥à«?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../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:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" àª¨à«? àª?à«?àª? àª¦àª²à«?àª²àª¨à«? àª?àª°à«?àª° àª¨àª¥à«?"
 
-#: ../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:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" àª¨à«? àª?àª? àª¦àª²à«?àª²àª¨à«? àª?àª°à«?àª° àª?à«?"
 
-#: ../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:735
+#: ../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:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" àª? àªªàª¹à«?àª²à«? àª¦àª²à«?àª² àª¶àª¬à«?àª¦àª®àª¾àª³àª¾ àª¹à«?àªµà«? àª?à«?àª?àª? àª?àª® àª?àª?à«?àª?à«? àª?à«?"
 
-#: ../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 "\"%s\" àª? àªªàª¹à«?àª²à«? àª¦àª²à«?àª² ISO 8601 àª¤àª¾àª°à«?àª?/àª¸àª®àª¯ àª¶àª¬à«?àª¦àª®àª¾àª³àª¾ àª¹à«?àªµà«? àª?à«?àª?àª? àª?àª® àª?àª?à«?àª?à«? àª?à«?"
 
-#: ../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:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../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:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" àª¨à«? àª¬à«? àª¦àª²à«?àª²àª¨à«? àª?àª°à«?àª° àª?à«?"
 
-#: ../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: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: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:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" àª? àªªàª¹à«?àª²à«? àª¦àª²à«?àª² time_t àª¹à«?àªµà«? àª?à«?àª?àª? àª?àª® àª?àª?à«?àª?à«? àª?à«?"
 
-#: ../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 "\"%s\" àª? àª¬à«?àª?à«? àª¦àª²à«?àª² àª?àª¨à«?àª?à«?àª?àª° àª¹à«?àªµà«?àª¹à«?àªµà«? àª?à«?àª?àª? àª?àª® àª?àª?à«?àª?à«? àª?à«?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" àª? àª¬à«?àª?à«? àª¦àª²à«?àª² time_t àª¹à«?àªµà«? àª?à«?àª?àª? àª?àª® àª?àª?à«?àª?à«? àª?à«?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" àª? àª¬à«?àª?à«? àª¦àª²à«?àª² àª¶àª¬à«?àª¦àª®àª¾àª³àª¾ àª¹à«?àªµà«? àª?à«?àª?àª? àª?àª® àª?àª?à«?àª?à«? àª?à«?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1213,12 +1470,12 @@ msgstr ""
 "\"%s\" àª? àªªàª¹à«?àª²à«? àª¦àª²à«?àª² àª?à«?àª¯àª¾àª? àª¤à«? \"àª?àª?àª? àªªàª£\", \"àª¸àª¾àª°àª¾àª?àª¶\" àª?àª¥àªµàª¾ \"àªµàª°à«?àª£àª¨\" àª?àª¥àªµàª¾ \"àª?àª?à«?àª¯àª¾\" "
 "àª?àª¥àªµàª¾ \"àª¸àªàª¾àª?àª¨\", àª?àª¥àªµàª¾ \"àª?àª¯à«?àª?àª?\", àª?àª¥àªµàª¾ \"àªµàª°à«?àª?à«?àª?àª°àª£\" àª¹à«?àªµà«? àª?à«?àª?àª? àª?àª® àª?àª?à«?àª?à«? àª?à«?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" àª?àª?àª¾àª®àª¾àª? àª?àª?à«? àª?àª? àª¦àª²à«?àª²àª¨à«? àª?àª?à«?àª?àª¾ àª°àª¾àª?à«? àª?à«?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1227,104 +1484,264 @@ msgstr ""
 "\"%s\" àª? àª¬àª§à«? àª¦àª²à«?àª²à«? àª¶àª¬à«?àª¦àª®àª¾àª³àª¾àª? àª¹à«?àªµà«? àª?à«?àª?àª? àª?àª¥àªµàª¾ àª?àª? àª?àª¨à«?  àª®àª¾àª¤à«?àª° àª?àª? àª¦àª²à«?àª² àª¬à«?àª²à«?àª¯àª¨ àª?à«?àª?à«?àª? "
 "àª¹à«?àªµà«? àª?à«?àª?àª? (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:113
 msgid "Invalid range"
 msgstr "àª?àª¯à«?àª?à«?àª¯ àªµàª¿àª¸à«?àª¤àª¾àª°"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "àª¬àª¿àª¨-àª?àª§àª¾àª°àªà«?àª¤ àª?à«?àª·à«?àª¤à«?àª°"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:120
 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:123
+#| msgid "Folder '%s' does not exist."
+msgid "Calendar does not exist"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª?àª¸à«?àª¤àª¿àª¤à«?àªµ àª§àª°àª¾àªµàª¤à«? àª¨àª¥à«?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
+#: ../calendar/libedata-cal/e-data-cal.c:124
+#| msgid "Unknown User"
+msgid "Unknown user"
+msgstr "àª?àª?à«?àª?àª¾àª¤ àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "àª?àª«àª²àª¾àª?àª¨ àª¸à«?àª¥àª¿àª¤àª¿ àª¬àª¿àª¨-àª?àªªàª²àª¬à«?àª§"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:610
+#, c-format
+#| msgid "Cannot create folder: %s: %s"
+msgid "Cannot retrieve calendar address: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª¸àª°àª¨àª¾àª®à«?àª? àª®à«?àª³àªµà«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "àªµàª§àª¾àª°à«?àª² àª®àª¾àªªàª¨à«? àª®àª°à«?àª¯àª¾àª¦àª¾àª¨à«? àª¶à«?àª§à«?"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:635
+#, c-format
+#| msgid "Cannot save calendar data: Malformed URI."
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª?àª²àª¾àª°à«?àª® àª?àª®à«?àª² àª¸àª°àª¨àª¾àª®à«?àª? àª®à«?àª³àªµà«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "àªµàª§àª¾àª°à«?àª² àª¸àª®àª¯ àª®àª°à«?àª¯àª¾àª¦àª¾ àª¨à«? àª¶à«?àª§à«?"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:660
+#, fuzzy, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª®àª¾àª¹àª¿àª¤à«? àª¸àª?àª?à«?àª°àª¹à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "àª?àª®àª¾àª¨à«?àª¯ àªªà«?àª°àª¶à«?àª°à«?àª¨"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:685
+#, fuzzy, c-format
+#| msgid "Cannot create CMS Recipient information"
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "CMS àª®à«?àª³àªµàª¨àª¾àª° àª?àª¾àª£àª?àª¾àª°à«? àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "àªªà«?àª°àª¶à«?àª¨ àª¨àª?àª¾àª°àª¾àª? àª?àª¯à«?"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:709
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot open calendar: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª?à«?àª²à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "àª?àª¯à«?àª?à«?àª¯ àª¸àª°à«?àªµàª° àª?àªµà«?àª¤à«?àª¤àª¿"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:730
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot refresh calendar: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª°àª¨à«? àªªà«?àª¨:àª¤àª¾àª?à«? àª?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:749
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª°àª¨à«? àª¦à«?àª° àª?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:770
+#, c-format
+#| msgid "Cannot create message: %s"
+msgid "Cannot create calendar object: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª?àª¬à«?àª?à«?àª?à«?àª?àª¨à«? àª¬àª¨àª¾àªµà«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:798
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot modify calendar object: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª?àª¬à«?àª?à«?àª?à«?àª?àª¨à«? àª¬àª¦àª²à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:824
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar object: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª?àª¬à«?àª?à«?àª?à«?àª?àª¨à«? àª¦à«?àª° àª?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:845
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot receive calendar objects: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª?àª¬à«?àª?à«?àª?à«?àª?àª¨à«? àªªà«?àª°àª¾àªªà«?àª¤ àª?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:864
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot discard calendar alarm: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª?àª²àª¾àª°à«?àª®àª¨à«? àª?àª¾àª¢à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:885
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot send calendar objects: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª?àª¬à«?àª?à«?àª?à«?àª?àª¨à«? àª®à«?àª?àª²à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:912
+#, c-format
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "àª®à«?àª³àªà«?àª¤ àª?à«?àª²à«?àª¨à«?àª¡àª° àª?àª¬à«?àª?à«?àª?à«?àª? àªªàª¾àª¥àª¨à«? àª®à«?àª³àªµà«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:937
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª?àª¬à«?àª?à«?àª?à«?àª? àªªàª¾àª¥àª¨à«? àª®à«?àª³àªµà«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:962
+#, c-format
+#| msgid "Cannot create folder lock on %s: %s"
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª?àª¬à«?àª?à«?àª?à«?àª? àª¯àª¾àª¦à«?àª¨à«? àª®à«?àª³àªµà«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:990
+#, c-format
+#| msgid "Could not remove cache entry: %s: %s"
+msgid "Could not retrieve attachment list: %s"
+msgstr "àª?à«?àª¡àª¾àª£ àª¯àª¾àª¦à«?àª¨à«? àª®à«?àª³àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1016
+#, fuzzy, c-format
+#| msgid "Could not open cache directory: %s"
+msgid "Could not complete calendar query: %s"
+msgstr "àª?à«?àª¶ àª¡àª¿àª°à«?àª?à«?àª?àª°à«? àª?à«?àª²à«? àª¶àª?àª¾àª? àª¨àª¹àª¿àª?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1041
+#, c-format
+#| msgid "Could not rename folder: %s"
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª?àª¾àª?àª® àª?à«?àª¨àª¨à«? àª®à«?àª³àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1066
+#, c-format
+#| msgid "Could not rename folder: %s"
+msgid "Could not add calendar time zone: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª?àª¾àª?àª® àª?à«?àª¨àª¨à«? àª?àª®à«?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1085
+#, c-format
+#| msgid "Could not send message: %s"
+msgid "Could not set default calendar time zone: %s"
+msgstr "àª®à«?àª³àªà«?àª¤ àª?à«?àª²à«?àª¨à«?àª¡àª° àª?àª¾àª?àª® àª?à«?àª¨àª¨à«? àª¸à«?àª¯à«?àª?àª¿àª¤ àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1108
+#, c-format
+#| msgid "Cannot create folder: %s: %s"
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "àª?à«?àª²à«?àª¨à«?àª¡àª° àª«à«?àª°àª«àª¾àª°à«?àª¨à«? àª®à«?àª³àªµà«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1139
+#, c-format
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr ""
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:374
+#, c-format
+#| msgid "Invalid server URI"
+msgid "Invalid URI"
+msgstr "àª?àª¯à«?àª?à«?àª¯ URI"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:392
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr ""
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:442
+#, fuzzy, c-format
+#| msgid "Could not create cache file"
+msgid "Could not instantiate backend"
+msgstr "àª?à«?àª¶ àª«àª¾àª?àª² àª¬àª¨àª¾àªµà«? àª¶àª?àª¾àª? àª¨àª¹àª¿"
 
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:204
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "àª? àª¸àª¾àª?àª«àª° àª¦à«?àªµàª¾àª°àª¾ àª?àª¾àªµàª¾àª¨à«?àª? àª?àª§àª¾àª°àªà«?àª¤ àª¨àª¥à«?"
 
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "àª?àª¾àªµàª¾àª¨à«? àª¸àª?àª¦à«?àª¶à«?"
-
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:217
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "àª? àª¸àª¾àª¯àª«àª° àª¦à«?àªµàª¾àª°àª¾ àª?àª?àª¾àª¸àª£à«? àª?àª§àª¾àª°àªà«?àª¤ àª¨àª¥à«?"
 
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "àª¸àª?àª¦à«?àª¶à«? àª?àª?àª¾àª¸à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
-
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:233
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "àª? àª¸àª¾àª¯àª«àª° àª¦à«?àªµàª¾àª°àª¾ àª?àª¨àª?à«?àª°àª¿àªªà«?àª¶àª¨ àª?àª§àª¾àª°àªà«?àª¤ àª¨àª¥à«?"
 
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "àª¸àª?àª¦à«?àª¶à«? àª?àª¨àª?à«?àª°àª¿àªªà«?àª? àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
-
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:247
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "àª? àª¸àª¾àª¯àª«àª° àª¦à«?àªµàª¾àª°àª¾ àª¡àª¿àª?à«?àª°àª¿àªªà«?àª¶àª¨ àª?àª§àª¾àª°àªà«?àª¤ àª¨àª¥à«?"
 
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "àª¸àª?àª¦à«?àª¶à«? àª¡àª¿àª?à«?àª°àª¿àªªà«?àª? àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
-
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:260
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "àª¤àª®à«? àª? àª¸àª¾àª¯àª«àª° àª¸àª¾àª¥à«? àª?à«? àª?àª¯àª¾àª¤ àª?àª°à«? àª¶àª?àª¶à«? àª¨àª¹àª¿àª?"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:274
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "àª¤àª®à«? àª? àª¸àª¾àª¯àª«àª° àª¸àª¾àª¥à«? àª?à«? àª¨àª¿àª?àª¾àª¸ àª?àª°à«? àª¶àª?àª¶à«? àª¨àª¹àª¿àª?"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-cipher-context.c:815
+msgid "Signing message"
+msgstr "àª?àª¾àªµàª¾àª¨à«? àª¸àª?àª¦à«?àª¶à«?"
+
+#: ../camel/camel-cipher-context.c:1056
+msgid "Encrypting message"
+msgstr "àª¸àª?àª¦à«?àª¶à«? àª?àª¨àª?à«?àª°àª¿àªªà«?àª? àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+
+#: ../camel/camel-cipher-context.c:1183
+msgid "Decrypting message"
+msgstr "àª¸àª?àª¦à«?àª¶à«? àª¡àª¿àª?à«?àª°àª¿àªªà«?àª? àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+
+#: ../camel/camel-data-cache.c:181
+#, c-format
 msgid "Unable to create cache path"
 msgstr "àª?à«?àª¶ àªªàª¥ àª¬àª¨àª¾àªµàªµàª¾ àª¸àª®àª°à«?àª¥ àª¨àª¥à«?"
 
-#: ../camel/camel-data-cache.c:402
+#: ../camel/camel-data-cache.c:499
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "àª?à«?àª¶àª¨à«? àªªà«?àª°àªµà«?àª¶ àª¦à«?àª° àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s: %s"
 
-#: ../camel/camel-db.c:412
+#: ../camel/camel-data-wrapper.c:147
+#, c-format
+#| msgid "No such message available."
+msgid "No stream available"
+msgstr "àª¸à«?àª?à«?àª°à«?àª® àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
+
+#: ../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"
@@ -1336,7 +1753,7 @@ 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"
@@ -1347,120 +1764,130 @@ msgstr ""
 "%s\n"
 "àª? àª«à«?àª²à«?àª¡àª°àª®àª¾àª? àª¥àª¯à«?àª²àª¾ àª«à«?àª°àª«àª¾àª°à«? àª«àª°à«?àª¥à«? àª¸à«?àª®à«?àª³ àª?àª°à«? àª¶àª?àª¾àª¶à«? àª¨àª¹àª¿àª?."
 
-#: ../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 "àª?àª«àª²àª¾àª?àª¨ àª?à«?àª°àª¿àª¯àª¾ àª®àª¾àª?à«? àª«à«?àª²à«?àª¡àª°àª¨àª¾ àª¸àª®àª¾àªµàª¿àª·à«?àª?à«? àª¸à«?àª¥àª¾àª¨àª¿àª? àª°à«?àª¤à«? àª¨àª?àª² àª?àª°à«?"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:67 ../camel/camel-offline-folder.c:83
 msgid "Downloading new messages for offline mode"
 msgstr "àª?àª«àª²àª¾àª?àª¨ àª¸à«?àª¥àª¿àª¤àª¿ àª®àª¾àª?à«? àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª¡àª¾àª?àª¨àª²à«?àª¡ àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:402
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? àª?àª«àª²àª¾àª?àª¨ àª®àª¾àª?à«? àª¤à«?àª¯àª¾àª° àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../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:468 ../camel/camel-offline-folder.c:316
+msgid "Copy folder content locally for offline operation"
+msgstr "àª?àª«àª²àª¾àª?àª¨ àª?à«?àª°àª¿àª¯àª¾ àª®àª¾àª?à«? àª«à«?àª²à«?àª¡àª°àª¨àª¾ àª¸àª®àª¾àªµàª¿àª·à«?àª?à«? àª¸à«?àª¥àª¾àª¨àª¿àª? àª°à«?àª¤à«? àª¨àª?àª² àª?àª°à«?"
+
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:232
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../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:277
+#: ../camel/providers/imapx/camel-imapx-store.c:1299
+#: ../camel/providers/imapx/camel-imapx-store.c:1387
+#: ../camel/providers/imapx/camel-imapx-store.c:1422
+#, 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:719
+#, c-format
+msgid "Canceled"
+msgstr "àª°àª¦ àª¥àª? àª?àª¯à«?àª²"
 
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:839 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "àª¬àª¾àª³ àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾ '%s' àª¬àª¨àª¾àªµàªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:886
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s àª®àª¾àª?àª¥à«? àª?àª¯à«?àª?à«?àª¯ àª¸àª?àª¦à«?àª¶àª¾ àª¸à«?àª?à«?àª°à«?àª® àª®àª³à«?: %s"
 
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1073 ../camel/camel-filter-driver.c:1082
 msgid "Syncing folders"
 msgstr "àª«à«?àª²à«?àª¡àª°à«? àª¸à«?àª®à«?àª³ àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1620
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "àª?àª¾àª³àª?àª¨à«?àª? àªªàª¦àª?à«?àª?à«?àª¦ àª?àª°àª¤àª¾àª? àªà«?àª²: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1181 ../camel/camel-filter-driver.c:1631
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "àª?àª¾àª³àª?àª¨à«? àª?àª²àª¾àªµàª¤àª¾àª? àªà«?àª²: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1278
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "àª¸à«?àªªà«?àª² àª«à«?àª²à«?àª¡àª° àª?à«?àª²àªµàª¾àª®àª¾àª? àª?àª¸àª®àª°à«?àª¥"
 
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1289
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "àª¸à«?àªªà«?àª² àª«à«?àª²à«?àª¡àª°àª¨à«? àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾ àª?àª°àªµàª¾àª®àª¾àª? àª?àª¸àª®àª°à«?àª¥"
 
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1307
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "àª¸àª?àª¦à«?àª¶à«? %d àª®à«?àª³àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?àª? (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
-msgstr "àª¸àª?àª¦à«?àª¶à«? àª?à«?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
-
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1314 ../camel/camel-filter-driver.c:1336
 #, c-format
 msgid "Failed on message %d"
 msgstr "àª¸àª?àª¦à«?àª¶àª¾ %d àªªàª° àª¨àª¿àª·à«?àª«àª³"
 
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1351 ../camel/camel-filter-driver.c:1456
 msgid "Syncing folder"
 msgstr "àª«à«?àª²à«?àª¡àª° àª¸à«?àª®à«?àª³ àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1356 ../camel/camel-filter-driver.c:1462
 msgid "Complete"
 msgstr "àªªà«?àª°à«?àª£"
 
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d àª®àª¾àª?àª¨à«? %d àª¸àª?àª¦à«?àª¶à«? àª®à«?àª³àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1438
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d àª®àª¾àª?àª¨à«? %d àª¸àª?àª¦à«?àª¶à«? àª¨àª¿àª·à«?àª«àª³ àª?àª¯à«?"
 
-#: ../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:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "àª?àª¾àª³àª? àª¶à«?àª§ àª?àª²àª¾àªµàªµàª¾àª®àª¾àª? àªà«?àª²: %s: %s"
 
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1469,8 +1896,8 @@ msgstr ""
 "àª¶à«?àª§ àª¸àª®à«?àª?àª°àª£à«? àªªàª¦àª?à«?àª?à«?àª¦ àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1479,72 +1906,83 @@ msgstr ""
 "àª¶à«?àª§ àª¸àª®à«?àª?àª°àª£ àª?àª²àª¾àªµàªµàª¾àª®àª¾àª? àªà«?àª²: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) àª®àª¾àª?à«? àª?àª? àª¬à«?àª? àªªàª°àª¿àª£àª¾àª® àª?àª°à«?àª°à«? àª?à«?"
 
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:938
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) %s àª?àª?àª¦àª° àª®àª¾àª¨à«?àª¯ àª¨àª¥à«?"
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) àª®àª¾àª?à«? àª?à«?àª¡àª£à«? àªªà«?àª°àª?àª¾àª° àª¶àª¬à«?àª¦àª®àª¾àª³àª¾ àª?àª°à«?àª°à«? àª?à«?"
 
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:978
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) àª?àª°à«? àªªàª°àª¿àª£àª¾àª® àª?àª?à«?àª?à«? àª?à«?"
 
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:987
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) àª«à«?àª²à«?àª¡àª° àª¸àª®à«?àª¹ àª?àª°à«?àª°à«? àª?à«?"
 
-#: ../camel/camel-folder.c:683
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾àª¨à«? àª?àª§àª¾àª° àª¨àª¥à«?: àª¸àª?àª¦à«?àª¶à«? àª?àª®à«?àª°à«?: %s àª®àª¾àª?à«?"
-
-#: ../camel/camel-folder.c:1388
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾àª¨à«? àª?àª§àª¾àª° àª¨àª¥à«?: àª¸àª®à«?àª?àª°àª£ àª¦à«?àªµàª¾àª°àª¾ àª¶à«?àª§à«?: %s àª®àª¾àª?à«?"
-
-#: ../camel/camel-folder.c:1429
-#, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾àª¨à«? àª?àª§àª¾àª° àª¨àª¥à«?: àª¸àª®à«?àª?àª°àª£ àª¦à«?àªµàª¾àª°àª¾ àª¶à«?àª§à«?: %s àª®àª¾àª?à«?"
-
-#: ../camel/camel-folder.c:1468
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "àª¬àª¿àª¨àª?àª§àª¾àª°àªà«?àª¤ àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾: UIDs àªªà«?àª°àª®àª¾àª£à«? àª¶à«?àª§à«?: %s àª®àª¾àª?à«?"
-
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:220
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "%s àª®àª¾àª? àª¬àª¦àª²àª¾àª¯à«?àª² àª¸àª?àª¦à«?àª¶àª¾àª? àª®àª¾àª?à«? àª?à«?àª? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+msgstr[1] "%s àª®àª¾àª? àª¬àª¦àª²àª¾àª¯à«?àª² àª¸àª?àª¦à«?àª¶àª¾àª? àª®àª¾àª?à«? àª?à«?àª? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+
+#: ../camel/camel-folder.c:244
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "%s àª®àª¾àª? àª¬àª¦àª²àª¾àª¯à«?àª² àª¸àª?àª¦à«?àª¶àª¾àª? àª®àª¾àª?à«? àª?à«?àª? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+msgstr[1] "%s àª®àª¾àª? àª¬àª¦àª²àª¾àª¯à«?àª² àª¸àª?àª¦à«?àª¶àª¾àª? àª®àª¾àª?à«? àª?à«?àª? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+
+#: ../camel/camel-folder.c:270
+#, fuzzy, c-format
+#| msgid "Filtering new message(s)"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª?àª¾àª³à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+msgstr[1] "àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª?àª¾àª³à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+
+#: ../camel/camel-folder.c:879
+#: ../camel/providers/local/camel-maildir-folder.c:293
 msgid "Moving messages"
 msgstr "àª¸àª?àª¦à«?àª¶à«? àª?àª¸à«?àª¡à«? àª°àª¹à«?àª¯à«? àª?à«?àª?"
 
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:882
 msgid "Copying messages"
 msgstr "àª¸àª?àª¦à«?àª¶àª¾àª? àª¨àª?àª² àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../camel/camel-folder.c:1922
-msgid "Learning junk"
-msgstr "àª?àª?àª? àª¶à«?àª?à«? àª°àª¹àª¯àª¾ àª?à«?àª?"
+#: ../camel/camel-folder.c:3251
+#, c-format
+#| msgid "Retrieving POP message %d"
+msgid "Retrieving message '%s'"
+msgstr "àª¸àª?àª¦à«?àª¶àª¾ '%s' àª¨à«? àª®à«?àª³àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?"
 
-#: ../camel/camel-folder.c:1939
-msgid "Learning non-junk"
-msgstr "àª?àª?àª? àª¨àª¹àª¿àª? àª¹à«?àª¯ àª¤à«? àª¶à«?àª?à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+#: ../camel/camel-gpg-context.c:646 ../camel/camel-gpg-context.c:651
+#: ../camel/camel-gpg-context.c:1276
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "gpg àª?àª²àª¾àªµàªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/camel-folder.c:1958
-msgid "Filtering new message(s)"
-msgstr "àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª?àª¾àª³à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+#: ../camel/camel-gpg-context.c:651
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
+msgid "Unknown"
+msgstr "àª?àª?à«?àª?àª¾àª¤"
 
-#: ../camel/camel-gpg-context.c:751
+#: ../camel/camel-gpg-context.c:715
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1555,15 +1993,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:766
+#: ../camel/camel-gpg-context.c:732
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid àª®àª¦àª¦ àªªàª¦àª?à«?àª?à«?àª¦ àª?àª°àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³."
 
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
+#: ../camel/camel-gpg-context.c:757 ../camel/camel-gpg-context.c:772
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg àªªàª¾àª¸àª«à«?àª°à«?àª? àª®àª¾àª?àª?àª£à«? àªªàª¦àª?à«?àª?à«?àª¦ àª?àª°àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³."
 
-#: ../camel/camel-gpg-context.c:824
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1572,7 +2012,7 @@ msgstr ""
 "àª¤àª®àª¾àª°à«? àª¤àª®àª¾àª°àª¾ àª¸à«?àª®àª¾àª°à«?àª?àª?àª¾àª°à«?àª¡àª¨à«? àª?à«?àª¨à«?àª? àª¤àª¾àª³à«?àª? àª?à«?àª²àªµàª¾ àª®àª¾àª?à«?\n"
 "PIN àª¨à«? àª?àª°à«?àª° àª?à«?: \"%s\""
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:797
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1581,140 +2021,133 @@ msgstr ""
 "àª¤àª®àª¾àª°à«? àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾àª¨à«? àª?à«?àª¨à«?àª? àª¤àª¾àª³à«? àª?à«?àª²àªµàª¾ àª®àª¾àª?à«? àªªàª¾àª¸àª«à«?àª°à«?àª?\n"
 "àª?àª°à«?àª°à«? àª?à«?: \"%s\""
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG àª®àª¾àª?àª¥à«? '%s' àª®àª¾àª?à«? àª?àª¨àª¿àª?à«?àª?àª¨à«?àª¯ àª®àª¾àª?àª?àª£à«?"
 
-#: ../camel/camel-gpg-context.c:858 ../camel/camel-gpg-context.c:1067
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "àª°àª¦ àª¥àª? àª?àª¯à«?àª²."
+#: ../camel/camel-gpg-context.c:832 ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4894
+#: ../camel/providers/imapx/camel-imapx-server.c:4911
+#: ../camel/providers/imapx/camel-imapx-store.c:199
+#: ../camel/providers/nntp/camel-nntp-summary.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:364
+#: ../camel/providers/pop3/camel-pop3-folder.c:429
+#: ../camel/providers/pop3/camel-pop3-folder.c:504
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+#| msgid "Canceled"
+msgid "Cancelled"
+msgstr "àª°àª¦ àª¥àª? àª?àª¯à«?àª²"
 
-#: ../camel/camel-gpg-context.c:872
+#: ../camel/camel-gpg-context.c:850
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "àª?àª¾àª¨àª?à«? àª?à«?àª¨à«?àª? àª¤àª¾àª³à«? àª?à«?àª²àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: à«© àª?à«?àª?àª¾ àªªàª¾àª¸àª«à«?àª°à«?àª? àª?àªªà«?àª² àª?à«?."
 
-#: ../camel/camel-gpg-context.c:880
+#: ../camel/camel-gpg-context.c:862
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG àª¤àª°àª«àª¥à«? àª?àª¨àª¿àª?à«?àª?àª¨àª¿àª¯ àª?àªµàª¾àª¬ àª®àª³à«?àª¯à«?: %s"
 
-#: ../camel/camel-gpg-context.c:943
+#: ../camel/camel-gpg-context.c:993
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "àª?àª¨àª?à«?àª°àª¿àªªà«?àª? àª?àª°àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: àª?à«?àª? àª®àª¾àª¨à«?àª¯ àª®à«?àª³àªµàª¨àª¾àª°à«? àª¸à«?àªªàª·à«?àª? àª?àª°à«?àª² àª¨àª¥à«?."
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1212 ../camel/camel-gpg-context.c:1337
-#: ../camel/camel-gpg-context.c:1859 ../camel/camel-gpg-context.c:1904
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "gpg àª?àª²àª¾àªµàªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
-
-#: ../camel/camel-gpg-context.c:1305 ../camel/camel-smime-context.c:602
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "àª¸àª¹à«? àª?àª°àªµàª¾àª¨à«? àª®àª¾àª¹àª¿àª¤à«? àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
+#: ../camel/camel-gpg-context.c:1539 ../camel/camel-smime-context.c:828
+#| msgid "Could not generate signing data: %s"
+msgid "Could not generate signing data: "
+msgstr "àª¸àª¹à«? àª?àª°àªµàª¾àª¨à«? àª®àª¾àª¹àª¿àª¤à«? àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: "
 
-#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1553
-#: ../camel/camel-gpg-context.c:1569 ../camel/camel-gpg-context.c:1649
-#: ../camel/camel-gpg-context.c:1664 ../camel/camel-gpg-context.c:1780
-#: ../camel/camel-gpg-context.c:1795 ../camel/camel-gpg-context.c:1875
-#: ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:1586 ../camel/camel-gpg-context.c:1786
+#: ../camel/camel-gpg-context.c:1896 ../camel/camel-gpg-context.c:2042
+#: ../camel/camel-gpg-context.c:2141 ../camel/camel-gpg-context.c:2189
 msgid "Failed to execute gpg."
 msgstr "gpg àª?àª²àª¾àªµàªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³."
 
-#: ../camel/camel-gpg-context.c:1371
-msgid "This is a digitally signed message part"
-msgstr "àª? àª¡àª¿àª?à«?àª?àª² àª°à«?àª¤à«? àª¸àª¹à«? àª?àª°àª²à«? àª¸àª?àª¦à«?àª¶àª¾àª¨à«? àªàª¾àª? àª?à«?"
-
-#: ../camel/camel-gpg-context.c:1457 ../camel/camel-gpg-context.c:1463
-#: ../camel/camel-gpg-context.c:1469 ../camel/camel-gpg-context.c:1484
-#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../camel/camel-gpg-context.c:1666 ../camel/camel-gpg-context.c:1674
+#: ../camel/camel-gpg-context.c:1682 ../camel/camel-gpg-context.c:1701
+#: ../camel/camel-smime-context.c:952 ../camel/camel-smime-context.c:966
+#: ../camel/camel-smime-context.c:975
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "àª¸àª?àª¦à«?àª¶àª¾àª¨à«? àª¸àª¹à«? àª?àª?àª¾àª¸à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª¯à«?àª?à«?àª¯ àª¸àª?àª¦à«?àª¶àª¾ àª¬àª?àª§àª¾àª°àª£"
 
-#: ../camel/camel-gpg-context.c:1523
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "àª¸àª?àª¦à«?àª¶àª¾àª¨à«? àª¸àª¹à«? àª?àª?àª¾àª¸à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª¾àª®àª?àª²àª¾àª? àª«àª¾àª?àª² àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
+#: ../camel/camel-gpg-context.c:1741
+#, fuzzy
+#| msgid "Cannot verify message signature: Incorrect message format"
+msgid "Cannot verify message signature: "
+msgstr "àª¸àª?àª¦à«?àª¶àª¾àª¨à«? àª¸àª¹à«? àª?àª?àª¾àª¸à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª¯à«?àª?à«?àª¯ àª¸àª?àª¦à«?àª¶àª¾ àª¬àª?àª§àª¾àª°àª£"
 
-#: ../camel/camel-gpg-context.c:1632
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "àª?àª¨àª?à«?àª°àª¿àªªà«?àª¶àª¨ àª®àª¾àª¹àª¿àª¤à«? àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
+#: ../camel/camel-gpg-context.c:1862
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not generate encrypting data: "
+msgstr "àª?àª¨àª?à«?àª°àª¿àªªà«?àª¶àª¨ àª®àª¾àª¹àª¿àª¤à«? àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: "
 
-#: ../camel/camel-gpg-context.c:1682
+#: ../camel/camel-gpg-context.c:1915
 msgid "This is a digitally encrypted message part"
 msgstr "àª? àª¡àª¿àª?à«?àª?àª² àª°à«?àª¤à«? àª?àª¨àª?à«?àª°àª¿àªªà«?àª? àª?àª°à«?àª² àª¸àª?àª¦à«?àª¶àª¾àª¨à«? àªàª¾àª? àª?à«?"
 
-#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1743
-#: ../camel/camel-gpg-context.c:1762
+#: ../camel/camel-gpg-context.c:1973 ../camel/camel-gpg-context.c:1982
+#: ../camel/camel-gpg-context.c:2005
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "àª¸àª?àª¦à«?àª¶à«? àª¡àª¿àª?à«?àª°àª¿àªªà«?àª? àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª¯à«?àª?à«?àª¯ àª¸àª?àª¦à«?àª¶àª¾ àª¬àª?àª§àª¾àª°àª£"
 
-#: ../camel/camel-gpg-context.c:1752
+#: ../camel/camel-gpg-context.c:1993
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME àªàª¾àª? àª¡àª¿àª?à«?àª°àª¿àªªà«?àª? àª?àª°àªµàª¾àª®àª¾àª? àªà«?àª²: àªªà«?àª°à«?àª?à«?àª?à«?àª² àªà«?àª²"
 
-#: ../camel/camel-gpg-context.c:1817 ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:2082 ../camel/camel-smime-context.c:1259
 msgid "Encrypted content"
 msgstr "àª?àª¨àª?à«?àª°àª¿àªªà«?àª? àª?àª°à«?àª² àª¸àª®àª¾àªµàª¿àª·à«?àª?"
 
-#: ../camel/camel-gpg-context.c:1836
-msgid "Unable to parse message content"
-msgstr "àª¸àª?àª¦à«?àª¶àª¾àª¨àª¾ àª¸àª®àª¾àªµàª¿àª·à«?àª?à«?àª¨à«?àª? àªªàª¦àª?à«?àª?à«?àª¦ àª?àª°àªµàª¾àª®àª¾àª? àª?àª¸àª®àª°à«?àª¥"
-
-#: ../camel/camel-gpg-context.c:1860 ../camel/camel-gpg-context.c:1905
-#: ../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 "àª?àª?à«?àª?àª¾àª¤"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "àª¤àª¾àª³à«? àª²àª?àª¾àªµàª¨àª¾àª° àª®àª¦àª¦àª?àª¾àª° àªªàª¾àª?àªª àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "àª¤àª¾àª³à«? àª²àª?àª¾àªµàª¨àª¾àª° àª®àª¦àª¦àª?àª¾àª°àª¨à«? àª«à«?àª°à«?àª? àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
 
-#: ../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 "'%s' àª¨à«? àª¤àª¾àª³à«? àª²àª?àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª¤àª¾àª³à«?-àª®àª¦àª¦àª?àª¾àª° àª¸àª¾àª¥à«? àªªà«?àª°à«?àª?à«?àª?à«?àª²àª¨à«? àªà«?àª²"
 
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "'%s' àª¨à«? àª¤àª¾àª³à«? àª²àª?àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s àª®àª¾àª?à«? àª¤àª¾àª³àª¾ àª«àª¾àª?àª² àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/camel-lock.c:144
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+#: ../camel/camel-lock.c:145
+#, fuzzy, 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 "%s àªªàª° àª¤àª¾àª³àª¾ àª«àª¾àª?àª² àª®à«?àª³àªµàªµàª¾àª¨à«? àªªà«?àª°àª¯àª¤à«?àª¨ àª?àª°àª¤àª¾àª? àª¸àª®àª¯ àª¸àª®àª¾àªªà«?àª¤ àª¥àª? àª?àª¯à«?. àªªàª?à«? àª«àª°à«?àª¥à«? àªªà«?àª°àª¯àª¤à«?àª¨ àª?àª°à«?."
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2) àª¨à«? àª®àª¦àª¦àª¥à«? àª¤àª¾àª³à«? àª®à«?àª³àªµàªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) àª¨à«? àª®àª¦àª¦àª¥à«? àª¤àª¾àª³à«? àª®à«?àª³àªµàªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "àª®à«?àª?àª² àª«àª¾àª?àª² %s àª?àª?àª¾àª¸à«? àª¶àª?àª¾àª? àª¨àª¹àª¿àª?: %s"
@@ -1724,143 +2157,146 @@ msgstr "àª®à«?àª?àª² àª«àª¾àª?àª² %s àª?àª?àª¾àª¸à«? àª¶àª?àª¾àª? àª¨àª¹àª¿àª?:
 msgid "Could not open mail file %s: %s"
 msgstr "àª®à«?àª?àª² àª«àª¾àª?àª² %s àª?à«?àª²à«? àª¶àª?àª¾àª? àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "àª?àª¾àª®àª?àª²àª¾àª? àª®à«?àª?àª² àª«àª¾àª?àª² %s àª?à«?àª²à«? àª¶àª?àª¾àª? àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "àª?àª¾àª®àª?àª²àª¾àª? àª«àª¾àª?àª² %s àª®àª¾àª? àª®à«?àª?àª² àª¸àª?àª?à«?àª°àª¹àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "àªªàª¾àª?àªª àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¥à«?: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "àª«à«?àª°à«?àª? àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail àª?àª¾àª°à«?àª¯àª?à«?àª°àª® àª¨àª¿àª·à«?àª«àª³ àª?àª¯à«?: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(àª?àª?à«?àª?àª¾àª¤ àªà«?àª²)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "àª®à«?àª?àª² àª«àª¾àª?àª² àªµàª¾àª?àª?àªµàª¾àª®àª¾àª? àªà«?àª²: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "àª®à«?àª?àª² àª?àª¾àª®àª?àª²àª¾àª? àª«àª¾àª?àª² àª²àª?àªµàª¾àª®àª¾àª? àªà«?àª²: %s"
 
-#: ../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 "àª®à«?àª?àª² àª?àª¾àª®àª?àª²àª¾àª? àª«àª¾àª?àª² àª¨àª?àª² àª?àª°àªµàª¾àª®àª¾àª? àªà«?àª²: %s"
 
-#: ../camel/camel-multipart-signed.c:592
-msgid "parse error"
-msgstr "àªªàª¦àª?à«?àª?à«?àª¦ àªà«?àª²"
+#: ../camel/camel-multipart-signed.c:322
+#, c-format
+#| msgid "No description available"
+msgid "No content available"
+msgstr "àª¸àª®àª¾àªµàª¿àª·à«?àª? àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
 
-#: ../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 "àª°àª¦ àª¥àª? àª?àª¯à«?àª²"
+#: ../camel/camel-multipart-signed.c:330
+#, c-format
+#| msgid "No description available"
+msgid "No signature available"
+msgstr "àª¹àª¸à«?àª¤àª¾àª?à«?àª·àª° àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
 
-#: ../camel/camel-net-utils.c:522
-msgid "cannot create thread"
-msgstr "àª¥à«?àª°à«?àª¡ àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
+#: ../camel/camel-multipart-signed.c:658
+#, c-format
+msgid "parse error"
+msgstr "àªªàª¦àª?à«?àª?à«?àª¦ àªà«?àª²"
 
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
 msgstr "àª?àª?à«?àª²à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?: %s"
 
-#: ../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 "àª¯àª?àª®àª¾àª¨ àª?à«?àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s: %s"
 
-#: ../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 "àª¨àª¾àª® àª?à«?àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:193
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "àª¸àª?àª¦à«?àª¶àª¾àª? àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª?àª¥à«? àª¡àª¿àª¸à«?àª?àª®àª¾àª? àª¸à«?àª®à«?àª³ àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../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 "àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª?à«? àª?àª«àª²àª¾àª?àª¨ àª?àª°à«?àª¨àª² àª²àª?à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
 
-#: ../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:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s àª²àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: àª®à«?àª¡à«?àª¯à«?àª² àª²àª¾àªµàªµàª¾àª¨à«?àª? àª? àª¸àª¿àª¸à«?àª?àª® àªªàª° àª?àª§àª¾àª°àªà«?àª¤ àª¨àª¥à«?."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s àª²àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s àª²àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: àª®à«?àª¡à«?àª¯à«?àª²àª®àª¾àª? àª?à«?àª? àªªà«?àª°àª¾àª°àª?àªàª¿àª? àª?à«?àª¡ àª¨àª¥à«?."
 
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:206
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "àªªà«?àª°à«?àª?à«?àª?à«?àª² '%s' àª®àª¾àª?à«? àª?à«?àª? àªªà«?àª°à«? àªªàª¾àª¡àª¨àª¾àª° àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
 
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "àª¨àª¾àª® àªµàª?àª°àª¨à«?àª?"
 
-#: ../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 "àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª¨àª¿àª·à«?àª«àª³."
 
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1869,7 +2305,7 @@ msgstr ""
 "àª?àª¯à«?àª?à«?àª¯ àª?-àª®à«?àª?àª² àª¸àª°àª¨àª¾àª®àª¾ àª?à«?àª°à«?àª¸ àª?àª¾àª£àª?àª¾àª°à«?:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1878,7 +2314,7 @@ msgstr ""
 "àª?àª¯à«?àª?à«?àª¯ àª?àªªà«?àª? àª?à«?àª°à«?àª¸ àª?àª¾àª£àª?àª¾àª°à«?:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1887,59 +2323,65 @@ msgstr ""
 "àª?àª¯à«?àª?à«?àª¯ àª?à«?àª°à«?àª¸ àª?àª¾àª£àª?àª¾àª°à«?:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:47
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr "àª? àªµàª¿àª?àª²à«?àªª àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª¸à«?àª°àª?à«?àª·àª¿àª¤ CRAM-MD5 àªªàª¾àª¸àªµàª°à«?àª¡àª¥à«? àª?à«?àª¡àª¾àª¶à«?, àª?à«? àª¸àª°à«?àªµàª°àª¤à«?àª¨à«? àª?àª§àª¾àª° àª?àªªàª¤à«? àª¹à«?àª¯ àª¤à«?."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:60
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr "àª? àªµàª¿àª?àª²à«?àªª àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª¸à«?àª°àª?à«?àª·àª¿àª¤ DIGEST-MD5 àªªàª¾àª¸àªµàª°à«?àª¡àª¥à«? àª?à«?àª¡àª¾àª¶à«?, àª?à«? àª¸àª°à«?àªµàª°àª¤à«?àª¨à«? àª?àª§àª¾àª° àª?àªªàª¤à«? àª¹à«?àª¯ àª¤à«?."
 
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:821
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "àª¸àª°à«?àªµàª°àª¨à«? àª¶àª°àª¤ àª?à«?àª¬ àª²àª¾àª?àª¬à«? àª?à«? (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:832
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "àª¸àª°à«?àªµàª°àª¨à«? àª¶àª°àª¤ àª?à«?àª?à«? àª?à«?\n"
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:840
+#, 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:875
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "àª¸àª°à«?àªµàª°àª¨à«? àª?àªµàª¾àª¬ àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª®àª¾àª¹àª¿àª¤à«? àª¸àª®àª¾àªµàª¤à«?àª? àª¨àª¥à«?"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:896
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "àª¸àª°à«?àªµàª°àª¨à«? àª?àªµàª¾àª¬ àª?àªªà«?àª°à«?àª£ àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª®àª¾àª¹àª¿àª¤à«? àª§àª°àª¾àªµà«? àª?à«?"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:909
+#, c-format
 msgid "Server response does not match"
 msgstr "àª¸àª°à«?àªµàª°àª¨à«? àª?àªµàª¾àª¬ àª¬àª?àª§àª¬à«?àª¸àª¤à«? àª¨àª¥à«?"
 
-#: ../camel/camel-sasl-gssapi.c:63
+#: ../camel/camel-sasl-gssapi.c:85
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:65
+#: ../camel/camel-sasl-gssapi.c:87
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "àª? àªµàª¿àª?àª²à«?àªª àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? Kerberos 5 àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£àª¨à«? àª®àª¦àª¦àª¥à«? àª?à«?àª¡àª¾àª¶à«?."
 
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:128
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -1947,17 +2389,17 @@ msgstr ""
 "àªªà«?àª°àª¾ àªªàª¾àª¡à«?àª² àª?à«?àª°à«?àª¡à«?àª¨à«?àª¶à«?àª¯àª² àª¦à«?àªµàª¾àª°àª¾ àª¸à«?àªªàª·à«?àª? àª?àª°à«?àª² àª®àª¿àª?à«?àª¨àª¿àª?àª® àª?àª§àª¾àª°àªà«?àª¤ àª¨àª¥à«?, àª?àª¥àªµàª¾àª¸à«?àª§àª¾àª°àª¾ àª¦à«?àªµàª¾àª°àª¾ àª?àª³àª?àª¾àª¯à«?àª² "
 "àª¨àª¥à«?."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:133
 msgid "The provided target_name parameter was ill-formed."
 msgstr "àªªà«?àª°à«? àªªàª¾àª¡à«?àª² àª²àª?à«?àª·à«?àª¯ àª¨àª¾àª® àªªàª°àª¿àª®àª¾àª£ àª? àª?àªªà«?àª°àª¤à«?àª? àª?à«?."
 
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:136
 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:140
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -1965,13 +2407,13 @@ msgstr ""
 "àª?àª¨àªªà«?àª? àª?à«?àª?àª¨ àªµàª¿àªµàª¿àª§ àª?à«?àª¡àª¾àª£ àª®àª¾àª§à«?àª¯àª®à«? àª?à«? àª?à«? àª?àª¨àªªà«?àª? àª®àª¾àª§à«?àª¯àª® àª?à«?àª¡àª¾àª£ àªªàª°àª¿àª®àª¾àª£ àª¦à«?àªµàª¾àª°àª¾ àª¸à«?àªªàª·à«?àª? àª¥àª¯à«?àª²àª¾ àª¹à«?àª¯ "
 "àª¤à«? àª§àª°àª¾àªµà«? àª?à«?."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:145
 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:149
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -1979,117 +2421,106 @@ msgstr ""
 "àªªà«?àª°àª¾ àªªàª¾àª¡à«?àª² àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª°à«? àª¸àª?àª¦àª°à«?àªàª¨à«? àª¶àª°à«?àª?àª¤ àª®àª¾àª?à«? àª®àª¾àª¨à«?àª¯ àª¨àª¥à«?, àª?àª¥àªµàª¾ àª?à«?àª£àªµàª¤à«?àª¤àª¾ àª¨àª¿àª¯àª?àª¤à«?àª°àª? àª?à«?àª? "
 "àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª°à«?àª¨à«? àª¸àª?àª¦àª°à«?àª àª?àªªàª¤àª¾ àª¨àª¥à«?."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:154
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "àªªà«?àª°à«? àªªàª¾àª¡à«?àª² àª¸àª?àª¦àª°à«?àª àª¨àª¿àª¯àª?àª¤à«?àª°àª? àª®àª¾àª¨à«?àª¯ àª¸àª?àª¦àª°à«?àª àª¨à«? àª?àª¨à«?àª²àª?à«?àª·àª¤à«?àª? àª¨àª¥à«?."
 
-#: ../camel/camel-sasl-gssapi.c:188
+#: ../camel/camel-sasl-gssapi.c:157
 msgid "The consistency checks performed on the input_token failed."
 msgstr "àª?àª¨àªªà«?àª? àª?à«?àª?àª¨àª¨à«? àª¨àª¿àª·à«?àª«àª³àª¤àª¾ àªªàª° àª?àª¿àª?àª®àª¤àª¨à«? àª?àª?àª¾àª¸àª£à«? àª?àª°àªµàª¾àª®àª¾àª? àª?àªµà«? àª?à«?."
 
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:160
 msgid "The consistency checks performed on the credential failed."
 msgstr "àª?à«?àª£àªµàª¤à«?àª¤àª¾àª¨à«? àª¨àª¿àª·à«?àª«àª³àª¤àª¾ àªªàª° àª?àª¿àª?àª®àª¤àª¨à«? àª?àª?àª¾àª¸àª£à«? àª?àª°àªµàª¾àª®àª¾àª? àª?àªµà«? àª?à«?."
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:163
 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:169 ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:353 ../camel/camel-sasl-gssapi.c:370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "àª¸àª°à«?àªµàª° àª¤àª°àª«àª¥à«? àª?àª°àª¾àª¬ àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àªµàª³àª¤à«? àª?àªµàª¾àª¬."
 
-#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:382
+#, c-format
 msgid "Unsupported security layer."
 msgstr "àª¬àª¿àª¨-àª?àª§àª¾àª°àªà«?àª¤ àª¸à«?àª°àª?à«?àª·àª¾ àª¸à«?àª¤àª°."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "àª?àª°à«?àª¬àª°à«?àª? à«ª"
-
-#: ../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
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"àª?àª°à«?àª¬àª°à«?àª? àª?àª¿àª?àª¿àª? àª®à«?àª³àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?:\n"
-"%s"
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
 msgid "Login"
 msgstr "àªªà«?àª°àªµà«?àª¶"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
 msgid "This option will connect to the server using a simple password."
 msgstr "àª? àªµàª¿àª?àª²à«?àªª àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª¸àª°àª³ àªªàª¾àª¸àªµàª°à«?àª¡ àª¸àª¾àª¥à«? àª?à«?àª¡àª¾àª¶à«?."
 
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:95
+#, c-format
 msgid "Unknown authentication state."
 msgstr "àª?àª?à«?àª?àª¾àª¤ àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª¸à«?àª¥àª¿àª¤àª¿."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:41
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:43
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr "àª? àªµàª¿àª?àª²à«?àªª àªµàª¿àª¨à«?àª¡à«?àª? àª?àª§àª¾àª°àª¿àª¤ àª¸àª°à«?àªµàª°à«? àª¸àª¾àª¥à«? NTLM / àª¸à«?àª°àª?à«?àª·àª¿àª¤ àªªàª¾àª¸àªµàª°à«?àª¡ àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª¸àª¾àª¥à«? àª?à«?àª¡àª¾àª¶à«?."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "SMTP àªªàª¹à«?àª²àª¾àª? POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "àª? àªµàª¿àª?àª²à«?àªª SMTP àª¨à«? àªµàª¾àª°à«? àª?àªªà«?àª¯àª¾ àªµàª?àª° POP àª?à«?àª¡àª¾àª£àª¨à«? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª¾àª° àª?àªªàª¶à«?"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:83
 msgid "POP Source URI"
 msgstr "POP àª¸à«?àª°à«?àª¤ URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
+#: ../camel/camel-sasl-popb4smtp.c:90
+#, fuzzy, c-format
+#| msgid "POP Before SMTP auth using an unknown transport"
+msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "àª?àª?à«?àª?àª¾àª¤ àªªàª°àª¿àªµàª¹àª¨àª¨à«? àª®àª¦àª¦àª¥à«? SMTP àª¨à«?àª? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ POP àªªàª¹à«?àª²àª¾àª?"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
+#: ../camel/camel-sasl-popb4smtp.c:98
+#, fuzzy, c-format
+#| msgid "POP Before SMTP auth using a non-pop source"
+msgid "POP Before SMTP authentication using a non-POP source"
 msgstr "pop àª¸àª¿àªµàª¾àª¯àª¨àª¾ àª¸à«?àª°à«?àª¤àª¨à«? àª®àª¦àª¦àª¥à«? SMTP àª¨à«?àª? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ POP àªªàª¹à«?àª²àª¾àª?"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "àª¨àª¿àª¯àª®àª¿àª¤ àª¸àª®à«?àª?àª°àª£àª¨à«? àª?àª®à«?àªªàª¾àª?àª² àª?àª°àªµàª¾àª¨à«?àª? àª¨àª¿àª·à«?àª«àª³: %s: %s"
 
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:89
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' àª¨à«? àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾ àª¨àª¾àª® àªàª¾àª? àª?àª°à«?àª°à«? àª?à«?"
 
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:93
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' àª¨à«? àª¯àª?àª®àª¾àª¨ àªàª¾àª? àª?àª°à«?àª°à«? àª?à«?"
 
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:97
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' àª¨à«? àªªàª¥ àªàª¾àª? àª?àª°à«?àª°à«? àª?à«?"
 
-#: ../camel/camel-session.c:307
+#: ../camel/camel-session.c:260
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2098,373 +2529,321 @@ msgstr ""
 "àª¡àª¿àª°à«?àª?à«?àª?àª°à«? %s àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?:\n"
 "%s"
 
-#: ../camel/camel-session.c:479
+#: ../camel/camel-session.c:757
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "àª®àª¹à«?àª°àª¬àª¾àª¨à«? àª?àª°à«?àª¨à«? %s àªªàª¾àª¸àªµàª°à«?àª¡àª¨à«? %s àª®àª¾àª?à«? àª¯àª?àª®àª¾àª¨ %s àªªàª° àª¦àª¾àª?àª² àª?àª°à«?."
 
-#: ../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:348 ../camel/camel-smime-context.c:1052
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' àª®àª¾àª?à«? àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª¶à«?àª§à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
 msgstr "CMS àª¸àª?àª¦à«?àª¶à«? àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
 msgstr "CMS àª¸àª¹à«? àª¥àª¯à«?àª² àª®àª¾àª¹àª¿àª¤à«? àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
 msgstr "CMS àª¸àª¹à«? àª¥àª¯à«?àª² àª®àª¾àª¹àª¿àª¤ àª?à«?àª¡à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
 msgstr "CMS àª®àª¾àª¹àª¿àª¤à«? àª?à«?àª¡à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
 msgstr "CMS àª¸àª¹à«? àª?àª°àª¨àª¾àª° àª?àª¾àª£àª?àª¾àª°à«? àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
 msgstr "àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª¸àª¾àª?àª?àª³ àª¶à«?àª§à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
 msgstr "CMS àª¸àª¹à«?àªµàª¾àª³à«? àª¸àª®àª¯ àª?àª®à«?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' àª®àª¾àª?à«?àª¨à«?àª? àª?àª¨àª?à«?àª°àª¿àªªà«?àª¶àª¨ àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª?àª¸à«?àª¤àª¿àª¤à«?àªµàª®àª¾àª? àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs àª²àª?à«?àª·àª£ àª?àª®à«?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs àª²àª?à«?àª·àª£ àª?àª®à«?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
 msgstr "àª?àª¨àª?à«?àª°àª¿àªªà«?àª¶àª¨ àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª?àª®à«?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
 msgstr "CMS àª¸àª¹à«? àª?àª°àª¨àª¾àª° àª?àª¾àª£àª?àª¾àª°à«? àª?àª®à«?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../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 "CMS àª?àª¨àª?à«?àª¡àª°àª®àª¾àª? àª®àª¾àª¹àª¿àª¤à«? àª?àª®à«?àª°àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³"
-
-#: ../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:507
 msgid "Unverified"
 msgstr "àª?àª?àª¾àª¸àª¾àª¯à«?àª² àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:509
 msgid "Good signature"
 msgstr "àª¸àª¾àª°à«? àª¸àª¹à«?"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:511
 msgid "Bad signature"
 msgstr "àª?àª°àª¾àª¬ àª¸àª¹à«?"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:513
 msgid "Content tampered with or altered in transit"
 msgstr "àªªàª°àª¿àªµàª¹àª¨ àª¸àª¾àª¥à«? àª¸àª®àª¾àªµàª¿àª·à«?àª?à«? àª¸àª?àª?àª³àª¾àª¯à«?àª² àª?à«? àª?àª¥àªµàª¾ àª¬àª¦àª²àª¾àª¯à«?àª² àª?à«?"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:515
 msgid "Signing certificate not found"
 msgstr "àª¸àª¹à«? àª?àª°àªµàª¾àª¨à«?àª? àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª®àª³à«?àª¯à«?àª? àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:517
 msgid "Signing certificate not trusted"
 msgstr "àª¸àª¹à«? àª?àª°àªµàª¾àª¨à«?àª? àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àªµàª¿àª¶à«?àªµàª¾àª¸àªªàª¾àª¤à«?àª° àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:519
 msgid "Signature algorithm unknown"
 msgstr "àª¸àª¹à«?àª¨à«? àª?àª²àª?à«?àª°à«?àª§àª® àª?àª?à«?àª?àª¾àª¤ àª?à«?"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:521
 msgid "Signature algorithm unsupported"
 msgstr "àª¸àª¹à«?àª¨à«? àª?àª²àª?à«?àª°àª¿àª§àª® àª¬àª¿àª¨-àª?àª§àª¾àª°àªà«?àª¤ àª?à«?"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:523
 msgid "Malformed signature"
 msgstr "àª?àª¦àª°à«?àªªà«? àª¸àª¹à«?"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:525
 msgid "Processing error"
 msgstr "àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾ àªà«?àª²"
 
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:570
 msgid "No signed data in signature"
 msgstr "àª¸àª¹à«?àª®àª¾àª? àª?à«?àª? àª¸àª¹à«? àª?àª°à«?àª² àª®àª¾àª¹àª¿àª¤à«? àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:575
 msgid "Digests missing from enveloped data"
 msgstr "àª?àªµàª°à«?àª² àª®àª¾àª¹àª¿àª¤à«?àª®àª¾àª? àª¸àª¾àª°àª¨à«? àª?àª¾àª£àª?àª¾àª°à«? àª?à«?àªµàª¾àª¯à«?àª² àª?à«?"
 
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:588 ../camel/camel-smime-context.c:599
 msgid "Cannot calculate digests"
 msgstr "àª¸àª¾àª°àª¨à«? àª?àª¾àª£àª?àª¾àª°à«? àª?àª£à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:606 ../camel/camel-smime-context.c:610
 msgid "Cannot set message digests"
 msgstr "àª¸àª?àª¦à«?àª¶àª¾àª¨à«? àª¸àª¾àª°àª¨à«? àª?àª¾àª£àª?àª¾àª°à«? àª¸à«?àª¯à«?àª?àª¿àª¤ àª?àª°à«? àª¶àª?àª¾àª¶à«? àª¨àª¹àª¿àª?"
 
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:625
 msgid "Certificate import failed"
 msgstr "àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª?àª¯àª¾àª¤ àª?àª°àªµàª¾àª¨à«?àª? àª¨àª¿àª·à«?àª«àª³"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:635
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª? àª®àª¾àª¤à«?àª° àª¸àª?àª¦à«?àª¶à«? àª?à«?, àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª°à«? àª?àª?àª¾àª¸à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª? àª®àª¾àª¤à«?àª° àª¸àª?àª¦à«?àª¶à«? àª?à«?, àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª°à«? àª?àª¯àª¾àª¤ àª¥àª¯à«?àª² àª?à«? àª?àª¨à«? àª?àª?àª¾àª¸àª¾àª¯à«?àª² àª?à«?"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:642
 msgid "Cannot find signature digests"
 msgstr "àª¸àª¹à«? àª?àª°à«?àª² àª?àª¾àª£àª?àª¾àª°à«? àª¶à«?àª§à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:658
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "àª¸àª¹à«? àª?àª°àª¨àª¾àª°: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:839 ../camel/camel-smime-context.c:1125
+msgid "Cannot create encoder context"
+msgstr "àª?àª¨àª?à«?àª¡àª° àª¸àª?àª¦àª°à«?àª àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
+
+#: ../camel/camel-smime-context.c:845
+msgid "Failed to add data to CMS encoder"
+msgstr "CMS àª?àª¨àª?à«?àª¡àª°àª®àª¾àª? àª®àª¾àª¹àª¿àª¤à«? àª?àª®à«?àª°àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³"
+
+#: ../camel/camel-smime-context.c:850 ../camel/camel-smime-context.c:1142
+msgid "Failed to encode data"
+msgstr "àª®àª¾àª¹àª¿àª¤à«?àª¨à«? àª?àª¨àª?à«?àª¡ àª?àª°àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³"
+
+#: ../camel/camel-smime-context.c:991 ../camel/camel-smime-context.c:1237
 msgid "Decoder failed"
 msgstr "àª¡àª¿àª?à«?àª¡àª° àª¨àª¿àª·à«?àª«àª³"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1060
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "àª¸àª¾àª®àª¾àª¨à«?àª¯ àª¬àª²à«?àª? àª?àª¨àª?à«?àª°àª¿àªªà«?àª¶àª¨ àª?àª²àª?à«?àª°àª¿àª§àª® àª¶à«?àª§à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "àª?àª¨àª?à«?àª°àª¿àªªà«?àª¶àª¨ àª¬àª²à«?àª? àª?à«? àª®àª¾àª?à«? àª?àª?à«?àª¯àª¾ àª¨àª?à«?àª?à«? àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1079
 msgid "Cannot create CMS Message"
 msgstr "CMS àª¸àª?àª¦à«?àª¶à«? àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1085
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS àª?àªµàª°àª¿àª¤ àª®àª¾àª¹àª¿àª¤à«? àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1091
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS àª?àªµàª°àª¿àª¤ àª®àª¾àª¹àª¿àª¤à«? àª?à«?àª¡à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1097
 msgid "Cannot attach CMS data object"
 msgstr "CMS àª®àª¾àª¹àª¿àª¤à«? àª?àª¬à«?àª?à«?àª?à«?àª?à«? àª?à«?àª¡à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1106
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS àª®à«?àª³àªµàª¨àª¾àª° àª?àª¾àª£àª?àª¾àª°à«? àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1111
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS àª®à«?àª³àªµàª¨àª¾àª° àª?àª¾àª£àª?àª¾àª°à«? àª?àª®à«?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1136
 msgid "Failed to add data to encoder"
 msgstr "àª?àª¨àª?à«?àª¡àª°àª®àª¾àª? àª®àª¾àª¹àª¿àª¤à«? àª?àª®à«?àª°àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1244
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME àª¡àª¿àª?à«?àª°àª¿àªªà«?àª?: àª?à«?àª? àª?àª¨àª?à«?àª°àª¿àªªà«?àª¶àª¨ àª¸àª®àª¾àªµàª¿àª·à«?àª?à«? àª®àª³à«?àª¯àª¾ àª¨àª¥à«?"
 
-#: ../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:2184
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "'%s' àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª«à«?àª²à«?àª¡àª° àªªàª¹à«?àª²àª¾àª¥à«? àª? àª¹àª¾àª?àª° àª?à«?"
 
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "àª«à«?àª²à«?àª¡àª° àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª? àª¸àª?àª?à«?àª°àª¹ àªªàª° àª?àª®àª¾àª¨à«?àª¯ àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾"
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:2375 ../camel/camel-store.c:2385
+#: ../camel/camel-vtrash-folder.c:48
+msgid "Trash"
+msgstr "àª?àª?àª°àª¾àªªà«?àª?à«?"
+
+#. the name of the Junk folder, used for spam messages
+#: ../camel/camel-store.c:2378 ../camel/camel-store.c:2389
+#: ../camel/camel-vtrash-folder.c:50
+msgid "Junk"
+msgstr "àª¨àª?àª¾àª®à«?"
 
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:2832
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "àª«à«?àª²à«?àª¡àª° àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: àª«à«?àª²à«?àª¡àª° àªªàª¹à«?àª²àª¾àª¥à«? àª? àª¹àª¾àª?àª° àª?à«?"
 
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:2959 ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "àª«à«?àª²à«?àª¡àª° àª?àª¾àª¢à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: àª?àª®àª¾àª¨à«?àª¯ àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:3100 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:668
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "àª«à«?àª²à«?àª¡àª°àª¨à«?àª? àª¨àª¾àª® àª¬àª¦àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: àª?àª®àª¾àª¨à«?àª¯ àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾"
 
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
-msgid "Trash"
-msgstr "àª?àª?àª°àª¾àªªà«?àª?à«?"
-
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
-msgid "Junk"
-msgstr "àª¨àª?àª¾àª®à«?"
-
-#: ../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"
-msgstr "àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª°àª¨à«? àª®àª°à«?àª¯àª¾àª¦àª¾ àªªà«?àª°à«? àª¥àª? àª?àª?"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-#| msgid "Certificate Revocation List signature failure"
-msgid "Certificate Revocation List (CRL) not yet valid"
-msgstr "Certificate Revocation List (CRL) àª¹àª?à«? àª¯à«?àª?à«?àª¯ àª¨àª¥à«?"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-#| msgid "Certificate Revocation List signature failure"
-msgid "Certificate Revocation List (CRL) has expired"
-msgstr "Certificate Revocation List (CRL) àª¨àª¿àªµà«?àª¤à«?àª¤ àª¥àª¯à«?àª² àª?à«?"
-
-#: ../camel/camel-tcp-stream-openssl.c:589
-#| msgid "Unable to get Certificate Revocation List"
-msgid "Error in Certificate Revocation List (CRL)"
-msgstr "Certificate Revocation List (CRL) àª®àª¾àª? àªà«?àª²"
-
-#: ../camel/camel-tcp-stream-openssl.c:591
-msgid "Out of memory"
-msgstr "àª®à«?àª®àª°à«?àª¨à«? àª¬àª¹àª¾àª°"
+#: ../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:593
-msgid "Zero-depth self-signed certificate"
-msgstr "àª¶à«?àª¨à«?àª¯-àª?àª?àª¡àª¾àª?àªµàª¾àª³à«? àª?àª¾àª¤à«? àª¸àª¹à«? àª?àª°à«?àª² àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª°"
+#: ../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"
-msgstr "àª?àª¾àª¤à«? àª¸àª¹à«? àª?àª°à«?àª² àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª¸àª¾àª?àª?àª³àª®àª¾àª? àª?à«?"
+#: ../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"
-msgstr "àª?àª¦àª¾ àª?àª°àª¨àª¾àª° àª¸à«?àª¥àª¾àª¨àª¿àª? àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª®à«?àª³àªµàªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³"
+#: ../camel/camel-tcp-stream-raw.c:879
+#, fuzzy, c-format
+#| msgid "No support for authentication type %s"
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àªªà«?àª°àª?àª¾àª° %s àª®àª¾àª?à«? àª?à«?àª? àª?àª§àª¾àª° àª¨àª¥à«?"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Unable to verify leaf signature"
-msgstr "àªªàª¾àª?àª¦àª¡àª¾ àª¸àª¹à«? àª?àª?àª¾àª¸àªµàª¾ àª¸àª®àª°à«?àª¥ àª¨àª¥à«?"
+#: ../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"
-msgstr "àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª¸àª¾àª?àª?àª³ àª?à«?àª¬ àª²àª¾àª?àª¬à«? àª?à«?"
+#: ../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"
-msgstr "àªªà«?àª°àª®àª¾àª®àªªàª¤à«?àª°àª¨à«? àª®àª¾àª¨à«?àª¯àª¤àª¾ àªªà«?àª°à«? àª¥àª?"
+#: ../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)"
-msgstr "àª?àª®àª¾àª¨à«?àª¯ àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª°àª¨à«?àª? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ (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
+#| msgid "Connection canceled"
+msgid "Connection refused"
+msgstr "àª?à«?àª¡àª¾àª£ àª°àª¦ àª¥àª? àª?àª¯à«?àª²"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid purpose"
-msgstr "àª?àª®àª¾àª¨à«?àª¯ àª¹à«?àª¤à«?"
+#: ../camel/camel-tcp-stream-raw.c:896
+msgid "Time-to-live expired"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate untrusted"
-msgstr "àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àªµàª¿àª¶à«?àªµàª¾àª¸à«? àª¨àª¥à«?"
+#: ../camel/camel-tcp-stream-raw.c:897
+#| msgid "STLS not supported by server"
+msgid "Command not supported by SOCKS server"
+msgstr "SOCKS àª¸àª°à«?àªµàª° àª¦à«?àª¦àª¾àª°àª¾ àª?àª¦à«?àª¶ àª?àª§àª¾àª°àªà«?àª¤ àª¨àª¥à«?"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Certificate rejected"
-msgstr "àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª¨àª?àª¾àª°àª¾àª? àª?àª¯à«?àª?"
+#: ../camel/camel-tcp-stream-raw.c:898
+#| msgid "STLS not supported by server"
+msgid "Address type not supported by SOCKS server"
+msgstr "SOCKS àª¸àª°à«?àªµàª° àª¦à«?àª¦àª¾àª°àª¾ àª¸àª°àª¨àª¾àª®àª¾àª? àªªà«?àª°àª?àª¾àª° àª?àª§àª¾àª°àªà«?àª¤ àª¨àª¥à«?"
 
-#: ../camel/camel-tcp-stream-openssl.c:616
-msgid "Subject/Issuer mismatch"
-msgstr "àªµàª¿àª·àª¯/àª?àª¦àª¾ àª?àª°àª¨àª¾àª° àª¬àª?àª§àª¬à«?àª¸àª¤àª¾ àª¨àª¥à«?"
+#: ../camel/camel-tcp-stream-raw.c:899
+#| msgid "Unknown error: %s"
+msgid "Unknown error from SOCKS server"
+msgstr "SOCKS àª¸àª°à«?àªµàª°àª®àª¾àª?àª¥à«? àª?àª?à«?àª?àª¾àª¤ àªà«?àª²"
 
-#: ../camel/camel-tcp-stream-openssl.c:618
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID àª¬àª?àª§àª¬à«?àª¸àª¤àª¾ àª¨àª¥à«?"
+#: ../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"
-msgstr "AKID/àª?àª¦àª¾ àª?àª°àª¨àª¾àª° àª¶à«?àª°à«?àª£à«? àª¬àª?àª§àª¬à«?àª¸àª¤àª¾ àª?à«?"
+#: ../camel/camel-tcp-stream-raw.c:950
+#, c-format
+#| msgid "Invalid response from server"
+msgid "Incomplete reply from SOCKS server"
+msgstr "SOCKS àª¸àª°à«?àªµàª°àª®àª¾àª?àª¥à«? àª?àªªà«?àª°àª¤à«? àª?àªµàª¾àª¬"
 
-#: ../camel/camel-tcp-stream-openssl.c:622
-msgid "Key usage does not support certificate signing"
-msgstr "àª?à«?àª¨à«? àªµàªªàª°àª¾àª¶ àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª°àª¨à«? àª¸àª¹à«? àª?àª°àªµàª¾àª¨à«?àª? àª?àª§àª¾àª° àª?àªªàª¤à«?àª? àª¨àª¥à«?"
+#: ../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"
-msgstr "àª?àª¾àª°à«?àª¯àª?à«?àª°àª®àª¨à«? àª?àª?àª¾àª¸àª£à«?àª®àª¾àª? àªà«?àª²"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
+#, c-format
+#| msgid "Invalid response from server"
+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:457
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2477,35 +2856,16 @@ msgstr ""
 "àª?àª?àª³à«?àª¨à«? àª?àª¾àªª:       %s\n"
 "àª¸àª¹à«?:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:463
 msgid "GOOD"
 msgstr "àª¸àª°àª¸"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:463
 msgid "BAD"
 msgstr "àª?àª°àª¾àª¬"
 
-#: ../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 ""
-"%s àª®àª¾àª?àª¥à«? àª?àª°àª¾àª¬ àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª®àª³à«?àª¯à«?àª?:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"àª¶à«?àª? àª¤àª®à«? àª?à«?àª?àªªàª£ àª°à«?àª¤à«? àª¸à«?àªµà«?àª?àª¾àª°àªµàª¾ àª®àª¾àª?àª?à«? àª?à«??"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:883
+#: ../camel/camel-tcp-stream-ssl.c:467
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2520,7 +2880,7 @@ msgstr ""
 "\n"
 "àª¶à«?àª? àª¤àª®à«? àª?àª¨à«? àª¸à«?àªµà«?àª?àª¾àª°àªµàª¾ àª®àª¾àª?àª?à«? àª?à«??"
 
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:511
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2529,7 +2889,7 @@ msgstr ""
 "àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª¸àª®àª¸à«?àª¯àª¾: %s\n"
 "àª?àª¦àª¾ àª?àª°àª¨àª¾àª°: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:563
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2538,7 +2898,7 @@ msgstr ""
 "àª?àª°àª¾àª¬ àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª° àª¡à«?àª®à«?àª?àª¨: %s\n"
 "àª?àª¦àª¾ àª?àª°àª¨àª¾àª°: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:581
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2547,7 +2907,7 @@ msgstr ""
 "àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª°àª¨à«? àª®àª°à«?àª¯àª¾àª¦àª¾ àªªà«?àª°à«? àª¥àª?: %s\n"
 "àª?àª¦àª¾ àª?àª°àª¨àª¾àª°: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:598
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2556,284 +2916,284 @@ msgstr ""
 "àªªà«?àª°àª®àª¾àª£àªªàª¤à«?àª°àª¨à«? àª?àª¾àª¯àª¦àª¾àª¨à«? àª¯àª¾àª¦à«?àª¨à«? àª®àª°à«?àª¯àª¾àª¦àª¾ àªªà«?àª°à«? àª¥àª?: %s\n"
 "àª?àª¦àª¾ àª?àª°àª¨àª¾àª°: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:316
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "URL '%s' àª¨à«?àª? àªªàª¦àª?à«?àª?à«?àª¦ àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?"
 
-#: ../camel/camel-vee-folder.c:580
+#: ../camel/camel-vee-folder.c:1240 ../camel/camel-vee-folder.c:1403
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "'%s' àª¨à«? àª¸àª?àª?à«?àª°àª¹àªµàª¾àª®àª¾àª? àªà«?àª²: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "àªµàª°à«?àª?à«?àª¯à«?àª?àª² àª«à«?àª²à«?àª¡àª°àª®àª¾àª? àª¸àª?àª¦à«?àª¶àª¾àª?àª¨à«? àª¨àª?àª² àª?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«? àª?àª¥àªµàª¾ àª?àª¸à«?àª¡à«? àª¶àª?àª¾àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-vee-folder.c:657
+#: ../camel/camel-vee-folder.c:1276
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s àª®àª¾àª? %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:1344
+#, c-format
+#| msgid "Error storing '%s': %s"
+msgid "Error storing '%s': "
+msgstr "'%s' àª¨à«? àª¸àª?àª?à«?àª°àª¹àªµàª¾àª®àª¾àª? àªà«?àª²: "
 
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:322
 msgid "Unmatched"
 msgstr "àª¬àª?àª§àª¬à«?àª¸àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/camel-vee-store.c:400
+#: ../camel/camel-vee-store.c:393
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "àª«à«?àª²à«?àª¡àª° àª?àª¾àª¢à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: àª?àªµà«?àª? àª?à«?àª? àª«à«?àª²à«?àª¡àª° àª¨àª¥à«?"
 
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:427
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "àª«à«?àª²à«?àª¡àª°àª¨à«?àª? àª¨àª¾àª® àª¬àª¦àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: àª?àªµà«?àª? àª?à«?àª? àª«à«?àª²à«?àª¡àª° àª¨àª¥à«?"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "àª?àª?àª°àª¾àªªà«?àª?à«? àª«à«?àª²à«?àª¡àª°àª®àª¾àª? àª¸àª?àª¦à«?àª¶àª¾àª?àª¨à«? àª¨àª?àª² àª?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "àª¨àª?àª¾àª®àª¾ àª«à«?àª²à«?àª¡àª°àª®àª¾àª? àª¸àª?àª¦à«?àª¶àª¾àª?àª¨à«? àª¨àª?àª² àª?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"àª¸àª?àª¦à«?àª¶à«? àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:262
-#: ../camel/providers/local/camel-maildir-folder.c:291
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:226
-msgid "No such message"
-msgstr "àª?àªµà«? àª?à«?àª? àª¸àª?àª¦à«?àª¶à«? àª¨àª¥à«?"
-
-#: ../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 "àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾ àª°àª¦ àª¥àª? àª?àª¯à«?àª²"
-
-#: ../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
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "àª¸àª?àª¦à«?àª¶à«? %s àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %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."
-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 "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª³àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¥à«?"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
-#: ../camel/providers/imap/camel-imap-folder.c:296
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:958
+#: ../camel/providers/imap/camel-imap-folder.c:395
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s àª®àª¾àª?à«? àª¸àª¾àª° àª²àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1034
 #, c-format
-#| msgid "Checking for new messages"
 msgid "Checking for deleted messages %s"
 msgstr "àª?àª¾àª¢à«? àª¨àª¾àª?àª?à«?àª² àª¸àª?àª¦à«?àª¶àª¾àª? %s àª®àª¾àª?à«? àª?àª?àª¾àª¸à«? àª°àª¹à«?àª¯àª¾ àª?à«?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
-msgid "Trash Folder Full. Please Empty."
-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/groupwise/camel-groupwise-store.c:669
+#: ../camel/providers/groupwise/camel-groupwise-store.c:800
+#: ../camel/providers/imap/camel-imap-folder.c:3965
+#: ../camel/providers/imap/camel-imap-folder.c:4047
+#: ../camel/providers/imapx/camel-imapx-server.c:3871
+#: ../camel/providers/imapx/camel-imapx-server.c:4002
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s àª®àª¾àª? àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª®àª¾àª?à«? àª¸àª¾àª°àª¨à«? àª?àª¾àª£àª?àª¾àª°à«? àª®à«?àª³àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1991
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2044
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2708
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2718
+#, c-format
+msgid "Could not get message"
+msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª³àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¥à«?"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2428
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2478
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª? àª¸àª?àª¦à«?àª¶à«? àª?àª®à«?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2464
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "àª¸àª?àª¦à«?àª¶à«? àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"àª¸àª?àª¦à«?àª¶à«? àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s\n"
+"  %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:307
+#: ../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 "àª?àªµà«? àª?à«?àª? àª¸àª?àª¦à«?àª¶à«? àª¨àª¥à«?"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2663
+#: ../camel/providers/nntp/camel-nntp-folder.c:251
+#: ../camel/providers/nntp/camel-nntp-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:455
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get message %s: "
+msgstr "àª¸àª?àª¦à«?àª¶à«? %s àª¨à«? àª®à«?àª³àªµà«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: "
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2681
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2691
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2894
+#, c-format
+msgid "This message is not available in offline mode."
+msgstr "àª? àª¸àª?àª¦à«?àª¶à«? àª?àª«àª²àª¾àª?àª¨ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?."
+
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "àª«à«?àª²à«?àª¡àª° àª¸àª®àª¾àªµàª¨àª¾àª° %s àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "àª?àª«àª²àª¾àª?àª¨ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? àª¸àª?àª¦à«?àª¶à«? àª?àª®à«?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: àª?à«?àª¶ àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
-#, c-format
-msgid "Cannot append message in offline mode: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
+#, fuzzy
+#| msgid "Cannot append message in offline mode: %s"
+msgid "Cannot append message in offline mode: "
 msgstr "àª?àª«àª²àª¾àª?àª¨ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? àª¸àª?àª¦à«?àª¶à«? àª?àª®à«?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
 msgstr "àª¨àªµàª¾ àª®à«?àª?àª² àª®àª¾àª?à«? àª?àª?àª¾àª¸à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../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
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../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 "àª¬àª§àª¾ àª«à«?àª²à«?àª¡àª°à«?àª®àª¾àª? àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª®àª¾àª?à«? àª?àª?àª¾àª¸à«? (_h)"
 
-#: ../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
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../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:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "àªµàª¿àª?àª²à«?àªªà«?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "àª? àª¸àª°à«?àªµàª° àªªàª° àª?àª¨àª¬à«?àª?à«?àª¸àª®àª¾àª? àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª?àª¨à«? àª?àª¾àª³àª?à«? àª²àª¾àª?à«? àª?àª°à«? (_A)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "àª¬àª?àª¡à«?àª² àª¸àª®àª¾àªµàª¿àª·à«?àª?à«? àª®àª¾àª?à«? àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª?àª?àª¾àª¸à«? (_u)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-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 "àª®àª¾àª¤à«?àª° IN_BOX àª«à«?àª²à«?àª¡àª°àª®àª¾àª? àª¬àª?àª¡à«?àª² àª¸àª?àª¦à«?àª¶àª¾àª? àª®àª¾àª?à«? àª?àª?àª¾àª¸à«?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "àª?àª¾àª¤à«?àª? àª¸à«?àª¥àª¾àª¨àª¿àª? àª°à«?àª¤à«? àª?àªªà«?àª?àªª àª¸à«?àª®à«?àª³ àª?àª°à«? (_z)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "SOAP àª¸à«?àª¯à«?àª?àª¨à«?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "àªªà«?àª¸à«?àª? àª?àª«àª¿àª¸ àª?àª?àª¨à«?àª? SOAP àªªà«?àª°à«?àª? (_P):"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
 msgstr "àª¨à«?àªµà«?àª² àª?à«?àª°à«?àªªàªµàª¾àª?àª?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
 msgstr "Novell GroupWise àª¸àª°à«?àªµàª°à«? àªµàª¾àªªàª°àªµàª¾ àª®àª¾àª?à«?"
 
-#: ../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
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:104
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:73
 msgid "Password"
 msgstr "àªªàª¾àª¸àªµàª°à«?àª¡"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
 msgid "This option will connect to the GroupWise server using a plaintext password."
 msgstr "àª? àªµàª¿àª?àª²à«?àªª àª¸àª¾àª¦àª¾ àª²àª?àª¾àª£àª¨àª¾ àªªàª¾àª¸àªµàª°à«?àª¡àª¨à«? àª®àª¦àª¦àª¥à«? àª?à«?àª¥àªªà«?àª°àª®àª¾àª£à«?àª¨àª¾ àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª?à«?àª¡àª¾àª¶à«?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
 msgid "Host or user not available in url"
 msgstr "àª¯àª?àª®àª¾àª¨ àª?àª¥àªµàª¾ àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾ url àª®àª¾àª? àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1358
+#: ../camel/providers/groupwise/camel-groupwise-store.c:209
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3085
+#, c-format
 msgid "You did not enter a password."
 msgstr "àª¤àª®à«? àªªàª¾àª¸àªµàª°à«?àª¡ àª¦àª¾àª?àª² àª?àª°à«?àª² àª¨àª¥à«?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../camel/providers/groupwise/camel-groupwise-store.c:332
 msgid "Some features may not work correctly with your current server version"
 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/groupwise/camel-groupwise-store.c:560
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:342
 #, c-format
 msgid "No such folder %s"
 msgstr "àª?àªµà«?àª? àª?à«?àª? àª«à«?àª²à«?àª¡àª° %s àª¨àª¥à«?"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1221
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 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
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1230
+#, c-format
+#| msgid "Cannot delete folder '%s': Special folder"
+msgid "Cannot create a special system folder"
+msgstr "àªµàª¿àª¶àª¿àª·à«?àª? àª¸àª¿àª¸à«?àª?àª® àª«à«?àª²à«?àª¡àª°àª¨à«? àª¬àª¨àª¾àªµà«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1240
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1341
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "àªªàª¿àª¤à«? àª«à«?àª²à«?àª¡àª°àª¨à«? àª?àªªàª«à«?àª²à«?àª¡àª°à«? àª¸àª®àª¾àªµàªµàª¾àª¨à«? àªªàª°àªµàª¾àª¨àª?à«? àª¨àª¥à«?"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1325
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "àª?à«?àª¥àªªà«?àª°àª®àª¾àª£à«? àª«à«?àª²à«?àª¡àª° àª¨à«? '%s' àª¨à«? '%s' àª®àª¾àª? àª¨àª¾àª® àª¬àª¦àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1384
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
 #, c-format
 msgid "GroupWise server %s"
 msgstr "àª?à«?àª¥àªªà«?àª°àª®àª¾àª£à«? àª¸àª°à«?àªµàª° %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1386
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "%s àª®àª¾àª?à«? %s àªªàª° àª?à«?àª¥àªªà«?àª°àª®àª¾àª£à«? àª¸à«?àªµàª¾"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "%s àª®àª¾àª°àª«àª¤à«? àª?à«?àª¥àªªà«?àª°àª®àª¾àª£à«? àª®à«?àª?àª² àª®à«?àª³àªµàªµàª¾àª¨à«?àª?"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
 msgid "Sending Message"
 msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª?àª²à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
+#, c-format
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "àª«à«?àª²à«?àª¡àª° àª®à«?àª³àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¥à«?: àª? àª¸àª?àª?à«?àª°àª¹ àªªàª° àª?àª®àª¾àª¨à«?àª¯ àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#, c-format
 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 "
@@ -2843,93 +3203,36 @@ msgstr ""
 "àª®à«?àª?àª²à«? àª?àª¾àª¢à«? àª¨àª¾àª?àª?à«?àª¯àª¾ àªªàª?à«?/àª¸àª?àª?à«?àª?àª¿àª¤ àª?àª°à«?àª¯àª¾ àªªàª?à«? àª®à«?àª?àª²à«?/àª®à«?àª³àªµà«? àª¬àª?àª¨ àª¦àª¬àª¾àªµà«?àª¨à«? àª«àª°à«? àª®à«?àª?àª²àªµàª¾àª¨à«? àªªà«?àª°àª¯àª¤à«?àª¨ "
 "àª?àª°à«?.\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
 #, c-format
 msgid "Could not send message: %s"
 msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª?àª²à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "àª¨àªµàª¾ àª®à«?àª?àª²à«? àª®àª¾àª?à«? àª?àª?àª¾àª¸à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
-
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«?àª¨à«?àª? àª?à«?àª¡àª¾àª£"
-
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª?à«?àª¡àª¾àªµàª¾ àª®àª¾àª?à«? àªµà«?àªµàª¿àª§à«?àª¯àªªà«?àª°à«?àª£ àª?àª¦à«?àª¶ àªµàª¾àªªàª°à«? (_U)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "àª?àª¦à«?àª¶:"
-
-#: ../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
-msgid "Folders"
-msgstr "àª«à«?àª²à«?àª¡àª°à«?"
-
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-msgid "_Show only subscribed folders"
-msgstr "àª®àª¾àª¤à«?àª° àª?àª®à«?àª¦àªµàª¾àª°à«? àª¥àª¯à«?àª² àª«à«?àª²à«?àª¡àª°à«? àª¬àª¤àª¾àªµà«? (_S)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
-msgid "O_verride server-supplied folder namespace"
-msgstr "àª¸àª°à«?àªµàª°-àªªà«?àª°àª¾ àªªàª¡àª¾àª¯à«?àª² àª«à«?àª²à«?àª¡àª° àª¨àª¾àª®àª?àª?à«?àª¯àª¾ àªªàª° àª«àª°à«?àª¥à«? àª²àª?à«? (_v)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "àª¨àª¾àª®àª¨à«? àª?àª?à«?àª¯àª¾àª?"
-
-#: ../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 "Hula àª¸àª°à«?àªµàª°à«?àª¨àª¾ àªµàªªàª°àª¾àª¶ àª®àª¾àª?à«?"
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "àª? àªµàª¿àª?àª²à«?àªª àª¸àª¾àª¦àª¾àª²àª?àª¾àª£àª¨àª¾ àªªàª¾àª¸àªµàª°à«?àª¡àª¨à«? àª®àª¦àª¦àª¥à«? Hula àª¸àª°à«?àªµàª°àª¨à«? àª¸àª¾àª¥à«? àª?à«?àª¡àª¾àª¶à«?."
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
+#, c-format
 msgid "No output stream"
 msgstr "àª?àª?àª?àªªà«?àª? àª¸à«?àª?à«?àª°à«?àª® àª¨àª¥à«?"
 
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
+#, c-format
 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
+#: ../camel/providers/imap/camel-imap-command.c:255
+#, c-format
 msgid "Operation cancelled"
 msgstr "àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾ àª¨àª?àª¾àª°à«? àª¦à«?àªµàª¾àª®àª¾àª? àª?àªµà«?"
 
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3056
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "àª¸àª°à«?àªµàª°àª¨à«?àª? àª?àª¨àª¿àª?à«?àª?àª¨àª¿àª¯ àª°à«?àª¤à«? àª?à«?àª¡àª¾àª£ àª¤à«?àª?à«? àª?àª¯à«?àª?: %s"
 
 #. 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
+#: ../camel/providers/imap/camel-imap-command.c:394
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2938,244 +3241,252 @@ msgstr ""
 "IMAP àª¸àª°à«?àªµàª° àª¤àª°àª«àª¥à«? àª?à«?àª¤àªµàª£à«? %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:468
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP àª¸àª°à«?àªµàª° àª¤àª°àª«àª¥à«? àª?àª¨àª¿àª?à«?àª?àª¨àª¿àª¯ àª?àªµàª¾àª¬: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:480
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:560
+#, c-format
 msgid "Server response ended too soon."
 msgstr "àª¸àª°à«?àªµàª°àª¨à«? àª?àªµàª¾àª¬ àª?à«?àª¬ àª?àª²àª¦à«? àª?àª?àª¤ àª¥àª? àª?àª¯à«?."
 
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:771
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP àª¸àª°à«?àªµàª°àª¨à«? àª?àªµàª¾àª¬ %s àª?àª¾àª£àª?àª¾àª°à«? àª¸àª®àª¾àªµàª¤à«? àª¨àª¥à«?"
 
-#: ../camel/providers/imap/camel-imap-command.c:748
+#: ../camel/providers/imap/camel-imap-command.c:809
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP àª¸àª°à«?àªµàª°àª®àª¾àª?àª¥à«? àª?àª¨àª¿àª?à«?àª?àª¨àª¿àª¯ àª¬àª°àª¾àª¬àª° àª?àªµàª¾àª¬: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:91
+#: ../camel/providers/imap/camel-imap-folder.c:296
 msgid "Always check for new mail in this folder"
 msgstr "àª¨àªµàª¾ àª®à«?àª?àª² àª®àª¾àª?à«? àª¹àª?àª®à«?àª¶àª¾ àª? àª«à«?àª²à«?àª¡àª°àª®àª¾àª? àª?àª?àª¾àª¸à«?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:277
+#: ../camel/providers/imap/camel-imap-folder.c:372
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "àª¡àª¿àª°à«?àª?à«?àª?àª°à«? %s àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:919
+#: ../camel/providers/imap/camel-imap-folder.c:995
+#: ../camel/providers/imapx/camel-imapx-server.c:3915
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s àª®àª¾àª? àª¬àª¦àª²àª¾àª¯à«?àª² àª¸àª?àª¦à«?àª¶àª¾àª? àª®àª¾àª?à«? àª?à«?àª? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1987
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "APPEND àª?àª¦à«?àª¶ àªªàª?à«? àª?àª¨àª¿àª?à«?àª?àª¨à«?àª¯ àªªà«?àª°àª¤à«?àª¯à«?àª¤à«?àª¤àª° àªªàª°àª¿àª¸à«?àª¥àª¿àª¤àª¿ '%s'"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2002
-msgid "No response on continuation after APPEND command"
-msgstr "APPEND àª?àª¦à«?àª¶ àªªàª?à«? àª?àª¾àª²à«? àª°àª¾àª?àªµàª¾ àªªàª° àª?à«?àª? àªªà«?àª°àª¤à«?àª¯à«?àª¤à«?àª¤àª° àª¨àª¹àª¿àª?"
+#: ../camel/providers/imap/camel-imap-folder.c:3372
+#| msgid "Unable to retrieve message: %s"
+msgid "Unable to retrieve message: "
+msgstr "àª¸àª?àª¦à«?àª¶à«? àªªà«?àª°àª¾àªªà«?àª¤ àª?àª°àªµàª¾àª®àª¾àª? àª?àª¸àª®àª°à«?àª¥: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:2047
-msgid "Unknown error occurred during APPEND command!"
-msgstr "APPEND àª?àª¦à«?àª¶ àª¦àª°àª®à«?àª¯àª¾àª¨ àª?àª?à«?àª?àª¾àª¤ àªà«?àª² àª?àª¤à«?àªªàª¨à«?àª¨ àª¥àª?!"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2878
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª³àªµàªµàª¾ àª®àª¾àª?à«? àª?àª¸àª®àª°à«?àª¥: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:3407
+#: ../camel/providers/imapx/camel-imapx-server.c:5195
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "àª¸àª?àª¦à«?àª¶à«? ID %s àª¸àª¾àª¥à«? àª¸àª?àª¦à«?àª¶àª¨à«? àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2914
+#: ../camel/providers/imap/camel-imap-folder.c:3408
+#: ../camel/providers/imapx/camel-imapx-server.c:5196
 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
+#: ../camel/providers/imap/camel-imap-folder.c:3483
+#: ../camel/providers/imap/camel-imap-folder.c:4378
+#: ../camel/providers/nntp/camel-nntp-folder.c:407
+#, c-format
 msgid "This message is not currently available"
 msgstr "àª? àª¸àª?àª¦à«?àª¶à«? àªµàª°à«?àª¤àª®àª¾àª¨àª®àª¾àª? àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3624
+#: ../camel/providers/imap/camel-imap-folder.c:4179
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "àª?àªªà«?àª°à«?àª£ àª¸àª°à«?àªµàª°àª¨à«? àª?àªµàª¾àª¬: àª¸àª?àª¦à«?àª¶àª¾ %d àª®àª¾àª?à«? àª?à«?àª? àª?àª¾àª£àª?àª¾àª°à«? àªªà«?àª°à«? àªªàª¾àª¡à«?àª² àª¨àª¥à«?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:4189
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "àª¸àª°à«?àªµàª°àª¨à«? àª?àªªà«?àª°à«?àª£ àª?àªµàª¾àª¬: àª?à«?àª? UID àª¸àª?àª¦à«?àª¶àª¾ %d àª®àª¾àª?à«? àªªà«?àª°à«? àªªàª¾àª¡à«?àª² àª¨àª¥à«?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3846
+#: ../camel/providers/imap/camel-imap-folder.c:4418
+#, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH àª?àªµàª¾àª¬àª®àª¾àª? àª¸àª?àª¦à«?àª¶àª¾àª¨à«? àªàª¾àª? àª¶à«?àª§à«? àª¶àª?àª¾àª¯à«? àª¨àª¹àª¿àª?."
 
-#: ../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 "àª?à«?àª¶ àª¡àª¿àª°à«?àª?à«?àª?àª°à«? àª?à«?àª²à«? àª¶àª?àª¾àª? àª¨àª¹àª¿àª?: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+#| msgid "Could not open cache directory: %s"
+msgid "Could not open cache directory: "
+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
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "àª¸àª?àª¦à«?àª¶àª¾ %s àª¨à«? àª?à«?àª¶ àª?àª°àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
-#, c-format
-msgid "Failed to cache %s: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
+#, fuzzy, c-format
+#| msgid "Failed to cache message %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "àª¸àª?àª¦à«?àª¶àª¾ %s àª¨à«? àª?à«?àª¶ àª?àª°àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
+
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#, fuzzy, c-format
+#| msgid "Failed to cache %s: %s"
+msgid "Failed to cache %s: "
 msgstr "%s àª¨à«? àª?à«?àª¶ àª?àª°àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "àª¨àªµàª¾ àª®à«?àª?àª²à«? àª®àª¾àª?à«? àª?àª?àª¾àª¸à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+
+#: ../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 "àª?àª®à«?àª¦àªµàª¾àª°à«? àª¥àª¯à«?àª² àª«à«?àª²à«?àª¡àª°à«?àª®àª¾àª? àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª®àª¾àª?à«? àª?àª?àª¾àª¸à«? (_e)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-msgid "Namespace:"
-msgstr "àª¨àª¾àª®àª?àª?à«?àª¯àª¾:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«?àª¨à«?àª? àª?à«?àª¡àª¾àª£"
 
-#: ../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"
-msgstr "àª? àª¸àª°à«?àªµàª° àªªàª° àª?àª¨àª¬à«?àª?à«?àª¸àª®àª¾àª? àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª?àª¾àª³àª?à«? àª?àª®àª²àª®àª¾àª? àª®à«?àª?à«? (_A)"
+#: ../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 "àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª?à«?àª¡àª¾àªµàª¾ àª®àª¾àª?à«? àªµà«?àªµàª¿àª§à«?àª¯àªªà«?àª°à«?àª£ àª?àª¦à«?àª¶ àªµàª¾àªªàª°à«? (_U)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap/camel-imap-provider.c:52
+#| msgid "Command:"
+msgid "Co_mmand:"
+msgstr "àª?àª¦à«?àª¶ (_m):"
+
+#: ../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 "àª«à«?àª²à«?àª¡àª°à«?"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "àª®àª¾àª¤à«?àª° àª?àª®à«?àª¦àªµàª¾àª°à«? àª¥àª¯à«?àª² àª«à«?àª²à«?àª¡àª°à«? àª¬àª¤àª¾àªµà«? (_S)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+msgid "O_verride server-supplied folder namespace"
+msgstr "àª¸àª°à«?àªµàª°-àªªà«?àª°àª¾ àªªàª¡àª¾àª¯à«?àª² àª«à«?àª²à«?àª¡àª° àª¨àª¾àª®àª?àª?à«?àª¯àª¾ àªªàª° àª«àª°à«?àª¥à«? àª²àª?à«? (_v)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#| msgid "Namespace:"
+msgid "Names_pace:"
+msgstr "àª¨àª¾àª®àª?àª?à«?àª¯àª¾ (_p):"
+
+#: ../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 "àª¬àª?àª¡à«?àª² àª¸àª®àª¾àªµàª¿àª·à«?àª?à«? àª®àª¾àª?à«? àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª?àª?àª¾àª¸à«? (_k)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "àª¦à«?àª°àª¸à«?àª¥ àª®à«?àª?àª²àª¨à«? àª¸à«?àª¥àª¾àª¨àª¿àª?àªªàª£à«? àª?àªªà«?àª?àªª àª¸à«?àª®à«?àª³ àª?àª°à«? (_z)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 msgid "For reading and storing mail on IMAP servers."
 msgstr "àª®à«?àª?àª² IMAP àª¸àª°à«?àªµàª°à«? àªªàª° àªµàª¾àª?àª?àªµàª¾ àª?àª¨à«? àª¸àª?àª?à«?àª°àª¹àªµàª¾ àª®àª¾àª?à«?."
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "àª? àªµàª¿àª?àª²à«?àªª àª¸àª°àª³ àªªàª¾àª¸àªµàª°à«?àª¡àª¨à«? àª®àª¦àª¦àª¥à«? IMAP àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª?à«?àª¡àª¾àª¶à«?."
 
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:210
-#, c-format
-msgid "IMAP server %s"
-msgstr "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 "%s àª®àª¾àª?à«? %s àªªàª° IMAP àª¸à«?àªµàª¾"
-
-#: ../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:243
+#: ../camel/providers/nntp/camel-nntp-store.c:313
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "%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:244
+#: ../camel/providers/nntp/camel-nntp-store.c:314
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "SSL unavailable"
 msgstr "SSL àª¬àª¿àª¨-àª?àªªàª²àª¬à«?àª§"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "àª?à«?àª¡àª¾àª£ àª¨àª?àª¾àª°àª¾àª? àª?àª¯à«?àª?"
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:333
+#, c-format
+#| msgid "Could not connect to %s: %s"
+msgid "Could not connect to %s: "
+msgstr "%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:370
+#: ../camel/providers/imap/camel-imap-store.c:390
+#: ../camel/providers/imap/camel-imap-store.c:397
+#: ../camel/providers/imap/camel-imap-store.c:424
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/imapx/camel-imapx-server.c:2967
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "IMAP àª¸àª°à«?àªµàª° %s àª¨à«? àª¸à«?àª°àª?à«?àª·àª¿àª¤ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? àª?à«?àª¡àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "STARTTLS not supported"
 msgstr "STARTTLS àª?àª§àª¾àª°àªà«?àª¤ àª¨àª¥à«?"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
 msgid "SSL negotiations failed"
 msgstr "SSL àª¨à«?àª? àªàª¾àªµàª¤àª¾àª² àª¨àª¿àª·à«?àª«àª³"
 
-#: ../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:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
 msgid "SSL is not available in this build"
 msgstr "SSL àª? àªªà«?àª°àª?àª¾àª¶àª¨àª®àª¾àª? àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
+#, c-format
+msgid "Connection cancelled"
+msgstr "àª?à«?àª¡àª¾àª£ àª¨àª?àª¾àª°àª¾àª? àª?àª¯à«?àª?"
+
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "àª?àª¦à«?àª¶ \"%s\" àª¸àª¾àª¥à«? àª?à«?àª¡àª¾àª? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#. 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 "àª?àª¨àª¬à«?àª?à«?àª¸"
-
-#: ../camel/providers/imap/camel-imap-store.c:1305
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP àª¸àª°à«?àªµàª° %s àª®àª¾àª?àª?àª£à«? àª¥àª¯à«?àª² àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£àª¨àª¾ àªªà«?àª°àª?àª¾àª° %s àª¨à«? àª?àª§àª¾àª° àª?àªªàª¤à«?àª? àª¨àª¥à«?"
 
-#: ../camel/providers/imap/camel-imap-store.c:1315
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
+#: ../camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àªªà«?àª°àª?àª¾àª° %s àª®àª¾àª?à«? àª?à«?àª? àª?àª§àª¾àª° àª¨àª¥à«?"
 
-#: ../camel/providers/imap/camel-imap-store.c:1389
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3186,411 +3497,196 @@ msgstr ""
 "%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
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:183
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP àª¸àª°à«?àªµàª° %s"
+
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:185
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s àª®àª¾àª?à«? %s àªªàª° IMAP àª¸à«?àªµàª¾"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:372
+#: ../camel/providers/imapx/camel-imapx-store.c:794
+#: ../camel/providers/local/camel-maildir-folder.c:409
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:615
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:669
+#: ../camel/providers/local/camel-spool-store.c:289
+msgid "Inbox"
+msgstr "àª?àª¨àª¬à«?àª?à«?àª¸"
+
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1320
 #, c-format
 msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "àª«à«?àª²à«?àª¡àª° àª¨àª¾àª® \"%s\" àª? àª?àª®àª¾àª¨à«?àª¯ àª?à«? àª?àª¾àª°àª£ àª?à«? àª¤à«? \"%c\" àª?àª?à«?àª·àª° àª§àª°àª¾àªµà«? àª?à«?"
 
-#: ../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
+#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:407
+#: ../camel/providers/local/camel-mh-store.c:504
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª«à«?àª²à«?àª¡àª° àªªàª¹à«?àª²àª¾àª¥à«? àª? àª¹àª¾àª?àª° àª?à«?."
 
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1331
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "àª?àª?à«?àª?àª¾àª¤ àªªàª¿àª¤à«? àª«à«?àª²à«?àª¡àª°: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3053
-#| msgid "Server unexpectedly disconnected: %s"
+#: ../camel/providers/imap/camel-imap-store.c:3137
+#, c-format
 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 "IMAP àª¸àª°à«?àªµàª° %s àª¨à«? àª?àª¦à«?àª¶ àª®à«?àª?àª²àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "IMAP4 àª¸àª°à«?àªµàª° %s àª®àª¾àª?àª¥à«? àª?àª¨àª¿àª?à«?àª?àª¨àª¿àª¯ àª?àªµàª¾àª¬: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "IMAP àª¸àª°à«?àªµàª° %s àª®àª¾àª?àª¥à«? àª?àª¨àª¿àª?à«?àª?àª¨àª¿àª¯ àª¶à«?àªà«?àª?à«?àª?àª¾."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àªªàª¸àª?àª¦ àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª®àª¾àª¨à«?àª¯ àª®à«?àª?àª²àª¬à«?àª?à«?àª¸ àª¨àª¾àª®"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àªªàª¸àª?àª¦ àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª°àª¾àª¬ àª?àª¦à«?àª¶"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "IMAP àª¸àª°à«?àªµàª° %s àª¨à«? àª?àª¦à«?àª¶ àª®à«?àª?àª²àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "àª¸à«?àªµàª¾ àª¬àª¿àª¨-àª?àªªàª²àª¬à«?àª§"
-
-#: ../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 "IMAP4 àª¸àª°à«?àªµàª° %s àª¨à«?àª? àª?àª¨àª¿àª?à«?àª?àª¨àª¿àª¯ àª°à«?àª¤à«? àª?à«?àª¡àª¾àª£ àª¤à«?àª?à«? àª?àª¯à«?àª?: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr "àª?àª®à«?àª? àª?àª¾àª³àª?à«? àª?àª¨à«? vFolder àª¨àª¿àª¯àª®à«? àª®àª¾àª?à«? àªµàª¿àª¸à«?àª¤à«?àª¤ àª®à«?àª?àª²à«?àª?àª?-àª¯àª¾àª¦à«? àª¶à«?àª§ àª¸àª?à«?àª°àª¿àª¯ àª?àª°àªµàª¾àª¨à«? àª?àª°à«?àª° àª?à«?"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "àª?à«?àª¶ àª¥àª¯à«?àª² àª¸àª?àª¦à«?àª¶àª¾àª? àª¨àª¿àªµà«?àª¤à«?àª¤ àª¥àª¯àª¾ àª?à«? àª?à«?àª? X àª¸à«?àª?àª¨à«?àª¡à«?àª®àª¾àª? àªµàª?àª?àª¾àª¯àª¾ àª¨ àª¹àª¤àª¾"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "X àª¸à«?àª?àª¨à«?àª¡à«? àª?àª°àª¤àª¾àª? àª?à«?àª¨àª¾ àª?à«?àª¶ àª¥àª¯à«?àª² àª¸àª?àª¦à«?àª¶àª¾àª? àª¨àª¿àªµà«?àª¤à«?àª¤ àª¥àª¯àª¾"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? àªµàª¾àªªàª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? àª?àª¿àª¹à«?àª¨à«? àª¸à«?àª®à«?àª³ àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª?à«?àª?àª¾àª¤ àªà«?àª²"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? àª?àª¿àª¹à«?àª¨à«? àª¸à«?àª®à«?àª³ àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª°àª¾àª¬ àª?àª¦à«?àª¶"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? àª¸àª?àªªà«?àª°à«?àª£ àª°à«?àª¤à«? àª¦à«?àª° àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª?à«?àª?àª¾àª¤ àªà«?àª²"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? àª¸àª?àªªà«?àª°à«?àª£ àª°à«?àª¤à«? àª¦à«?àª° àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª°àª¾àª¬ àª?àª¦à«?àª¶"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "àª¸àª?àª¦à«?àª¶à«? %s àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª?àª¥à«? àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àªµà«? àª?à«?àª? àª¸àª?àª¦à«?àª¶à«? àª¨àª¥à«?"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "àª¸àª?àª¦à«?àª¶à«? %s àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª?àª¥à«? àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª°àª¾àª¬ àª?àª¦à«?àª¶"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª? àª¸àª?àª¦à«?àª¶à«? àª?àª®à«?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª«à«?àª²à«?àª¡àª° àª®àª¾àª¤à«?àª°-àªµàª¾àª?àª?à«? àª¶àª?àª¾àª¯ àª¤à«?àªµà«?àª? àª?à«?"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª? àª¸àª?àª¦à«?àª¶à«? àª?àª®à«?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: àª?àª?à«?àª?àª¾àª¤ àªà«?àª²"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª? àª¸àª?àª¦à«?àª¶à«? àª?àª®à«?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: àª?àª°àª¾àª¬ àª?àª¦à«?àª¶"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª?àª¥à«? àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª? àª¸àª?àª¦à«?àª¶àª¾àª? àª?àª¸à«?àª¡à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª?à«?àª?àª¾àª¤ àªà«?àª²"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª?àª¥à«? àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª? àª¸àª?àª¦à«?àª¶àª¾àª? àª¨àª?àª² àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª?à«?àª?àª¾àª¤ àªà«?àª²"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª?àª¥à«? àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª? àª¸àª?àª¦à«?àª¶àª¾àª? àª?àª¸à«?àª¡à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª°àª¾àª¬ àª?àª¦à«?àª¶"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª?àª¥à«? àª«à«?àª²à«?àª¡àª° '%s' àª®àª¾àª? àª¸àª?àª¦à«?àª¶àª¾àª? àª¨àª?àª² àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª°àª¾àª¬ àª?àª¦à«?àª¶"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "àª¬àª?àª¡à«?àª²àª¾ àª¸àª®àª¾àªµàª¿àª·à«?àª?à«? àª®àª¾àª?à«? àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª?àª?àª¾àª¸à«? (_J)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "àª?àª¨àª¬à«?àª?à«?àª¸ àª«à«?àª²à«?àª¡àª°àª®àª¾àª? àª®àª¾àª¤à«?àª° àª¬àª?àª¡à«?àª²àª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª®àª¾àª?à«? àª? àª?àª?àª¾àª¸à«? (_g)"
-
-#: ../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 "IMAPv4rev1 àª¸àª°à«?àªµàª°à«? àªªàª° àª®à«?àª?àª² àªµàª¾àª?àª?àªµàª¾ àª?àª¨à«? àª¸àª?àª?à«?àª°àª¹àªµàª¾ àª®àª¾àª?à«?."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "àª? àªµàª¿àª?àª²à«?àªª IMAPv4rev1 àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª¸àª°àª³ àª²àª?àª¾àª£àªµàª¾àª³àª¾ àªªàª¾àª¸àªµàª°à«?àª¡ àªµàª¾àªªàª°à«?àª¨à«? àª?à«?àª¡àª¾àª¶à«?."
-
-#: ../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 "àª?à«?àª¡àª¾àª£ àª°àª¦ àª¥àª? àª?àª¯à«?àª²"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "IMAP àª¸àª°à«?àªµàª° %s àª¨à«? àª¸à«?àª°àª?à«?àª·àª¿àª¤ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? àª?à«?àª¡àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: àª¸àª°à«?àªµàª° STARTTLS àª¨à«? àª?àª§àª¾àª° àª?àªªàª¤à«?àª? àª¨àª¥à«?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-msgid "TLS negotiations failed"
-msgstr "TLS àª¨à«?àª? àªàª¾àªµàª¤àª¾àª² àª¨àª¿àª·à«?àª«àª³"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "IMAP àª¸àª°à«?àªµàª° %s àª¨à«? %s àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£àª¨à«? àª®àª¦àª¦àª¥à«? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª® àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "IMAP àª¸àª°à«?àªµàª° %s àª¨à«? %s àª®àª¦àª¦àª¥à«? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?"
-
-#: ../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 "àª?àª«àª²àª¾àª?àª¨ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? IMAP àª«à«?àª²à«?àª¡àª°à«? àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? IMAP àª¸àª°à«?àªµàª° %s àªªàª° àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª?à«?àª?àª¾àª¤ àªà«?àª²"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "IMAP àª¸àª°à«?àªµàª° %s àªªàª° '%s' àª®àª¾àª?à«?àª¨à«? LIST àª?àª¾àª£àª?àª¾àª°à«? àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "àª?àª°àª¾àª¬ àª?àª¦à«?àª¶"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª®àª¾àª¨à«?àª¯ àª®à«?àª?àª²àª¬à«?àª?à«?àª¸ àª¨àª¾àª®"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª°àª¾àª¬ àª?àª¦à«?àª¶"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª?àª¾àª¢à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àªµàª¿àª¶àª¿àª·à«?àª? àª«à«?àª²à«?àª¡àª°"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "àª?àª«àª²àª¾àª?àª¨ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? IMAP àª«à«?àª²à«?àª¡àª°à«? àª?àª¾àª¢à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª?àª¾àª¢à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª®à«?àª?àª²àª¬à«?àª?à«?àª¸àª¨à«?àª? àª¨àª¾àª® àª?àª®àª¾àª¨à«?àª¯ àª?à«?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª?àª¾àª¢à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª°àª¾àª¬ àª?àª¦à«?àª¶"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? '%s' àª¨àª¾àª®àª®àª¾àª? àª«à«?àª°àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àªµàª¿àª¶àª¿àª·à«?àª? àª«à«?àª²à«?àª¡àª°"
+#: ../camel/providers/imap/camel-imap-store.c:3140
+#, fuzzy
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected: "
+msgstr "àª¸àª°à«?àªµàª°àª¨à«?àª? àª?àª¨àª¿àª?à«?àª?àª¨àª¿àª¯ àª°à«?àª¤à«? àª?à«?àª¡àª¾àª£ àª¤à«?àª?à«? àª?àª¯à«?àª?: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "àª?àª«àª²àª¾àª?àª¨ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? IMAP àª«à«?àª²à«?àª¡àª°à«?àª¨à«?àª? àª¨àª¾àª® àª¬àª¦àª²à«? àª¶àª?àª¾àª¤à«?àª? àª¨àª¥à«?."
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
+#, fuzzy, c-format
+#| msgid "Could not load summary for %s"
+msgid "Could not create folder summary for %s"
+msgstr "%s àª®àª¾àª?à«? àª¸àª¾àª° àª²àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? '%s' àª¨àª¾àª®àª®àª¾àª? àª«à«?àª°àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª®à«?àª?àª²àª¬à«?àª?à«?àª¸àª¨à«?àª? àª¨àª¾àª® àª?àª®àª¾àª¨à«?àª¯ àª?à«?"
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
+#, fuzzy, c-format
+#| msgid "Could not create cache file"
+msgid "Could not create cache for %s: "
+msgstr "àª?à«?àª¶ àª«àª¾àª?àª² àª¬àª¨àª¾àªµà«? àª¶àª?àª¾àª? àª¨àª¹àª¿"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? '%s' àª¨àª¾àª®àª®àª¾àª? àª«à«?àª°àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª°àª¾àª¬ àª?àª¦à«?àª¶"
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+msgid "Use _Quick Resync 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 "àªàª¾àª¤ %s àª®àª¾àª?à«? àª?àª¾àª£àª?àª¾àª°à«? '%s' àª¨à«? IMAP àª¸àª°à«?àªµàª° %s àªªàª° àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "àª?àª«àª²àª¾àª?àª¨ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? IMAP àª«à«?àª²à«?àª¡àª°à«?àª¨à«? àª?àª®à«?àª¦àªµàª¾àª°à«? àª¨à«?àª?àª§à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?."
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "àª?àª¦à«?àª¶:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? àª?àª®à«?àª¦àªµàª¾àª°à«? àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª®à«?àª?àª²àª¬à«?àª?à«?àª¸àª¨à«? àª¨àª¾àª® àª?àª®àª¾àª¨à«?àª¯ àª?à«?"
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? àª?àª®à«?àª¦àªµàª¾àª°à«? àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª°àª¾àª¬ àª?àª¦à«?àª¶"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "àª¨àª¾àª®àª?àª?à«?àª¯àª¾:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "àª?àª«àª²àª¾àª?àª¨ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? IMAP àª«à«?àª²à«?àª¡àª°à«?àª®àª¾àª?àª¥à«? àª?àª®à«?àª¦àªµàª¾àª°à«? àª¦à«?àª° àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?."
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? àª?àª®à«?àª¦àªµàª¾àª°à«? àª¦à«?àª° àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª®à«?àª?àª²àª¬à«?àª?à«?àª¸àª¨à«?àª? àª¨àª¾àª® àª?àª®àª¾àª¨à«?àª¯ àª?à«?"
+#: ../camel/providers/imapx/camel-imapx-server.c:1404
+#, fuzzy
+#| msgid "Error writing mail temp file: %s"
+msgid "Error writing to cache stream: "
+msgstr "àª®à«?àª?àª² àª?àª¾àª®àª?àª²àª¾àª? àª«àª¾àª?àª² àª²àª?àªµàª¾àª®àª¾àª? àªà«?àª²: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
 #, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? àª?àª®à«?àª¦àªµàª¾àª°à«? àª¦à«?àª° àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª°àª¾àª¬ àª?àª¦à«?àª¶"
+#| msgid "Failed to authenticate.\n"
+msgid "Not authenticated"
+msgstr "àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª¥àª¯à«?àª² àª¨àª¥à«?"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "àª¬àª¦àª²àª¾àª¯à«?àª² àª¸àª?àª¦à«?àª¶àª¾àª? àª®àª¾àª?à«? àª?àª?àª¾àª¸à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
+#, fuzzy, c-format
+#| msgid "Could not connect to %s (port %s): %s"
+msgid "Could not connect to %s (port %s): "
+msgstr "%s (àªªà«?àª°à«?àª? %s) àª¸àª¾àª¥à«? àª?à«?àª¡àª¾àª? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP àª¸àª°à«?àªµàª° %s àª? àª?àªªà«?àª°à«?àª£ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? àª?à«?."
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
+#, fuzzy
+#| msgid "Posting failed: %s"
+msgid "Closing tmp stream failed: "
+msgstr "àªªà«?àª¸à«?àª? àª?àª°àªµàª¾àª¨à«?àª? àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª?àª¨àª¾ àª?àªµàª°à«? àª®à«?àª³àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+#: ../camel/providers/imapx/camel-imapx-server.c:5345
+#: ../camel/providers/imapx/camel-imapx-server.c:5360
+#| msgid "Cannot create message: %s"
+msgid "Cannot create spool file: "
+msgstr "àª¸à«?àªªà«?àª² àª«àª¾àª?àª²àª¨à«? àª¬àª¨àª¾àªµà«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
+#: ../camel/providers/imapx/camel-imapx-store.c:1136
+#: ../camel/providers/nntp/camel-nntp-store.c:1610
 #, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "IMAP àª¸àª°à«?àªµàª° %s àª®àª¾àª?àª¥à«? àª?àª¨àª¿àª?à«?àª?àª¨àª¿àª¯ àª?à«?àª?àª¨ àª?àªµàª¾àª¬ àª®àª³à«?àª¯à«?: "
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "àª?à«?àª? àª®àª¾àª¹àª¿àª¤à«? àª¨àª¥à«?"
+msgid "No such folder: %s"
+msgstr "àª?àªµà«?àª? àª?à«?àª? àª«à«?àª²à«?àª¡àª° àª¨àª¥à«?: %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 "IMAP àª¸àª°à«?àªµàª° %s àª¨à«?àª? àª?àª¨àª¿àª?à«?àª?àª¨àª¿àª¯ àª°à«?àª¤à«? àª?à«?àª¡àª¾àª£ àª¤à«?àª?à«? àª?àª¯à«?àª?: %s"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-msgid "Message storage"
-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"
+msgid "Source stream returned no data"
 msgstr ""
-"àªªà«?àª°àª¾àª¯à«?àª?àª¿àª? IMAP 4(.1) àª?à«?àª²àª¾àª?àª¨à«?àª?\n"
-"àª? àª¨àª¹àª¿àª? àª?àª?àª¾àª¸àª¾àª¯à«?àª² àª?àª¨à«? àª¬àª¿àª¨àª?àª§àª¾àª°àªà«?àª¤ àª?à«?àª¡ àª?à«?, àª¶à«?àª? àª¤àª®à«? àª?àª¨à«? àª?àª?à«?àª¯àª¾àª? àª¸àª¾àª¦à«?àª? imap àªµàª¾àªªàª°àªµàª¾ àª®àª¾àª?àª?à«? àª?à«?.\n"
-"\n"
-" !!! àª?àª¨à«? àª?àª¤à«?àªªàª¾àª¦àª¨ àª?àª®à«?àª?àª² àª®àª¾àª?à«? àªµàª¾àªªàª°àª¶à«? àª¨àª¹àª¿àª?  !!!\n"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "%s (àªªà«?àª°à«?àª? %s) àª¸àª¾àª¥à«? àª?à«?àª¡àª¾àª? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
+#| msgid "service unavailable"
+msgid "Source stream unavailable"
+msgstr "àª¸à«?àª¤à«?àª°à«?àª¤ àª¸à«?àª?à«?àª°à«?àª® àª¬àª¿àª¨àª?àªªàª²àª¬à«?àª§"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:348
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "POP àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? %s àªªàª° àª?à«?àª¡àª¾àª? àª¶àª?à«?àª¯àª¾ àª¨àª¥à«?"
-
-#: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "àª?àª¨à«?àª?à«?àª°àª® àª¸àª?àª¦à«?àª¶àª¾àª¨à«? àª®àª¾àª¹àª¿àª¤à«?"
-
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
+#: ../camel/providers/local/camel-local-folder.c:182
 #, 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:192
+#: ../camel/providers/local/camel-local-folder.c:201
 #, c-format
-#| msgid "mailbox:%s (%s)"
 msgid "mailbox: %s (%s)"
 msgstr "àª®à«?àª?àª²àª¬à«?àª?à«?àª¸: %s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:210
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:470
+msgid "Index message body data"
+msgstr "àª?àª¨à«?àª?à«?àª°àª® àª¸àª?àª¦à«?àª¶àª¾àª¨à«? àª®àª¾àª¹àª¿àª¤à«?"
+
+#: ../camel/providers/local/camel-local-folder.c:683
+#, fuzzy, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"àª¸àª?àª¦à«?àª¶à«? àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s àª¨à«? àª«à«?àª²à«?àª¡àª° %s àª®àª¾àª?àª¥à«?\n"
+"  %s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "`.folders' àª«à«?àª²à«?àª¡àª° àª¸àª¾àª° àª«àª¾àª?àª² (exmh) àªµàª¾àªªàª°à«? (_U)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "MH-àª¬àª?àª§àª¾àª°àª£ àª®à«?àª?àª² àª¡àª¿àª°à«?àª?à«?àª?àª°à«?àª?"
 
-#: ../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 "MH-àª?à«?àªµà«? àª®à«?àª?àª² àª¡àª¿àª°à«?àª?à«?àª?àª°à«?àª?àª®àª¾àª? àª¸à«?àª¥àª¾àª¨àª¿àª? àª®à«?àª?àª² àª¸àª?àª?à«?àª°àª¹àªµàª¾ àª®àª¾àª?à«?."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "àª¸à«?àª¥àª¾àª¨àª¿àª¯ àª°à«?àª¤à«? àª®àª³à«? àª?àª¯à«?àª?"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3598,29 +3694,29 @@ msgstr ""
 "àªªà«?àª°àª®àª¾àª£àªà«?àª¤ mbox-àª¬àª?àª§àª¾àª°àª£à«?àª¯ àª¹àª°à«?àª³à«?àª®àª¾àª?àª¥à«? àª¸à«?àª¥àª¾àª¨àª¿àª? àª®à«?àª?àª² àª?àªµà«?àª²à«?àª¯à«?àª¶àª¨ àª¦à«?àªµàª¾àª°àª¾ àªµà«?àª¯àªµàª¸à«?àª¥àª¾àªªàª¿àª¤ àª«à«?àª²à«?àª¡àª°àª®àª¾àª? "
 "àªªà«?àª¨àª?àªªà«?àª°àª¾àªªà«?àª¤ àª?àª°àªµàª¾ (àª?àª¸à«?àª¡àªµàª¾) àª®àª¾àª?à«?."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "INBOX àª®àª¾àª? àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª®àª¾àª?à«? àª?àª¾àª³àª? àª?àª®àª²àª®àª¾àª? àª®à«?àª?à«? (_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
 msgstr "àª®à«?àª?àª² àª¡àª¿àª°à«?àª?à«?àª?àª°à«?-àª¬àª?àª§àª¾àª°àª£ àª®à«?àª?àª² àª¡àª¿àª°à«?àª?à«?àª?àª°à«?àª?"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
 msgstr "àª®à«?àª?àª²àª¡àª¿àª°à«?àª?à«?àª?àª°à«? àª¡àª¿àª°à«?àª?à«?àª?àª°à«?àª?àª®àª¾àª? àª¸à«?àª¥àª¾àª¨àª¿àª? àª®à«?àª?àª² àª¸àª?àª?à«?àª°àª¹àªµàª¾ àª®àª¾àª?à«?."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "àª¸à«?àª¥àª¿àª¤àª¿ àª¹à«?àª¡àª°à«?àª¨à«? Elm/Pine/Mutt àª¬àª?àª§àª¾àª°àª£àª®àª¾àª? àª¸àª?àª?à«?àª°àª¹à«? (_S)"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
 msgstr "àªªà«?àª°àª®àª¾àª£àªà«?àª¤ Unix mbox àª¸à«?àªªà«?àª² àª«àª¾àª?àª²"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3628,207 +3724,230 @@ msgstr ""
 "àª¬àª¾àª¹à«?àª¯ àªªà«?àª°àª®àª¾àª£àªà«?àª¤ mbox àª¸à«?àªªà«?àª² àª«àª¾àª?àª²à«?àª®àª¾àª? àª¸à«?àª¥àª¾àª¨àª¿àª? àª®à«?àª?àª² àªµàª¾àª?àª?àªµàª¾ àª?àª¨à«? àª¸àª?àª?à«?àª°àª¹àªµàª¾ àª®àª¾àª?à«?.\n"
 "àª¤à«? àª?àª¦àª¾àª? lm, Pine, àª?àª¥àªµàª¾ Mutt àª¶à«?àª²à«?àª¨àª¾ àª«à«?àª²à«?àª¡àª°à«?àª¨à«?àª? àª?à«?àª°à«? àªµàª¾àª?àª?àªµàª¾ àª®àª¾àª?à«? àªµàªªàª°àª¾àª¶à«?."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
 msgstr "àªªà«?àª°àª®àª¾àª£àªà«?àª¤ Unix mbox àª¸à«?àªªà«?àª² àª¡àª¿àª°à«?àª?à«?àª?àª°à«?"
 
-#: ../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:174
+#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-maildir-store.c:92
+#: ../camel/providers/local/camel-mbox-store.c:526
+#: ../camel/providers/local/camel-spool-store.c:318
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "àª°à«?àª? %s àª? àª¸àª?àª?à«?àª°àª¹àªµàª¾ àª®àª¾àª?à«? àª?à«?àª? àª?à«?àª?à«?àª?àª¸ àªªàª¥ àª¨àª¥à«?"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "àª°à«?àª? %s àª? àª¸àª?àª?à«?àª°àª¹àªµàª¾ àª®àª¾àª?à«? àª?à«?àª? àª¨àª¿àª¯àª®àª¿àª¤ àª¡àª¿àª°à«?àª?à«?àª?àª°à«? àª¨àª¥à«?"
 
-#: ../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:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "àª«à«?àª²à«?àª¡àª° àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:220
+#, 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:281
 #, c-format
 msgid "Local mail file %s"
 msgstr "àª¸à«?àª¥àª¾àª¨àª¿àª? àª®à«?àª?àª² àª«àª¾àª?àª² %s"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:393
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "àª«à«?àª²à«?àª¡àª° %s àª¨à«? %s àª®àª¾àª? àª¨àª¾àª® àª¬àª¦àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:467
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' àª¨à«?àª? àª¨àª¾àª® àª¬àª¦àª²à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:695
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "àª«à«?àª²à«?àª¡àª° àª?àª¨à«?àª?à«?àª°àª® àª«àª¾àª?àª² '%s' àª?àª¾àª¢à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:724
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "àª«à«?àª²à«?àª¡àª° àª®à«?àª?àª¾ àª«àª¾àª?àª² '%s' àª?àª¾àª¢à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../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:228
-msgid "Maildir append message canceled"
-msgstr "Maildir àª?àª®à«?àª°à«? àª¸àª?àª¦à«?àª¶à«? àª°àª¦ àª¥àª? àª?àª¯à«?àª²"
+#: ../camel/providers/local/camel-maildir-folder.c:198
+#, fuzzy, c-format
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "Maildir àª«à«?àª²à«?àª¡àª°àª®àª¾àª? àª¸àª?àª¦à«?àª¶à«? àª?àª®à«?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:231
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
+#: ../camel/providers/local/camel-maildir-folder.c:246
+#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
+#, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid "Cannot get message %s from folder %s: "
+msgstr "àª«à«?àª²à«?àª¡àª° %s àª®àª¾àª?àª¥à«? àª¸àª?àª¦à«?àª¶à«? %s àª¨à«? àª®à«?àª³àªµà«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: "
+
+#: ../camel/providers/local/camel-maildir-folder.c:326
+#, fuzzy, c-format
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot transfer message to destination folder: %s"
 msgstr "Maildir àª«à«?àª²à«?àª¡àª°àª®àª¾àª? àª¸àª?àª¦à«?àª¶à«? àª?àª®à«?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:261
-#: ../camel/providers/local/camel-maildir-folder.c:290
-#: ../camel/providers/local/camel-maildir-folder.c:304
-#: ../camel/providers/local/camel-maildir-folder.c:312
-#: ../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:225
-#: ../camel/providers/local/camel-mh-folder.c:236
-#: ../camel/providers/local/camel-mh-folder.c:244
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"àª¸àª?àª¦à«?àª¶à«? àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s àª¨à«? àª«à«?àª²à«?àª¡àª° %s àª®àª¾àª?àª¥à«?\n"
-"  %s"
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, fuzzy, c-format
+#| msgid "Cannot create folder: %s: folder exists"
+msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgstr "àª«à«?àª²à«?àª¡àª° àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: àª«à«?àª²à«?àª¡àª° àªªàª¹à«?àª²àª¾àª¥à«? àª? àª¹àª¾àª?àª° àª?à«?"
 
-#: ../camel/providers/local/camel-maildir-folder.c:313
-msgid "Invalid message contents"
-msgstr "àª¸àª?àª¦à«?àª¶àª¾àª¨àª¾ àª¸àª®àª¾àªµàª¿àª·à«?àª?à«? àª?àª¯à«?àª?à«?àª¯ àª?à«?"
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:686
+#, c-format
+#| msgid "Folder already exists"
+msgid "Folder %s already exists"
+msgstr "àª«à«?àª²à«?àª¡àª° %s àªªàª¹à«?àª²àª¾àª¥à«? àª? àª¹àª¾àª?àª° àª?à«?"
 
-#: ../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:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:389
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %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:341
+#: ../camel/providers/local/camel-mh-store.c:464
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %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:351
+#: ../camel/providers/local/camel-mh-store.c:473
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª«à«?àª²à«?àª¡àª° àª?àª¸à«?àª¤àª¿àª¤à«?àªµàª®àª¾àª? àª¨àª¥à«?."
 
-#: ../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 "àª«à«?àª²à«?àª¡àª° '%s' àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: maildir àª¡àª¿àª°à«?àª?à«?àª?àª°à«? àª¨àª¥à«?."
 
-#: ../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:584
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª?àª¾àª¢à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
 msgstr "maildir àª¡àª¿àª°à«?àª?à«?àª?àª°à«? àª¨àª¥à«?"
 
-#: ../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:508
+#: ../camel/providers/local/camel-maildir-store.c:825
+#: ../camel/providers/local/camel-spool-store.c:143
+#: ../camel/providers/local/camel-spool-store.c:159
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¸à«?àª?à«?àª¨ àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:437
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-store.c:677
+#, fuzzy, c-format
+#| msgid "Cannot create folder: %s: folder exists"
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "àª«à«?àª²à«?àª¡àª° àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: àª«à«?àª²à«?àª¡àª° àªªàª¹à«?àª²àª¾àª¥à«? àª? àª¹àª¾àª?àª° àª?à«?"
+
+#: ../camel/providers/local/camel-maildir-summary.c:435
+#: ../camel/providers/local/camel-maildir-summary.c:565
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir àª¡àª¿àª°à«?àª?à«?àª?àª°à«?àª¨à«? àªªàª¥ àª?à«?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:556
 msgid "Checking folder consistency"
 msgstr "àª«à«?àª²à«?àª¡àª°àª¨à«? àª?àª¿àª?àª®àª¤ àª?àª?àª¾àª¸à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:649
 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:742
+#: ../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 "àª«à«?àª²à«?àª¡àª°à«? àª¸àª?àª?à«?àª°àª¹à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../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 "%s àªªàª° àª«à«?àª²à«?àª¡àª° àª¤àª¾àª³à«?àª? àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
-
-#: ../camel/providers/local/camel-mbox-folder.c:231
+#: ../camel/providers/local/camel-mbox-folder.c:183
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "àª®à«?àª?àª²àª¬à«?àª?à«?àª¸ àª?à«?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: %s\n"
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot open mailbox: %s: "
+msgstr "àª®à«?àª?àª²àª¬à«?àª?à«?àª¸ àª?à«?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr "àª®à«?àª?àª² àª?àª®à«?àª°à«? àª°àª¦ àª¥àª? àª?àª¯à«?àª²"
-
-#: ../camel/providers/local/camel-mbox-folder.c:300
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
+#: ../camel/providers/local/camel-mbox-folder.c:249
+#, fuzzy, c-format
+#| msgid "Cannot append message to mbox file: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
 msgstr "mbox àª«àª¾àª?àª²àª®àª¾àª? àª¸àª?àª¦à«?àª¶à«? àª?àª®à«?àª°à«? àª¶àª?àª¾àª¤à«? àª¨àª¥à«?: %s: %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:245
-msgid "Message construction failed."
-msgstr "àª¸àª?àª¦à«?àª¶à«? àª¬àª¨àª¾àªµàªµàª¾àª¨à«?àª? àª¨àª¿àª·à«?àª«àª³."
+#: ../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 "%s àªªàª° àª«à«?àª²à«?àª¡àª° àª¤àª¾àª³à«?àª? àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
+#, 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:400
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?à«?àª? àª¨àª¿àª¯àª®àª¿àª¤ àª«àª¾àª?àª² àª¨àª¥à«?."
 
-#: ../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:550
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "àª¡àª¿àª°à«?àª?à«?àª?àª°à«? '%s' àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:566
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "àª«à«?àª²à«?àª¡àª° àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:568
+msgid "Folder already exists"
+msgstr "àª«à«?àª²à«?àª¡àª° àªªàª¹à«?àª²àª¾àª¥à«? àª? àª¹àª¾àª?àª° àª?à«?"
+
+#: ../camel/providers/local/camel-mbox-store.c:609
+#: ../camel/providers/local/camel-mbox-store.c:622
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3837,164 +3956,166 @@ msgstr ""
 "àª«à«?àª²à«?àª¡àª° '%s' àª?àª¾àª¢à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:632
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' àª? àª?à«?àª? àª¨àª¿àª¯àª®àª¿àª¤ àª«àª¾àª?àª² àª¨àª¥à«?."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:641
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª? àª?àª¾àª²à«? àª¨àª¥à«?. àª?àª¾àª¢à«? àª¨àª?àª?àª¾àª¯à«?àª² àª¨àª¥à«?."
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:667
+#: ../camel/providers/local/camel-mbox-store.c:681
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "àª«à«?àª²à«?àª¡àª° àª¸àª¾àª° àª«àª¾àª?àª² '%s' àª?àª¾àª¢à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:761
 #, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "àª¡àª¿àª°à«?àª?à«?àª?àª°à«? '%s' àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s."
-
-#: ../camel/providers/local/camel-mbox-store.c:392
-#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "àª«à«?àª²à«?àª¡àª° àª¬àª¨àª¾àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:394
-msgid "Folder already exists"
-msgstr "àª«à«?àª²à«?àª¡àª° àªªàª¹à«?àª²àª¾àª¥à«? àª? àª¹àª¾àª?àª° àª?à«?"
-
-#: ../camel/providers/local/camel-mbox-store.c:485
 msgid "The new folder name is illegal."
 msgstr "àª¨àªµàª¾ àª«à«?àª²à«?àª¡àª°àª¨à«?àª? àª¨àª¾àª® àª?àª¯à«?àª?à«?àª¯ àª?à«?."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:776
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' àª¨à«?àª? àª¨àª¾àª® àª¬àª¦àª²à«? àª¶àª?àª¾àª¯à«?àª? àª¨àª¥à«?: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:859
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' àª¨à«?àª? àª¨àª¾àª® %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 "àª«à«?àª²à«?àª¡àª° àª?à«?àª²à«? àª¶àª?à«?àª¯àª¾ àª¨àª¥à«?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
+#: ../camel/providers/local/camel-mbox-summary.c:537
+#, fuzzy, 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 "%ld àª?àª?à«?àª¯àª¾àª? àª«à«?àª²à«?àª¡àª° %s àª®àª¾àª? àª?àª°àª¾àª¬ àª®à«?àª?àª² àªªàª¦àª?à«?àª?à«?àª¦ àªà«?àª² àª?àªµà«?"
 
-#: ../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 "àª«à«?àª²à«?àª¡àª° àª?àª?àª¾àª¸à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: %s"
 
-#: ../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 "àª«àª¾àª?àª² àª?à«?àª²à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %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 "àª?àª¾àª®àª?àª²àª¾àª? àª®à«?àª?àª²àª¬à«?àª?à«?àª¸ àª?à«?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
 
-#: ../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 "àª¸à«?àª°à«?àª¤ àª«à«?àª²à«?àª¡àª° %s àª¨à«? àª¬àª?àª§ àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../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 "àª?àª¾àª®àª?àª²àª¾àª? àª«à«?àª²à«?àª¡àª° àª¬àª?àª§ àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../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 "àª«à«?àª²à«?àª¡àª°àª¨à«?àª? àª¨àª¾àª® àª¬àª¦àª²à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../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 "àª«à«?àª²à«?àª¡àª° àª¸àª?àª?à«?àª°àª¹à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../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 "àª?àª?à«?àª?àª¾àª¤ àªà«?àª²: %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 "àª?àª¾àª®àª?àª²àª¾àª? àª®à«?àª?àª²àª¬à«?àª?à«?àª¸àª®àª¾àª? àª²àª?àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../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 "àª?àª¾àª®àª?àª²àª¾àª? àª®à«?àª?àª²àª¬à«?àª?à«?àª¸àª®àª¾àª? àª²àª?àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:180
-msgid "MH append message canceled"
-msgstr "MH àª?àª®à«?àª°à«? àª¸àª?àª¦à«?àª¶à«? àª°àª¦ àª¥àª? àª?àª¯à«?àª²"
-
-#: ../camel/providers/local/camel-mh-folder.c:183
+#: ../camel/providers/local/camel-mh-folder.c:115
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "mh àª«à«?àª²à«?àª¡àª°àª®àª¾àª? àª¸àª?àª¦à«?àª¶à«? àª?àª®à«?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: %s"
+#| msgid "Cannot append message to mh folder: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "mh àª«à«?àª²à«?àª¡àª°àª®àª¾àª? àª¸àª?àª¦à«?àª¶à«? àª?àª®à«?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:483
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:497
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª®à«?àª³àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: àª¡àª¿àª°à«?àª?à«?àª?àª°à«? àª¨àª¥à«?."
 
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../camel/providers/local/camel-mh-summary.c:230
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH àª¡àª¿àª°à«?àª?à«?àª?àª°à«? àªªàª¥ àª?à«?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:134
+#: ../camel/providers/local/camel-spool-store.c:327
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "àª¸à«?àªªà«?àª² '%s' àª?à«?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:146
+#: ../camel/providers/local/camel-spool-store.c:341
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "àª¸à«?àªªà«?àª² '%s' àª? àª?à«?àª? àª¨àª¿àª¯àª®àª¿àª¤ àª«àª¾àª?àª² àª?à«? àª¡àª¿àª°à«?àª?à«?àª?àª°à«? àª¨àª¥à«?"
 
-#: ../camel/providers/local/camel-spool-store.c:165
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "àª¸à«?àªªà«?àª² àª®à«?àª?àª² àª«àª¾àª?àª² %s"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "àª¸à«?àªªà«?àª² àª«à«?àª²à«?àª¡àª° àª?à«?àª°à«? %s"
+
+#: ../camel/providers/local/camel-spool-store.c:391
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "àª«à«?àª²à«?àª¡àª° '%s/%s' àª?àª¸à«?àª¤àª¿àª¤à«?àªµàª®àª¾àª? àª¨àª¥à«?."
 
-#: ../camel/providers/local/camel-spool-store.c:175
+#: ../camel/providers/local/camel-spool-store.c:403
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4003,12 +4124,12 @@ msgstr ""
 "àª«à«?àª²à«?àª¡àª° '%s' àª¨à«? àª?à«?àª²à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:409
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "àª«à«?àª²à«?àª¡àª° '%s' àª?àª¸à«?àª¤àª¿àª¤à«?àªµàª®àª¾àª? àª¨àª¥à«?."
 
-#: ../camel/providers/local/camel-spool-store.c:184
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4017,117 +4138,142 @@ msgstr ""
 "àª«à«?àª²à«?àª¡àª° '%s' àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:192
+#: ../camel/providers/local/camel-spool-store.c:426
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' àª? àª®à«?àª?àª²àª¬à«?àª?à«?àª¸ àª«àª¾àª?àª² àª¨àª¥à«?."
 
-#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:462
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "àª¸à«?àª?à«?àª° INBOX àª¨à«? àª?àª§àª¾àª° àª?àªªàª¤à«? àª¨àª¥à«?"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:476
 #, c-format
-msgid "Spool mail file %s"
-msgstr "àª¸à«?àªªà«?àª² àª®à«?àª?àª² àª«àª¾àª?àª² %s"
+msgid "Spool folders cannot be deleted"
+msgstr "àª¸à«?àªªà«?àª² àª«à«?àª²à«?àª¡àª°à«? àª?àª¾àª¢à«? àª¶àª?àª¾àª¤àª¾ àª¨àª¥à«?"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:491
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "àª¸à«?àªªà«?àª² àª«à«?àª²à«?àª¡àª° àª?à«?àª°à«? %s"
-
-#: ../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-summary.c:169
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:193
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
+#| msgid "Could not sync temporary folder %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
 msgstr "àª?àª¾àª®àª?àª²àª¾àª? àª«à«?àª²à«?àª¡àª° %s àª¨à«? àª¸à«?àª®à«?àª³ àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
-msgid "Could not sync spool folder %s: %s"
+#| msgid "Could not sync spool folder %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
 msgstr "àª¸à«?àªªà«?àª² àª«à«?àª²à«?àª¡àª° %s àª¨à«? àª¸à«?àª®à«?àª³ àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
-#, c-format
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
+#, fuzzy, c-format
+#| msgid ""
+#| "Could not sync spool folder %s: %s\n"
+#| "Folder may be corrupt, copy saved in '%s'"
 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 ""
 "àª¸à«?àªªà«?àª² àª«à«?àª²à«?àª¡àª° %s àª¨à«? àª¸à«?àª®à«?àª³ àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s\n"
 "àª«à«?àª²à«?àª¡àª° àª?àª¦àª¾àª? àª¬àª?àª¡à«?àª² àª¹à«?àª? àª¶àª?à«?, àª¨àª?àª² `%s' àª®àª¾àª? àª¸àª?àª?à«?àª°àª¹àª¾àª¯à«?àª²à«? àª?à«?"
 
-#: ../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:200
+#: ../camel/providers/nntp/camel-nntp-folder.c:279
+#: ../camel/providers/nntp/camel-nntp-folder.c:393
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "àª?àª?àª¤àª°àª¿àª? àªà«?àª²: UID àª? àª?àª¯à«?àª?à«?àª¯ àª¬àª?àª§àª¾àª°àª£àª®àª¾àª? àª?à«?: %s"
 
-#: ../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:241
+#: ../camel/providers/nntp/camel-nntp-folder.c:245
+#: ../camel/providers/pop3/camel-pop3-folder.c:369
+#: ../camel/providers/pop3/camel-pop3-folder.c:434
+#: ../camel/providers/pop3/camel-pop3-folder.c:446
+#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "àª¸àª?àª¦à«?àª¶à«? %s àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:477
+#: ../camel/providers/nntp/camel-nntp-folder.c:483
+#: ../camel/providers/nntp/camel-nntp-folder.c:530
 #, c-format
 msgid "Posting failed: %s"
 msgstr "àªªà«?àª¸à«?àª? àª?àª°àªµàª¾àª¨à«?àª? àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
+#| msgid "Posting failed: %s"
+msgid "Posting failed: "
+msgstr "àªªà«?àª¸à«?àª? àª?àª°àªµàª¾àª¨à«?àª? àª¨àª¿àª·à«?àª«àª³: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:554
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "àª¤àª®à«? àª?àª«àª²àª¾àª?àª¨ àª°à«?àª¤à«? àª?àª¾àª® àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª¹à«?àª¯ àª¤à«?àª¯àª¾àª°à«? NNTP àª¸àª?àª¦à«?àª¶àª¾àª? àª®à«?àª?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:443
+#: ../camel/providers/nntp/camel-nntp-folder.c:574
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "àª¤àª®à«? NNTP àª«à«?àª²à«?àª¡àª°àª®àª¾àª?àª¥à«? àª¸àª?àª¦à«?àª¶àª¾àª? àª¨àª?àª² àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?!"
 
-#: ../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 "àª?à«?àª?àª?àª¾ àª¨à«?àª?à«?àª¶àª¨àª®àª¾àª? àª«à«?àª²à«?àª¡àª°à«? àª¬àª¤àª¾àªµà«? (àª¦àª¾.àª¤. comp.os.linux àª¨à«? àª?àª?à«?àª¯àª¾àª? c.o.linux) (_S)"
 
-#: ../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 "àª¸àª¬àª¸à«?àª?à«?àª°àª¿àªªà«?àª¶àª¨ àª¸àª?àªµàª¾àª¦àª®àª¾àª?, àª¸àª?àª¬àª?àª§àª¿àª¤ àª«à«?àª²à«?àª¡àª°à«?àª¨àª¾ àª¨àª¾àª® àª¬àª¤àª¾àªµà«? (_d)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "USENET àª¸àª®àª¾àª?àª¾àª°à«?"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "àª? USENET àª¸àª®àª¾àª?àª¾àª° àª?à«?àª¥àª®àª¾àª?àª¥à«? àªµàª¾àª?àª?àªµàª¾ àª®àª¾àª?à«? àª?àª¨à«? àª¤à«?àª®àª¾àª? àªªà«?àª¸à«?àª? àª?àª°àªµàª¾ àª®àª¾àª?à«? àªªà«?àª°à«?àªµàª¾àª?àª¡àª° àª?à«?."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "àª? àªµàª¿àª?àª²à«?àªª àª¸àª¾àª¦àª¾ àª²àª?àª¾àª£àªµàª¾àª³àª¾ àªªàª¾àª¸àªµàª°à«?àª¡àª¨à«? àª®àª¦àª¦àª¥à«? NNTP àª¸àª°à«?àªµàª°àª¨à«?àª? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª?àª°à«? àª?à«?."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:77
+#, c-format
+msgid "Authentication requested but no username provided"
+msgstr "àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£àª¨à«? àª®àª¾àª?àª?àª£à«? àª¥àª¯à«?àª² àª?à«? àªªàª°àª?àª¤à«? àª?à«?àª? àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾ àª¨àª¾àª® àªªà«?àª°à«? àªªàª¾àª¡àªµàª¾àª®àª¾àª? àª?àªµà«?àª² àª¨àª¥à«?"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:89
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "%s àª®àª¾àª?àª¥à«? àª¶à«?àªà«?àª?à«?àª?àª¾ àªµàª¾àª?àª?à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s"
+msgid "Cannot authenticate to server: %s"
+msgstr "àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:346
+#, c-format
+#| msgid "Could not read greeting from %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "%s àª®àª¾àª?àª¥à«? àª¶à«?àªà«?àª?à«?àª?àª¾ àªµàª¾àª?àª?à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:359
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP àª¸àª°à«?àªµàª° %s àª? àªà«?àª² àª?à«?àª¡ %d àª?àªªà«?àª¯à«?: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:527
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s àª®àª¾àª°àª«àª¤à«? USENET àª¸àª®àª¾àª?àª¾àª°"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:1045
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4138,7 +4284,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1160
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4148,7 +4295,8 @@ msgstr ""
 "\n"
 "àª?àªµà«?àª? àª?à«?àª? àª¸àª®àª¾àª?àª¾àª° àª?à«?àª¥ àª¨àª¥à«?. àªªàª¸àª?àª¦ àª?àª°à«?àª² àªµàª¸à«?àª¤à«? àª? àª¸àª?àªàªµàª¿àª¤ àª?à«? àª?à«? àªªàª¿àª¤à«? àª«à«?àª²à«?àª¡àª° àª?à«?."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1202
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4158,122 +4306,115 @@ msgstr ""
 "\n"
 "àª¸àª®àª¾àª?àª¾àª° àª?à«?àª¥ àª?àª¸à«?àª¤àª¿àª¤à«?àªµàª®àª¾àª? àª¨àª¥à«?!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1235
+#, 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:1251
+#, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "àª¸àª®àª¾àª?àª¾àª° àª¸à«?àª?à«?àª°àª®àª¾àª? àª¤àª®à«? àª«à«?àª²à«?àª¡àª°à«?àª¨à«?àª? àª¨àª¾àª® àª¬àª¦àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:986
+#: ../camel/providers/nntp/camel-nntp-store.c:1268
+#, c-format
 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:1479
+#| msgid "NNTP Command failed: %s"
+msgid "NNTP Command failed: "
+msgstr "NNTP àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1553
 #, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª?àª°à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
 msgid "Not connected."
 msgstr "àª?à«?àª¡àª¾àª¯à«?àª² àª¨àª¥à«?."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-msgid "No such folder: %s"
-msgstr "àª?àªµà«?àª? àª?à«?àª? àª«à«?àª²à«?àª¡àª° àª¨àª¥à«?: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:234
+#: ../camel/providers/nntp/camel-nntp-summary.c:345
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: àª¨àªµàª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª?àª?àª¾àª¸à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:246
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover àª®àª¾àª?àª¥à«? àª¸àª°à«?àªµàª°àª¨à«? àª?àª¨àª¿àª?à«?àª?àª¨àª¿àª¯ àª?àªµàª¾àª¬: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:362
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head àª®àª¾àª?àª¥à«? àª¸àª°à«?àªµàª°àª¨à«? àª?àª¨àª¿àª?à«?àª?àª¨àª¿àª¯ àª?àªµàª¾àª¬: %s"
 
-#: ../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:407
 #, c-format
 msgid "Operation failed: %s"
 msgstr "àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾ àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:277
+#: ../camel/providers/pop3/camel-pop3-folder.c:334
+#, c-format
+msgid "No message with UID %s"
+msgstr "UID %s àª¸àª¾àª¥à«? àª?à«?àª? àª¸àª?àª¦à«?àª¶à«? àª¨àª¥à«?"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "POP àª¸àª?àª¦à«?àª¶à«? %d àª®à«?àª³àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+msgid "Unknown reason"
+msgstr "àª?àª?à«?àª?àª¾àª¤ àª?àª¾àª°àª£"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:486
 msgid "Retrieving POP summary"
 msgstr "POP àª¸àª¾àª° àª®à«?àª³àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:509
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "POP àª¸àª¾àª° àª®à«?àª³àªµà«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:561
 msgid "Expunging old messages"
 msgstr "àª?à«?àª¨àª¾ àª¸àª?àª¦à«?àª¶àª¾àª? àª?àª¾àª¢à«? àª¨àª¾àª?àª?à«?"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:575
 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 "UID %s àª¸àª¾àª¥à«? àª?à«?àª? àª¸àª?àª¦à«?àª¶à«? àª¨àª¥à«?"
-
-#. 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"
-msgstr "POP àª¸àª?àª¦à«?àª¶à«? %d àª®à«?àª³àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-msgid "Unknown reason"
-msgstr "àª?àª?à«?àª?àª¾àª¤ àª?àª¾àª°àª£"
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr "àª¸àª?àª¦à«?àª¶àª¾ àª¸àª?àª?à«?àª°àª¹àª¸à«?àª¥àª¾àª¨"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "àª¸àª°à«?àªµàª° àªªàª° àª¸àª?àª¦à«?àª¶àª¾àª? àª?à«?àª¡à«? àª¦à«? (_L)"
 
-#: ../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 "%s àª¦àª¿àªµàª¸(à«?) àªªàª?à«? àª?àª¾àª¢à«? àª¨àª¾àª?àª?à«? (_D)"
 
-#: ../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 "àª¬àª§àª¾ POP3 àª?àª?à«?àª¸àª?à«?àª¨à«?àª¸àª¨à«? àª®àª¾àª?à«? àª?àª§àª¾àª° àª¨àª¿àª·à«?àª?à«?àª°àª¿àª¯ àª?àª°à«? (_s)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:58
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "POP àª¸àª°à«?àªµàª°à«?àª®àª¾àª?àª¥à«? àª?à«?àª¡àª¾àªµàª¾ àª®àª¾àª?à«? àª?àª¨à«? àª®à«?àª?àª² àª¡àª¾àª?àª¨àª²à«?àª¡ àª?àª°àªµàª¾ àª®àª¾àª?à«?."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
+#: ../camel/providers/pop3/camel-pop3-provider.c:75
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4281,7 +4422,7 @@ msgstr ""
 "àª? àªµàª¿àª?àª²à«?àªª POP àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª¸àª¾àª¦àª¾ àª²àª?àª¾àª£àªµàª¾àª³àª¾ àªªàª¾àª¸àªµàª°à«?àª¡àª¥à«? àª?à«?àª¡àª¾àª¶à«?. àª? àª®àª¾àª¤à«?àª° àª?àª? àª? àªµàª¿àª?àª²à«?àªª àª?à«? àª?à«? àª?àª£àª¾ "
 "POP àª¸àª°à«?àªµàª°à«? àª®àª¾àª?à«? àª?àª§àª¾àª°àªà«?àª¤ àª?à«?."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
 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 "
@@ -4290,56 +4431,69 @@ msgstr ""
 "àª? àªµàª¿àª?àª²à«?àªª POP àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª?àª¨àª?à«?àª°àª¿àªªà«?àª?à«?àª¡ àªªàª¾àª¸àªµàª°à«?àª¡àª¨à«? àª®àª¦àª¦àª¥à«?APOP àªªà«?àª°à«?àª?à«?àª?à«?àª² àª¦à«?àªµàª¾àª°àª¾ àª?à«?àª¡àª¾àª¶à«?. àª? "
 "àª?àª¦àª¾àª? àª¬àª§àª¾ àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾àª? àª®àª¾àª?à«? àª¨àª¹àª¿àª? àª?àª¾àª²à«? àª?à«? àª?à«?àª? àª¤à«?àª¨à«? àª?àª§àª¾àª° àª?àªªàª¤àª¾ àª¸àª°à«?àªµàª°àª¨à«? àªµàª¾àªªàª°à«? àª?à«?."
 
-#: ../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:181
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP àª¸àª°à«?àªµàª° %s àª®àª¾àª?àª¥à«? àª®àª¾àª¨à«?àª¯ àª¶à«?àªà«?àª?à«?àª?àª¾ àªµàª¾àª?àª?àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³"
 
-#: ../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:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "POP àª¸àª°à«?àªµàª° %s àª¸àª¾àª¥à«? àª¸à«?àª°àª?à«?àª·àª¿àª¤ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? àª?à«?àª¡àª¾àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:200
 msgid "STLS not supported by server"
 msgstr "STLS àª¸àª°à«?àªµàª° àª¦à«?àªµàª¾àª°àª¾ àª?àª§àª¾àª°àªà«?àª¤ àª¨àª¥à«?"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:218
+#, fuzzy, c-format
+#| msgid "Failed to connect to POP server %s in secure mode: %s"
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "POP àª¸àª°à«?àªµàª° %s àª¸àª¾àª¥à«? àª¸à«?àª°àª?à«?àª·àª¿àª¤ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? àª?à«?àª¡àª¾àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:231
+msgid "TLS negotiations failed"
+msgstr "TLS àª¨à«?àª? àªàª¾àªµàª¤àª¾àª² àª¨àª¿àª·à«?àª«àª³"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:238
 msgid "TLS is not available in this build"
 msgstr "TLS àª? àª¬à«?àª²à«?àª¡àª®àª¾àª? àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:361
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "POP àª¸àª°à«?àªµàª° %s àª¸àª¾àª¥à«? àª?à«?àª¡àª¾àª£ àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:402
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "POP àª¸àª°à«?àªµàª° %s àª¸àª¾àª¥à«? àª¸àª?àªªàª°à«?àª? àª?àª°àªµàª¾ àª¸àª®àª°à«?àª¥ àª¨àª¥à«?: àª®àª?àª?à«?àª°à«? àª?àª°àª¾àª¯à«?àª² àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª®àª¾àª?à«? àª?à«?àª? àª?àª§àª¾àª° àª¨àª¥à«?."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:418
-#, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:340
+#, fuzzy, c-format
+#| msgid "SASL '%s' Login failed for POP server %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "POP àª¸àª°à«?àªµàª° %s àª®àª¾àª?à«? SASL '%s' àªªà«?àª°àªµà«?àª¶ àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:430
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP àª¸àª°à«?àªµàª° %s àª®àª¾àª? àªªà«?àª°àªµà«?àª¶à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: SASL àªªà«?àª°à«?àª?à«?àª?à«?àª² àªà«?àª²"
 
-#: ../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:374
+#, fuzzy, c-format
+#| msgid "Failed to authenticate on POP server %s: %s"
+msgid "Failed to authenticate on POP server %s: "
 msgstr "POP àª¸àª°à«?àªµàª° %s àªªàª° àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª?àª°àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:508
+#: ../camel/providers/pop3/camel-pop3-store.c:439
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4348,8 +4502,7 @@ msgstr ""
 "POP àª¸àª°à«?àªµàª° %s àª¸àª¾àª¥à«? àª?à«?àª¡àª¾àªµàª¾àª®àª¾àª? àª?àª¸àª®àª°à«?àª¥:\tàª?àª¯à«?àª?à«?àª¯ APOP ID àª®àª³à«?àª¯à«?. àª?àª?àª¿àª?àª¤à«? àª¹à«?àª®àª²à«? àª¶àª?àª?àª¾àª?àª¨àª? àª?à«?. "
 "àª®àª¹à«?àª°àª¬àª¾àª¨à«? àª?àª°à«?àª¨à«? àª¤àª®àª¾àª°àª¾ àª¸àª?àª?àª¾àª²àª?àª¨à«? àª¸àª?àªªàª°à«?àª? àª?àª°à«?."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:549
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4358,411 +4511,498 @@ msgstr ""
 "POP àª¸àª°à«?àªµàª° %s àª¸àª¾àª¥à«? àª¸àª?àªªàª°à«?àª? àª?àª°àªµàª¾àª®àª¾àª? àª?àª¸àª®àª°à«?àª¥.\n"
 "àªªàª¾àª¸àªµàª°à«?àª¡ àª®à«?àª?àª²àª¤à«? àªµàª?àª¤à«? àªà«?àª²: %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:505
+#, fuzzy, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending username: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
 msgstr ""
 "POP àª¸àª°à«?àªµàª° %s àª¸àª¾àª¥à«? àª¸àª?àªªàª°à«?àª? àª?àª°àªµàª¾àª®àª¾àª? àª?àª¸àª®àª°à«?àª¥.\n"
 "àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾ àª¨àª¾àª® àª®à«?àª?àª²àªµàª¾àª®àª¾àª? àªà«?àª²: %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:518
+#, fuzzy, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending password: %s"
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password%s"
+msgstr ""
+"POP àª¸àª°à«?àªµàª° %s àª¸àª¾àª¥à«? àª¸àª?àªªàª°à«?àª? àª?àª°àªµàª¾àª®àª¾àª? àª?àª¸àª®àª°à«?àª¥.\n"
+"àªªàª¾àª¸àªµàª°à«?àª¡ àª®à«?àª?àª²àª¤à«? àªµàª?àª¤à«? àªà«?àª²: %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:558
+#, c-format
+#| msgid "IMAP server %s"
+msgid "POP3 server %s"
+msgstr "POP3 àª¸àª°à«?àªµàª° %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:562
+#, fuzzy, c-format
+#| msgid "IMAP service for %s on %s"
+msgid "POP3 server for %s on %s"
+msgstr "%s àª®àª¾àª?à«? %s àªªàª° IMAP àª¸à«?àªµàª¾"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:693
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "POP àª¸àª°à«?àªµàª° %s àª¸àª¾àª¥à«? àª?à«?àª¡àª¾àª£ àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:720
 #, c-format
 msgid "No such folder '%s'."
 msgstr "àª?àªµà«? àª«à«?àª²à«?àª¡àª° '%s' àª¨àª¥à«?."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:737
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr ""
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "àª®à«?àª?àª²àª®à«?àª?àª²à«?"
 
-#: ../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."
 msgstr "àª®à«?àª?àª² àª®à«?àª?àª²àªµàª¾ àª®àª¾àª?à«? àª¤à«?àª¨à«? àª¸à«?àª¥àª¾àª¨àª¿àª? àª¸àª¿àª¸à«?àª?àª® àªªàª° \"àª®à«?àª?àª²àª®à«?àª?àª²à«?\" àª?àª¾àª°à«?àª¯àª?à«?àª°àª® àª¦à«?àªµàª¾àª°àª¾ àªªàª¸àª¾àª° àª?àª°à«?àª¨à«?."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "àª®à«?àª?àª²àª®à«?àª?àª²à«?"
+
+#: ../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 "àª®à«?àª?àª²àª®à«?àª?àª²à«?àª¨à«? pipe àª¬àª¨àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s: àª®à«?àª?àª² àª®à«?àª?àª²àª¾àª¯à«? àª¨àª¹àª¿àª?"
 
-#: ../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 "àª®à«?àª?àª²àª®à«?àª?àª²à«?àª¨ fork àª?àª°à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: %s: àª®à«?àª?àª² àª®à«?àª?àª²àª¾àª¯à«? àª¨àª¥à«?"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#| msgid "Could not send message: %s"
+msgid "Could not send message: "
+msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª?àª²à«? àª¶àª?à«?àª¯àª¾ àª¨àª¹àª¿àª?: "
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "àª®à«?àª?àª²àª®à«?àª?àª²à«? àª¸àª?àª?à«?àª¤ %s àª¥à«? àª?àª¤à«?àª¤à«?àª?àª¿àª¤ àª¥àª? àª?àª¯à«?: àª®à«?àª?àª² àª®à«?àª?àª²àª¾àª¯à«? àª¨àª¥à«?."
 
-#: ../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 "%s àª?àª²àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¥à«?: àª®à«?àª?àª² àª®à«?àª?àª²àª¾àª¯à«? àª¨àª¥à«?."
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#, c-format
+msgid "sendmail exited with status %d: mail not sent."
+msgstr "àª®à«?àª?àª²àª®à«?àª?àª²à«? àª¸à«?àª¥àª¿àª¤àª¿ %d àª¥à«? àª?àª¤à«?àª¤à«?àª?àª¿àª¤ àª¥àª? àª?àª¯à«? àª?à«?: àª®à«?àª?àª² àª®à«?àª?àª²àª¾àª¯à«? àª¨àª¥à«?."
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
+msgid "SMTP"
+msgstr "SMTP"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr "àª¦à«?àª°àª¸à«?àª¥ mailhub àª¦à«?àªµàª¾àª°àª¾ SMTP àªµàª¾àªªàª°à«?àª¨à«? àª?à«?àª¡àª¾àª?àª¨à«? àª®à«?àª?àª² àª®à«?àª³àªµàªµàª¾ àª®àª¾àª?à«?."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#, fuzzy
+#| msgid "Welcome response error"
+msgid "Welcome response error: "
+msgstr "àª?àªµàª¾àª¬àª¨à«? àªà«?àª²àª®àª¾àª? àª¤àª®àª¾àª°à«? àª¸à«?àªµàª¾àª?àª¤ àª?à«?"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "SMTP àª¸àª°à«?àªµàª° %s àª¸àª¾àª¥à«? àª¸à«?àª°àª?à«?àª·àª¿àª¤ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? àª?à«?àª¡àª¾àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+#| msgid "STARTTLS command failed: %s"
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP àª¸àª°à«?àªµàª° %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "SMTP àª®à«?àª?àª² %s àª¦à«?àªµàª¾àª°àª¾ àª®à«?àª³àªµà«?"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "SMTP àª¸àª°à«?àªµàª° %s àª®àª¾àª?àª?àª£à«? àª?àª°àª¾àª¯à«?àª² àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£àª¨àª¾ àªªà«?àª°àª?àª¾àª°àª¨à«? àª?àª§àª¾àª° àª?àªªàª¤à«?àª? àª¨àª¥à«? %s."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:495
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"SMTP àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª¾àª° àª?àª°àªµàª¾ àª?àª¸àª®àª°à«?àª¥.\n"
+"%s\n"
+"\n"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
 #, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "%s àª?àª²àª¾àªµà«? àª¶àª?à«?àª¯àª¾ àª¨àª¥à«?: àª®à«?àª?àª² àª®à«?àª?àª²àª¾àª¯à«? àª¨àª¥à«?."
+msgid "Cannot send message: service not connected."
+msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª¸à«?àªµàª¾ àª?à«?àª¡àª¾àª¯à«?àª² àª¨àª¥à«?."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "àª®à«?àª?àª²àª®à«?àª?àª²à«? àª¸à«?àª¥àª¿àª¤àª¿ %d àª¥à«? àª?àª¤à«?àª¤à«?àª?àª¿àª¤ àª¥àª? àª?àª¯à«? àª?à«?: àª®à«?àª?àª² àª®à«?àª?àª²àª¾àª¯à«? àª¨àª¥à«?."
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
-msgid "sendmail"
-msgstr "àª®à«?àª?àª²àª®à«?àª?àª²à«?"
+msgid "Cannot send message: sender address not valid."
+msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª®à«?àª?àª²àª¨àª¾àª° àª¸àª°àª¨àª¾àª®à«?àª? àª®àª¾àª¨à«?àª¯ àª¨àª¥à«?."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "Mail delivery via the sendmail program"
-msgstr "àª®à«?àª?àª² àª®à«?àª³àªµàªµàª¾àª¨à«?àª? àª®à«?àª?àª²àª®à«?àª?àª²à«? àª?àª¾àª°à«?àª¯àª?à«?àª°àª® àª¦à«?àªµàª¾àª°àª¾"
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
+msgid "Sending message"
+msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª?àª²à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
-msgid "SMTP"
-msgstr "SMTP"
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?à«?àª? àª®à«?àª³àªµàª¨àª¾àª°àª¾àª? àªµà«?àª¯àª¾àª?à«?àª¯àª¾àª¯àª¿àª¤ àª¨àª¥à«?."
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "àª¦à«?àª°àª¸à«?àª¥ mailhub àª¦à«?àªµàª¾àª°àª¾ SMTP àªµàª¾àªªàª°à«?àª¨à«? àª?à«?àª¡àª¾àª?àª¨à«? àª®à«?àª?àª² àª®à«?àª³àªµàªµàª¾ àª®àª¾àª?à«?."
+#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª? àª?àª¥àªµàª¾ àªµàª§à«? àª®à«?àª³àªµàª¨àª¾àª°àª¾àª?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
 msgid "Syntax error, command unrecognized"
 msgstr "àªµàª¾àª?à«?àª¯àª°àª?àª¨àª¾ àªà«?àª², àª?àª¦à«?àª¶ àª?àª³àª?àª¾àª¯à«? àª¨àª¥à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Syntax error in parameters or arguments"
 msgstr "àªªàª°àª¿àª®àª¾àª£à«? àª?àª¥àªµàª¾ àª¦àª²à«?àª²à«?àª®àª¾àª? àªµàª¾àª?à«?àª¯àª°àª?àª¨àª¾ àªà«?àª²"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Command not implemented"
 msgstr "àª?àª¦à«?àª¶ àª¸à«?àª§àª¾àª°àª¾àª¯à«? àª¨àª¥à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Command parameter not implemented"
 msgstr "àª?àª¦à«?àª¶ àªªàª°àª¿àª®àª¾àª£ àª¸à«?àª§àª¾àª°àª¾àª¯à«? àª¨àª¥à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
 msgid "System status, or system help reply"
 msgstr "àª¸àª¿àª¸à«?àª?àª®àª¨à«? àª¸à«?àª¥àª¿àª¤àª¿, àª?àª¥àªµàª¾ àª¸àª¿àª¸à«?àª?àª® àª®àª¦àª¦àª¨à«? àªµàª³àª¤à«? àª?àªµàª¾àª¬"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Help message"
 msgstr "àª®àª¦àª¦ àª¸àª?àª¦à«?àª¶à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 msgid "Service ready"
 msgstr "àª¸à«?àªµàª¾ àª¤à«?àª¯àª¾àª° àª?à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 msgid "Service closing transmission channel"
 msgstr "àª¸à«?àªµàª¾ àª¬àª?àª§ àª?àª°àªµàª¾àª¨à«? àªªàª°àª¿àªµàª¹àª¨ àª?à«?àª¨àª²"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
 msgid "Service not available, closing transmission channel"
 msgstr "àª¸à«?àªµàª¾ àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?, àªªàª°àª¿àªµàª¹àª¨ àª?à«?àª¨àª² àª¬àª?àª§ àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
 msgid "Requested mail action okay, completed"
 msgstr "àª®àª?àª?à«?àª°à«? àª¥àª¯à«?àª² àª®à«?àª?àª² àª?à«?àª°àª¿àª¯àª¾ àª¬àª°àª¾àª¬àª° àª?à«?, àªªà«?àª°à«?àª£ àª¥àª¯à«?àª²"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "User not local; will forward to <forward-path>"
 msgstr "àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾ àª¸à«?àª¥àª¾àª¨àª¿àª? àª¨àª¥à«?; <forward-path> àª¨à«? àª?àª?àª³ àª§àªªàª¾àªµàª¾àª¶à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "àª®àª?àª?à«?àª°à«? àª¥àª¯à«?àª² àª®à«?àª?àª²àª¨à«? àª?à«?àª°àª¿àª¯àª¾ àª²à«?àªµàª¾àª? àª¨àª¥à«?: àª®à«?àª?àª²àª¬à«?àª?à«?àª¸ àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "àª®àª?àª?à«?àª°à«? àª¥àª¯à«?àª² àª?à«?àª°àª¿àª¯àª¾ àª²à«?àªµàª¾àª? àª¨àª¥à«?: àª®à«?àª?àª²àª¬à«?àª?à«?àª¸ àª?àªªàª²àª¬à«?àª§ àª¨àª¥à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
 msgid "Requested action aborted: error in processing"
 msgstr "àª®àª?àª?à«?àª°à«? àª¥àª¯à«?àª² àª?à«?àª°àª¿àª¯àª¾ àª?àª¡àª§à«?àª¥à«? àª¬àª?àª§ àª¥àª? àª?àª?: àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾ àª?àª°àªµàª¾àª®àª¾àª? àªà«?àª²"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
 msgid "User not local; please try <forward-path>"
 msgstr "àªµàªªàª°àª¾àª¶àª?àª°à«?àª¤àª¾ àª¸à«?àª¥àª¾àª¨àª¿àª? àª¨àª¥à«?; àª®àª¹à«?àª°àª¬àª¾àª¨à«? àª?àª°à«?àª¨à«? <forward-path> àªªà«?àª°àª¯àª¤à«?àª¨ àª?àª°à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
 msgid "Requested action not taken: insufficient system storage"
 msgstr "àª®àª?àª?à«?àª°à«? àª¥àª¯à«?àª² àª?à«?àª°àª¿àª¯àª¾ àª²à«?àªµàª¾àª? àª¨àª¥à«?: àª?àªªà«?àª°àª¤à«? àª¸àª¿àª¸à«?àª?àª®àª¨à«? àª?àª?à«?àª¯àª¾"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "àª®àª?àª?à«?àª°à«? àª¥àª¯à«?àª² àª®à«?àª?àª²àª¨à«? àª?à«?àª°àª¿àª¯àª¾ àª?àª¡àª§à«?àª¥à«? àª¬àª?àª§ àª¥àª? àª?àª?: àª¸àª?àª?à«?àª°àª¹àª¸à«?àª¥àª¾àª¨àª¨à«? àªµàª¹à«?àª?àª?àª£à«? àªµàª§à«? àª?àª?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "àª®àª?àª?à«?àª°à«? àª¥àª¯à«?àª² àª?à«?àª°àª¿àª¯àª¾ àª²à«?àªµàª¾àª? àª¨àª¥à«?: àª®à«?àª?àª²àª¬à«?àª?à«?àª¸ àª¨àª¾àª® àª®àª¾àª¨à«?àª¯ àª¨àª¥à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "àª®à«?àª?àª² àª?àª¨àªªà«?àª? àª¶àª°à«? àª?àª°à«?; <CRLF>.<CRLF> àª¥à«? àª?àª?àª¤ àª¥àª¾àª¯ àª?à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
 msgid "Transaction failed"
 msgstr "àªªàª°àª¿àªµàª¹àª¨ àª¨àª¿àª·à«?àª«àª³"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
 msgid "A password transition is needed"
 msgstr "àªªàª¾àª¸àªµàª°à«?àª¡àª¨à«?àª? àªªàª°àª¿àªµàª¹àª¨ àª?àª°à«?àª°à«? àª?à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
 msgid "Authentication mechanism is too weak"
 msgstr "àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£àª¨à«? àª?à«?àª°àª¿àª¯àª¾ àª?à«?àª¬ àª¨àª¬àª³à«? àª?à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
 msgid "Encryption required for requested authentication mechanism"
 msgstr "àª®àª?àª?à«?àª° àª¥àª¯à«?àª² àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª?à«?àª°àª¿àª¯àª¾ àª®àª¾àª?à«? àª?àª¨àª?à«?àª°àª¿àªªà«?àª¶àª¨ àª?àª°à«?àª°à«? àª?à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
 msgid "Temporary authentication failure"
 msgstr "àª?àª¾àª®àª?àª²àª¾àª? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª¨àª¿àª·à«?àª«àª³"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-msgid "Welcome response error"
-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"
-msgstr "SMTP àª¸àª°à«?àªµàª° %s àª¸àª¾àª¥à«? àª¸à«?àª°àª?à«?àª·àª¿àª¤ àª¸à«?àª¥àª¿àª¤àª¿àª®àª¾àª? àª?à«?àª¡àª¾àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-msgid "STARTTLS command failed"
-msgstr "STARTTLS àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP àª¸àª°à«?àªµàª° %s àª®àª¾àª?àª?àª£à«? àª?àª°àª¾àª¯à«?àª² àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£àª¨àª¾ àªªà«?àª°àª?àª¾àª°àª¨à«? àª?àª§àª¾àª° àª?àªªàª¤à«?àª? àª¨àª¥à«? %s."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:567
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"SMTP àª¸àª°à«?àªµàª° àª¸àª¾àª¥à«? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª¾àª° àª?àª°àªµàª¾ àª?àª¸àª®àª°à«?àª¥.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP àª¸àª°à«?àªµàª° %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP àª®à«?àª?àª² %s àª¦à«?àªµàª¾àª°àª¾ àª®à«?àª³àªµà«?"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
-msgid "Cannot send message: service not connected."
-msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª¸à«?àªµàª¾ àª?à«?àª¡àª¾àª¯à«?àª² àª¨àª¥à«?."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
-msgid "Cannot send message: sender address not valid."
-msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª®à«?àª?àª²àª¨àª¾àª° àª¸àª°àª¨àª¾àª®à«?àª? àª®àª¾àª¨à«?àª¯ àª¨àª¥à«?."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
-msgid "Sending message"
-msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª?àª²à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
-msgid "Cannot send message: no recipients defined."
-msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?à«?àª? àª®à«?àª³àªµàª¨àª¾àª°àª¾àª? àªµà«?àª¯àª¾àª?à«?àª¯àª¾àª¯àª¿àª¤ àª¨àª¥à«?."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª?àª²à«? àª¶àª?àª¤àª¾ àª¨àª¥à«?: àª?àª? àª?àª¥àªµàª¾ àªµàª§à«? àª®à«?àª³àªµàª¨àª¾àª°àª¾àª?"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:1030
 msgid "SMTP Greeting"
 msgstr "SMTP àª¶à«?àªà«?àª?à«?àª?àª¾"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "HELO àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+#| msgid "HELO command failed: %s"
+msgid "HELO command failed: "
+msgstr "HELO àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "SMTP Authentication"
 msgstr "SMTP àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
+#, c-format
 msgid "Error creating SASL authentication object."
 msgstr "SASL àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª?àª¬à«?àª?à«?àª?à«?àª? àª¬àª¨àª¾àªµàª¤à«? àªµàª?àª¤à«? àªà«?àª²."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-msgid "AUTH command failed"
-msgstr "AUTH àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr "àª¸àª°à«?àªµàª° àª¤àª°àª«àª¥à«? àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª°àª£ àª?àªµàª¾àª¬ àª?àª°àª¾àª¬.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: %s: àª®à«?àª?àª² àª®à«?àª?àª²àª¾àª¯à«? àª¨àª¥à«?"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: %s: àª®à«?àª?àª² àª®à«?àª?àª²àª¾àª¯à«? àª¨àª¥à«?"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "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 "DATA àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: %s: àª®à«?àª?àª² àª®à«?àª?àª²àª¾àª¯à«? àª¨àª¥à«?"
-
-#. 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"
-msgstr "DATA àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "RSET àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1187
+#: ../camel/providers/smtp/camel-smtp-transport.c:1196
+#| msgid "AUTH command failed: %s"
+msgid "AUTH command failed: "
+msgstr "AUTH àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1304
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
+#: ../camel/providers/smtp/camel-smtp-transport.c:1327
+#| msgid "MAIL FROM command failed"
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#| msgid "RSET command failed: %s"
+msgid "RCPT TO command failed: "
+msgstr "RCPT TO àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#, c-format
+#| msgid "RCPT TO <%s> failed"
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> àª¨àª¿àª·à«?àª«àª³: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1421
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1441
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1532
+#: ../camel/providers/smtp/camel-smtp-transport.c:1540
+#| msgid "DATA command failed"
+msgid "DATA command failed: "
+msgstr "DATA àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1565
+#: ../camel/providers/smtp/camel-smtp-transport.c:1579
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+#| msgid "RSET command failed: %s"
+msgid "RSET command failed: "
+msgstr "RSET àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
+#| msgid "QUIT command failed: %s"
+msgid "QUIT command failed: "
+msgstr "QUIT àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³: %s"
+#: ../libedataserver/e-categories.c:47
+#| msgid "Anniversary"
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "àª¸àª¾àª²àª?à«?àª°à«?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "QUIT àª?àª¦à«?àª¶ àª¨àª¿àª·à«?àª«àª³"
+#: ../libedataserver/e-categories.c:48
+#| msgid "Birthday"
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "àª?àª¨à«?àª®àª¦àª¿àªµàª¸"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
+#| msgid "Business"
+msgctxt "CategoryName"
 msgid "Business"
 msgstr "àªµà«?àª¯àªµàª¸àª¾àª¯"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
+#| msgid "Competition"
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "àª¸à«?àªªàª°à«?àª§àª¾"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
+#| msgid "Favorites"
+msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "àª®àª¨àª?àª®àª¤àª¾àª?"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
+#| msgid "Gifts"
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "àªà«?àª?àª¸à«?àª?àª¾àª¦à«?"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
+#| msgid "Goals/Objectives"
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "àª§à«?àª¯à«?àª¯à«?/àª¹à«?àª¤à«?àª?"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:54
+#| msgid "Holiday"
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "àª°àª?àª¾àª¨à«? àª¦àª¿àªµàª¸"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
+#| msgid "Holiday Cards"
+msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "àª°àª?àª¾àª¨àª¾ àª¦àª¿àªµàª¸àª¨àª¾ àª?àª¾àª°à«?àª¡à«?"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:57
+#| msgid "Hot Contacts"
+msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "àª?àª¾àª¸ àª¸àª?àªªàª°à«?àª?à«?"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
+#| msgid "Ideas"
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "àª¯à«?àª?à«?àª¤àª¿àª?"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
+#| msgid "International"
+msgctxt "CategoryName"
 msgid "International"
 msgstr "àª?àª?àª¤àª°àª°àª¾àª·à«?àª?à«?àª°àª¿àª¯"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
+#| msgid "Key Customer"
+msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "àª®à«?àª?à«?àª¯ àª?à«?àª°àª¾àª¹àª?"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
+#| msgid "Miscellaneous"
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "àª®àª¿àª¶à«?àª°àª¿àª¤"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:62
+#| msgid "Personal"
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "àª?àª¾àª¨àª?à«?"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
+#| msgid "Phone Calls"
+msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "àª«à«?àª¨ àª?à«?àª²"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:65
+#| msgid "Status"
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "àªªàª°àª¿àª¸à«?àª¥àª¿àª¤àª¿"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
+#| msgid "Strategies"
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "àª¨à«?àª¤àª¿àª?"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
+#, fuzzy
+#| msgid "Suppliers"
+msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "àªªà«?àª°àª¾ àªªàª¾àª¡àª¨àª¾àª°àª¾àª?"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
+#| msgid "Time & Expenses"
+msgctxt "CategoryName"
 msgid "Time & Expenses"
-msgstr "àª¸àª®àª¯ & àª?àª°à«?àª?àª¾àª?"
+msgstr "àª¸àª®àª¯ àª?àª¨à«? àª?àª°à«?àª?àª¾àª?"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:69
+#| msgid "VIP"
+msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:70
+#| msgid "Waiting"
+msgctxt "CategoryName"
 msgid "Waiting"
-msgstr "àª°àª¾àª¹àª®àª¾àª?"
+msgstr "àª°àª¾àª¹ àª?à«?àª? àª°àª¹à«?àª¯àª¾ àª?à«?"
 
 #. 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:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -4770,7 +5010,7 @@ msgstr "%a %m/%d/%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:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
@@ -4778,7 +5018,7 @@ msgstr "%a %m/%d/%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:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -4786,7 +5026,7 @@ msgstr "%a %m/%d/%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:1889
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
@@ -4804,8 +5044,8 @@ msgstr "%a %m/%d/%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:1765
+#: ../libedataserver/e-time-utils.c:1884
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -4845,19 +5085,19 @@ msgstr "%m/%d/%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:1768
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%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:1826 ../libedataserver/e-time-utils.c:1946
 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:1830 ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4865,200 +5105,197 @@ 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:1835 ../libedataserver/e-time-utils.c:1943
 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:1839 ../libedataserver/e-time-utils.c:1935
 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:1842
 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:1846
 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 "LDAP àª¸àª°à«?àªµàª° àª?àª¨àª¾àª®àª¿àª? àª°à«?àª¤à«? àªµàª¾àªªàª°à«? àª°àª¹à«?àª¯àª¾ àª?à«?àª?"
 
-#: ../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 "àª¸àª¤à«?àª¤àª¾àª§àª¿àª?àª¾àª°à«?àª¤ àª?àª°àªµàª¾àª®àª¾àª? àª¨àª¿àª·à«?àª«àª³.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:327
-#, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "àª°à«?àªªàª°à«?àª?àª¾àª?àª?àª¨àª®àª¾àª? àªªàª¹à«?àª²àª¾àª¥à«? àª? àªµàª°à«?àª? '%s' àª?à«?. àª®àª¬à«?àª°àª¬àª¾àª¨à«? àª?àª°à«?àª¨à«? àª?àª¨à«?àª¯ àª¨àª¾àª® àªµàª¾àªªàª°à«?"
+#: ../libedataserverui/e-categories-dialog.c:131
+msgid "Category Properties"
+msgstr "àªµàª°à«?àª? àª?à«?àª£àª§àª°à«?àª®à«?"
 
-#: ../libedataserverui/e-categories-dialog.c:618
-msgid "Icon"
-msgstr "àª?àª¿àª¹à«?àª¨"
+#: ../libedataserverui/e-categories-dialog.c:142
+msgid "Category _Name"
+msgstr "àªµàª°à«?àª? àª¨àª¾àª® (_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:623
-msgid "Category"
-msgstr "àªµàª°à«?àª?"
+#: ../libedataserverui/e-categories-dialog.c:148
+msgid "Category _Icon"
+msgstr "àªµàª°à«?àª? àª?àª¿àª¹à«?àª¨ (_I)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
+#: ../libedataserverui/e-categories-dialog.c:189
 msgid "Category Icon"
 msgstr "àªµàª°à«?àª? àª?àª¿àª¹à«?àª¨"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:2
-msgid "Category Properties"
-msgstr "àªµàª°à«?àª? àª?à«?àª£àª§àª°à«?àª®à«?"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:3
-msgid "Category _Icon"
-msgstr "àªµàª°à«?àª? àª?àª¿àª¹à«?àª¨ (_I)"
+#: ../libedataserverui/e-categories-dialog.c:195
+msgid "_No Image"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
-msgid "Category _Name"
-msgstr "àªµàª°à«?àª? àª¨àª¾àª® (_N)"
+#: ../libedataserverui/e-categories-dialog.c:406
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "àª°à«?àªªàª°à«?àª?àª¾àª?àª?àª¨àª®àª¾àª? àªªàª¹à«?àª²àª¾àª¥à«? àª? àªµàª°à«?àª? '%s' àª?à«?. àª®àª¬à«?àª°àª¬àª¾àª¨à«? àª?àª°à«?àª¨à«? àª?àª¨à«?àª¯ àª¨àª¾àª® àªµàª¾àªªàª°à«?"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "àªµàª¸à«?àª¤à«?àª? àª? àªµàª°à«?àª?à«?àª®àª¾àª?àª¥à«? àª?àªµà«? àª?à«? (_c):"
+#: ../libedataserverui/e-categories-dialog.c:661
+msgid "Currently _used categories:"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.c:668
 msgid "_Available Categories:"
 msgstr "àª?àªªàª²àª¬à«?àª§ àªµàª°à«?àª?à«? (_A):"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.c:711
 msgid "_Edit"
 msgstr "àª«à«?àª°àª«àª¾àª° àª?àª°à«? (_E)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
-msgid "categories"
-msgstr "àªµàª°à«?àª?à«?"
+#: ../libedataserverui/e-categories-dialog.c:767
+msgid "Icon"
+msgstr "àª?àª¿àª¹à«?àª¨"
+
+#: ../libedataserverui/e-categories-dialog.c:772
+msgid "Category"
+msgstr "àªµàª°à«?àª?"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:292
 #, c-format
 msgid "Create category \"%s\""
 msgstr "àªµàª°à«?àª? \"%s\" àª¨à«? àª¬àª¨àª¾àªµà«?"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "àª°àª?àª? àª?àª¾àª£"
+#: ../libedataserverui/e-name-selector-dialog.c:169
+#| msgid "Hot Contacts"
+msgid "Show Contacts"
+msgstr "àª¸àª?àªªàª°à«?àª?à«? àª¬àª¤àª¾àªµà«?"
 
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "àª°à«?àª¨à«?àª¡àª° àª?àª°àªµàª¾ àª®àª¾àª?à«?àª¨à«? àª°àª?àª?"
-
-#: ../libedataserverui/e-name-selector-dialog.c:276
-msgid "Select Contacts from Address Book"
-msgstr "àª¸àª°àª¨àª¾àª®àª¾ àªªà«?àª¥à«?àª®àª¾àª?àª¥à«? àª¸àª?àªªàª°à«?àª?à«? àªªàª¸àª?àª¦ àª?àª°à«?"
+#: ../libedataserverui/e-name-selector-dialog.c:191
+msgid "Address B_ook:"
+msgstr "àª¸àª°àª¨àª¾àª®àª¾ àªªà«?àª¥à«? (_o):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:563
-msgid "_Add"
-msgstr "àª?àª®à«?àª°à«? (_A)"
+#: ../libedataserverui/e-name-selector-dialog.c:199
+msgid "Cate_gory:"
+msgstr "àªµàª°à«?àª? (_g):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:588
-msgid "_Remove"
-msgstr "àª¦à«?àª° àª?àª°à«? (_R)"
+#: ../libedataserverui/e-name-selector-dialog.c:217
+msgid "_Search:"
+msgstr "àª¶à«?àª§à«? (_S):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:765
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:235
+#: ../libedataserverui/e-name-selector-dialog.c:970
 msgid "Any Category"
 msgstr "àª?à«?àª?àªªàª£ àªµàª°à«?àª?"
 
-#: ../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>àª¸àª?àªªàª°à«?àª?à«? (_n)</b>"
+#: ../libedataserverui/e-name-selector-dialog.c:237
+#| msgid "Contacts"
+msgid "Co_ntacts"
+msgstr "àª¸àª?àªªàª°à«?àª?à«? (_n)"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>àª¸àª?àªªàª°à«?àª?à«? àª¬àª¤àª¾àªµà«?</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
-msgid "Address B_ook:"
-msgstr "àª¸àª°àª¨àª¾àª®àª¾ àªªà«?àª¥à«? (_o):"
+#: ../libedataserverui/e-name-selector-dialog.c:282
+msgid "Search"
+msgstr "àª¶à«?àª§à«?"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:285
 msgid "Address Book"
 msgstr "àª¸àª°àª¨àª¾àª®àª¾ àªªà«?àª¸à«?àª¤àª¿àª?àª¾"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
-msgid "Cate_gory:"
-msgstr "àªµàª°à«?àª? (_g):"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: ../libedataserverui/e-name-selector-dialog.c:288
 msgid "Contacts"
 msgstr "àª¸àª?àªªàª°à«?àª?à«?"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
-msgid "Search"
-msgstr "àª¶à«?àª§à«?"
+#: ../libedataserverui/e-name-selector-dialog.c:405
+msgid "Select Contacts from Address Book"
+msgstr "àª¸àª°àª¨àª¾àª®àª¾ àªªà«?àª¥à«?àª®àª¾àª?àª¥à«? àª¸àª?àªªàª°à«?àª?à«? àªªàª¸àª?àª¦ àª?àª°à«?"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
-msgid "_Search:"
-msgstr "àª¶à«?àª§à«? (_S):"
+#: ../libedataserverui/e-name-selector-dialog.c:740
+msgid "_Add"
+msgstr "àª?àª®à«?àª°à«? (_A)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:744
+msgid "_Remove"
+msgstr "àª¦à«?àª° àª?àª°à«? (_R)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:884
+#, fuzzy, c-format
+#| msgid "Error reading mail file: %s"
+msgid "Error loading address book: %s"
+msgstr "àª®à«?àª?àª² àª«àª¾àª?àª² àªµàª¾àª?àª?àªµàª¾àª®àª¾àª? àªà«?àª²: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2494
+#: ../libedataserverui/e-name-selector-entry.c:2665
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s àª²à«?àª?à«?àª®àª¾àª? àªµàª¿àª¸à«?àª¤à«?àª¤ àª?àª°à«? (_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2509
+#: ../libedataserverui/e-name-selector-entry.c:2680
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s àª¨à«? àª¨àª?àª² àª?àª°à«? (_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2519
+#: ../libedataserverui/e-name-selector-entry.c:2690
 #, c-format
 msgid "C_ut %s"
 msgstr "%s àª?àª¾àªªà«? (_u)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2536
+#: ../libedataserverui/e-name-selector-entry.c:2707
 #, c-format
 msgid "_Edit %s"
 msgstr "%s àª®àª¾àª? àª«à«?àª°àª«àª¾àª° àª?àª°à«? (_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:513
 #, c-format
 msgid "_Delete %s"
 msgstr "%s àª?àª¾àª¢à«? àª¨àª¾àª?àª?à«? (_D)"
 
-#: ../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
 msgid "You have the Caps Lock key on."
 msgstr "àª¤àª®àª¾àª°à«? àª?à«?àªªà«?àª¸ àª²à«?àª? àª?à«? àª?àª¾àª²à«? àª?à«?."
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:821
 msgid "_Remember this passphrase"
 msgstr "àª? àª®àª¹àª¾àªµàª°à«? àª¯àª¾àª¦ àª°àª¾àª?à«? (_R)"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:822
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "àª? àª¸àª¤à«?àª°àª¨à«? àª¯àª¾àª¦ àª?àªªàª¾àªµàªµàª¾ àª®àª¾àª?à«? àª? àª®àª¹àª¾àªµàª°à«? àª¯àª¾àª¦ àª°àª¾àª?à«? (_R)"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:827
 msgid "_Remember this password"
 msgstr "àª? àªªàª¾àª¸àªµàª°à«?àª¡ àª¯àª¾àª¦ àª°àª¾àª?à«? (_R)"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:828
 msgid "_Remember this password for the remainder of this session"
 msgstr "àª? àª¸àª¤à«?àª°àª¨àª¾ àª¬àª¾àª?à«?àª¨àª¾ àªàª¾àª? àª®àª¾àª?à«? àª? àªªàª¾àª¸àªµàª°à«?àª¡ àª¯àª¾àª¦ àª°àª¾àª?à«? (_R)"
 
@@ -5067,201 +5304,23 @@ msgstr "àª? àª¸àª¤à«?àª°àª¨àª¾ àª¬àª¾àª?à«?àª¨àª¾ àªàª¾àª? àª®àª¾àª?à«? àª? àªª
 msgid "Select destination"
 msgstr "àª?àª?àª¤àª¿àª® àª®à«?àª?àª¾àª® àªªàª¸àª?àª¦ àª?àª°à«?"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:170
 msgid "_Destination"
 msgstr "àª?àª?àª¤àª¿àª® àª®à«?àª?àª¾àª® (_D)"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1694
-#: ../servers/exchange/storage/exchange-account.c:955
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s àª®àª¾àª?à«? àªªàª¾àª¸àªµàª°à«?àª¡ àª¦àª¾àª?àª² àª?àª°à«?"
-
-#: ../servers/exchange/lib/e2k-autoconfig.c:1695
-#: ../servers/exchange/storage/exchange-account.c:960
-msgid "Enter password"
-msgstr "àªªàª¾àª¸àªµàª°à«?àª¡ àª¦àª¾àª?àª² àª?àª°à«?"
-
-#. 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 "àª®àª¾àª²àª¿àª?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:854
-msgid "Publishing Editor"
-msgstr "àªªà«?àª°àª?àª¾àª¶àª¨ àª¸àª?àªªàª¾àª¦àª?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:862
-msgid "Editor"
-msgstr "àª¸àª?àªªàª¾àª¦àª?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:869
-msgid "Publishing Author"
-msgstr "àªªà«?àª°àª?àª¾àª¶àª¨ àª²à«?àª?àª?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:875
-msgid "Author"
-msgstr "àª²à«?àª?àª?"
-
-#: ../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 "àª?àª?àª? àª¨àª¹àª¿àª?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:903
-msgid "Custom"
-msgstr "àªµà«?àªµàª¿àª§à«?àª¯àªªà«?àª°à«?àª£"
-
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "Generic error"
-msgstr "àª¸àª¾àª®àª¾àª¨à«?àª¯ àªà«?àª²"
-
-#: ../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 "I/O àªà«?àª²"
-
-#: ../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 "àªªà«?àª°àª?à«?àª°àª¿àª¯àª¾ àª?àª§àª¾àª°àªà«?àª¤ àª¨àª¥à«?"
-
-#: ../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 "%s àª¨àª¾ àª«à«?àª²à«?àª¡àª°à«?"
-
-#: ../servers/exchange/storage/exchange-account.c:1260
-msgid "Personal Folders"
-msgstr "àªµà«?àª¯àª?à«?àª¤àª¿àª?àª¤ àª«à«?àª²à«?àª¡àª°à«?"
-
-#: ../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 "àªµà«?àª¶à«?àªµàª¿àª? àª¸àª°àª¨àª¾àª®àª¾ àª¯àª¾àª¦à«?"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "àª?àª¾àª¢à«? àª¨àª¾àª?àª?à«?àª² àªµàª¸à«?àª¤à«?àª?"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "àª¡à«?àª°àª¾àª«à«?àª?à«?"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "àª?àª°à«?àª¨àª²"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "àª¨à«?àª?àª§à«?"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "àª?àª?àª?àª¬à«?àª?à«?àª¸"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "àª®à«?àª?àª²àª¾àª¯à«?àª² àªµàª¸à«?àª¤à«?àª?"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "àª?à«?àª°àª¿àª¯àª¾àª?"
-
-#: ../servers/groupwise/e-gw-connection.c:225
+#: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid connection"
 msgstr "àª?àª¯à«?àª?à«?àª¯ àª?à«?àª¡àª¾àª£"
 
-#: ../servers/groupwise/e-gw-connection.c:229
+#: ../servers/groupwise/e-gw-connection.c:231
 msgid "Invalid response from server"
 msgstr "àª¸àª°à«?àªµàª°àª®àª¾àª?àª¥à«? àª?àªµàª¤à«? àªµàª³àª¤à«? àª?àªµàª¾àª¬ àª?àª¯à«?àª?à«?àª¯ àª?à«?"
 
-#: ../servers/groupwise/e-gw-connection.c:231
+#: ../servers/groupwise/e-gw-connection.c:233
 msgid "No response from the server"
 msgstr "àª¸àª°à«?àªµàª°àª®àª¾àª?àª¥à«? àª?à«?àª? àªªà«?àª°àª¤à«?àª¯à«?àª¤à«?àª¤àª° àª¨àª¥à«?"
 
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../servers/groupwise/e-gw-connection.c:239
 msgid "Bad parameter"
 msgstr "àª?à«?àª?àª¾ àªªàª°àª¿àª®àª¾àª£"
 
-#: ../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 "àª?àªµà«?àª²à«?àª¯à«?àª¶àª¨ àª®àª¾àª¹àª¿àª¤à«? àª¸àª°à«?àªµàª° àªªà«?àª°àªµà«?àª¶ àª¸à«?àªµàª¾"
-
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]