[evolution-data-server/gnome-3-0] Updated Marathi Translations



commit f85ae3b58a0073fa139cacf88d6d65f336417931
Author: Sandeep Shedmake <sshedmak redhat com>
Date:   Wed Mar 30 17:48:10 2011 +0530

    Updated Marathi Translations

 po/mr.po | 5404 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 2727 insertions(+), 2677 deletions(-)
---
diff --git a/po/mr.po b/po/mr.po
index 59349c4..a928927 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -4,13 +4,13 @@
 #
 # Rahul Bhalerao <b rahul pm gmail com>, 2006.
 # Sandeep Shedmake <sandeep shedmake gmail com>, 2008, 2009.
-# Sandeep Shedmake <sshedmak redhat com>, 2009.
+# Sandeep Shedmake <sshedmak redhat com>, 2009, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: mr\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=general\n";
-"POT-Creation-Date: 2009-08-11 14:04+0000\n"
-"PO-Revision-Date: 2009-08-12 14:43+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n";
+"POT-Creation-Date: 2011-03-21 19:01+0000\n"
+"PO-Revision-Date: 2011-03-30 17:46+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak redhat com>\n"
 "Language-Team: Marathi <fedora-trans-mr redhat com>\n"
 "MIME-Version: 1.0\n"
@@ -19,172 +19,171 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\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
+msgstr "ल�ड �रत �ह�..."
+
+#: ../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:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2849
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
 #, 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 सर�वरवर�न स�पर�� र�पा�तरित �रत �ह�..."
+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/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:3329
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
 #, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: EBookListener बनवता �ल� नाह�"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "प�ढ�ल HTTP स�थित�सह स�र�त '%s' निर�माण �रण� �पयश�: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3595
+#: ../addressbook/libebook/e-book.c:3160
 #, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: gconf मध�य� स�व स�पर�� UID �ढळला नाह�"
+#| 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: GConf मध�य� साठवल�ल�या UID '%s' �र�ता स�त�र�त �ढळल� नाह�."
 
-#: ../addressbook/libebook/e-book.c:3727
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: gconf म�� भ�डारित uid `%s' साठ� ��णताह� स�त�र�त नाह� ह�ता."
+#: ../addressbook/libebook/e-book.c:3516
+#: ../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"
 
@@ -192,994 +191,1248 @@ 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 "�म�ल 1"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
-msgstr "�म�ल २"
+msgstr "�म�ल 2"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
-msgstr "�म�ल ३"
+msgstr "�म�ल 3"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
 msgstr "�म�ल 4"
 
-#: ../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 "बि�न�स द�रध�वन� २"
+msgstr "बि�न�स द�रध�वन� 2"
 
-#: ../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 "�र�ा द�रध�वन�२"
+msgstr "�र�ा द�रध�वन� 2"
 
-#: ../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:757
 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 ह�म स���र�न नाव 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "AIM ह�म स���र�न नाव 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "AIM ह�म स���र�न नाव 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "AIM �ार�य स���र�न नाव 1"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "AIM �ार�य स���र�न नाव 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "AIM �ार�य स���र�न नाव 3"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
 msgstr "सम�ह �न�सार ह�म स���र�न नाव 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
 msgstr "सम�ह �न�सार ह�म स���र�न नाव 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
 msgstr "सम�ह �न�सार ह�म स���र�न नाव 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
 msgstr "सम�ह �न�सार �ार�य स���र�न नाव 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
 msgstr "सम�ह �न�सार �ार�य स���र�न नाव 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
 msgstr "सम�ह �न�सार �ार�य स���र�न नाव 3"
 
-#: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "Gadu-Gadu ह�म Id 1"
-
-#: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "Gadu-Gadu ह�म Id 2"
-
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "Gadu-Gadu ह�म Id 3"
+#| 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 "Gadu-Gadu �ार�य Id 1"
+#| 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 "Gadu-Gadu �ार�य Id 2"
+#| 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 "Gadu-Gadu �ार�य Id 3"
+#| 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 "Yahoo! ह�म स���र�न नाव 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! ह�म स���र�न नाव 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! ह�म स���र�न नाव 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! �ार�य स���र�न नाव 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! �ार�य स���र�न नाव 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! �ार�य स���र�न नाव 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
 msgstr "MSN ह�म स���र�न नाव 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
 msgstr "MSN ह�म स���र�न नाव 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
 msgstr "MSN ह�म स���र�न नाव 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
 msgstr "MSN �ार�य स���र�न नाव 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
 msgstr "MSN �ार�य स���र�न नाव 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
 msgstr "MSN �ार�य स���र�न नाव 3"
 
-#: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "ICQ ह�म Id 1"
-
-#: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "ICQ ह�म Id 2"
-
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "ICQ ह�म Id 3"
+#| 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 1"
+#| 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 2"
+#| 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 3"
+#| 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 "पत�ता याद�"
+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 "श�र�ण� याद�"
+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 "�म�ल याद�"
+msgstr "�म�ल स���"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
-msgid "AIM Screen Name List"
-msgstr "AIM स���र�न नाव याद�"
-
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "सम�ह �न�सार Id याद�"
-
 #: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "Gadu-Gadu Id याद�"
+msgid "AIM Screen Name List"
+msgstr "AIM स���र�न नाव स���"
 
 #: ../addressbook/libebook/e-contact.c:250
-msgid "Yahoo! Screen Name List"
-msgstr "Yahoo! स���र�न नाव याद�"
+#| msgid "GroupWise Id List"
+msgid "GroupWise ID List"
+msgstr "GroupWise ID स���"
 
 #: ../addressbook/libebook/e-contact.c:251
-msgid "MSN Screen Name List"
-msgstr "MSN स���र�न नाव याद�"
+#| msgid "Jabber Id List"
+msgid "Jabber ID List"
+msgstr "Gadu-Gadu ID स���"
 
 #: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
-msgstr "ICQ Id याद�"
+msgid "Yahoo! Screen Name List"
+msgstr "Yahoo! स���र�न नाव स���"
+
+#: ../addressbook/libebook/e-contact.c:253
+msgid "MSN Screen Name List"
+msgstr "MSN स���र�न नाव स���"
 
 #: ../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 "याद�"
+msgstr "स���"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
-msgstr "दि�वा पत�ता याद�"
+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 याद�"
+#| 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 Home Name 1"
+msgstr "Skype ह�म नाव 1"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
-msgstr "Skype Home Name 2"
+msgstr "Skype ह�म नाव 2"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
-msgstr "Skype Home Name 3"
+msgstr "Skype ह�म नाव 3"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
-msgstr "Skype Work Name 1"
+msgstr "Skype �ार�य नाव 1"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
-msgstr "Skype Work Name 2"
+msgstr "Skype �ार�य नाव 2"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
-msgstr "Skype Work Name 3"
+msgstr "Skype �ार�य नाव 3"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
-msgstr "Skype नाव याद�"
+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 "वाढदिवस"
+msgstr "निनाव� स���"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../addressbook/libedata-book/e-data-book-factory.c:301
+#: ../addressbook/libedata-book/e-data-book-factory.c:334
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
 #, c-format
-msgid "Birthday: %s"
-msgstr "वाढदिवस: %s"
+msgid "Empty URI"
+msgstr "रि�ाम� URI"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../addressbook/libedata-book/e-data-book-factory.c:320
+#: ../addressbook/libedata-book/e-data-book-factory.c:370
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
 #, 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."
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:108
+msgid "Success"
+msgstr "यशस�व�"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#: ../calendar/backends/file/e-cal-backend-file.c:247
-msgid "Cannot save calendar data"
-msgstr "दिनदर�शि�ा माहित� स��य�त �र� श�ल� नाह�"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
-msgid "Could not create thread for getting deltas"
-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:174
+#: ../calendar/libedata-cal/e-data-cal.c:109
+#| msgid "Repository is offline"
+msgid "Repository offline"
+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:175
+#: ../calendar/libecal/e-cal.c:4159 ../calendar/libedata-cal/e-data-cal.c:110
+msgid "Permission denied"
+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: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:115
+#| msgid "Authentication failed"
+msgid "Authentication Failed"
+msgstr "�ळ� प�वण� �पयश�"
+
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:116
+#| msgid "Authentication required"
+msgid "Authentication Required"
+msgstr "�ळ� प�वण� �वश�य�"
+
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:117
+msgid "Unsupported field"
+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:181
+#: ../calendar/libedata-cal/e-data-cal.c:119
+msgid "Unsupported authentication method"
+msgstr "�धिप�रमाणन पद�धत� समर�थ�त नाह�"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
-#, c-format
-msgid "Loading %s items"
-msgstr "%s बाब ल�ड �रत �ह�"
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "TLS not available"
+msgstr "TLS �न�पलब�ध"
 
-#: ../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:184
+msgid "Book removed"
+msgstr "ब�� �ाढ�न �ा�ल�"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
-msgid "Invalid server URI"
-msgstr "�व�ध सर�वर URI"
-
-#: ../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:185
+#: ../calendar/libedata-cal/e-data-cal.c:123
+#| msgid "This message is not available in offline mode."
+msgid "Not available in offline mode"
+msgstr "�फला�न म�डमध�य� �न�पलब�ध"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:316
-msgid "Redirected to Invalid URI"
-msgstr "�व�ध URI मध�य� प�नर�प�र�षित"
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Search size limit exceeded"
+msgstr "श�ध ��ार मर�यादा मध�य� वाढ �ाल�"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:339
-msgid "Bad file format."
-msgstr "वा�� फा�ल स�वर�प."
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "Search time limit exceeded"
+msgstr "श�ध व�ळ मर�यादा मध�य� वाढ �ाल�"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:346
-msgid "Not a calendar."
-msgstr "दिनदर�शि�ा नाह�."
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Invalid query"
+msgstr "�व�ध विन�त�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
-msgid "Could not retrieve weather data"
-msgstr "हवामान ड��ा नाह� मिळवता �ला"
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Query refused"
+msgstr "विन�त� फ��ाळल�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Fog"
-msgstr "हवामान: ध���"
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:128
+#| msgid "%s: could not cancel"
+msgid "Could not cancel"
+msgstr "रद�द �रण� �श��य"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy"
-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:130
+msgid "Invalid server version"
+msgstr "�व�ध सर�व�हर �व�त�त�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-msgid "Weather: Cloudy Night"
-msgstr "हवामान: ढ�ाळ रात�र"
+#: ../addressbook/libedata-book/e-data-book.c:193
+#| msgid "Namespace"
+msgid "No space"
+msgstr "�ा�ा �न�पलब�ध"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-msgid "Weather: Overcast"
-msgstr "हवामान: पावसाळ�"
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4143 ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Invalid argument"
+msgstr "�व�ध तर��"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#. 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:133
+#| msgid "Protocol not supported"
+msgid "Not supported"
+msgstr "समर�थ�त नाह�"
+
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:141
+#| 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 "रि�ाम� ���श�: %s"
+
+#. 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
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get supported fields: %s"
+msgstr "समर�थ�त ��ष�त�र प�राप�त �रण� �श��य: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:625
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get required fields: %s"
+msgstr "�वश�य� ��ष�त�र प�राप�त �रण� �श��य: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:640
+#, c-format
+#| msgid "Unsupported authentication method"
+msgid "Cannot get supported authentication methods: %s"
+msgstr "समर�थ�त �ळ� प�वण�या��या पद�धत� प�राप�त �रण� �श��य: %s"
+
+#. 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
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get changes: %s"
+msgstr "बदल प�राप�त �रण� �श��य: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:755
+#, 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 "सर�व�हर प�हण��या���� नाह� (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, c-format
+#| msgid ""
+#| "Unexpected GnuPG status message encountered:\n"
+#| "\n"
+#| "%s"
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "�नप���ष�त HTTP स�थित� ��ड %d प�रवल� (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2096
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"सर�व�हर प�ह�ण�या���� नाह�, दिनदर�शि�ा फ��त-वा�ण�य म�डमध�य�� ��ल� �ह�.\n"
+"त�र��� स�द�श: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
+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:2101
+msgid "Reply Requested: by "
+msgstr "�त�तर निव�दित: द�वारा"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
+msgid "Reply Requested: When convenient"
+msgstr "�त�तर निव�दित: ��व�हा स�विधा �स�ल"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
+#| msgid "Loading %s items"
+msgid "Loading Appointment items"
+msgstr "भ�� ���� ल�ड �रत �ह�"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
+#| msgid "Loading %s items"
+msgid "Loading Task items"
+msgstr "�ार�य ���� ल�ड �रत �ह�"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
+#| msgid "Loading %s items"
+msgid "Loading Note items"
+msgstr "�िप ���� ल�ड �रत �ह�"
+
+#: ../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:463
+msgid "Not a calendar."
+msgstr "दिनदर�शि�ा नाह�."
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+msgid "Could not retrieve weather data"
+msgstr "हवामान ड��ा नाह� मिळवता �ला"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+msgid "Weather: Fog"
+msgstr "हवामान: ध���"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+msgid "Weather: Cloudy Night"
+msgstr "हवामान: ढ�ाळ रात�र"
+
+#: ../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: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:3986
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/libecal/e-cal-recur.c:3946
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/libecal/e-cal-recur.c:3947
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/libecal/e-cal-recur.c:3948
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/libecal/e-cal-recur.c:3949
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/libecal/e-cal-recur.c:3950
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "31st"
 msgstr "31st"
 
-#: ../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)साठ� ��प�तशब�द दा�ल �रा"
+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साठ� प�र���स� समर�थ �रण�यासाठ�"
+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 "�भिल��ा�ार �फला�न"
+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:112
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
-msgstr "वस�त� नाह� मिळाल�"
+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:113
+#: ../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 "�परि��त �पय���ता"
+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:114
 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:1306
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
+#: ../camel/providers/groupwise/camel-groupwise-store.c:628
+#: ../camel/providers/groupwise/camel-groupwise-store.c:810
+#: ../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"
-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 "�परि�ित त�र���"
+msgstr "�ळ� प�वण� �वश�य�"
+
+#: ../calendar/libecal/e-cal.c:4175
+#| msgid "A CORBA exception has occurred"
+msgid "A D-Bus exception has occurred"
+msgstr "�� D-Bus �पवाद �ढळला"
 
-#: ../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 "�ाह� त�र��� नाह�"
+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 date/time स���रि�� ह�ण�या�� �शा �रत�"
 
-#: ../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 "
@@ -1189,12 +1442,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 "
@@ -1203,104 +1456,264 @@ msgstr ""
 "\"%s\" सार� तर�� �� स���रि�� ह�न� �� �शा �रता ह� या �� व सिर�फ �� तर�� ब�लियन �लत (#f) "
 "ह�न�साठ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:111
 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:118
 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:121
+#| 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:122
+#| 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:608
+#, 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:633
+#, 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:658
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "दिनदर�शि�ा�� LDAP ��णधर�म प�न�प�राप�त �रण� �श��य: %s"
 
-#: ../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:683
+#, c-format
+#| msgid "Cannot create CMS Recipient information"
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "दिनदर�शि�ा व�ळपत�र� माहित� प�न�प�राप�त �रण� �श��य: %s"
 
-#: ../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:707
+#, 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:728
+#, 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:747
+#, 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:768
+#, 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:796
+#, 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:822
+#, 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:843
+#, 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:862
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot discard calendar alarm: %s"
+msgstr "दिनदर�शि�ा �लार�म व�ळण� �श��य: %s"
 
-#: ../camel/camel-cipher-context.c:102
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:883
+#, 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:910
+#, 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:935
+#, 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:960
+#, 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:988
+#, 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:1014
+#, 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:1039
+#, 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:1064
+#, 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:1083
+#, 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:1106
+#, 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:1137
+#, c-format
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "दिनदर�शि� म��ळ�/व�य��र स��� प�न�प�राप�त �रण� �श��य: %s"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:375
+#, c-format
+#| msgid "Invalid server URI"
+msgid "Invalid URI"
+msgstr "�व�ध URI"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:393
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "'%2$s' प��� '%1$s' �र�ता ब����ड फ�����र� �ढळल� नाह�"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:443
+#, c-format
+#| msgid "Could not create cache file"
+msgid "Could not instantiate backend"
+msgstr "ब����ड स�र� �रण� �श��य"
+
+#: ../camel/camel-cipher-context.c:200
+#, 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:213
+#, 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:229
+#, 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:243
+#, 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:256
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "या सिफरद�वार� त�म�ह� �ळ �यात �रणार नाह�"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:270
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "या सिफरद�वार� त�म�ह� �ळ निर�यात �रणार नाह�"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-cipher-context.c:812
+msgid "Signing message"
+msgstr "स�द�शावर स�वा��षर� �रत �ह�"
+
+#: ../camel/camel-cipher-context.c:1053
+msgid "Encrypting message"
+msgstr "स�द�श  �न��रिप�� �रत �ह�"
+
+#: ../camel/camel-cipher-context.c:1180
+msgid "Decrypting message"
+msgstr "स�द�श �ा डि��रिप�� �रत �ह�"
+
+#: ../camel/camel-data-cache.c:178
+#, c-format
 msgid "Unable to create cache path"
 msgstr "��श पथ निर�माण �रण�यात ���षम"
 
-#: ../camel/camel-data-cache.c:402
+#: ../camel/camel-data-cache.c:496
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "��श प�रविष��ि नाह� ह�व� श�त: %s: %s"
 
-#: ../camel/camel-db.c:412
+#: ../camel/camel-data-wrapper.c:143
+#, 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"
@@ -1308,11 +1721,11 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 "ल�� प�रविष��ि नाह� लिह� श�त: %s\n"
-"या सर�वर वर प�ढ�ल स���रिया प�न� नाह� �ालवल� �ाणार  ��पर�य�त त�म�ह�\n"
+"या सर�व�हर वर प�ढ�ल स���रिया प�न� नाह� �ालवल� �ाणार  ��पर�य�त त�म�ह�\n"
 "स��ाळाश� प�नर�स�ब�ध ��डत नाह�."
 
 #: ../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"
@@ -1323,120 +1736,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 "�फला�न स���रिय�साठ� फ�ल�डर समाविष��ा�स स�थान�य रित�या प�रतिलिप� �रा"
+msgstr "सर�व�हरश� र�सि���रना�� ह�त �ह�"
 
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:63 ../camel/camel-offline-folder.c:79
 msgid "Downloading new messages for offline mode"
 msgstr "�फला�न म�डसाठ� निवन स�द�श डा�नल�ड �रत �ह�"
 
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:398
 #, 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:464 ../camel/camel-offline-folder.c:312
+msgid "Copy folder content locally for offline operation"
+msgstr "�फला�न स���रिय�साठ� फ�ल�डर समाविष��ा�स स�थान�य रित�या प�रतिलिप� �रा"
+
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
+#: ../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:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1298
+#: ../camel/providers/imapx/camel-imapx-store.c:1386
+#: ../camel/providers/imapx/camel-imapx-store.c:1421
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "या स���रिया �� समाप�त �रन� �� लि� �प�� निश��ित र�प स� �नला�न �ाम �रना पड़��ा"
 
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr "वर�णन �पलब�ध नाह�"
+#: ../camel/camel-file-utils.c:722
+#, c-format
+msgid "Canceled"
+msgstr "रद�द ��ल�"
 
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:817 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
-msgstr "'%s' �पत�य प�र��रिया बनवण�यात �सफल: %s"
+msgstr "'%s' �पत�य प�र��रिया बनवण�यात �पयश�: %s"
 
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:864
 #, 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:1051 ../camel/camel-filter-driver.c:1060
 msgid "Syncing folders"
 msgstr "फ�ल�डर सि���रना�� �रत �ह�"
 
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
 #, 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:1159 ../camel/camel-filter-driver.c:1609
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "�ाळ� �ालवण�यात त�र���: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1256
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "स�प�ल फ�ल�डर ��लण�यास ���षम"
 
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1267
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "स�प�ल फ�ल�डर वर प�र��रिया �रण�यास ���षम"
 
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1285
 #, 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:1292 ../camel/camel-filter-driver.c:1314
 #, c-format
 msgid "Failed on message %d"
-msgstr "%d स�द�शावर �सफल"
+msgstr "%d स�द�शावर �पयश�"
 
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1329 ../camel/camel-filter-driver.c:1434
 msgid "Syncing folder"
 msgstr "फ�ल�डर सि��ि�� �रत �ह�"
 
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
 msgid "Complete"
 msgstr "स�पन�न"
 
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1398
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d �ा %d स�द�श प�राप�त �रत �ह�"
 
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1416
 #, c-format
 msgid "Failed at message %d of %d"
-msgstr "%d �ा %d स�द�शा वर �सफल"
+msgstr "%d �ा %d स�द�शा वर �पयश�"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
-msgstr "स�द�श प�राप�त �रण�यात �सफल"
+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 "(�पय���ता-���) ला �व�ध तर��"
+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:342 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:624
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1445,8 +1868,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:354 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:636
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1455,72 +1878,83 @@ msgstr ""
 "श�ध �भिव�य��ति �ालवण�यात त�र���: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ला bool परिणाम�� �वश�य�ता �ह�"
 
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:935
 #, 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:941 ../camel/camel-folder-search.c:948
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ला ��ळवण� प�र�ार ���षरमाळा�� �वश�य�ता �ह�"
 
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ला श�र���ला परिणाम�� �प���षा �ह�"
 
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:984
 #, 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
+#: ../camel/camel-folder.c:216
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "�समर�थ�त �ार�य: �भिव�य��त�न� श�धा: %s साठ�"
+#| 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:1429
+#: ../camel/camel-folder.c:240
 #, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "�समर�थ�त �ार�य: �भिव�य��त� न�र�प श�धा: %s साठ�"
+#| 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:1468
+#: ../camel/camel-folder.c:266
 #, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "�समर�थ�त �ार�यपध�दत�: UID द�वार� श�धा: %s �र�ता"
+#| msgid "Filtering new message(s)"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "'%s' मध�य� नव�न स�द�श फिल��र �रत �ह�"
+msgstr[1] "'%s' मध�य� नव�न स�द�श फिल��र �रत �ह�"
 
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:875
+#: ../camel/providers/local/camel-maildir-folder.c:293
 msgid "Moving messages"
 msgstr "स�द�श प�रतिस�थापित �रत �ह�"
 
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:878
 msgid "Copying messages"
 msgstr "स�द�श प�रतिलिप� �रत �ह�"
 
-#: ../camel/camel-folder.c:1922
-msgid "Learning junk"
-msgstr "��� सम��न ��त �ह�"
+#: ../camel/camel-folder.c:3247
+#, 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:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
+#, 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:647
+#: ../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:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1531,15 +1965,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:766
+#: ../camel/camel-gpg-context.c:728
+#, c-format
 msgid "Failed to parse gpg userid hint."
-msgstr "gpg userid �शाऱ�या��या विश�ल�षणात �सफल."
+msgstr "gpg userid �शाऱ�या��या विश�ल�षणात �पयश�."
 
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
+#, c-format
 msgid "Failed to parse gpg passphrase request."
-msgstr "gpg ��प�तशब�द विन�त���या विश�ल�षणात �सफल."
+msgstr "gpg ��प�तशब�द विन�त���या विश�ल�षणात �पयश�."
 
-#: ../camel/camel-gpg-context.c:824
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1548,7 +1984,7 @@ msgstr ""
 "त�म��या स�मार���ार�ड�� �ळ �नल�� �रण�यासाठ� त�म�हास PIN\n"
 "�� �र� �ह�: \"%s\""
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1557,140 +1993,132 @@ msgstr ""
 "त�म�हा�स �पय���त�यासाठ� �ळ ��लण�यासाठ� \n"
 "��प�तशब�दा�� �र� �ह�: \"%s\""
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s' साठ� GnuPG �ड�न �नप���षित विन�त�"
 
-#: ../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:828 ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4892
+#: ../camel/providers/imapx/camel-imapx-server.c:4909
+#: ../camel/providers/imapx/camel-imapx-store.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:506
+#: ../camel/providers/pop3/camel-pop3-store.c: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:846
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "��प�त �ळ ��लण�यात �सफल:३ ������ ��प�तशब�द दिल� ��ल�."
+msgstr "��प�त �ळ ��लण�यात �पयश�: 3 ������ ��प�तशब�द दिल� ��ल�."
 
-#: ../camel/camel-gpg-context.c:880
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG �ड�न �नप���षित प�रतिसाद: %s"
 
-#: ../camel/camel-gpg-context.c:943
-msgid "Failed to encrypt: No valid recipients specified."
-msgstr "�न��रिप�� �रण�यात �सफल: �ाह� व�ध प�राप�त�र�ता नाह�."
-
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1205 ../camel/camel-gpg-context.c:1330
-#: ../camel/camel-gpg-context.c:1852 ../camel/camel-gpg-context.c:1897
+#: ../camel/camel-gpg-context.c:989
 #, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "gpg �ालवण�यास �सफल: %s"
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "�न��रिप�� �रण�यात �पयश�: �ाह� व�ध प�राप�त�र�ता नाह�."
 
-#: ../camel/camel-gpg-context.c:1298 ../camel/camel-smime-context.c:602
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "स�वा��षर� ड��ा �त�पन�न �रता �ला नाह�: %s"
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+#| msgid "Could not generate signing data: %s"
+msgid "Could not generate signing data: "
+msgstr "स�वा��षर� ड��ा निर�माण �रण� �श��य: "
 
-#: ../camel/camel-gpg-context.c:1345 ../camel/camel-gpg-context.c:1546
-#: ../camel/camel-gpg-context.c:1562 ../camel/camel-gpg-context.c:1642
-#: ../camel/camel-gpg-context.c:1657 ../camel/camel-gpg-context.c:1773
-#: ../camel/camel-gpg-context.c:1788 ../camel/camel-gpg-context.c:1868
-#: ../camel/camel-gpg-context.c:1913
+#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
+#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
 msgid "Failed to execute gpg."
-msgstr "gpg �ालवण�यात �सफल."
+msgstr "gpg �ालवण�यात �पयश�."
 
-#: ../camel/camel-gpg-context.c:1364
-msgid "This is a digitally signed message part"
-msgstr "हा डि�ि�ल� स�वा��षर�त स�द�शा�ा �ह�"
-
-#: ../camel/camel-gpg-context.c:1450 ../camel/camel-gpg-context.c:1456
-#: ../camel/camel-gpg-context.c:1462 ../camel/camel-gpg-context.c:1477
-#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
+#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
+#: ../camel/camel-smime-context.c:971
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "स�द�श स�वा��षर��� पडताळण� नाह� �र� श�त: �श�द�ध स�द�श स�वर�प"
 
-#: ../camel/camel-gpg-context.c:1516
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "स�द�श स�वा��षर��� पडताळण� नाह� �र� श�त: �स�थाय� फा�ल निर�माण �रता �ल� नाह�: %s"
+#: ../camel/camel-gpg-context.c:1737
+#| msgid "Cannot verify message signature: Incorrect message format"
+msgid "Cannot verify message signature: "
+msgstr "स�द�श स�वा��षर� तपासण� �श��य: "
 
-#: ../camel/camel-gpg-context.c:1625
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "�न��रिप����� ड��ा �त�पन�न नाह� �रता �ला: %s"
+#: ../camel/camel-gpg-context.c:1858
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not generate encrypting data: "
+msgstr "����रिप��ि�� ड��ा निर�माण �रण� �श��य: "
 
-#: ../camel/camel-gpg-context.c:1675
+#: ../camel/camel-gpg-context.c:1911
 msgid "This is a digitally encrypted message part"
 msgstr "हा डि�ि�ल� �न��रिप���ड स�द�शा�ा भा� �ह�"
 
-#: ../camel/camel-gpg-context.c:1728 ../camel/camel-gpg-context.c:1736
-#: ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
+#: ../camel/camel-gpg-context.c:2001
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "स�द�श स�वा��षर� �� पडताळण� नाह� �र� श�त: �श�द�ध स�द�श स�वर�प"
 
-#: ../camel/camel-gpg-context.c:1745
+#: ../camel/camel-gpg-context.c:1989
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
-msgstr "MIME भा�ास डि��रिप�� �रण�यात �सफल: प�र�����ल त�र���"
+msgstr "MIME भा�ास डि��रिप�� �रण�यात �पयश�: प�र�����ल त�र���"
 
-#: ../camel/camel-gpg-context.c:1810 ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
 msgid "Encrypted content"
 msgstr "�न��रिप���ड समाविष��"
 
-#: ../camel/camel-gpg-context.c:1829
-msgid "Unable to parse message content"
-msgstr "स�द�श म���र विश�ल�षण �रण�यास ���षम"
-
-#: ../camel/camel-gpg-context.c:1853 ../camel/camel-gpg-context.c:1898
-#: ../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
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "%s वर ल�� फा�ल मिळवण�यासाठ� प�रयत�ना�ा �ाळ समाप�त. न�तर प�न�हा प�रयत�न �रा."
+#| 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"
+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"
+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"
@@ -1700,143 +2128,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"
+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"
+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:327
+#, 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:335
+#, 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:663
+#, c-format
+msgid "parse error"
+msgstr "त�र��ि विश�ल�षण �रा"
 
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
 msgstr "स�डवत �ह�: %s"
 
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:718
 msgid "Host lookup failed"
-msgstr "य�मान श�धण�यात �सफलता"
+msgstr "य�मान श�धण�यात �पयश�ता"
 
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
-msgstr "य�मान श�ध �सफल: %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:189
 #, 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:202
 #, 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 "हा पर�याय निनाव� ल���नद�वार� सर�वरश� ��ड�ल."
+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 "�धिप�रमाणन �सफल."
+msgstr "�धिप�रमाणन �पयश�."
 
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1845,7 +2276,7 @@ msgstr ""
 "�व�ध �म�ल पत�ता �न�र��� स��ना:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1854,7 +2285,7 @@ msgstr ""
 "�व�ध �पारदर�श� पत�ता ��र�स माहित�:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1863,63 +2294,69 @@ msgstr ""
 "�व�ध �न�र��� स��ना:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"स�र��षित CRAM-MD5 ��प�तशब�द �ा �पय�� �र�न हा पर�याय सर�वरश� ��ड�ल, �र सर�वर यास समर�थन "
+"स�र��षित CRAM-MD5 ��प�तशब�द �ा �पय�� �र�न हा पर�याय सर�व�हरश� ��ड�ल, �र सर�व�हर यास समर�थन "
 "द�त �स�ल."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"स�र��षित DIGEST-MD5 ��प�तशब�दा�ा �पय�� �र�न हा पर�याय सर�वरश� ��ड�ल, �र सर�वर यास "
+"स�र��षित DIGEST-MD5 ��प�तशब�दा�ा �पय�� �र�न हा पर�याय सर�व�हरश� ��ड�ल, �र सर�व�हर यास "
 "समर�थन द�त �स�ल."
 
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:817
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
-msgstr "सर�वर �व�हान ��प ला�ब �ह� (>2048 octets)"
+msgstr "सर�व�हर �व�हान ��प ला�ब �ह� (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:828
+#, c-format
 msgid "Server challenge invalid\n"
-msgstr "सर�वर �व�हान �व�ध �ह�\n"
+msgstr "सर�व�हर �व�हान �व�ध �ह�\n"
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:836
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "सर�वर �व�हाना�वळ �व�ध \"स�र��ष��� ��णवत�ता \" ���न �ह�"
+msgstr "सर�व�हर �व�हाना�वळ �व�ध \"स�र��ष��� ��णवत�ता \" ���न �ह�"
 
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:871
+#, c-format
 msgid "Server response did not contain authorization data"
-msgstr "सर�वर प�रतिसादामध�य� प�राधि�ार ड��ा नाह�"
+msgstr "सर�व�हर प�रतिसादामध�य� प�राधि�ार ड��ा नाह�"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:892
+#, c-format
 msgid "Server response contained incomplete authorization data"
-msgstr "सर�वर प�रतिसादामध�य� �प�र�ण प�राधि�ार ड��ा �ह�"
+msgstr "सर�व�हर प�रतिसादामध�य� �प�र�ण प�राधि�ार ड��ा �ह�"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:905
+#, c-format
 msgid "Server response does not match"
-msgstr "सर�वर प�रतिसाद म�ळ नाह� �ात �ह�"
+msgstr "सर�व�हर प�रतिसाद म�ळ नाह� �ात �ह�"
 
-#: ../camel/camel-sasl-gssapi.c:63
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:65
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "Kerberos 5 �धिप�रमाणन �ा �पय�� �र�न हा पर�याय सर�वरश� ��ड�ल."
+msgstr "Kerberos 5 �धिप�रमाणन �ा �पय�� �र�न हा पर�याय सर�व�हरश� ��ड�ल."
 
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -1927,29 +2364,29 @@ msgstr ""
 "निर�धार�त पध�दत� श�र�य प�रविणाऱ�या तर�फ� समर�थ�त नाह�, �ि�वा �ार�यान�व�त �रत�व�ळ� "
 "�धि��तरित�या �ळ�ल� ��ल� नाह�."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "प�रविष�� ल��ष�य नाव सद�ष�त ह�त� (_n)."
 
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:137
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "ठरव�न दिल�ला ल��ष�य_नाव प�रामि�रमध�य� �व�ध वा स�बध नसल�ल�या नावा�ा प�र�ार ह�ता."
 
-#: ../camel/camel-sasl-gssapi.c:171
+#: ../camel/camel-sasl-gssapi.c:141
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr "�नप��_���नमध�य� विविध ��न�ल बा��डि��� �ह�त �� �नप��_��न_बा��ि��� प�राम��रद�वार� दर�शविल� �ह�त."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "�नप��_���नमध�य� �व�ध सह� �ह� �ि�वा सह� �ह� �� पडताळल� �ा� श�त नाह�."
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:150
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -1957,494 +2394,431 @@ msgstr ""
 "��न����स�� �न�सि�शन �रता दिल�ल� ��र�न�ड���शियल व�ध नव�हत� �ि�वा ��रिड�न�श��ल हाताळण�न� ��णत�ह� "
 "��रिड�न�शि�ल�स दर�शविल� नाह�त."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "दिल�ल� स�दर�भ ह�डल य���य स�दर�भ दर�शवत नाह�."
 
-#: ../camel/camel-sasl-gssapi.c:188
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
-msgstr "स�स��तता पडताळण� input_token वर �सफल �ाल�."
+msgstr "स�स��तता पडताळण� input_token वर �पयश� �ाल�."
 
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
-msgstr "महत�व वर ��ल�ल� स�स��तता पडताळण� �सफल �ाल�."
+msgstr "महत�व वर ��ल�ल� स�स��तता पडताळण� �पयश� �ाल�."
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "स�दर�भ महत�व �ा �ाळ समाप�त �ाला."
 
-#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
-#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
-#: ../camel/camel-sasl-kerberos4.c:230
-#: ../camel/providers/imap/camel-imap-store.c:1274
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#, c-format
 msgid "Bad authentication response from server."
-msgstr "सर�वर �ड�न �����ा �धिप�रमाणन प�रतिसाद."
+msgstr "सर�व�हर �ड�न �����ा �धिप�रमाणन प�रतिसाद."
 
-#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:383
+#, c-format
 msgid "Unsupported security layer."
 msgstr "�समर�थित स�र��षा पातळ�."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "हा पर�याय Kerberos 4 �धिप�रमाणन��या सहाय�यान� सर�वरश� ��ळवण� �र�ल."
-
-#: ../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:35
 msgid "Login"
 msgstr "ल��िन"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "हा वि�ल�प सर�व�हरश� साधा ��प�तशब�ध वापर�न ��डला �ा�ल."
 
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:91
+#, c-format
 msgid "Unknown authentication state."
 msgstr "�परि��त �धिप�रमाणन स�थिति."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:37
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:39
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr ""
-"NTLM / स�र��षित परवल�शब�द �धिप�रमाणन वापर�न हा वि�ल�प वि�ड��ब�स स�वास��ण�ाश� ��डला �ा� "
+"NTLM / स�र��षित पासवर�ड �धिप�रमाणन वापर�न हा वि�ल�प वि�ड��ब�स सर�व�हरश� ��डला �ा� "
 "श��ल."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "SMTP ��या �ध� POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "SMTP स�पर��ा��या प�रयत�ना�ध� हा वि�ल�प प�प स�पर��ात परवान�� द��ल"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:79
 msgid "POP Source URI"
 msgstr "POP स�त�र�त URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "SMTP �ध� POP �थ�रा�स �परि��त वाह� वापरत �ह�"
+#: ../camel/camel-sasl-popb4smtp.c:86
+#, c-format
+#| msgid "POP Before SMTP auth using an unknown transport"
+msgid "POP Before SMTP authentication using an unknown transport"
+msgstr "�परि��त ��रा�स�प�र���ा वापर �र�न POP बिफ�र SMTP �ळ� प�वा"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "SMTP �ध� POP �थ न�न प�प स�त�र�त �ह�"
+#: ../camel/camel-sasl-popb4smtp.c:94
+#, c-format
+#| msgid "POP Before SMTP auth using a non-pop source"
+msgid "POP Before SMTP authentication using a non-POP source"
+msgstr "विना-POP स�र�त�ा वापर �र�न POP बिफ�र SMTP �ळ� प�वा"
 
-#: ../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:85
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' ह� URL �रता य��रन�म भा�ा�� �र� �ह�"
 
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:89
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' ह� URL �रता ह�स�� भा�ा�� �र� �ह�"
 
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:93
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' ह� URL �रता मार�� भा�ा�� �र� �ह�"
 
-#: ../camel/camel-session.c:307
+#: ../camel/camel-session.c:256
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
-"फ�ल�डर बनव� श�त नाह� %s:\n"
+"फ�ल�डर बनवण� �श��य %s:\n"
 "%s"
 
-#: ../camel/camel-session.c:479
+#: ../camel/camel-session.c:753
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "य�मान %3$s वर�ल %2$s �र�ता %1$s ��प�तशब�द प�रविष�� �रा."
 
-#: ../camel/camel-session.c:817
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel सत�र स�द�श फ�र�वड �रण� पद�धत �र�ता समर�थन प�रवित नाह�."
-
-#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1048
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s'साठ� प�रमाणपत�र नाह� मिळवता �ल�"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
 msgstr "CMS स�द�श नाह� निर�मित �रता �ला"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
 msgstr "CMS स�वा��षर� ड��ा नाह� निर�मित �रता �ला"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
 msgstr "CMS स�वा��षर� ड��ा नाह� स�ल��न �रता �ला"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr "CMS ड��ा नाह� स�ल��न �रता �ला"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr "CMS सायनर माहित� निर�माण ह�� श�त नाह�"
 
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
 msgstr "प�रमाणपत�र श�र���ला नाह� सापडल�"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
 msgstr "CMS स�वा��षर� व�ळ नाह� ��डता �ल�"
 
-#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' �� �न��र�प�शन सर���पि��� �स�तिवात नाह�"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ��णधर�म मिळवत य�त नाह�"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ��णधर�म मिळवत य�त नाह�"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
 msgstr "�न��र�प�शन सर���पि��� मिळवता य�त नाह�"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
 msgstr "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:503
 msgid "Unverified"
 msgstr "न तपासल�ल�"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "�ा��ल� सह�"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "वा� सह�"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "स�दर�भाला प�रवासात हात ला�ला �ि�वा त� बदल ��ला"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
 msgstr "सह� प�रमाणपत�र सापडल� नाह�"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
 msgstr "सायनि�� सर���पि��� विश�वास� नाह�"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "����ा� सि��न��र �ल���रिदम"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
 msgstr "�सहाय�य सि���न��र �ल���रिदम"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "बि�डल�ल� स�वा��षर� "
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "प�र��रिया त�र���"
 
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "स�वा��षर� मध�य� स�वा��षर� ड��ा नाह�"
 
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "�न�व�हलप�ड माहित�ह�न हरवल�ल� प�ह��त�"
 
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "डाय��स�� �� �णना नाह� �र� श�त"
 
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "स�द�श डाय��स���� स�� �र� श�त नाह�"
 
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
-msgstr "प�रमाणपत�र �यात �सफल"
+msgstr "प�रमाणपत�र �यात �पयश�"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "सर���पि��� हा� फ��त स�द�श �ह�, सर���पि���स तपासता य�त नाह�"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "सर���पि��� हा� फ��त स�द�श �ह�, सर���पि���स �यात �र�न तपासल�"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "स�वा��षर� डाय��स�� प�राप�त नाह� �र� श�त"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "स�वा��षर��र�ता: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
+msgid "Cannot create encoder context"
+msgstr "�न��डर स�दर�भ निर�माण �रता य�त नाह�"
+
+#: ../camel/camel-smime-context.c:841
+msgid "Failed to add data to CMS encoder"
+msgstr "CMS �न��डवर माहित� ��डण� �यशस�व� �ाल�"
+
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
+msgid "Failed to encode data"
+msgstr "माहित� �न��ड �ाल�� नाह�"
+
+#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
 msgid "Decoder failed"
 msgstr "डि��डर विफल"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "समान बल�� �न��र�प�शन �ल���रिदम सापडत नाह�"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1064
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "�न��र�प�शन बल�� �ळ��रता भा� वा��न द�ता य�त नाह�त"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1075
 msgid "Cannot create CMS Message"
 msgstr "CMS स�द�श नाह� निर�मित �र� श�त"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1081
 msgid "Cannot create CMS Enveloped data"
-msgstr "CMS पा��� माहित� बनव� श�त नाह�"
+msgstr "CMS पा��� माहित� बनवण� �श��य"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS पा��� माहित� ��ड� श�त नाह�"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot attach CMS data object"
-msgstr "CMS माहित� बनव� श�त नाह�"
+msgstr "CMS माहित� बनवण� �श��य"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Recipient information"
-msgstr "CMS मिळणाऱ�या�� माहित� बनव� श�त नाह�"
+msgstr "CMS मिळणाऱ�या�� माहित� बनवण� �श��य"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS स�व��ार�न माहित� ��डता य�त नाह�"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1132
 msgid "Failed to add data to encoder"
 msgstr "�न��डरवर माहित� ��डण� यशस�व� �ाल� नाह�"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1240
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: ��णताह� �न���र�प�� ��ल�ला स�दर�भ मिळाला नाह�"
 
-#: ../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:2181
 #, 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 "�प�प� निर�माण �र� श�त नाह�त: हया द��ानावर �य���य प�र��रिया"
-
-#: ../camel/camel-store.c:423
-#, 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
-#, 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
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "स��ि��ला परत नाव द�� श�त नाह�: %s: �व�ध प�र��रिया"
+msgstr "फ�ल�डर '%s' बनवण� �श��य: फ�ल�डर �स�तित�वात �ह�"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-store.c:2372 ../camel/camel-store.c:2382
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "��रा"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:2375 ../camel/camel-store.c:2386
+#: ../camel/camel-vtrash-folder.c:50
 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-store.c:2829
+#, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "फ�ल�डर बनवण� �श��य: %s: फ�ल�डर �स�तित�वात �ह�"
 
-#: ../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-store.c:2956 ../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-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-store.c:3097 ../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: �व�ध प�र��रिया"
 
-#: ../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 "प�र���स� य�मान SOCKS4 �र�ता समर�थन प�रवत नाह�"
 
-#: ../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 "प�र���स� य�मानन� विन�त� ना�ारल�: ��ड %d"
 
-#: ../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 "प�र���स� य�मान SOCKS5 �र�ता समर�थन प�रवत नाह�"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Unable to get issuer's certificate locally"
-msgstr "स�थानि� ठि�ाण� द�णा-या�� सर���पि��� मिळाल� नाह�"
+#: ../camel/camel-tcp-stream-raw.c:879
+#, c-format
+#| msgid "No support for authentication type %s"
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "य���य �ळ� प�वा प�र�ार �ढळल� नाह�: ��ड 0x%x"
 
-#: ../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 "सामान�य SOCKS सर�व�हर �पयश"
 
-#: ../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 "SOCKS सर�व�हर�� नियम ��डण� स�व��ारत नाह�"
 
-#: ../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 "SOCKS सर�व�हरपास�न न��वर�� प�ह�ण�या���� नाह�"
 
-#: ../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 "SOCKS सर�व�हरपास�न य�मान प�ह�ण�या���� नाह�"
 
-#: ../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 "SOCKS सर�व�हरपास�न �परि��त पत�ता प�र�ार प�राप�त �ाल�"
 
-#: ../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 "य�माननाव ��प ला�ब �ह� (�माल 255 ���षर� �ह�)"
 
-#: ../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:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2457,35 +2831,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:459
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "BAD"
 
-#: ../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:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2500,7 +2855,7 @@ msgstr ""
 "\n"
 "त�म�ह� स�व��ार �र� ����िता?"
 
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2509,7 +2864,7 @@ msgstr ""
 "प�रमाणपत�र समस�या: %s\n"
 "निर��म�: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2518,7 +2873,7 @@ msgstr ""
 "वा�� प�रमाणपत�र ड�म�न: %s\n"
 "निर��म�: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2527,7 +2882,7 @@ msgstr ""
 "प�रमाणपत�र बाद �ाल�: %s\n"
 "निर��म�: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2536,284 +2891,283 @@ 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:1235 ../camel/camel-vee-folder.c:1398
 #, 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:1271
 #, c-format
 msgid "No such message %s in %s"
-msgstr "%s मध�य� �सा ��णताह� निर�प नाह� %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:1339
+#, 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: �सा निर�प नाह�"
+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:255
-#: ../camel/providers/local/camel-maildir-folder.c:281
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:216
-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:954
+#: ../camel/providers/imap/camel-imap-folder.c:392
 #, c-format
 msgid "Could not load summary for %s"
-msgstr "%s साठ� सारा�श प�रस�थापित �र� श�त नाह�"
+msgstr "%s साठ� सारा�श प�रस�थापित �रण� �श��य"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
 #, 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-folder.c:1517
+#: ../camel/providers/groupwise/camel-groupwise-store.c:665
+#: ../camel/providers/groupwise/camel-groupwise-store.c:796
+#: ../camel/providers/imap/camel-imap-folder.c:3962
+#: ../camel/providers/imap/camel-imap-folder.c:4044
+#: ../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:1987
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
+#, c-format
+msgid "Could not get message"
+msgstr "स�द�श प�राप�त �रण� �श��य"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
 #, 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:2460
 #, c-format
 msgid "Cannot create message: %s"
-msgstr "निर�प बनव� श�त नाह�: %s"
+msgstr "स�द�श बनवण� �श��य: %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"स�द�श प�राप�त �रण� �श��य: %s\n"
+"  %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#: ../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:2659
+#: ../camel/providers/nntp/camel-nntp-folder.c:246
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get message %s: "
+msgstr "स�द�श %s प�राप�त �रण� �श��य: "
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
+#, c-format
+msgid "This message is not available in offline mode."
+msgstr "�फला�न पद�धत�त हा स�द�श �पलब�ध नाह�."
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
 #, c-format
 msgid "Cannot get folder container %s"
-msgstr "%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 "�फला�न पद�धत�त स�द�श �प��ड �रता य�त नाह�: ��श �पलब�ध नाह�"
+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"
-msgstr "�फला�न पद�धत�त स�द�श �प��ड �रता य�त नाह�: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
+#| msgid "Cannot append message in offline mode: %s"
+msgid "Cannot append message in offline mode: "
+msgstr "�फला�न पद�धत�त स�द�श समाविष�� �रण� �श��य: "
 
-#: ../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 "��ब���स फ�ल�डर मध�य� ��� स�द�श �र�ता तपास �रा (_B)"
 
-#: ../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 "Post Office Agent SOAP प�र�� (_P):"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
 msgstr "न�व�ह�ल ��र�पवा�� सर�व�हरश� स�पर�� ��डण�यासाठ�"
 
-#: ../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 "न�सत�या म���रासाठ� परवल�शब�द वापर�न हा वि�ल�प ��ाप�रमाण� स�वास��ण�ाश� ��डला �ा� श��ल."
+msgstr "न�सत�या म���रासाठ� पासवर�ड वापर�न हा वि�ल�प ��ाप�रमाण� सर�व�हरश� ��डला �ा� श��ल."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:103
+#, 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:205
+#: ../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:328
 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:556
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:341
 #, c-format
 msgid "No such folder %s"
 msgstr "%s �सा फ�ल�डर नाह�"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
+#, 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:1226
+#, c-format
+#| msgid "Cannot delete folder '%s': Special folder"
+msgid "Cannot create a special system folder"
+msgstr "विश�ष प�रणाल� फ�ल�डर निर�माण �रण� �श��य"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1236
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1340
+#, 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:1321
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "Groupwise फ�ल�डर '%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:1380
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
 #, c-format
 msgid "GroupWise server %s"
-msgstr "GroupWise सर�वर %s"
+msgstr "GroupWise सर�व�हर %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
 #, 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 "
@@ -2822,93 +3176,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)"
+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 "ह�ला"
-
-#: ../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"
@@ -2917,662 +3214,449 @@ msgstr ""
 "%s %s: IMAP सर�व�हरह�न �ा��त �रा\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"
+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 "%s माहित� IMAP सर�व�हरला प�रतिसादात नव�हत� "
 
-#: ../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 सर�व�हर�ड�न �नप���षित OK प�रतिसाद: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:91
+#: ../camel/providers/imap/camel-imap-folder.c:292
 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:369
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr "फ�ल�डर बनव� श�त नाह�%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:992
+#: ../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: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:3369
+#| msgid "Unable to retrieve message: %s"
+msgid "Unable to retrieve message: "
+msgstr "स�द�श प�न�प�राप�त �रण� �श��य: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:3404
+#: ../camel/providers/imapx/camel-imapx-server.c:5193
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
-msgstr "स�द�श ID %s �सल�ल� स�द�श प�राप�त �र� श�त नाह�: %s"
+msgstr "स�द�श ID %s �सल�ल� स�द�श प�राप�त �रण� �श��य: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2914
+#: ../camel/providers/imap/camel-imap-folder.c:3405
+#: ../camel/providers/imapx/camel-imapx-server.c:5194
 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:3480
+#: ../camel/providers/imap/camel-imap-folder.c:4375
+#: ../camel/providers/nntp/camel-nntp-folder.c:402
+#, c-format
 msgid "This message is not currently available"
-msgstr "हा निर�प सध�या �पलब�ध नाह�"
+msgstr "हा स�द�श सध�या �पलब�ध नाह�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3624
+#: ../camel/providers/imap/camel-imap-folder.c:4176
 #, 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:4186
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "�प�र�ण सर�व�हर प�रतिसाद: %d स�द�शा�रता �ाह�ह� UID दिल�ल� नाह�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3846
+#: ../camel/providers/imap/camel-imap-folder.c:4415
+#, 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
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "%s: %s ��श �यशस�व�"
+#| msgid "Failed to cache message %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "स�द�श %s ��श �रण� �पयश�: "
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#, c-format
+#| msgid "Failed to cache %s: %s"
+msgid "Failed to cache %s: "
+msgstr "%s ��श �रण� �पयश�: "
+
+#: ../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 सर�वर वर�ल म�ल वा�ण�या�रिता �णि स��य�त �रण�या �र�ता."
+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"
+msgstr "न�सता म���र पासवर�डा�ा वापर �र�न हा वि�ल�प IMAP सर�व�हरश� ��डला �ा�ल."
 
-#: ../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:342
+#: ../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:343
+#: ../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:362
+#, 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 "%s स�र��षित पध�दत�त IMAP स�वास��ण�ाश� स�पर�� साधण�यात �पयश �ल�: %s"
+msgstr "%s स�र��षित पध�दत�त IMAP सर�व�हरश� स�पर�� साधण�यात �पयश �ल�: %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 "%s IMAP स�वास��ण� विन�त� ��ल�ल�या �धिप�रमाणन प�र�ाराला सहाय�य �रत नाह� %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"
 "%s\n"
 "\n"
 msgstr ""
-"IMAP स�वास��ण�ाला �थ�न��ि��� �र� श�त नाह�.\n"
+"IMAP स�वास��ण�ाला �थ�न��ि��� �रण� �श��य.\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:954
-#, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "स��ि���� नाव \"%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
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "फ�ल�डर '%s' बनव� श�त नाह�: फ�ल�डर �स�तित�वात �ह�."
-
-#: ../camel/providers/imap/camel-imap-store.c:2253
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "�परि��त पित� फ�ल�डर: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:3053
-#| msgid "Server unexpectedly disconnected: %s"
-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 "याद� सर�वर %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 ""
-"�ाहि� फिल��र व व�ह�फ�ल�डर नियम �र�ता विस�तार�त म�ल���-याद� �ढळण� �ार�यान�व�त �रण� "
-"�वश�य� �ह�"
-
-#: ../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 "%s श� �थ�न�����शन�� पध�दत वापर�न IMAP स�वास��ण�ाश� %s �थ�न��ि��� �रता य�त नाह�"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:182
 #, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "%s �ा वापर �र�न %s IMAP सर�वर य�थ� �थ�न��ि��� �रता य�त नाह�"
-
-#: ../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 "IMAP सर�वर %s य�थ� फ�ल�डर '%s' प�राप�त �र� श�त नाह�: �परि��त त�र���"
+msgid "IMAP server %s"
+msgstr "IMAP सर�व�हर %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:816
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:184
 #, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "IMAP सर�वर %s वर�ल '%s' �र�ता याद� विषय� माहित� प�राप�त �र� श�त नाह�: %s"
+msgid "IMAP service for %s on %s"
+msgstr "%2$s वर %1$s �रिता IMAP सर�व�हिस"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "�����ा �द�श"
+#. 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:371
+#: ../camel/providers/imapx/camel-imapx-store.c:793
+#: ../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/imap4/camel-imap4-store.c:897
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1319
 #, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "फ�ल�डर '%s' बनव� श�त नाह�: �व�ध पत�रप����� नाव"
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "स��ि���� नाव \"%s\" �व�ध �ह� �ारण त�यात ���षर� �ह�त \"%c\""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:902
+#: ../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': Bad command"
-msgstr "फ�ल�डर '%s' बनव� श�त नाह�: �����ा �द�श"
+msgid "Cannot create folder '%s': folder exists."
+msgstr "फ�ल�डर '%s' बनवण� �श��य: फ�ल�डर �स�तित�वात �ह�."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1330
 #, 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 फ�ल�डर �ाढता य�त नाह�."
+msgid "Unknown parent folder: %s"
+msgstr "�परि��त पित� फ�ल�डर: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
+#: ../camel/providers/imap/camel-imap-store.c:3137
 #, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "फ�ल�डर '%s' �ाढ�न �ा�� श�त नाह�: �व�ध पत�रप����� नाव"
+msgid "Server unexpectedly disconnected"
+msgstr "सर�व�हरश� ��ळवण� �नप���ष�तरित�या ��ड�त �ाल�"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "फ�ल�डर '%s' �ाढ�न �ा�� श�त नाह�: �����ा �द�श"
+#: ../camel/providers/imap/camel-imap-store.c:3140
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected: "
+msgstr "सर�व�हर �नप���षितपण� ��ड�त �ाल�: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "फ�ल�डर '%s' ला '%s' �स� प�न�हनामा��न �र� श�त नाह�: महत�वा�� फ�ल�डर"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "�फला�न पध�दत�त IMAP फ�ल�डर�ना नव�न नाव द�ता य�त नाह�."
+#| 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
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "फ�ल�डर '%s' ला '%s' �स� प�न�हनामा��न �र� श�त नाह�: �व�ध पत�रप����� नाव"
+#| msgid "Could not create cache file"
+msgid "Could not create cache for %s: "
+msgstr "%s �र�ता ��श� निर�माण �रण� �श��य: "
 
-#: ../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 "सर�व�हर समर�थन प�रवत �सल�यास प��न प�न�सि���ा वापर �रा (_Q)"
 
-#. 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 "IMAP सर�वर %s य�थ� र�ना '%s' �र�ता %s माहित� �ढळल� नाह�: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
+msgstr "सर�व�हर समर�थन प�रवत �सल�यास रि�ाम��ा वापर �रा (_d)"
 
-#: ../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 "वापरण�या���� ��श�ड� ��डण���� स���या (_r)"
 
-#: ../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
+#| msgid "Error writing mail temp file: %s"
+msgid "Error writing to cache stream: "
+msgstr "��श� स���रिम�र�ता लिहतव�ळ� त�र���: "
 
-#: ../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/imap4/camel-imap4-summary.c:1611
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
 #, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP सर�वर %s �स�थ�र स�थित�त �ह�."
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "नविन स�द�श�� पा��� प�राप�त �र�त �ह�"
+#| msgid "Could not connect to %s (port %s): %s"
+msgid "Could not connect to %s (port %s): "
+msgstr "%s (प�र�� %s) श� ��डण� �रण� �श��य: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "स�वास��ण� IMAP स�वास��ण�ा�ड�व प�रतिसाद म�हण�न �नप���षित ���न %s: "
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
+#| msgid "Posting failed: %s"
+msgid "Closing tmp stream failed: "
+msgstr "tmp स���रिम ब�द �रण� �पयश�: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "माह�त� नाह�"
+#: ../camel/providers/imapx/camel-imapx-server.c:5343
+#: ../camel/providers/imapx/camel-imapx-server.c:5358
+#| msgid "Cannot create message: %s"
+msgid "Cannot create spool file: "
+msgstr "स�प�ल फा�ल निर�माण �रण� �श��य: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
+#: ../camel/providers/imapx/camel-imapx-store.c:1135
+#: ../camel/providers/nntp/camel-nntp-store.c:1666
 #, 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"
-msgstr ""
-"प�राय���� IMAP 4(.1) ��राह�\n"
-"हा मदत�शिवाय व न तपासल�ला सा���त�� �ह�, त�म�हाला त�या�व�� साधा IMAP वापराय�ा �ह� "
-"�ा.\n"
-"\n"
-" !!! ह� �त�पाद�त पत�रा�रिता वापर� न�ा !!!\n"
+msgid "No such folder: %s"
+msgstr "�श� फ�ल�डर नाह�: %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "%s श� ��ड� श�त नाह� (स�थान %s): %s"
+msgid "Source stream returned no data"
+msgstr "स�र�त स���रिमन� डा�ा प�रवल� नाह�"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:348
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "%s ��यावर प�प स�वास��ण� ��ड� श�त नाह�"
+#| msgid "service unavailable"
+msgid "Source stream unavailable"
+msgstr "स�र�त स���रिम �न�पलब�ध"
 
 #: ../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
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
-#| msgid "mailbox:%s (%s)"
 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:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:466
+msgid "Index message body data"
+msgstr "स��� स�द�श ब�ड� पाठ"
+
+#: ../camel/providers/local/camel-local-folder.c:700
+#, 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."
@@ -3580,29 +3664,29 @@ msgstr ""
 "मान� mbox-स�वर�प स�प�ल माहित� फ�ल�डर पास�न Evolution द�वार� निय�त�र�त फ�ल�डर मध�य� स�थान�� "
 "म�ल हलवा."
 
-#: ../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 "��ब���स मध�य� नविन स�द�श �र�ता फिल��र ला�� �रा (_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
-msgstr "Maildir- स�वर�प म�ल डायर����र�"
+msgstr "Maildir-र�पण म�ल डिर�����र���"
 
-#: ../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."
@@ -3610,207 +3694,230 @@ msgstr ""
 "बाह�र�ल साधारण �मब���स स�प�ल फा�ल ��तर��त वा�ण�यासाठ� व स�थानि� म�ल साठविण�यासाठ�.\n"
 "��ा पा�न व म� श�ल� फ�ल�डर वा�विण�यासाठ� ह� वापरल� �ा� श��ल."
 
-#: ../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"
+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:229
-msgid "Maildir append message canceled"
-msgstr "Maildir स�द�श ��दा रद�द ��ल�"
+#: ../camel/providers/local/camel-maildir-folder.c:198
+#, c-format
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "maildir फ�ल�डर�र�ता स�द�श समाविष�� �रण� �श��य: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:232
+#: ../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 append message to maildir folder: %s: %s"
-msgstr "म�लस��िस��ि��वर स�द�श �प�न�ड �रता य�त नाह�: %s: %s"
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid "Cannot get message %s from folder %s: "
+msgstr "फ�ल�डर %2$s पास�न स�द�श %1$s प�राप�त �रण� �श��य: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:254
-#: ../camel/providers/local/camel-maildir-folder.c:280
-#: ../camel/providers/local/camel-maildir-folder.c:294
-#: ../camel/providers/local/camel-maildir-folder.c:303
-#: ../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:215
-#: ../camel/providers/local/camel-mh-folder.c:226
-#: ../camel/providers/local/camel-mh-folder.c:235
+#: ../camel/providers/local/camel-maildir-folder.c:326
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"स��ि��त�न: %s स�द�श प�राप�त �र� श�त नाह� %s\n"
-"  %s"
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "maildir फ�ल�डर�र�ता स�द�श समाविष�� �रण� �श��य: %s"
+
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, 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:304
-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"
+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"
+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' प�राप�त �र� श�त नाह�: फ�ल�डर �स�तित�वात नाह�."
+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' प�राप�त �र� श�त नाह�: पत�र फ�ल�डर नाह�."
+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 "पत�रस��� फ�ल�डर नाह�"
+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
+#, 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:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "म�लस���फ�ल�डर मार�� ��ड� श�त नाह�: %s: %s"
+msgstr "maildir डिर�����र� मार�� ��डण� �श��य नाह�: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
 msgstr "फ�ल�डर सतत तपासल� �ात �ह�"
 
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
 msgstr "नव�न स�द�शा�रता तपासण� ह�त �ह�"
 
-#: ../camel/providers/local/camel-maildir-summary.c:744
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:842
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
 msgstr "�प�पा साठव�न ठ�वल� �ात �ह�"
 
-#: ../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
+#: ../camel/providers/local/camel-mbox-folder.c:249
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "पत�रप��� फा�लवर स�द�श �प�न�ड �र� श�त नाह�: %s: %s"
+#| msgid "Cannot append message to mbox file: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "mbox फा�लमध�य� स�द�श समाविष�� �रण� �श��य: %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:236
-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 "ह�या नावान� फ�ल�डर निर�माण �र� श�त नाह�."
+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' प�राप�त �र� श�त नाह�: ह� र���य�लर फा�ल नाह�."
+msgstr "फ�ल�डर '%s' प�राप�त �रण� �श��य: ह� र���य�लर फा�ल नाह�."
+
+#: ../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:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../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"
@@ -3819,297 +3926,324 @@ 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
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "फ�ल�डर '%s' बनव� श�त नाह�: %s."
-
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:761
 #, 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"
+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"
+msgstr "फ�ल�डर ��डण� �श��य: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:582
+#: ../camel/providers/local/camel-mbox-summary.c:537
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "�ात� पत�र पार�सर त�र��� %ld �ळ���रमा��ा��या स�थित��वळ %s स��ि��त नाह�"
+#| msgid "Fatal mail parser error near position %ld in folder %s"
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "फ�ल�डर %2$s मध�य� ठि�ाण %1$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"
+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"
+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"
+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 "MBOX फा�ल सद�ष�त �ह�, ��पया निवारन �रा. (पास�न �ळ �प���ष�त, पर�त� �ढळल� नाह�.)"
+
+#: ../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:181
-msgid "MH append message canceled"
-msgstr "MH ��डण� स�द�श रद�द �ाल�"
-
-#: ../camel/providers/local/camel-mh-folder.c:184
+#: ../camel/providers/local/camel-mh-folder.c:115
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "�म�� स��ि��वर स�द�श �प�न�ड �रता य�त नाह�: %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"
+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' प�राप�त �र� श�त नाह�: फ�ल�डर नाह�."
+msgstr "फ�ल�डर '%s' प�राप�त �रण� �श��य: फ�ल�डर नाह�."
 
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "MH फ�ल�डर मार�� ��ड� श�त नाह�: %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"
+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"
 "%s"
 msgstr ""
-"फ�ल�डर '%s' ��ड� श�त नाह�:\n"
+"फ�ल�डर '%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"
 "%s"
 msgstr ""
-"फ�ल�डर '%s' बनव� श�त नाह�:\n"
+"फ�ल�डर '%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 "�नब���सला स���रह सहाय�य �रत नाह�"
 
-#: ../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"
-msgstr "तात�प�रत� फ�ल�डर स���र�ना�� �र� श�त नाह� %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"
-msgstr "स�प�ल फ�ल�डर स���र�ना�� �र� श�त नाह� %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
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
 #, c-format
+#| msgid ""
+#| "Could not sync spool folder %s: %s\n"
+#| "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' य�थ� स���रह�त �ह�"
+"स�प�ल फ�ल�डर %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:195
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "��तर�� त�र���: 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:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:240
+#: ../camel/providers/pop3/camel-pop3-folder.c:371
+#: ../camel/providers/pop3/camel-pop3-folder.c:436
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:697
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "स�द�श प�राप�त �रण� �श��य %s: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:472
+#: ../camel/providers/nntp/camel-nntp-folder.c:478
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 #, c-format
 msgid "Posting failed: %s"
-msgstr "बदल� �पयश� ठरल�: %s"
+msgstr "प�स��ि�� �पयश�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:520
+#| msgid "Posting failed: %s"
+msgid "Posting failed: "
+msgstr "प�स��ि�� �पयश�: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:549
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
-msgstr "�फला�न �ाम �रताना NNTP स�द�श प�स�� �र� श�त नाह�!"
+msgstr "�फला�न �ाम �रताना NNTP स�द�श प�स�� �रण� �श��य!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:443
+#: ../camel/providers/nntp/camel-nntp-folder.c:569
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "NNTP स��ि��त�न त�म�ह� स�द�श प�रति��त �र� श�त नाह�!"
+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 स�वास��ण�ाश� �थ�न������ ह��ल."
+msgstr "साधा म���र पासवर�ड वापर�न हा वि�ल�प NNTP सर�व�हरश� �थ�न������ ह��ल."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:73
+#, c-format
+msgid "Authentication requested but no username provided"
+msgstr "�धिप�रमाणन�� विन�त� ��ल� पण वापर�र�त�या��� नाव दिल�"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:85
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "सर�व�हर य�थ� �थ�न��ि��� �रण� �श��य: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:375
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "%s वर�न श�भ����ा वा�ता य�� श�त नाह�: %s"
+#| 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:388
 #, 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:582
 #, 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:1100
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4120,7 +4254,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1215
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4130,623 +4265,714 @@ msgstr ""
 "\n"
 "�सा बातम���र�प �स�तित�वात नाह�. निवडल�ल� ��ष�� ह� �दा�ित म�ळ फ�ल�डर �स�ल."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
-"ह�या बातम�या��ा स���रह �नसबस���रा�ब �र� श�त नाह�:\n"
+"ह�या बातम�या��ा स���रह �नसबस���रा�ब �रण� �श��य:\n"
 "\n"
 "बातम�या��ा स���रह �स�तित�वात नाह�!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1290
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "बातम�या���या स���रहात त�म�ह� फ�ल�डर निर�माण �र� श�त नाह�: त�या�व�� सबस���रा�ब �रा."
+msgstr "बातम�या���या स���रहात त�म�ह� फ�ल�डर निर�माण �रण� �श��य: त�या�व�� सबस���रा�ब �रा."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#, 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:1323
+#, 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:1192
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "सर�वर य�थ� �थ�न��ि��� �र� श�त नाह�: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1535
+#| msgid "NNTP Command failed: %s"
+msgid "NNTP Command failed: "
+msgstr "NNTP �द�श �पयश�: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
+#: ../camel/providers/nntp/camel-nntp-store.c:1609
 #, 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:232
+#: ../camel/providers/nntp/camel-nntp-summary.c:348
 #, c-format
 msgid "%s: Scanning new messages"
-msgstr "%s: नव�न निर�प तपासत �ह�"
+msgstr "%s: नव�न स�द�श तपासत �ह�"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "���स�व�हह�न �नप���षित स�वास��ण� प�रतिसाद: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:365
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "म�ळठि�ाणाह�न �वप���षित स�वास��ण� प�रतिसाद: %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:410
 #, 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:336
+#, c-format
+msgid "No message with UID %s"
+msgstr "UID %s सह स�द�श नाह�"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "प�प स�द�श परत मिळविला �ात �ह� %d"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
+msgid "Unknown reason"
+msgstr "�परि��त �ारण"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:488
 msgid "Retrieving POP summary"
 msgstr "प�प सारा�श परत मिळविला �ात �ह�"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:511
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "प�प सारा�श मिळत नाह�: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
 msgid "Expunging old messages"
 msgstr "��न� स�द�श �ाढण �ा�त �ह�"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:577
 msgid "Expunging deleted messages"
 msgstr "�ाढ�न �ा�ल�ल� स�द�श ���सप�� ��ल� �ात �ह�त"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
-#, c-format
-msgid "No message with UID %s"
-msgstr "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 "प�प स�द�श परत मिळविला �ात �ह� %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)"
+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 "स�थान�य ��ब���सपास�न �ाढ�न �ा�ल�ल� नष�� �रा (_e)"
+
+#: ../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 स�वास��ण�ाश� स�पर�� �रा व त�यावर�न म�ल �तरव�न ��या."
+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."
 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 "
 "claim to support it."
 msgstr ""
-"APOP प�र�����लद�वार� �न��रिप���ड परवल�शब�द वापर�न हा वि�ल�प POP स�वास��ण�ाश� ���ला "
+"APOP प�र�����लद�वार� �न��रिप���ड पासवर�ड वापर�न हा वि�ल�प POP सर�व�हरश� ���ला "
 "�ात�. ह� सर�व वापर�र�त�या�रता नाह� �� स�वास��ण�ास मदत �रतात �सा दावा �रतात."
 
-#: ../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 पास�न व�ध श�भ����ा वा�ण�यास �पयश ठरल�"
+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 "ह�या स�र��षित पध�दत�त ह�या प�प स�वास��ण�ाश� %s स�पर�� साधण�यात �पयश �ल� : %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 या सर�वर द�वार� समर�थ�त नाह�"
+msgstr "STLS या सर�व�हर द�वार� समर�थ�त नाह�"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:218
+#, 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 "स���य�र म�ड%2$s मध�य� POP सर�व�हर %1$s सह ��डण� �रण�यास �पयश�"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#: ../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: विन�त� ��ल�ल�या �धिप�रमाणन म���नि�मला ह� �ाह� "
+"POP सर�व�हरश� स�ब�ध ��डण�यात �पयश %s: विन�त� ��ल�ल�या �धिप�रमाणन म���नि�मला ह� �ाह� "
 "मदत नाह�."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:418
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "SASL '%s' POP सर�वर %s �र�ता दा�लन �पयश�: %s"
+#| msgid "SASL '%s' Login failed for POP server %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "POP सर�व�हर %2$s%3$s �र�ता SASL '%1$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 प�र�����ल�� त�र���"
+msgstr "POP सर�व�हर %s �र�ता प�रव�श �श��य: SASL प�र�����ल त�र���"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:449
+#: ../camel/providers/pop3/camel-pop3-store.c:374
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "POP सर�वर य�थ� �थ�न��ि��� ह�� श�ल� नाह� %s: %s"
+#| msgid "Failed to authenticate on POP server %s: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "POP सर�व�हर %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 "
 "attack suspected. Please contact your admin."
 msgstr ""
-"POP सर�वर %s श� ��ळवण� �र� श�त नाह�:\t�व�ध APOP ID प�राप�त. सद�ष�य ���रमण �ढळल� ��ल�. "
+"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"
 "Error sending password: %s"
 msgstr ""
-"प�प स�वास��ण�ाश� ��डण� �रता �ल� नाह� %s.\n"
-"परवल�शब�द पाठविताना त�र��� �ाल�: %s"
+"POP सर�व�हर %s श� ��डण� �श��य.\n"
+"पासवर�ड पाठवत�व�ळ� त�र���: %s"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:505
+#, 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"
+msgstr ""
+"प�प सर�व�हर ��डण� �श��य %s श�.\n"
+"वापर�र�त�या��� नाव पाठवत�व�ळ� त�र��� �ाल�: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:556
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:518
 #, 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 username: %s"
+"Error sending password%s"
 msgstr ""
-"प�प स�वास��ण�ाश� ��डण� �रता �ल� नाह� %s.\n"
-"वापर�र�त�या��� नाव पाठविताना त�र��� �ाल�: %s"
+"POP सर�व�हर %sश� ��डण� �श��य.\n"
+"पासवर�ड पाठवत�व�ळ� त�र���: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:669
+#: ../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
+#, c-format
+#| msgid "IMAP service for %s on %s"
+msgid "POP3 server for %s on %s"
+msgstr "%2$s वर %1$s �रिता POP3 सर�व�हर"
+
+#: ../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 "POP3 स���र�समध�य� फ�ल�डर श�र�ण� �ढळल� नाह�"
+
+#: ../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 "��राह�ा��� याद� पार�स �रता य�त नाह�"
+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 "पत�र पाठविण�या�रता पा�प निर�माण �रता �ला नाह�: %s: पत�र पाठविल� नाह�"
+msgstr "पत�र पाठविण�या�रता पा�प निर�माण �रण� �श��य: %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 "पाठविणार� पत�र फ�र�� �रता �ल� नाह�: %s: पत�र पाठविल� नाह�"
+msgstr "पाठविणार� पत�र फ�र�� �रण� �श��य: %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:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "स�थित�सह पाठविणार� पत�र बाह�र पडल� %d: पत�र पाठविल� नाह�."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
-msgid "sendmail"
-msgstr "पत�र पाठवा"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "Mail delivery via the sendmail program"
-msgstr "पाठविणाऱ�या पत�र �ार�य��रमाद�वार� म�ल डिल�व�हर�"
-
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP वापर�न द�रस�थ पत�रहबश� स�पर�� ��ड�न पत�र पाठविल� �ात �ह�."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#| 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 "ह�या स�र��षित पध�दत�त %s SMTP सर�व�हरश� स�पर�� साधता �ला नाह� : %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 "%s द�वार� SMTP पत�र डिलिव�हर�"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "विन�त� ��ल�ल�या %s �धिप�रमाणन प�र�ाराला SMTP स�वास��ण� सहाय�य �रत नाह� %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 "Cannot send message: service not connected."
+msgstr "स�द�श पाठव� न�ा: स�वा ��डल�ल� नाह�."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "स�द�श पाठव� न�ा: पाठवणाऱ�या�ा पत�ता �य���य."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
+msgid "Sending message"
+msgstr "स�द�श पाठवत �ह�"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "स�द�श पाठवण� �श��य: ��राह� ठरविल�ल� नाह�त."
+
+#: ../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: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 "मदत निर�प"
+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 "वापर�र�ता स�थानि� नाह�; <प�ढ�ल-मार��ावर> प�ढ� ��ल� �ा�ल"
 
-#: ../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 "वापर�र�ता स�थानि� नाह�; <प�ढ�ल-मार��ावर> ��पया प�रयत�न �रा"
 
-#: ../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 "परवल�शब�दा��या ��त� �वश�य� �ह�"
+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 "ह�या स�र��षित पध�दत�त %s SMTP स�वास��ण�ाश� स�पर�� साधता �ला नाह� : %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 "विन�त� ��ल�ल�या %s �धिप�रमाणन प�र�ाराला SMTP स�वास��ण� सहाय�य �रत नाह� %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 "%s द�वार� SMTP पत�र डिलिव�हर�"
-
-#: ../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
-msgid "Error creating SASL authentication object."
-msgstr "SASL �धिप�रमाणन ह�त� तयार �रताना त�र���."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
 #, 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 �द�श �सफल"
+msgid "Error creating SASL authentication object."
+msgstr "SASL �ळ� प�वण� ह�त� तयार �रताना त�र���."
+
+#: ../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 "प�रिय"
+msgstr "पस�त���"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
+#| msgid "Gifts"
+msgctxt "CategoryName"
 msgid "Gifts"
-msgstr "�पहार"
+msgstr "ब��ष�स"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
+#| msgid "Goals/Objectives"
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
-msgstr "ल��ष�य / �द�द�श�य"
+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 "स����� �ार�ड"
+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 "महत�वप�र�ण स�पर��"
+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 "��तर�राष���र�य"
+msgstr "��तरराष���र�य"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
+#| msgid "Key Customer"
+msgctxt "CategoryName"
 msgid "Key Customer"
-msgstr "�ळ ��राह�"
+msgstr "महत�वा�� ��राह�"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
+#| msgid "Miscellaneous"
+msgctxt "CategoryName"
 msgid "Miscellaneous"
-msgstr "विविध"
+msgstr "मिश�र"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:62
+#| msgid "Personal"
+msgctxt "CategoryName"
 msgid "Personal"
-msgstr "�ा���"
+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 "रणन�ति"
+msgstr "डावप��"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
+#| 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:1931
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -4754,7 +4980,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:1922
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
@@ -4762,7 +4988,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:1927
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -4770,7 +4996,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:1918
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
@@ -4788,8 +5014,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:1783
+#: ../libedataserver/e-time-utils.c:1913
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -4829,19 +5055,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:1786
 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:1855 ../libedataserver/e-time-utils.c:1975
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1828 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1859 ../libedataserver/e-time-utils.c:1967
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4849,200 +5075,202 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
+#: ../libedataserver/e-time-utils.c:1864 ../libedataserver/e-time-utils.c:1972
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1837 ../libedataserver/e-time-utils.c:1933
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1964
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1840
+#: ../libedataserver/e-time-utils.c:1871
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1844
+#: ../libedataserver/e-time-utils.c:1875
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:673
 msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP सर�वर निनाव� पद�धत�न� मिळवत �ह�"
+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:127
+msgid "Category Properties"
+msgstr "प�रवर�� ��णधर�म"
 
-#: ../libedataserverui/e-categories-dialog.c:618
-msgid "Icon"
-msgstr "�िन�ह"
+#: ../libedataserverui/e-categories-dialog.c:138
+msgid "Category _Name"
+msgstr "प�रवर�� नाव (_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:623
-msgid "Category"
-msgstr "प�रवर��"
+#: ../libedataserverui/e-categories-dialog.c:144
+msgid "Category _Icon"
+msgstr "प�रवर�� नाव (_I)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
+#: ../libedataserverui/e-categories-dialog.c:185
 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:191
+msgid "_No Image"
+msgstr "प�रतिमा नाह� (_N)"
 
-#: ../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 "सध�या वापरल�ल� विभा� (_u):"
 
-#: ../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"
+#: ../libedataserverui/e-categories-dialog.c:768
+msgid "Icon"
+msgstr "�िन�ह"
+
+#: ../libedataserverui/e-categories-dialog.c:773
+msgid "Category"
 msgstr "प�रवर��"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:294
 #, c-format
 msgid "Create category \"%s\""
 msgstr "प�रवर�� \"%s\" बनवा"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "र�� माहित�"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "दर�शवाय�ा त� र��"
+#: ../libedataserverui/e-name-selector-dialog.c:176
+#| msgid "Hot Contacts"
+msgid "Show Contacts"
+msgstr "स�पर��� दा�वा"
 
-#: ../libedataserverui/e-name-selector-dialog.c:276
-msgid "Select Contacts from Address Book"
-msgstr "पत�त�या��या प�स�त�ात�न स�पर�� निवडा"
+#: ../libedataserverui/e-name-selector-dialog.c:198
+msgid "Address B_ook:"
+msgstr "पत�ता प�स�ति�ा (_o):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:563
-msgid "_Add"
-msgstr "समाव�ष �रा (_A)"
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Cate_gory:"
+msgstr "श�र�ण� (_g):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:588
-msgid "_Remove"
-msgstr "�ाढ�न �ा�ा (_R)"
+#: ../libedataserverui/e-name-selector-dialog.c:224
+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:242
+#: ../libedataserverui/e-name-selector-dialog.c:977
 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.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>स�पर�� दा�वा</b>"
+#: ../libedataserverui/e-name-selector-dialog.c:244
+#| msgid "Contacts"
+msgid "Co_ntacts"
+msgstr "स�पर��� (_n)"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
-msgid "Address B_ook:"
-msgstr "पत�ता प�स�ति�ा (_o):"
+#: ../libedataserverui/e-name-selector-dialog.c:289
+msgid "Search"
+msgstr "श�धा"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:292
 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:295
 msgid "Contacts"
 msgstr "स�पर��"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
-msgid "Search"
-msgstr "श�धा"
+#: ../libedataserverui/e-name-selector-dialog.c:412
+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:747
+msgid "_Add"
+msgstr "समाव�ष �रा (_A)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:751
+msgid "_Remove"
+msgstr "�ाढ�न �ा�ा (_R)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:891
+#, 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:2455
+#: ../libedataserverui/e-name-selector-entry.c:2661
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s �ळ�मध�य� विस�तारा(_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2470
+#: ../libedataserverui/e-name-selector-entry.c:2676
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s �� प�रत बनवा (_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2480
+#: ../libedataserverui/e-name-selector-entry.c:2686
 #, c-format
 msgid "C_ut %s"
 msgstr "%s �ापा (_u)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2497
+#: ../libedataserverui/e-name-selector-entry.c:2703
 #, c-format
 msgid "_Edit %s"
 msgstr "स�पादन (_E) %s"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:509
 #, 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
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "Caps Lock �ि �ाल� �ह�."
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "ह� ��प�तवा��यर�ना ल��षात ठ�वा (_R)"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "या सत�रा��या �र�वर�त भा�ा�र�ता ��प�तवा��र�ना ल��षात ठ�वा (_R)"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "��प�तशब�द ल��षात ठ�वा(_R)"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "या सत�रा��या �र�वर�त भा�ा�र�ता हा ��प�तशब�द ल��षात ठ�वा (_R)"
 
@@ -5051,201 +5279,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 "सर�वर�ड�न �व�ध प�रतिसाद"
+msgstr "सर�व�हर�ड�न �व�ध प�रतिसाद"
 
-#: ../servers/groupwise/e-gw-connection.c:231
+#: ../servers/groupwise/e-gw-connection.c:233
 msgid "No response from the server"
-msgstr "सर�वर�ड�न प�रतिसाद नाह�"
+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]