hindi updated by Rajesh Ranjan
authorRajesh Ranjan <rranjan@src.gnome.org>
Thu, 12 Mar 2009 11:40:51 +0000 (11:40 +0000)
committerRajesh Ranjan <rranjan@src.gnome.org>
Thu, 12 Mar 2009 11:40:51 +0000 (11:40 +0000)
svn path=/trunk/; revision=10158

po/ChangeLog
po/hi.po

index 23980cc..8c18ef2 100644 (file)
@@ -1,3 +1,7 @@
+2009-03-12  Rajesh Ranjan <rranjan@redhat.com>
+
+       * hi.po: Updated Hindi Translation.
+       
 2009-03-12  I. Felix <ifelix@redhat.com>
 
        * ta.po:  Tamil Translation updated
index 9657788..158c668 100644 (file)
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,19 +1,16 @@
-# translation of evolution-data-server.HEAD.hi.po to Hindi
-# translation of evolution.HEAD.hi .po to Hindi
-# translation of evolution.HEAD.hi.po to Hindi
-# translation of evolution.HEAD.po to Gnome Hindi Team
+# translation of evolution-data-server.HEAD.po to Hindi
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Rajesh Ranjan <rranjan@redhat.com>, 2004, 2005, 2006.
 #
+# Rajesh Ranjan <rranjan@redhat.com>, 2004, 2005, 2006, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server.HEAD.hi\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-29 07:56+0200\n"
-"PO-Revision-Date: 2006-08-29 16:20+0530\n"
+"Project-Id-Version: evolution-data-server.HEAD\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=general\n"
+"POT-Creation-Date: 2009-02-25 12:08+0000\n"
+"PO-Revision-Date: 2009-03-12 17:08+0530\n"
 "Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n"
-"Language-Team: Hindi <fedora-trans-hi@redhat.com>\n"
+"Language-Team: Hindi <hindi.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,65 +18,66 @@ msgstr ""
 "\n"
 "\n"
 "\n"
-"X-Generator: KBabel 1.9.1\n"
+"\n"
+"X-Generator: KBabel 1.11.4\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:542
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:484
+#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
-msgstr "à¤\85धिभारित कर रहा है..."
-
-#: ../addressbook/backends/file/e-book-backend-file.c:545
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2281
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2301
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2320
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4021
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:486
+msgstr "लà¥\8bड कर रहा है..."
+
+#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
-msgstr "ढà¥\82à¤\82ढ़ रहा है..."
+msgstr "à¤\96à¥\8bà¤\9c रहा है..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2690
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4177
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "संपर्क डाउनलोड कर रहा है (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3036
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3080
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "संपर्क कैश अद्यतन कर रहा है (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:720
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
 msgid "Using Distinguished Name (DN)"
 msgstr "विशिष्ट नाम का उपयोग कर रहा है (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:723
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
 msgid "Using Email Address"
 msgstr "ईमेल पता का उपयोग कर रहा है"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:974
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP सर्वर से जोड़ रहा है..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1568
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP सर्वर में संपर्क जोड़ रहा है..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1696
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP सर्वर से संपर्क हटा रहा है..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2001
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP सर्वर से संपर्क रूपांतरित रहा है..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:3893
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
 msgid "Receiving LDAP search results..."
 msgstr "LDAP खोज परिणाम पा रहा है..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4041
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
 msgid "Error performing search"
 msgstr "ढूंढ़ने में त्रुटि"
 
@@ -87,106 +85,108 @@ msgstr "ढूंढ़ने में त्रुटि"
 #. * function names, e.g.
 #. * "e_book_add_contact" on book before
 #. * "e_book_open
-#: ../addressbook/libebook/e-book.c:257 ../addressbook/libebook/e-book.c:261
-#: ../addressbook/libebook/e-book.c:473 ../addressbook/libebook/e-book.c:477
-#: ../addressbook/libebook/e-book.c:618 ../addressbook/libebook/e-book.c:622
-#: ../addressbook/libebook/e-book.c:711 ../addressbook/libebook/e-book.c:715
-#: ../addressbook/libebook/e-book.c:1029 ../addressbook/libebook/e-book.c:1034
-#: ../addressbook/libebook/e-book.c:1221 ../addressbook/libebook/e-book.c:1225
-#: ../addressbook/libebook/e-book.c:1382 ../addressbook/libebook/e-book.c:1386
-#: ../addressbook/libebook/e-book.c:1595 ../addressbook/libebook/e-book.c:1599
-#: ../addressbook/libebook/e-book.c:1836 ../addressbook/libebook/e-book.c:1840
-#: ../addressbook/libebook/e-book.c:2077 ../addressbook/libebook/e-book.c:2081
-#: ../addressbook/libebook/e-book.c:2293 ../addressbook/libebook/e-book.c:2297
-#: ../addressbook/libebook/e-book.c:3413
+#: ../addressbook/libebook/e-book.c:288 ../addressbook/libebook/e-book.c:292
+#: ../addressbook/libebook/e-book.c:496 ../addressbook/libebook/e-book.c:500
+#: ../addressbook/libebook/e-book.c:639 ../addressbook/libebook/e-book.c:643
+#: ../addressbook/libebook/e-book.c:730 ../addressbook/libebook/e-book.c:734
+#: ../addressbook/libebook/e-book.c:1028 ../addressbook/libebook/e-book.c:1033
+#: ../addressbook/libebook/e-book.c:1211 ../addressbook/libebook/e-book.c:1215
+#: ../addressbook/libebook/e-book.c:1370 ../addressbook/libebook/e-book.c:1374
+#: ../addressbook/libebook/e-book.c:1575 ../addressbook/libebook/e-book.c:1579
+#: ../addressbook/libebook/e-book.c:1818 ../addressbook/libebook/e-book.c:1822
+#: ../addressbook/libebook/e-book.c:2055 ../addressbook/libebook/e-book.c:2059
+#: ../addressbook/libebook/e-book.c:2263 ../addressbook/libebook/e-book.c:2267
+#: ../addressbook/libebook/e-book.c:3454
 #, c-format
 msgid "\"%s\" on book before \"%s\""
 msgstr "\"%s\" पर \"%s\" के पहले बुक"
 
-#: ../addressbook/libebook/e-book.c:270 ../addressbook/libebook/e-book.c:486
-#: ../addressbook/libebook/e-book.c:631 ../addressbook/libebook/e-book.c:724
-#: ../addressbook/libebook/e-book.c:1044 ../addressbook/libebook/e-book.c:1235
-#: ../addressbook/libebook/e-book.c:1396 ../addressbook/libebook/e-book.c:1608
-#: ../addressbook/libebook/e-book.c:1849 ../addressbook/libebook/e-book.c:2091
-#: ../addressbook/libebook/e-book.c:2306 ../addressbook/libebook/e-book.c:2660
-#: ../addressbook/libebook/e-book.c:2866
+#: ../addressbook/libebook/e-book.c:301 ../addressbook/libebook/e-book.c:509
+#: ../addressbook/libebook/e-book.c:652 ../addressbook/libebook/e-book.c:743
+#: ../addressbook/libebook/e-book.c:1043 ../addressbook/libebook/e-book.c:1225
+#: ../addressbook/libebook/e-book.c:1384 ../addressbook/libebook/e-book.c:1588
+#: ../addressbook/libebook/e-book.c:1831 ../addressbook/libebook/e-book.c:2069
+#: ../addressbook/libebook/e-book.c:2276 ../addressbook/libebook/e-book.c:2685
+#: ../addressbook/libebook/e-book.c:2883
+#, c-format
 msgid "book busy"
 msgstr "व्यस्त के रूप में दिखायें"
 
-#: ../addressbook/libebook/e-book.c:303 ../addressbook/libebook/e-book.c:307
-#: ../addressbook/libebook/e-book.c:519 ../addressbook/libebook/e-book.c:523
-#: ../addressbook/libebook/e-book.c:660 ../addressbook/libebook/e-book.c:664
-#: ../addressbook/libebook/e-book.c:753 ../addressbook/libebook/e-book.c:757
-#: ../addressbook/libebook/e-book.c:1073 ../addressbook/libebook/e-book.c:1076
-#: ../addressbook/libebook/e-book.c:1267 ../addressbook/libebook/e-book.c:1270
-#: ../addressbook/libebook/e-book.c:1425 ../addressbook/libebook/e-book.c:1429
-#: ../addressbook/libebook/e-book.c:1644 ../addressbook/libebook/e-book.c:1648
-#: ../addressbook/libebook/e-book.c:1896 ../addressbook/libebook/e-book.c:1900
-#: ../addressbook/libebook/e-book.c:2123 ../addressbook/libebook/e-book.c:2127
-#: ../addressbook/libebook/e-book.c:2334 ../addressbook/libebook/e-book.c:2338
-#: ../addressbook/libebook/e-book.c:2601 ../addressbook/libebook/e-book.c:2688
-#: ../addressbook/libebook/e-book.c:2692 ../addressbook/libebook/e-book.c:2894
-#: ../addressbook/libebook/e-book.c:2898 ../addressbook/libebook/e-book.c:3422
+#: ../addressbook/libebook/e-book.c:332 ../addressbook/libebook/e-book.c:336
+#: ../addressbook/libebook/e-book.c:540 ../addressbook/libebook/e-book.c:544
+#: ../addressbook/libebook/e-book.c:679 ../addressbook/libebook/e-book.c:683
+#: ../addressbook/libebook/e-book.c:770 ../addressbook/libebook/e-book.c:774
+#: ../addressbook/libebook/e-book.c:1070 ../addressbook/libebook/e-book.c:1073
+#: ../addressbook/libebook/e-book.c:1255 ../addressbook/libebook/e-book.c:1258
+#: ../addressbook/libebook/e-book.c:1411 ../addressbook/libebook/e-book.c:1415
+#: ../addressbook/libebook/e-book.c:1624 ../addressbook/libebook/e-book.c:1628
+#: ../addressbook/libebook/e-book.c:1878 ../addressbook/libebook/e-book.c:1882
+#: ../addressbook/libebook/e-book.c:2099 ../addressbook/libebook/e-book.c:2103
+#: ../addressbook/libebook/e-book.c:2302 ../addressbook/libebook/e-book.c:2306
+#: ../addressbook/libebook/e-book.c:2537 ../addressbook/libebook/e-book.c:2711
+#: ../addressbook/libebook/e-book.c:2715 ../addressbook/libebook/e-book.c:2909
+#: ../addressbook/libebook/e-book.c:2913 ../addressbook/libebook/e-book.c:3463
 #, c-format
 msgid "CORBA exception making \"%s\" call"
 msgstr "CORBA अपवाद \"%s\" कॉल मेकिंग"
 
-#: ../addressbook/libebook/e-book.c:2582
+#: ../addressbook/libebook/e-book.c:2526
 #, c-format
 msgid "%s: there is no current operation"
 msgstr "%s: कोई मौजूदा ऑपरेशन नहीं"
 
-#: ../addressbook/libebook/e-book.c:2617
-#, fuzzy, c-format
+#: ../addressbook/libebook/e-book.c:2555 ../addressbook/libebook/e-book.c:2600
+#: ../addressbook/libebook/e-book.c:2639
+#, c-format
 msgid "%s: could not cancel"
 msgstr "%s: रद्द नहीं कर सका"
 
-#: ../addressbook/libebook/e-book.c:2646 ../addressbook/libebook/e-book.c:2650
+#: ../addressbook/libebook/e-book.c:2671 ../addressbook/libebook/e-book.c:2675
 #, c-format
 msgid "\"%s\" on book after \"%s\""
 msgstr "\"%s\" पर \"%s\" बाद बुक करें"
 
-#: ../addressbook/libebook/e-book.c:2716
-#, fuzzy, c-format
+#: ../addressbook/libebook/e-book.c:2739
+#, c-format
 msgid "%s: canceled"
 msgstr "%s: रद्द"
 
-#: ../addressbook/libebook/e-book.c:3277
+#: ../addressbook/libebook/e-book.c:3318
 #, c-format
 msgid "%s: Invalid source."
 msgstr "%s: अमान्य श्रोत"
 
-#: ../addressbook/libebook/e-book.c:3285 ../addressbook/libebook/e-book.c:3351
-#, fuzzy, c-format
+#: ../addressbook/libebook/e-book.c:3326 ../addressbook/libebook/e-book.c:3392
+#, c-format
 msgid "%s: no factories available for URI `%s'"
-msgstr "%s: uri `%s' के लिये कोई फैक्टरी उपलब्ध नहीं"
+msgstr "%s: URI `%s' के लिये कोई फैक्टरी उपलब्ध नहीं"
 
-#: ../addressbook/libebook/e-book.c:3297
+#: ../addressbook/libebook/e-book.c:3338
 #, c-format
 msgid "%s: Could not create EBookListener"
 msgstr "%s: EBookListener बना नहीं सका"
 
-#: ../addressbook/libebook/e-book.c:3562
-#, fuzzy, c-format
+#: ../addressbook/libebook/e-book.c:3605
+#, c-format
 msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: कोई स्व संपर्क uid gconf में भंडारित नहीं था"
+msgstr "%s: कोई स्व संपर्क UID gconf में भंडारित नहीं था"
 
-#: ../addressbook/libebook/e-book.c:3692
+#: ../addressbook/libebook/e-book.c:3738
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s: कोई स्व संपर्क uid `%s' के लिये gconf में भंडारित नहीं था"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:112
+#: ../addressbook/libebook/e-contact.c:113
 msgid "Unique ID"
 msgstr "अद्वितीय ID"
 
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:114
 msgid "File Under"
 msgstr "इसके अंतर्गत फाइल करें"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:115
+#: ../addressbook/libebook/e-contact.c:116
 msgid "Book URI"
 msgstr "पुस्तक URI"
 
@@ -194,567 +194,613 @@ 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:121
+#: ../addressbook/libebook/e-contact.c:122
 msgid "Full Name"
 msgstr "पूरा नाम"
 
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:123
 msgid "Given Name"
 msgstr "दिया गया नाम"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Family Name"
 msgstr "परिवार का नाम"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Nickname"
 msgstr "उपनाम"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Email 1"
 msgstr "Email 1"
 
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Email 2"
 msgstr "Email 2"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 3"
 msgstr "Email 3"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 4"
 msgstr "Email 4"
 
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Mailer"
 msgstr "मेलर"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Home Address Label"
 msgstr "घर पता लेबल"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Work Address Label"
 msgstr "कार्य पता लेबल"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Other Address Label"
 msgstr "अन्य पता लेबल"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Assistant Phone"
 msgstr "सहायक फोन"
 
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Business Phone"
 msgstr "व्यापार फोन"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Business Phone 2"
 msgstr "व्यापार फोन २"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Fax"
 msgstr "व्यापार फैक्स"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Callback Phone"
 msgstr "कालबैक फोन"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Car Phone"
 msgstr "कार फोन"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Company Phone"
 msgstr "कंपनी फोन"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Home Phone"
 msgstr "आवास फोन"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Home Phone 2"
 msgstr "आवास फोन २"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Fax"
 msgstr "आवासह फैक्स"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:151
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Mobile Phone"
 msgstr "मोबाइल फोन"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Other Phone"
 msgstr "अन्य फोन"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Other Fax"
 msgstr "अन्य फैक्स"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Pager"
 msgstr "पेजर"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Primary Phone"
 msgstr "प्रारंभिक फोन"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Radio"
 msgstr "रेडियो"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Telex"
 msgstr "टेलेक्स"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:160
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Organization"
 msgstr "संगठन"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Organizational Unit"
 msgstr "संगठनात्मक इकाई"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Office"
 msgstr "कार्यालय"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Title"
 msgstr "शीर्षक"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Role"
 msgstr "भूमिका"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Manager"
 msgstr "प्रबंधक"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Assistant"
 msgstr "सहायक"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Homepage URL"
 msgstr "होमपेज URL"
 
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Weblog URL"
 msgstr "वेब्लाग "
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:175
-#: ../libedataserverui/e-categories-dialog.c:410
+#: ../addressbook/libebook/e-contact.c:176
+#: ../libedataserverui/e-categories-dialog.c:517
 msgid "Categories"
 msgstr "कोटियाँ"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Calendar URI"
-msgstr "à¤\95à¥\88लà¥\87à¤\82डर URI"
+msgstr "पà¤\82à¤\9aाà¤\82à¤\97 URI"
 
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:180
 msgid "Free/Busy URL"
 msgstr "रिक्त/व्यस्त URI"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:181
 msgid "ICS Calendar"
-msgstr "ICS à¤\95à¥\88लà¥\87à¤\82डर"
+msgstr "ICS à¤ªà¤\82à¤\9aाà¤\82à¤\97"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Video Conferencing URL"
 msgstr "वीडियो सम्मेलन URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Spouse's Name"
 msgstr "पति/पत्नी का नामः"
 
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:186
 msgid "Note"
 msgstr "टिप्पणी"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:189
 msgid "AIM Home Screen Name 1"
 msgstr "AIM होम स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:190
 msgid "AIM Home Screen Name 2"
 msgstr "AIM होम स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 3"
 msgstr "AIM होम स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Work Screen Name 1"
 msgstr "AIM कार्य स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Work Screen Name 2"
 msgstr "AIM कार्य स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 3"
 msgstr "AIM कार्य स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:195
 msgid "GroupWise Home Screen Name 1"
 msgstr "समूह अनुसार होम स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:196
 msgid "GroupWise Home Screen Name 2"
 msgstr "समूह अनुसार होम स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 3"
 msgstr "समूह अनुसार होम स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Work Screen Name 1"
 msgstr "समूह अनुसार कार्य स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Work Screen Name 2"
 msgstr "समूह अनुसार कार्य स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 3"
 msgstr "समूह अनुसार कार्य स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:201
 msgid "Jabber Home Id 1"
 msgstr "जैबर होम Id 1"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:202
 msgid "Jabber Home Id 2"
 msgstr "जैबर होम Id 2"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:203
 msgid "Jabber Home Id 3"
 msgstr "जैबर होम Id 3"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:204
 msgid "Jabber Work Id 1"
 msgstr "जैबर कार्य Id 1"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:205
 msgid "Jabber Work Id 2"
 msgstr "जैबर कार्य Id 2"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Work Id 3"
 msgstr "जैबर कार्य Id 3"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! होम स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! होम स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! होम स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! कार्य स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! कार्य स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! कार्य स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:213
 msgid "MSN Home Screen Name 1"
 msgstr "MSN होम स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:214
 msgid "MSN Home Screen Name 2"
 msgstr "MSN होम स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 3"
 msgstr "MSN होम स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Work Screen Name 1"
 msgstr "MSN कार्य स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Work Screen Name 2"
 msgstr "MSN कार्य स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 3"
 msgstr "MSN कार्य स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:219
 msgid "ICQ Home Id 1"
 msgstr "ICQ होम Id 1"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:220
 msgid "ICQ Home Id 2"
 msgstr "ICQ होम Id 2"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:221
 msgid "ICQ Home Id 3"
 msgstr "ICQ होम Id 3"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:222
 msgid "ICQ Work Id 1"
 msgstr "ICQ कार्य Id 1"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:223
 msgid "ICQ Work Id 2"
 msgstr "ICQ कार्य Id 2"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Work Id 3"
 msgstr "ICQ कार्य Id 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:227
 msgid "Last Revision"
 msgstr "अंतिम पुनरीक्षण"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:228
 msgid "Name or Org"
 msgstr "नाम या संगठन"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:231
 msgid "Address List"
 msgstr "पता सूची"
 
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:232
 msgid "Home Address"
 msgstr "घर का पता"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Work Address"
 msgstr "आफिस का पता"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Other Address"
 msgstr "अन्य पता"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Category List"
 msgstr "श्रेणी सूची"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:240
 msgid "Photo"
 msgstr "फोटो"
 
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:241
 msgid "Logo"
 msgstr "लोगो"
 
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Name"
 msgstr "नाम"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:244
 msgid "Email List"
 msgstr "ईमेल सूची"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:247
 msgid "AIM Screen Name List"
 msgstr "AIM स्क्रीन नाम सूची"
 
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:248
 msgid "GroupWise Id List"
 msgstr "समूह अनुसार Id सूची"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Jabber Id List"
 msgstr "जैबर Id सूची"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:250
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! स्क्रीन नाम सूची"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:251
 msgid "MSN Screen Name List"
 msgstr "MSN स्क्रीन नाम सूची"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:252
 msgid "ICQ Id List"
 msgstr "ICQ Id सूची"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:254
 msgid "Wants HTML Mail"
 msgstr "HTML डाक चाहता है"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:256
 msgid "List"
 msgstr "सूची"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:257
 msgid "List Show Addresses"
 msgstr "दिखायें पता सूची"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Birth Date"
 msgstr "जन्मदिन"
 
-#. Add default categories only if gconf doesn't contain any category list
-#. Make sure we have all categories
-#: ../addressbook/libebook/e-contact.c:259
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:460
-#: ../libedataserver/e-categories.c:246
+#: ../addressbook/libebook/e-contact.c:260
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
+#: ../libedataserver/e-categories.c:43
 msgid "Anniversary"
 msgstr "वर्षगांठ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:262
+#: ../addressbook/libebook/e-contact.c:263
 msgid "X.509 Certificate"
 msgstr "X.509 प्रमाणपत्र"
 
-#: ../addressbook/libebook/e-contact.c:264
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:265
 msgid "Gadu-Gadu Home Id 1"
-msgstr "à¤\9cà¥\88बर होम Id 1"
+msgstr "à¤\97ाडà¥\82-à¤\97ाडà¥\82 होम Id 1"
 
-#: ../addressbook/libebook/e-contact.c:265
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:266
 msgid "Gadu-Gadu Home Id 2"
-msgstr "à¤\9cà¥\88बर होम Id 2"
+msgstr "à¤\97ाडà¥\82-à¤\97ाडà¥\82 होम Id 2"
 
-#: ../addressbook/libebook/e-contact.c:266
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Gadu-Gadu Home Id 3"
-msgstr "à¤\9cà¥\88बर होम Id 3"
+msgstr "à¤\97ाडà¥\82-à¤\97ाडà¥\82 होम Id 3"
 
-#: ../addressbook/libebook/e-contact.c:267
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:268
 msgid "Gadu-Gadu Work Id 1"
-msgstr "à¤\9cà¥\88बर कार्य Id 1"
+msgstr "à¤\97ाडà¥\82-à¤\97ाडà¥\82 कार्य Id 1"
 
-#: ../addressbook/libebook/e-contact.c:268
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:269
 msgid "Gadu-Gadu Work Id 2"
-msgstr "à¤\9cà¥\88बर कार्य Id 2"
+msgstr "à¤\97ाडà¥\82-à¤\97ाडà¥\82 कार्य Id 2"
 
-#: ../addressbook/libebook/e-contact.c:269
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Work Id 3"
-msgstr "à¤\9cà¥\88बर कार्य Id 3"
+msgstr "à¤\97ाडà¥\82-à¤\97ाडà¥\82 कार्य Id 3"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Id List"
-msgstr ""
-
-#: ../addressbook/libebook/e-contact.c:1258
-#: ../addressbook/libebook/e-destination.c:771
+msgstr "गाडू-गाडू Id सूची"
+
+#. Geo information
+#: ../addressbook/libebook/e-contact.c:274
+msgid "Geographic Information"
+msgstr "भौगोलिक सूचना"
+
+#: ../addressbook/libebook/e-contact.c:276
+msgid "Telephone"
+msgstr "टेलिफोन"
+
+#: ../addressbook/libebook/e-contact.c:278
+#| msgid "MSN Home Screen Name 1"
+msgid "Skype Home Name 1"
+msgstr "स्काइप होम नाम 1"
+
+#: ../addressbook/libebook/e-contact.c:279
+#| msgid "MSN Home Screen Name 2"
+msgid "Skype Home Name 2"
+msgstr "स्काइप होम नाम 2"
+
+#: ../addressbook/libebook/e-contact.c:280
+#| msgid "MSN Home Screen Name 3"
+msgid "Skype Home Name 3"
+msgstr "स्काइप होम नाम 3"
+
+#: ../addressbook/libebook/e-contact.c:281
+#| msgid "MSN Work Screen Name 1"
+msgid "Skype Work Name 1"
+msgstr "स्काइप कार्य नाम 1"
+
+#: ../addressbook/libebook/e-contact.c:282
+#| msgid "MSN Work Screen Name 2"
+msgid "Skype Work Name 2"
+msgstr "स्काइप कार्य नाम नाम 2"
+
+#: ../addressbook/libebook/e-contact.c:283
+#| msgid "MSN Work Screen Name 3"
+msgid "Skype Work Name 3"
+msgstr "स्काइप कार्य नाम नाम 3"
+
+#: ../addressbook/libebook/e-contact.c:284
+#| msgid "AIM Screen Name List"
+msgid "Skype Name List"
+msgstr "स्काइप नाम सूची"
+
+#: ../addressbook/libebook/e-contact.c:286
+#| msgid "Home Address"
+msgid "SIP address"
+msgstr "SIP पता"
+
+#: ../addressbook/libebook/e-contact.c:1535
+#: ../addressbook/libebook/e-destination.c:761
 msgid "Unnamed List"
 msgstr "बेनामी सूची"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:462
-#: ../libedataserver/e-categories.c:247
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
+#: ../libedataserver/e-categories.c:44
 msgid "Birthday"
 msgstr "जन्मदिन"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:488
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
 #, c-format
 msgid "Birthday: %s"
 msgstr "जन्मदिन: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:512
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
 #, c-format
 msgid "Anniversary: %s"
 msgstr "वर्षगांठ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:203
-#, fuzzy
+#: ../calendar/backends/file/e-cal-backend-file.c:212
 msgid "Cannot save calendar data: Malformed URI."
-msgstr "कैलेंडर डाटा सहेज नहीं सका: विरूपित URI."
+msgstr "पंचांग डाटा सहेज नहीं सका: विरूपित URI."
+
+#: ../calendar/backends/file/e-cal-backend-file.c:219
+#: ../calendar/backends/file/e-cal-backend-file.c:225
+msgid "Cannot save calendar data"
+msgstr "पंचांग डाटा सहेज नहीं सका"
+
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
+msgid "Could not create thread for getting deltas"
+msgstr "डेल्टा के लिये थ्रेड नहीं बना सका"
+
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
+#: ../calendar/backends/google/e-cal-backend-google.c:1192
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
+#: ../calendar/backends/http/e-cal-backend-http.c:561
+#: ../calendar/backends/weather/e-cal-backend-weather.c:484
+msgid "Could not create cache file"
+msgstr "कैश फाइल नहीं बना सका"
+
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
+msgid "Could not create thread for populating cache"
+msgstr "कैश भरने के लिये थ्रेड नहीं बना सका"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:980
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1672
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1917
 msgid "Reply Requested: by "
 msgstr "जबाव निवेदित: इनके द्वारा"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:985
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1677
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1922
 msgid "Reply Requested: When convenient"
 msgstr "जबाव निवेदित: जब सुविधा हो"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:263
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
 #, c-format
 msgid "Loading %s items"
 msgstr "%s मद लोड कर रहा है"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:775
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
 msgid "Calendar"
-msgstr "à¤\95à¥\88लà¥\87à¤\82डर"
+msgstr "पà¤\82à¤\9aाà¤\82à¤\97"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:832
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
 msgid "Invalid server URI"
 msgstr "अमान्य सर्वर URI"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:851
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:860
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:960
-#: ../calendar/libecal/e-cal.c:5178
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1003
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1027
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1065
-#: ../camel/providers/groupwise/camel-groupwise-store.c:585
-#: ../camel/providers/groupwise/camel-groupwise-store.c:600
-#: ../camel/providers/groupwise/camel-groupwise-store.c:711
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
+#: ../calendar/libecal/e-cal.c:5098
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1147
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1179
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1217
+#: ../camel/providers/groupwise/camel-groupwise-store.c:588
 #: ../camel/providers/groupwise/camel-groupwise-store.c:753
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:157
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:184
 msgid "Authentication failed"
 msgstr "अनुमोदन असफल"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:902
-msgid "Could not create thread for getting deltas"
-msgstr "डेल्टा के लिये थ्रेड नहीं बना सका"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:942
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1211
-#: ../calendar/backends/http/e-cal-backend-http.c:526
-#: ../calendar/backends/weather/e-cal-backend-weather.c:450
-msgid "Could not create cache file"
-msgstr "कैश फाइल नहीं बना सका"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:954
-msgid "Could not create thread for populating cache"
-msgstr "कैश भरने के लिये थ्रेड नहीं बना सका"
-
-#: ../calendar/backends/http/e-cal-backend-http.c:265
+#: ../calendar/backends/http/e-cal-backend-http.c:268
 msgid "Redirected to Invalid URI"
 msgstr "अमान्य URI में पुनर्प्रेषित"
 
@@ -764,521 +810,408 @@ msgstr "गलत फाइल प्रारूप"
 
 #: ../calendar/backends/http/e-cal-backend-http.c:295
 msgid "Not a calendar."
-msgstr "à¤\95à¥\88लà¥\87à¤\82डर नहीं"
+msgstr "पà¤\82à¤\9aाà¤\82à¤\97 नहीं"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:142
+#: ../calendar/backends/weather/e-cal-backend-weather.c:149
 msgid "Could not retrieve weather data"
 msgstr "मौसम डाटा नहीं पा सका"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:200
-msgid "Fair"
-msgstr "साफ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:201
-msgid "Snow showers"
-msgstr "बर्फ की बौछार"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:202
-msgid "Snow"
-msgstr "बर्फबारी"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:203
-msgid "Partly cloudy"
-msgstr "आंशिक बादल"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:204
-msgid "Smoke"
-msgstr "धुआं"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:205
-msgid "Thunderstorms"
-msgstr "थंडरस्टार्म"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:206
-msgid "Cloudy"
-msgstr "बादल युक्त"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:207
-msgid "Drizzle"
-msgstr "बूंदा बांदी"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:208
-msgid "Sunny"
-msgstr "साफ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:209
-msgid "Dust"
-msgstr "धूल"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:210
-msgid "Clear"
-msgstr "खाली"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:211
-msgid "Mostly cloudy"
-msgstr "ज्यादातर बदलीयुक्त"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:212
-msgid "Windy"
-msgstr "हवा"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:213
-msgid "Rain showers"
-msgstr "बरसात की बौछार"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:214
-msgid "Foggy"
-msgstr "कुहरा युक्त"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:215
-msgid "Rain/snow mixed"
-msgstr "बर्षा/वर्फ मिला"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:216
-msgid "Sleet"
-msgstr "स्लीट"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:217
-msgid "Very hot/humid"
-msgstr "काफी गर्म/नम"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:218
-msgid "Blizzard"
-msgstr "ब्लिजार्ड"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:219
-msgid "Freezing rain"
-msgstr "बर्फीली बरसात"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:220
-msgid "Haze"
-msgstr "धुन्ध"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:221
-msgid "Blowing snow"
-msgstr "वर्फ वारी"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:222
-msgid "Freezing drizzle"
-msgstr "बर्फीली बूंदा बांदी"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:223
-msgid "Very cold/wind chill"
-msgstr "बहुत ठंडा/हवा ठंडी"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:224
-msgid "Rain"
-msgstr "बरसात"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:234
-#: ../calendar/backends/weather/e-cal-backend-weather.c:242
-#: ../calendar/backends/weather/e-cal-backend-weather.c:244
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
-msgid "Weather: Sunny"
-msgstr "मौसम: साफ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:235
-#: ../calendar/backends/weather/e-cal-backend-weather.c:236
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
-msgid "Weather: Snow"
-msgstr "मौसम: बर्फ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:237
-msgid "Weather: Partly Cloudy"
-msgstr "मौसम: आँशिक बदली"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:238
-#: ../calendar/backends/weather/e-cal-backend-weather.c:243
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:246
 msgid "Weather: Fog"
 msgstr "मौसम: कुहरा"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:239
-msgid "Weather: Thunderstorms"
-msgstr "मौसम: थंडरस्टार्म"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:240
-#: ../calendar/backends/weather/e-cal-backend-weather.c:245
+#: ../calendar/backends/weather/e-cal-backend-weather.c:247
 msgid "Weather: Cloudy"
 msgstr "मौसम: बदली"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:241
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+#| msgid "Weather: Cloudy"
+msgid "Weather: Cloudy Night"
+msgstr "मौसम: बदली युक्त रात"
+
 #: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#| msgid "Weather: Thunderstorms"
+msgid "Weather: Overcast"
+msgstr "मौसम: ओवरकास्ट"
+
 #: ../calendar/backends/weather/e-cal-backend-weather.c:250
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
-msgid "Weather: Rain"
+#| msgid "Weather: Snow"
+msgid "Weather: Showers"
 msgstr "मौसम: बर्षा"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:333
-#, c-format
-msgid "%.1f°C - %s"
-msgstr "%.1f°C - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:335
-#, c-format
-msgid "%.1f°F - %s"
-msgstr "%.1f°F - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:338
-#, c-format
-msgid "%.1f/%.1f°C - %s"
-msgstr "%.1f/%.1f°C - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:340
-#, c-format
-msgid "%.1f/%.1f°F - %s"
-msgstr "%.1f/%.1f°F - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:346
-#, c-format
-msgid "%d%% chance of precipitation\n"
-msgstr "%d%% वर्षा की संभावना\n"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+msgid "Weather: Snow"
+msgstr "मौसम: बर्फ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:353
-#, c-format
-msgid "%.1fcm snow\n"
-msgstr "%.1fcm वर्फ\n"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+msgid "Weather: Sunny"
+msgstr "मौसम: साफ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:355
-#, c-format
-msgid "%.1fin snow\n"
-msgstr "%.1fin वर्फ\n"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#| msgid "Weather: Rain"
+msgid "Weather: Clear Night"
+msgstr "मौसम: साफ रात"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:358
-#, c-format
-msgid "%.1f-%.1fcm snow\n"
-msgstr "%.1f-%.1fcm वर्फ\n"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+msgid "Weather: Thunderstorms"
+msgstr "मौसम: थंडरस्टार्म"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:360
-#, c-format
-msgid "%.1f-%.1fin snow\n"
-msgstr "%.1f-%.1fin वर्फ\n"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+msgid "Forecast"
+msgstr "पूर्वानुमान"
 
 #: ../calendar/libecal/e-cal-component.c:1322
 msgid "Untitled appointment"
 msgstr "व्यस्तता शीर्षकहीन"
 
-#: ../calendar/libecal/e-cal-recur.c:4032
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "1st"
 msgstr "पहला"
 
-#: ../calendar/libecal/e-cal-recur.c:4033
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "2nd"
 msgstr "दूसरा"
 
-#: ../calendar/libecal/e-cal-recur.c:4034
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "3rd"
 msgstr "तीसरा"
 
-#: ../calendar/libecal/e-cal-recur.c:4035
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "4th"
 msgstr "चौथा"
 
-#: ../calendar/libecal/e-cal-recur.c:4036
+#: ../calendar/libecal/e-cal-recur.c:4045
 msgid "5th"
 msgstr "पांचवा"
 
-#: ../calendar/libecal/e-cal-recur.c:4037
+#: ../calendar/libecal/e-cal-recur.c:4046
 msgid "6th"
 msgstr "छठा"
 
-#: ../calendar/libecal/e-cal-recur.c:4038
+#: ../calendar/libecal/e-cal-recur.c:4047
 msgid "7th"
 msgstr "सातवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4039
+#: ../calendar/libecal/e-cal-recur.c:4048
 msgid "8th"
 msgstr "आठवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4040
+#: ../calendar/libecal/e-cal-recur.c:4049
 msgid "9th"
 msgstr "नवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:4050
 msgid "10th"
 msgstr "दसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:4051
 msgid "11th"
 msgstr "ग्यारहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:4052
 msgid "12th"
 msgstr "बारहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:4053
 msgid "13th"
 msgstr "तेरहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:4054
 msgid "14th"
 msgstr "चौदहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4055
 msgid "15th"
 msgstr "पंद्रहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4056
 msgid "16th"
 msgstr "सोलहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4057
 msgid "17th"
 msgstr "सत्रहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4058
 msgid "18th"
 msgstr "अठारहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4059
 msgid "19th"
 msgstr "उन्नीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4060
 msgid "20th"
 msgstr "बीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4061
 msgid "21st"
 msgstr "इक्कीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4062
 msgid "22nd"
 msgstr "बाइसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4063
 msgid "23rd"
 msgstr "तेइसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4064
 msgid "24th"
 msgstr "चौबीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4065
 msgid "25th"
 msgstr "पच्चीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4066
 msgid "26th"
 msgstr "छब्बीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4067
 msgid "27th"
 msgstr "सत्ताइसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4068
 msgid "28th"
 msgstr "अट्ठाइसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4069
 msgid "29th"
 msgstr "उनतीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4070
 msgid "30th"
 msgstr "तीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4071
 msgid "31st"
 msgstr "इकतीसवां"
 
-#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:710
+#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
 msgid "High"
 msgstr "ज्यादा"
 
-#: ../calendar/libecal/e-cal-util.c:684 ../calendar/libecal/e-cal-util.c:712
+#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
 msgid "Normal"
 msgstr "सामान्य"
 
-#: ../calendar/libecal/e-cal-util.c:686 ../calendar/libecal/e-cal-util.c:714
+#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717
 msgid "Low"
 msgstr "कम"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:708
+#: ../calendar/libecal/e-cal-util.c:711
 msgid "Undefined"
 msgstr "अपरिभाषित"
 
-#. FIXME: Try to get the parent uri so that we dont have to ask the password again
-#: ../calendar/libecal/e-cal.c:1737
+#: ../calendar/libecal/e-cal.c:1677 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87 à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f à¤¦à¤¾à¤\96िल à¤\95रà¥\87à¤\82 à¤\89पभà¥\8bà¤\95à¥\8dता %s à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87 à¤ªà¥\8dरà¥\89à¤\95à¥\8dसà¥\80 à¤¸à¤®à¤°à¥\8dथ à¤\95रनà¥\87 à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87"
+msgid "Enter password for %s (user %s)"
+msgstr "%s à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87 à¤\95à¥\82à¤\9fशबà¥\8dद à¤¡à¤¾à¤²à¥\87à¤\82 (à¤\89पयà¥\8bà¤\95à¥\8dता %s)"
 
-#: ../calendar/libecal/e-cal.c:1740 ../libedataserverui/e-book-auth-util.c:198
+#.
+#. 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:1691
 #, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87 à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f à¤¡à¤¾à¤²à¥\87à¤\82 (à¤\89पयà¥\8bà¤\95à¥\8dता %s)"
+msgid "Enter password for %s to enable proxy for user %s"
+msgstr "%s à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87 à¤\95à¥\82à¤\9fशबà¥\8dद à¤¦à¤¾à¤\96िल à¤\95रà¥\87à¤\82 à¤\89पभà¥\8bà¤\95à¥\8dता %s à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87 à¤ªà¥\8dरà¥\89à¤\95à¥\8dसà¥\80 à¤¸à¤®à¤°à¥\8dथ à¤\95रनà¥\87 à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87"
 
-#: ../calendar/libecal/e-cal.c:5150
+#: ../calendar/libecal/e-cal.c:5070
 msgid "Invalid argument"
 msgstr "अवैध तर्क"
 
-#: ../calendar/libecal/e-cal.c:5152
+#: ../calendar/libecal/e-cal.c:5072
 msgid "Backend is busy"
 msgstr "पश्चशिरा व्यस्त"
 
-#: ../calendar/libecal/e-cal.c:5154
+#: ../calendar/libecal/e-cal.c:5074
+#: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "Repository is offline"
 msgstr "अभिलेखागार ऑफलाइन"
 
-#: ../calendar/libecal/e-cal.c:5156
+#: ../calendar/libecal/e-cal.c:5076
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "No such calendar"
-msgstr "à¤\95à¥\8bà¤\88 à¤\90सा à¤\95à¥\88लà¥\87à¤\82डर नहीं"
+msgstr "à¤\95à¥\8bà¤\88 à¤\90सा à¤ªà¤\82à¤\9aाà¤\82à¤\97 नहीं"
 
-#: ../calendar/libecal/e-cal.c:5158 ../servers/groupwise/e-gw-connection.c:175
+#: ../calendar/libecal/e-cal.c:5078
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../servers/groupwise/e-gw-connection.c:233
 msgid "Object not found"
 msgstr "वस्तु नहीं मिला"
 
-#: ../calendar/libecal/e-cal.c:5160 ../servers/groupwise/e-gw-connection.c:169
+#: ../calendar/libecal/e-cal.c:5080
+#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid object"
 msgstr "अवैध वस्तु"
 
-#: ../calendar/libecal/e-cal.c:5162
+#: ../calendar/libecal/e-cal.c:5082
 msgid "URI not loaded"
 msgstr "URI भारित नहीं"
 
-#: ../calendar/libecal/e-cal.c:5164
+#: ../calendar/libecal/e-cal.c:5084
 msgid "URI already loaded"
 msgstr "URI पहले से लोड"
 
-#: ../calendar/libecal/e-cal.c:5166
-#: ../servers/exchange/storage/e-storage.c:572
+#: ../calendar/libecal/e-cal.c:5086
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../servers/exchange/storage/e-storage.c:571
 msgid "Permission denied"
 msgstr "अनुमति निषेधित"
 
-#: ../calendar/libecal/e-cal.c:5168 ../servers/groupwise/e-gw-connection.c:177
+#: ../calendar/libecal/e-cal.c:5088
+#: ../calendar/libedata-cal/e-cal-backend-util.c:131
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Unknown User"
 msgstr "अज्ञात उपयोक्ता"
 
-#: ../calendar/libecal/e-cal.c:5170
+#: ../calendar/libecal/e-cal.c:5090
+#: ../calendar/libedata-cal/e-cal-backend-util.c:115
 msgid "Object ID already exists"
 msgstr "वस्तु ID पहले से मौजूद"
 
-#: ../calendar/libecal/e-cal.c:5172
+#: ../calendar/libecal/e-cal.c:5092
 msgid "Protocol not supported"
 msgstr "प्रोटोकाल समर्थित नहीं"
 
-#: ../calendar/libecal/e-cal.c:5174
-#, fuzzy
+#: ../calendar/libecal/e-cal.c:5094
 msgid "Operation has been canceled"
 msgstr "ऑपरेशन रद्द किया गया"
 
-#: ../calendar/libecal/e-cal.c:5176
+#: ../calendar/libecal/e-cal.c:5096
+#: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Could not cancel operation"
 msgstr "ऑपरेशन रद्द नहीं कर सका"
 
-#: ../calendar/libecal/e-cal.c:5180
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../calendar/libecal/e-cal.c:5100
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication required"
 msgstr "सत्यापन आवश्यक"
 
-#: ../calendar/libecal/e-cal.c:5182
+#: ../calendar/libecal/e-cal.c:5102
 msgid "A CORBA exception has occurred"
 msgstr "CORBA अपवाद पैदा हुआ"
 
-#: ../calendar/libecal/e-cal.c:5184
+#: ../calendar/libecal/e-cal.c:5104
+#: ../calendar/libedata-cal/e-cal-backend-util.c:146
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:310
-#: ../camel/providers/imap/camel-imap-command.c:410
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/pop3/camel-pop3-store.c:532
-#: ../camel/providers/pop3/camel-pop3-store.c:539
-#: ../camel/providers/pop3/camel-pop3-store.c:545
-#: ../servers/exchange/storage/e-storage.c:586
-#: ../servers/groupwise/e-gw-connection.c:183
+#: ../camel/providers/imap/camel-imap-command.c:434
+#: ../camel/providers/imap/camel-imap-store.c:743
+#: ../camel/providers/imap4/camel-imap4-engine.c:1570
+#: ../camel/providers/imap4/camel-imap4-engine.c:1609
+#: ../camel/providers/imap4/camel-imap4-engine.c:1654
+#: ../camel/providers/imap4/camel-imap4-engine.c:1710
+#: ../camel/providers/imap4/camel-imap4-store.c:315
+#: ../camel/providers/imap4/camel-imap4-store.c:823
+#: ../camel/providers/imap4/camel-imap4-store.c:1579
+#: ../camel/providers/pop3/camel-pop3-store.c:554
+#: ../camel/providers/pop3/camel-pop3-store.c:561
+#: ../camel/providers/pop3/camel-pop3-store.c:567
+#: ../servers/exchange/storage/e-storage.c:585
+#: ../servers/groupwise/e-gw-connection.c:241
 msgid "Unknown error"
 msgstr "अज्ञात त्रुटि"
 
-#: ../calendar/libecal/e-cal.c:5186
-#: ../servers/exchange/storage/e-storage.c:554
+#: ../calendar/libecal/e-cal.c:5106
+#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../servers/exchange/storage/e-storage.c:553
 msgid "No error"
 msgstr "कोई गलती नहीं"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:65
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:579
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:772
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:799
+#: ../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
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" किसी तर्क की आशा नहीं करता"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:98
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:208
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:250
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:286
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:837
+#: ../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
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" एक तर्क की आशा करता"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:104
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:111
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:292
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:523
+#: ../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
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" पहले तर्क की स्ट्रिंग होने की आशा करता"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
 #, 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:158
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:359
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:517
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:611
+#: ../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
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" दो तर्क की आशा करता"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:164
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:214
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:365
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:617
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:843
+#: ../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
 #, 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:172
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" दूसरे तर्क की एक पूर्णांक की आशा करता है"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:373
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:625
+#: ../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
 #, 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:531
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" दूसरे तर्क की एक स्ट्रिंग होने की आशा करता है"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:551
-#, c-format
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#, fuzzy, c-format
+#| msgid ""
+#| "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+#| "\"description\", or \"location\""
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\""
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
 msgstr ""
 "\"%s\" पहले तर्क को \"any\", \"summary\", or \"description\", या \"location\" "
 "में से किसी रूप में आशा करता है"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" कम से कम एक तर्क की आशा करता है"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:688
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1287,6 +1220,60 @@ msgstr ""
 "\"%s\" सारे तर्क को स्ट्रिंग होने की आशा करता है या एक व सिर्फ एक तर्क बुलियन गलत (#f) "
 "होने के लिये"
 
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#| msgid "Invalid argument"
+msgid "Invalid range"
+msgstr "अवैध दायरा"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#| msgid "Unsupported security layer."
+msgid "Unsupported field"
+msgstr "असमर्थित क्षेत्र"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#| msgid "Unsupported security layer."
+msgid "Unsupported method"
+msgstr "असमर्थित विधि"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#| msgid "No support for authentication type %s"
+msgid "Unsupported authentication method"
+msgstr "असमर्थित सत्यापन विधि"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+#| msgid "SSL unavailable"
+msgid "TLS not available"
+msgstr "TLS अनुपलब्ध"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#| msgid "SSL unavailable"
+msgid "Offline mode unavailable"
+msgstr "ऑफलाइन विधि अनुपलब्ध"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#| msgid "Path length exceeded"
+msgid "Search size limit exceeded"
+msgstr "खोज आकार सीमा ज्यादा हो गया"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
+#| msgid "Path length exceeded"
+msgid "Search time limit exceeded"
+msgstr "खोज सयम सीमा बढ़ गई"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+#| msgid "Invalid purpose"
+msgid "Invalid query"
+msgstr "अवैध प्रश्न"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+msgid "Query refused"
+msgstr "प्रश्न अस्वीकृत"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#| msgid "Invalid server URI"
+msgid "Invalid server version"
+msgstr "अवैध सर्वर संस्करण"
+
 #: ../camel/camel-cipher-context.c:102
 msgid "Signing is not supported by this cipher"
 msgstr "हस्ताक्षर इस सिफर के द्वारा समर्थित नहीं है"
@@ -1331,12 +1318,16 @@ msgstr "इस सिफर से आप कुंजी निर्यात
 msgid "Unable to create cache path"
 msgstr "कैश पथ निर्माण में अक्षम"
 
-#: ../camel/camel-data-cache.c:383
+#: ../camel/camel-data-cache.c:403
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "कैश प्रविष्टि नहीं हटा सकता: %s: %s"
 
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-db.c:469
+msgid "Insufficient memory"
+msgstr "अपर्याप्त स्मृति"
+
+#: ../camel/camel-disco-diary.c:198
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1347,131 +1338,136 @@ msgstr ""
 "इस सर्वर पर आगे की संक्रिया पुनः नहीं चलायी जायेगी जब आप\n"
 "संजाल से पुनर्संबंध जोड़ेंगे."
 
-#: ../camel/camel-disco-diary.c:260
+#: ../camel/camel-disco-diary.c:261
+#: ../camel/providers/imap/camel-imap-journal.c:318
 #, c-format
+#| msgid ""
+#| "Could not open `%s':\n"
+#| "%s\n"
+#| "Changes made to this folder will not be resynchronized."
 msgid ""
-"Could not open `%s':\n"
+"Could not open '%s':\n"
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 msgstr ""
-"`%s' à¤\95à¥\8b à¤¨à¤¹à¥\80à¤\82 à¤\96à¥\8bल à¤¸à¤\95ा :\n"
+"`%s' नहीं खोल सका :\n"
 "%s\n"
-"इस फोल्डर में किया गया परिवर्तन पुनर्तुल्यकालिक नहीं हो पायेगा."
+"à¤\87स à¤«à¤¼à¥\8bलà¥\8dडर à¤®à¥\87à¤\82 à¤\95िया à¤\97या à¤ªà¤°à¤¿à¤µà¤°à¥\8dतन à¤ªà¥\81नरà¥\8dतà¥\81लà¥\8dयà¤\95ालिà¤\95 à¤¨à¤¹à¥\80à¤\82 à¤¹à¥\8b à¤ªà¤¾à¤¯à¥\87à¤\97ा."
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:297
 msgid "Resynchronizing with server"
 msgstr "सर्वर से पुनर्तुल्यकालन"
 
-#: ../camel/camel-disco-folder.c:42 ../camel/camel-offline-folder.c:50
+#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52
 msgid "Copy folder content locally for offline operation"
-msgstr "ऑफलाइन संक्रिया के लिए फोल्डर अंतर्वस्तु की स्थानीय रूप से कापी करें"
+msgstr "à¤\91फलाà¤\87न à¤¸à¤\82à¤\95à¥\8dरिया à¤\95à¥\87 à¤²à¤¿à¤\8f à¤«à¤¼à¥\8bलà¥\8dडर à¤\85à¤\82तरà¥\8dवसà¥\8dतà¥\81 à¤\95à¥\80 à¤¸à¥\8dथानà¥\80य à¤°à¥\82प à¤¸à¥\87 à¤\95ापà¥\80 à¤\95रà¥\87à¤\82"
 
-#: ../camel/camel-disco-folder.c:104 ../camel/camel-offline-folder.c:109
+#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:111
 msgid "Downloading new messages for offline mode"
 msgstr "ऑफलाइन मोड के लिये नए संदेश को अधिभारित कर रहा है"
 
-#: ../camel/camel-disco-folder.c:467
+#: ../camel/camel-disco-folder.c:469
 #, c-format
 msgid "Preparing folder '%s' for offline"
-msgstr "ऑफलाइन के लिये '%s' फोल्डर को तैयार कर रहा है"
-
-#: ../camel/camel-disco-store.c:401
-#: ../camel/providers/imap/camel-imap-store.c:2971
+msgstr "ऑफलाइन के लिये '%s' फ़ोल्डर को तैयार कर रहा है"
+
+#: ../camel/camel-disco-store.c:403
+#: ../camel/providers/groupwise/camel-groupwise-store.c:226
+#: ../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:2997
 msgid "You must be working online to complete this operation"
 msgstr "इस संक्रिया को समाप्त करने के लिए आपको निश्चित रूप से ऑनलाइन काम करना पड़ेगा"
 
-#: ../camel/camel-exception.c:303
+#: ../camel/camel-exception.c:262
 msgid "No description available"
-msgstr ""
+msgstr "कोई वर्णन उपलब्ध नहीं"
 
-#: ../camel/camel-filter-driver.c:749
+#: ../camel/camel-filter-driver.c:795 ../camel/camel-filter-search.c:581
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "'%s' बाल प्रक्रिया बनाने में विफल: %s"
 
-#: ../camel/camel-filter-driver.c:791
+#: ../camel/camel-filter-driver.c:837
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s से अवैध संदेश धारा प्राप्त: %s"
 
-#: ../camel/camel-filter-driver.c:978 ../camel/camel-filter-driver.c:987
+#: ../camel/camel-filter-driver.c:1026 ../camel/camel-filter-driver.c:1035
 msgid "Syncing folders"
-msgstr "फोल्डर का तुल्यकालन कर रहा है"
+msgstr "फ़à¥\8bलà¥\8dडर à¤\95ा à¤¤à¥\81लà¥\8dयà¤\95ालन à¤\95र à¤°à¤¹à¤¾ à¤¹à¥\88"
 
-#: ../camel/camel-filter-driver.c:1076 ../camel/camel-filter-driver.c:1454
+#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1530
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "निस्पंदन विश्लेषण में दोष: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1085 ../camel/camel-filter-driver.c:1463
+#: ../camel/camel-filter-driver.c:1133 ../camel/camel-filter-driver.c:1539
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "निस्पंदन निस्पादन में त्रुटि: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1152
+#: ../camel/camel-filter-driver.c:1221
 msgid "Unable to open spool folder"
-msgstr "स्पूल फोल्डर को खोलने में अक्षम"
+msgstr "सà¥\8dपà¥\82ल à¤«à¤¼à¥\8bलà¥\8dडर à¤\95à¥\8b à¤\96à¥\8bलनà¥\87 à¤®à¥\87à¤\82 à¤\85à¤\95à¥\8dषम"
 
-#: ../camel/camel-filter-driver.c:1161
+#: ../camel/camel-filter-driver.c:1230
 msgid "Unable to process spool folder"
-msgstr "स्पूल फोल्डर की प्रक्रिया में अक्षम"
+msgstr "सà¥\8dपà¥\82ल à¤«à¤¼à¥\8bलà¥\8dडर à¤\95à¥\80 à¤ªà¥\8dरà¤\95à¥\8dरिया à¤®à¥\87à¤\82 à¤\85à¤\95à¥\8dषम"
 
-#: ../camel/camel-filter-driver.c:1176
+#: ../camel/camel-filter-driver.c:1246
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) संदेश प्राप्त कर रहा है"
 
-#: ../camel/camel-filter-driver.c:1180
+#: ../camel/camel-filter-driver.c:1250
 msgid "Cannot open message"
 msgstr "संदेश नहीं खोल सकता है"
 
-#: ../camel/camel-filter-driver.c:1181 ../camel/camel-filter-driver.c:1193
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d संदेश पर असफल"
 
-#: ../camel/camel-filter-driver.c:1207 ../camel/camel-filter-driver.c:1298
+#: ../camel/camel-filter-driver.c:1283 ../camel/camel-filter-driver.c:1374
 msgid "Syncing folder"
-msgstr "फोल्डर का तुल्यकालन कर रहा है"
+msgstr "फ़à¥\8bलà¥\8dडर à¤\95ा à¤¤à¥\81लà¥\8dयà¤\95ालन à¤\95र à¤°à¤¹à¤¾ à¤¹à¥\88"
 
-#: ../camel/camel-filter-driver.c:1211 ../camel/camel-filter-driver.c:1303
+#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1379
 msgid "Complete"
 msgstr "पूर्ण"
 
-#: ../camel/camel-filter-driver.c:1268
+#: ../camel/camel-filter-driver.c:1344
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d का %d संदेश प्राप्त कर रहा है"
 
-#: ../camel/camel-filter-driver.c:1283
+#: ../camel/camel-filter-driver.c:1359
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d के %d संदेश पर असफल"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "संदेश प्राप्त करने में असफल"
 
-#: ../camel/camel-filter-search.c:398
+#: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
 msgstr "इससे अवैध तर्क (सिस्टम-ध्वजा)"
 
-#: ../camel/camel-filter-search.c:413
+#: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
 msgstr "इससे अवैध तर्क (उपभोक्ता-टैग)"
 
-#: ../camel/camel-filter-search.c:578
-#, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "'%s' बाल प्रक्रिया बनाने में विफल: %s"
-
 #. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:700 ../camel/camel-filter-search.c:708
+#: ../camel/camel-filter-search.c:737 ../camel/camel-filter-search.c:745
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "निस्पंदन खोज के निस्पादन में त्रुटि: %s: %s"
 
-#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:479
+#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:608
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1480,7 +1476,8 @@ msgstr ""
 "खोज अभिव्यक्ति का विश्लेषण नहीं कर सकता: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:367 ../camel/camel-folder-search.c:489
+#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
+#: ../camel/camel-folder-search.c:618
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1489,67 +1486,78 @@ msgstr ""
 "खोज अभिव्यक्ति के क्रियान्वयन में दोष: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:675 ../camel/camel-folder-search.c:708
-msgid "(match-all) requires a single bool result"
-msgstr "(सबको मिलाएं) इसके लिए एकल बूल परिणाम जरूरी है"
-
-#: ../camel/camel-folder-search.c:758
-msgid "(match-threads) not allowed inside match-all"
-msgstr "(तंतुओं को मिलाएं) यह सबको मिलाइए के अंतर्गत आने की अनुमति नहीं देता है"
+#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:853
+#, c-format
+#| msgid "(match-all) requires a single bool result"
+msgid "(%s) requires a single bool result"
+msgstr "(%s) के लिए एकल बूल परिणाम जरूरी है"
 
-#: ../camel/camel-folder-search.c:761 ../camel/camel-folder-search.c:765
-msgid "(match-threads) requires a match type string"
-msgstr "(तंतुओं को मिलाएं) इसके लिए एक सुमेल प्रकार तंतु चाहिए"
+#: ../camel/camel-folder-search.c:906
+#, c-format
+#| msgid "(match-threads) not allowed inside match-all"
+msgid "(%s) not allowed inside %s"
+msgstr "(%s) स्वीकृत नहीं है %s के अंदर"
 
-#: ../camel/camel-folder-search.c:789
-msgid "(match-threads) expects an array result"
-msgstr "(तंतुओं को मिलाएं) इसे एक एरे परिणाम की आशा है"
+#: ../camel/camel-folder-search.c:912 ../camel/camel-folder-search.c:919
+#, c-format
+#| msgid "(match-threads) requires a match type string"
+msgid "(%s) requires a match type string"
+msgstr "(%s) के लिए मिलान प्रकार स्ट्रिंग की जरूरत है"
 
-#: ../camel/camel-folder-search.c:795
-msgid "(match-threads) requires the folder set"
-msgstr "(तंतुओं को मिलाएं) इसके लिए फोल्डर समुच्चय परिणाम जरूरी है"
+#: ../camel/camel-folder-search.c:946
+#, c-format
+#| msgid "(match-threads) expects an array result"
+msgid "(%s) expects an array result"
+msgstr "(%s) एक सरणी परिणाम की आशा करता है"
 
-#: ../camel/camel-folder-search.c:887
+#: ../camel/camel-folder-search.c:955
 #, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "अज्ञात शीर्षक पर प्रश्न निस्पादन: %s"
+#| msgid "(match-threads) requires the folder set"
+msgid "(%s) requires the folder set"
+msgstr "(%s) के लिए फ़ोल्डर सेट की जरूरत है"
 
-#: ../camel/camel-folder.c:615
+#: ../camel/camel-folder.c:696
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "असमर्थित संक्रिया: संदेश जोड़ें: %s के लिए"
 
-#: ../camel/camel-folder.c:1237
+#: ../camel/camel-folder.c:1398
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "असमर्थित संक्रिया: भाव से खोजें: %s के लिए"
 
-#: ../camel/camel-folder.c:1278
-#, fuzzy, c-format
+#: ../camel/camel-folder.c:1440
+#, c-format
+#| msgid "Unsupported operation: search by expression: for %s"
+msgid "Unsupported operation: count by expression: for %s"
+msgstr "असमर्थित संक्रिया: अभिव्यक्ति से गणना करें: %s के लिए"
+
+#: ../camel/camel-folder.c:1480
+#, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "असमर्थित संक्रिया: uids से खोजें: %s के लिए"
+msgstr "असमर्थित संक्रिया: UID से खोजें: %s के लिए"
 
-#: ../camel/camel-folder.c:1394
+#: ../camel/camel-folder.c:1596
 msgid "Moving messages"
 msgstr "संदेश प्रतिस्थापित कर रहा है"
 
-#: ../camel/camel-folder.c:1394
+#: ../camel/camel-folder.c:1596
 msgid "Copying messages"
 msgstr "संदेश कापी कर रहा है"
 
-#: ../camel/camel-folder.c:1648
+#: ../camel/camel-folder.c:1942
 msgid "Learning junk"
 msgstr "जंक को समझ रहा है"
 
-#: ../camel/camel-folder.c:1665
+#: ../camel/camel-folder.c:1959
 msgid "Learning non-junk"
 msgstr "गैर-जंक को समझ रहा है"
 
-#: ../camel/camel-folder.c:1684
+#: ../camel/camel-folder.c:1978
 msgid "Filtering new message(s)"
 msgstr "नए संदेश(शों) का निस्पंदन कर रहा है"
 
-#: ../camel/camel-gpg-context.c:753
+#: ../camel/camel-gpg-context.c:755
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1560,318 +1568,313 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:767
+#: ../camel/camel-gpg-context.c:770
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid इशारे के विश्लेषण में विफल."
 
-#: ../camel/camel-gpg-context.c:791 ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
 msgid "Failed to parse gpg passphrase request."
-msgstr "gpg à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f आग्रह के विश्लेषण में असफल."
+msgstr "gpg à¤\95à¥\82à¤\9fशबà¥\8dद आग्रह के विश्लेषण में असफल."
 
-#: ../camel/camel-gpg-context.c:824
-#, fuzzy, c-format
+#: ../camel/camel-gpg-context.c:828
+#, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr ""
-"à¤\86पà¤\95à¥\8b à¤\89पभà¥\8bà¤\95à¥\8dता à¤\95à¥\87 à¤²à¤¿à¤\8f à¤\95à¥\81à¤\82à¤\9cà¥\80 खोलने के लिए\n"
-"शबà¥\8dदà¤\95à¥\82à¤\9f की जरूरत है: \"%s\""
+"à¤\86पà¤\95à¥\8b à¤\85पनà¥\87 à¤¸à¥\8dमारà¥\8dà¤\9f à¤\95ारà¥\8dड à¤\95à¥\8b खोलने के लिए\n"
+"पिन की जरूरत है: \"%s\""
 
-#: ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:832
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 "आपको उपभोक्ता के लिए कुंजी खोलने के लिए\n"
-"शबà¥\8dदà¤\95à¥\82à¤\9f की जरूरत है: \"%s\""
+"à¤\95à¥\82à¤\9fशबà¥\8dद की जरूरत है: \"%s\""
 
-#: ../camel/camel-gpg-context.c:832
-#, fuzzy, c-format
-msgid "Unexpected request from GnuPG for `%s'"
-msgstr "GnuPG से अप्रत्याशित अनुक्रिया: %s"
+#: ../camel/camel-gpg-context.c:837
+#, c-format
+msgid "Unexpected request from GnuPG for '%s'"
+msgstr "GnuPG से '%s' के लिए अप्रत्याशित आग्रह"
 
-#: ../camel/camel-gpg-context.c:857 ../camel/camel-gpg-context.c:1057
-#: ../camel/providers/nntp/camel-nntp-store.c:1271
-#, fuzzy
+#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1071
+#: ../camel/providers/nntp/camel-nntp-store.c:1304
 msgid "Canceled."
-msgstr "निरसित."
+msgstr "रदà¥\8dद"
 
-#: ../camel/camel-gpg-context.c:871
+#: ../camel/camel-gpg-context.c:876
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "à¤\97à¥\81पà¥\8dत à¤\95à¥\81à¤\82à¤\9cà¥\80 à¤\96à¥\8bलनà¥\87 à¤®à¥\87à¤\82 à¤\85सफल:३ à¤\97लत à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f दिया गया."
+msgstr "à¤\97à¥\81पà¥\8dत à¤\95à¥\81à¤\82à¤\9cà¥\80 à¤\96à¥\8bलनà¥\87 à¤®à¥\87à¤\82 à¤\85सफल:३ à¤\97लत à¤\95à¥\82à¤\9fशबà¥\8dद दिया गया."
 
-#: ../camel/camel-gpg-context.c:877
+#: ../camel/camel-gpg-context.c:884
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG से अप्रत्याशित अनुक्रिया: %s"
 
-#: ../camel/camel-gpg-context.c:929
+#: ../camel/camel-gpg-context.c:947
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "गोपन में असफल: कोई वैध प्राप्तकर्ता नहीं."
 
 #. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1195 ../camel/camel-gpg-context.c:1323
-#: ../camel/camel-gpg-context.c:1802 ../camel/camel-gpg-context.c:1847
+#: ../camel/camel-gpg-context.c:1209 ../camel/camel-gpg-context.c:1337
+#: ../camel/camel-gpg-context.c:1850 ../camel/camel-gpg-context.c:1895
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg के निस्पादन में विफल: %s"
 
-#: ../camel/camel-gpg-context.c:1291 ../camel/camel-smime-context.c:387
+#: ../camel/camel-gpg-context.c:1305 ../camel/camel-smime-context.c:598
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "हस्ताक्षर आंकड़ा उत्पन्न नहीं कर सका: %s"
 
-#: ../camel/camel-gpg-context.c:1338 ../camel/camel-gpg-context.c:1522
-#: ../camel/camel-gpg-context.c:1605 ../camel/camel-gpg-context.c:1620
-#: ../camel/camel-gpg-context.c:1724 ../camel/camel-gpg-context.c:1739
-#: ../camel/camel-gpg-context.c:1818 ../camel/camel-gpg-context.c:1863
+#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1554
+#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-gpg-context.c:1771 ../camel/camel-gpg-context.c:1786
+#: ../camel/camel-gpg-context.c:1866 ../camel/camel-gpg-context.c:1911
 msgid "Failed to execute gpg."
 msgstr "gpg के निस्पादन में विफल."
 
-#: ../camel/camel-gpg-context.c:1357
+#: ../camel/camel-gpg-context.c:1371
 msgid "This is a digitally signed message part"
 msgstr "यह डिजिटल रूप से हस्ताक्षरित संदेश का हिस्सा है"
 
-#: ../camel/camel-gpg-context.c:1442 ../camel/camel-gpg-context.c:1448
-#: ../camel/camel-gpg-context.c:1454 ../camel/camel-gpg-context.c:1470
-#: ../camel/camel-smime-context.c:690 ../camel/camel-smime-context.c:701
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-gpg-context.c:1458 ../camel/camel-gpg-context.c:1464
+#: ../camel/camel-gpg-context.c:1470 ../camel/camel-gpg-context.c:1485
+#: ../camel/camel-smime-context.c:901 ../camel/camel-smime-context.c:912
+#: ../camel/camel-smime-context.c:919
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "संदेश हस्ताक्षर की जांच नहीं कर सकता: अशुद्ध संदेश प्रारूप"
 
-#: ../camel/camel-gpg-context.c:1507
+#: ../camel/camel-gpg-context.c:1524
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "सà¤\82दà¥\87श à¤¹à¤¸à¥\8dताà¤\95à¥\8dषर à¤\95à¥\80 à¤\9cाà¤\82à¤\9a à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता: à¤\85सà¥\8dथायà¥\80 à¤¸à¤\82à¤\9aिà¤\95ा नहीं निर्मित कर सकता: %s"
+msgstr "सà¤\82दà¥\87श à¤¹à¤¸à¥\8dताà¤\95à¥\8dषर à¤\95à¥\80 à¤\9cाà¤\82à¤\9a à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता: à¤\85सà¥\8dथायà¥\80 à¤«à¤¼à¤¾à¤\87ल नहीं निर्मित कर सकता: %s"
 
-#: ../camel/camel-gpg-context.c:1588
+#: ../camel/camel-gpg-context.c:1623
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "गोपन आंकड़ा उत्पन्न नहीं सका: %s"
 
-#: ../camel/camel-gpg-context.c:1638
+#: ../camel/camel-gpg-context.c:1673
 msgid "This is a digitally encrypted message part"
 msgstr "यह डिजिटल रूप से गुप्त संदेश का हिस्सा है"
 
-#: ../camel/camel-gpg-context.c:1695
-msgid "Failed to decrypt MIME part: protocol error"
-msgstr "MIME हिस्से के विगोपन में विफल: प्रोटोकाल त्रुटि"
-
-#: ../camel/camel-gpg-context.c:1706
+#: ../camel/camel-gpg-context.c:1726 ../camel/camel-gpg-context.c:1734
+#: ../camel/camel-gpg-context.c:1753
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "संदेश हस्ताक्षर की जांच नहीं कर सकता: अशुद्ध संदेश प्रारूप"
 
-#: ../camel/camel-gpg-context.c:1760 ../camel/camel-smime-context.c:964
+#: ../camel/camel-gpg-context.c:1743
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr "MIME हिस्से के विगोपन में विफल: प्रोटोकाल त्रुटि"
+
+#: ../camel/camel-gpg-context.c:1808 ../camel/camel-smime-context.c:1176
 msgid "Encrypted content"
 msgstr "गुप्त अंतर्वस्तु"
 
-#: ../camel/camel-gpg-context.c:1779
+#: ../camel/camel-gpg-context.c:1827
 msgid "Unable to parse message content"
 msgstr "संदेश अंतर्वस्तु के विश्लेषण में अक्षम"
 
-#: ../camel/camel-gpg-context.c:1803 ../camel/camel-gpg-context.c:1848
-#: ../camel/camel-tcp-stream-openssl.c:631
-#: ../camel/providers/imap4/camel-imap4-engine.c:1550
-#: ../camel/providers/imap4/camel-imap4-engine.c:1589
-#: ../camel/providers/imap4/camel-imap4-engine.c:1634
-#: ../camel/providers/imap4/camel-imap4-engine.c:1690
-#: ../camel/providers/imap4/camel-imap4-store.c:807
-#: ../camel/providers/imap4/camel-imap4-store.c:1482
-#: ../camel/providers/imap4/camel-imap4-utils.c:575
-#: ../camel/providers/smtp/camel-smtp-transport.c:160
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/camel-gpg-context.c:1851 ../camel/camel-gpg-context.c:1896
+#: ../camel/camel-tcp-stream-openssl.c:635
+#: ../camel/providers/imap4/camel-imap4-utils.c:624
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: ../camel/camel-lock-client.c:100
+#: ../camel/camel-lock-client.c:104
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "सहायता पाइप के लॉकिंग बिल्ड नहीं कर सकता: %s"
 
-#: ../camel/camel-lock-client.c:113
+#: ../camel/camel-lock-client.c:126
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "सहायक को लॉक करना फॉर्क नहीं कर सकता: %s"
 
-#: ../camel/camel-lock-client.c:191 ../camel/camel-lock-client.c:214
+#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "'%s' पर ताला नहीं लगा सका: ताला सहायक के साथ प्रोटोकाल त्रुटि"
 
-#: ../camel/camel-lock-client.c:204
+#: ../camel/camel-lock-client.c:217
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "'%s' पर ताला नहीं लगा सका"
 
-#: ../camel/camel-lock.c:95 ../camel/camel-lock.c:116
+#: ../camel/camel-lock.c:103
 #, c-format
 msgid "Could not create lock file for %s: %s"
-msgstr "%s à¤\95à¥\87 à¤²à¤¿à¤\8f à¤¤à¤¾à¤²à¤¾ à¤¸à¤\82à¤\9aिà¤\95ा नहीं बना सका: %s"
+msgstr "%s à¤\95à¥\87 à¤²à¤¿à¤\8f à¤¤à¤¾à¤²à¤¾ à¤«à¤¼à¤¾à¤\87ल नहीं बना सका: %s"
 
-#: ../camel/camel-lock.c:157
+#: ../camel/camel-lock.c:144
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "%s पर लॉक फाइल पाने के लिये कोशिश में समय समाप्त. फिर कोशिश करें."
 
-#: ../camel/camel-lock.c:212
+#: ../camel/camel-lock.c:199
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2) के प्रयोग से ताला पाने में विफल: %s"
 
-#: ../camel/camel-lock.c:275
+#: ../camel/camel-lock.c:262
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) के प्रयोग से ताला पाने में विफल: %s"
 
-#: ../camel/camel-movemail.c:104
+#: ../camel/camel-movemail.c:106
 #, c-format
 msgid "Could not check mail file %s: %s"
-msgstr "%s à¤¡à¤¾à¤\95 à¤¸à¤\82à¤\9aिà¤\95ा की जांच नहीं कर सका: %s"
+msgstr "%s à¤¡à¤¾à¤\95 à¤«à¤¼à¤¾à¤\87ल की जांच नहीं कर सका: %s"
 
-#: ../camel/camel-movemail.c:117
+#: ../camel/camel-movemail.c:119
 #, c-format
 msgid "Could not open mail file %s: %s"
-msgstr "%s à¤¡à¤¾à¤\95 à¤¸à¤\82à¤\9aिà¤\95ा को नहीं खोल सका: %s"
+msgstr "%s à¤¡à¤¾à¤\95 à¤«à¤¼à¤¾à¤\87ल को नहीं खोल सका: %s"
 
-#: ../camel/camel-movemail.c:125
+#: ../camel/camel-movemail.c:127
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr "%s à¤\85सà¥\8dथायà¥\80 à¤¡à¤¾à¤\95 à¤¸à¤\82à¤\9aिà¤\95ा को नहीं खोल सका: %s"
+msgstr "%s à¤\85सà¥\8dथायà¥\80 à¤¡à¤¾à¤\95 à¤«à¤¼à¤¾à¤\87ल को नहीं खोल सका: %s"
 
-#: ../camel/camel-movemail.c:154
+#: ../camel/camel-movemail.c:156
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "%s à¤\85सà¥\8dथायà¥\80 à¤¸à¤\82à¤\9aिà¤\95ा में डाक संग्रहन में असफल: %s"
+msgstr "%s à¤\85सà¥\8dथायà¥\80 à¤«à¤¼à¤¾à¤\87ल में डाक संग्रहन में असफल: %s"
 
-#: ../camel/camel-movemail.c:184
+#: ../camel/camel-movemail.c:186
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "पाइप नहीं बना सका: %s"
 
-#: ../camel/camel-movemail.c:196
+#: ../camel/camel-movemail.c:198
 #, c-format
 msgid "Could not fork: %s"
 msgstr "फोर्क नहीं कर सका: %s"
 
-#: ../camel/camel-movemail.c:234
+#: ../camel/camel-movemail.c:236
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail प्रोग्राम विफल हो गया: %s"
 
-#: ../camel/camel-movemail.c:235
+#: ../camel/camel-movemail.c:237
 msgid "(Unknown error)"
 msgstr "(अज्ञात त्रुटि)"
 
-#: ../camel/camel-movemail.c:258
+#: ../camel/camel-movemail.c:260
 #, c-format
 msgid "Error reading mail file: %s"
-msgstr "डाà¤\95 à¤¸à¤\82à¤\9aिà¤\95ा पढ़ने में दोष: %s"
+msgstr "डाà¤\95 à¤«à¤¼à¤¾à¤\87ल पढ़ने में दोष: %s"
 
-#: ../camel/camel-movemail.c:269
+#: ../camel/camel-movemail.c:271
 #, c-format
 msgid "Error writing mail temp file: %s"
-msgstr "डाà¤\95 à¤\85सà¥\8dथायà¥\80 à¤¸à¤\82à¤\9aिà¤\95ा को लिखने में दोष: %s"
+msgstr "डाà¤\95 à¤\85सà¥\8dथायà¥\80 à¤«à¤¼à¤¾à¤\87ल को लिखने में दोष: %s"
 
-#: ../camel/camel-movemail.c:462 ../camel/camel-movemail.c:529
+#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
 #, c-format
 msgid "Error copying mail temp file: %s"
-msgstr "डाà¤\95 à¤\85सà¥\8dथायà¥\80 à¤¸à¤\82à¤\9aिà¤\95ा को कापी करने में दोष: %s"
+msgstr "डाà¤\95 à¤\85सà¥\8dथायà¥\80 à¤«à¤¼à¤¾à¤\87ल को कापी करने में दोष: %s"
 
 #: ../camel/camel-multipart-signed.c:593
 msgid "parse error"
 msgstr "त्रुटि विश्लेषण करें"
 
-#: ../camel/camel-net-utils.c:497 ../camel/camel-net-utils.c:659
-#: ../camel/camel-net-utils.c:790
-#: ../camel/providers/pop3/camel-pop3-store.c:445
-#: ../camel/providers/pop3/camel-pop3-store.c:526
-#, fuzzy
+#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
+#: ../camel/camel-net-utils.c:799
+#: ../camel/providers/pop3/camel-pop3-store.c:448
+#: ../camel/providers/pop3/camel-pop3-store.c:548
 msgid "Canceled"
 msgstr "रद्द"
 
-#: ../camel/camel-net-utils.c:516
+#: ../camel/camel-net-utils.c:524
 msgid "cannot create thread"
 msgstr "थ्रेड नहीं निर्मित कर सकता"
 
-#: ../camel/camel-net-utils.c:663
+#: ../camel/camel-net-utils.c:671
 #, c-format
 msgid "Resolving: %s"
 msgstr "हल कर रहा है: %s"
 
-#: ../camel/camel-net-utils.c:685
+#: ../camel/camel-net-utils.c:693
 msgid "Host lookup failed"
 msgstr "मेजबान देखने में असफलता"
 
-#: ../camel/camel-net-utils.c:687
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "मेजबान देखने में असफलता: %s: %s"
 
-#: ../camel/camel-net-utils.c:794
+#: ../camel/camel-net-utils.c:803
 msgid "Resolving address"
 msgstr "पता हल कर रहा है"
 
-#: ../camel/camel-net-utils.c:814
+#: ../camel/camel-net-utils.c:823
 msgid "Name lookup failed"
 msgstr "नाम देखना विफल"
 
-#: ../camel/camel-net-utils.c:817
+#: ../camel/camel-net-utils.c:826
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "नाम देखना विफल: %s"
 
-#: ../camel/camel-offline-folder.c:252
+#: ../camel/camel-offline-folder.c:253
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "%s फोल्डर से डिस्क में संदेश तुल्यकालित कर रहा है"
+msgstr "%s à¤«à¤¼à¥\8bलà¥\8dडर à¤¸à¥\87 à¤¡à¤¿à¤¸à¥\8dà¤\95 à¤®à¥\87à¤\82 à¤¸à¤\82दà¥\87श à¤¤à¥\81लà¥\8dयà¤\95ालित à¤\95र à¤°à¤¹à¤¾ à¤¹à¥\88"
 
-#: ../camel/camel-offline-journal.c:163 ../camel/camel-offline-journal.c:186
+#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
 #, c-format
-msgid "Cannot write offline journal for folder `%s': %s"
-msgstr "`%s' फोल्डर के लिये ऑफलाइन जर्नल लिख नहीं सकता है: %s"
+#| msgid "Cannot write offline journal for folder `%s': %s"
+msgid "Cannot write offline journal for folder '%s': %s"
+msgstr "'%s' फ़ोल्डर के लिए ऑफलाइन जर्नल लिख नहीं सकता है: %s"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "Virtual folder email provider"
-msgstr "आभासी फोल्डर ईडाक प्रस्तोता"
+msgstr "à¤\86भासà¥\80 à¤«à¤¼à¥\8bलà¥\8dडर à¤\88डाà¤\95 à¤ªà¥\8dरसà¥\8dतà¥\8bता"
 
-#: ../camel/camel-provider.c:64
+#: ../camel/camel-provider.c:62
 msgid "For reading mail as a query of another set of folders"
-msgstr "अन्य फोल्डर समुच्चय के प्रश्न के रूप में डाक पढ़ने के लिए"
+msgstr "à¤\85नà¥\8dय à¤«à¤¼à¥\8bलà¥\8dडर à¤¸à¤®à¥\81à¤\9aà¥\8dà¤\9aय à¤\95à¥\87 à¤ªà¥\8dरशà¥\8dन à¤\95à¥\87 à¤°à¥\82प à¤®à¥\87à¤\82 à¤¡à¤¾à¤\95 à¤ªà¤¢à¤¼à¤¨à¥\87 à¤\95à¥\87 à¤²à¤¿à¤\8f"
 
-#: ../camel/camel-provider.c:188
+#: ../camel/camel-provider.c:184
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s अधिभारित नहीं कर सका: इस सिस्टम पर मोड्यूल अधिभारण को समर्थन नहीं है."
 
-#: ../camel/camel-provider.c:197
+#: ../camel/camel-provider.c:193
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s को अधिभारित नहीं कर सका: %s"
 
-#: ../camel/camel-provider.c:205
+#: ../camel/camel-provider.c:201
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s को अधिभारित नहीं कर सका: मोड्यूल में कोई आरंभीकरण कूट नहीं है."
 
-#: ../camel/camel-provider.c:377 ../camel/camel-session.c:166
+#: ../camel/camel-provider.c:373 ../camel/camel-session.c:182
 #, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "`%s' प्रोटोकाल के लिये कोई प्रस्तोता उपलब्ध नहीं"
+#| msgid "No provider available for protocol `%s'"
+msgid "No provider available for protocol '%s'"
+msgstr "'%s' प्रोटोकॉल के लिये कोई प्रदाता उपलब्ध नहीं"
 
-#: ../camel/camel-sasl-anonymous.c:35
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "Anonymous"
 msgstr "अज्ञात"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:39
 msgid "This option will connect to the server using an anonymous login."
 msgstr "अज्ञात लागिन के उपयोग से यह विकल्प सर्वर से जोड़ेगा."
 
-#: ../camel/camel-sasl-anonymous.c:122 ../camel/camel-sasl-plain.c:89
+#: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
 msgid "Authentication failed."
 msgstr "सत्यापन असफल"
 
-#: ../camel/camel-sasl-anonymous.c:131
+#: ../camel/camel-sasl-anonymous.c:133
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1880,7 +1883,7 @@ msgstr ""
 "अवैध ईडाक पता अनुरेखी सूचना:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:143
+#: ../camel/camel-sasl-anonymous.c:145
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1889,7 +1892,7 @@ msgstr ""
 "अवैध अपारदर्शी पता अनुरेखी सूचना:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:155
+#: ../camel/camel-sasl-anonymous.c:157
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1907,7 +1910,7 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"सà¥\81रà¤\95à¥\8dषित CRAM-MD5 à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f के उपयोग से यह विकल्प सर्वर से जोड़ेगा, अगर सर्वर इसे समर्थन देता "
+"सà¥\81रà¤\95à¥\8dषित CRAM-MD5 à¤\95à¥\82à¤\9fशबà¥\8dद के उपयोग से यह विकल्प सर्वर से जोड़ेगा, अगर सर्वर इसे समर्थन देता "
 "है."
 
 #: ../camel/camel-sasl-digest-md5.c:48
@@ -1919,42 +1922,42 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"सà¥\81रà¤\95à¥\8dषित DIGEST-MD5 à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f के उपयोग से यह विकल्प सर्वर से जोड़ेगा, अगर सर्वर इसे समर्थन "
+"सà¥\81रà¤\95à¥\8dषित DIGEST-MD5 à¤\95à¥\82à¤\9fशबà¥\8dद के उपयोग से यह विकल्प सर्वर से जोड़ेगा, अगर सर्वर इसे समर्थन "
 "देता है."
 
-#: ../camel/camel-sasl-digest-md5.c:818
+#: ../camel/camel-sasl-digest-md5.c:845
 msgid "Server challenge too long (>2048 octets)"
 msgstr "सर्वर चुनौती काफी लंबी है (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:827
+#: ../camel/camel-sasl-digest-md5.c:854
 msgid "Server challenge invalid\n"
 msgstr "सर्वर चुनौती अवैध है\n"
 
-#: ../camel/camel-sasl-digest-md5.c:833
+#: ../camel/camel-sasl-digest-md5.c:860
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "सर्वर चुनौती के पास अवैध \"सुरक्षा की गुणवत्ता \" टोकन है"
 
-#: ../camel/camel-sasl-digest-md5.c:863
+#: ../camel/camel-sasl-digest-md5.c:890
 msgid "Server response did not contain authorization data"
 msgstr "सर्वर अनुक्रिया के पास प्राधिकार आंकड़ा नहीं है"
 
-#: ../camel/camel-sasl-digest-md5.c:881
+#: ../camel/camel-sasl-digest-md5.c:908
 msgid "Server response contained incomplete authorization data"
 msgstr "सर्वर अनुक्रिया के पास अपूर्ण प्राधिकार आंकड़ा है"
 
-#: ../camel/camel-sasl-digest-md5.c:891
+#: ../camel/camel-sasl-digest-md5.c:918
 msgid "Server response does not match"
 msgstr "सर्वर अनुक्रिया मेल नहीं खाता है"
 
-#: ../camel/camel-sasl-gssapi.c:57
+#: ../camel/camel-sasl-gssapi.c:64
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:59
+#: ../camel/camel-sasl-gssapi.c:66
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Kerberos 5 सत्यापन के उपयोग से यह विकल्प सर्वर से जोड़ेगा."
 
-#: ../camel/camel-sasl-gssapi.c:157
+#: ../camel/camel-sasl-gssapi.c:164
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -1962,17 +1965,17 @@ msgstr ""
 "दिये गये श्रेय के द्वारा निर्दिष्ट यांत्रिकी समर्थित नहीं है, या कार्यान्वयन के द्वारा "
 "अपरिचित है."
 
-#: ../camel/camel-sasl-gssapi.c:162
+#: ../camel/camel-sasl-gssapi.c:169
 msgid "The provided target_name parameter was ill-formed."
 msgstr "दिया गया लक्ष्यनाम पैरामीटर कु-रूप था."
 
-#: ../camel/camel-sasl-gssapi.c:165
+#: ../camel/camel-sasl-gssapi.c:172
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "दिया गया लक्ष्यनाम पैरामीटर एक अवैध या असमर्थित नाम के प्रकार को समाहित करता है."
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:176
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -1980,13 +1983,13 @@ msgstr ""
 "input_token अलग चैनल बाइंडिंग को उनमें समाहित करता है input_chan_bindings पैरामीटर "
 "से होकर."
 
-#: ../camel/camel-sasl-gssapi.c:174
+#: ../camel/camel-sasl-gssapi.c:181
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "आगतटोकन के पास एक अवैध हस्ताक्षर है, या एक हस्ताक्षर है जिसको जांचा नहीं जा सका है."
 
-#: ../camel/camel-sasl-gssapi.c:178
+#: ../camel/camel-sasl-gssapi.c:185
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -1994,42 +1997,42 @@ msgstr ""
 "संदर्भ आरंभ के लिये दी गई महत्व मान्य नहीं था, या महत्व नियंत्रण किसी महत्व का संदर्भ नहीं "
 "लेता है."
 
-#: ../camel/camel-sasl-gssapi.c:183
+#: ../camel/camel-sasl-gssapi.c:190
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "दी गई संदर्भ नियंत्रण मान्य संदर्भ का सहारा नहीं लेती."
 
-#: ../camel/camel-sasl-gssapi.c:186
+#: ../camel/camel-sasl-gssapi.c:193
 msgid "The consistency checks performed on the input_token failed."
 msgstr "सुसंगतता जांच input_token पर विफल रही."
 
-#: ../camel/camel-sasl-gssapi.c:189
+#: ../camel/camel-sasl-gssapi.c:196
 msgid "The consistency checks performed on the credential failed."
 msgstr "महत्व पर किया सुसंगतता जांच विफल रही."
 
-#: ../camel/camel-sasl-gssapi.c:192
+#: ../camel/camel-sasl-gssapi.c:199
 msgid "The referenced credentials have expired."
 msgstr "सदर्भ महत्व का समय समाप्त हो गया."
 
-#: ../camel/camel-sasl-gssapi.c:198 ../camel/camel-sasl-gssapi.c:246
-#: ../camel/camel-sasl-gssapi.c:282 ../camel/camel-sasl-gssapi.c:297
-#: ../camel/camel-sasl-kerberos4.c:229
-#: ../camel/providers/imap/camel-imap-store.c:1281
+#: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
+#: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
+#: ../camel/camel-sasl-kerberos4.c:231
+#: ../camel/providers/imap/camel-imap-store.c:1273
 msgid "Bad authentication response from server."
 msgstr "सर्वर से गलत सत्यापन अनुक्रिया."
 
-#: ../camel/camel-sasl-gssapi.c:307
+#: ../camel/camel-sasl-gssapi.c:314
 msgid "Unsupported security layer."
 msgstr "असमर्थित सुरक्षा परत."
 
-#: ../camel/camel-sasl-kerberos4.c:45
+#: ../camel/camel-sasl-kerberos4.c:47
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: ../camel/camel-sasl-kerberos4.c:47
+#: ../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:172
+#: ../camel/camel-sasl-kerberos4.c:174
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -2038,53 +2041,53 @@ msgstr ""
 "Kerberos टिकट नहीं पा सका:\n"
 "%s"
 
-#: ../camel/camel-sasl-login.c:34
+#: ../camel/camel-sasl-login.c:36
 msgid "Login"
 msgstr "लागिन"
 
-#: ../camel/camel-sasl-login.c:36 ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
 msgid "This option will connect to the server using a simple password."
-msgstr "साधारण à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f के उपयोग से यह विकल्प सर्वर से जोड़ेगा."
+msgstr "साधारण à¤\95à¥\82à¤\9fशबà¥\8dद के उपयोग से यह विकल्प सर्वर से जोड़ेगा."
 
-#: ../camel/camel-sasl-login.c:133
+#: ../camel/camel-sasl-login.c:135
 msgid "Unknown authentication state."
 msgstr "अज्ञात सत्यापन स्थिति."
 
-#: ../camel/camel-sasl-ntlm.c:32
+#: ../camel/camel-sasl-ntlm.c:34
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:36
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
-msgstr "NTLM / à¤¸à¥\81रà¤\95à¥\8dषित à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f सत्यापन के उपयोग से यह विकल्प विंडो आधारित सर्वर से जोड़ेगा."
+msgstr "NTLM / à¤¸à¥\81रà¤\95à¥\8dषित à¤\95à¥\82à¤\9fशबà¥\8dद सत्यापन के उपयोग से यह विकल्प विंडो आधारित सर्वर से जोड़ेगा."
 
-#: ../camel/camel-sasl-plain.c:34
+#: ../camel/camel-sasl-plain.c:36
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:37
+#: ../camel/camel-sasl-popb4smtp.c:39
 msgid "POP before SMTP"
 msgstr "SMTP के पहले POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:41
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "SMTP à¤ªà¤° à¤ªà¥\8dरयास à¤\95à¥\87 à¤ªà¤¹à¤²à¥\87 à¤¯à¤¹ à¤µà¤¿à¤\95लà¥\8dप à¤\8fà¤\95 POP à¤¸à¤\82बà¤\82धन को प्राधिकृत करेगा"
+msgstr "SMTP à¤ªà¤° à¤ªà¥\8dरयास à¤\95à¥\87 à¤ªà¤¹à¤²à¥\87 à¤¯à¤¹ à¤µà¤¿à¤\95लà¥\8dप à¤\8fà¤\95 POP à¤\95नà¥\87à¤\95à¥\8dशन को प्राधिकृत करेगा"
 
-#: ../camel/camel-sasl-popb4smtp.c:104
+#: ../camel/camel-sasl-popb4smtp.c:106
 msgid "POP Source URI"
 msgstr "POP श्रोत URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:107
+#: ../camel/camel-sasl-popb4smtp.c:109
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "एक अज्ञात परिवहन के प्रयोग से SMTP प्राधिकार के पूर्व POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:112
+#: ../camel/camel-sasl-popb4smtp.c:114
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "एक गैर pop श्रोत के प्रयोग से SMTP प्राधिकार के पूर्व POP"
 
-#: ../camel/camel-search-private.c:152
+#: ../camel/camel-search-private.c:149
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "सामान्या एक्स्रेषन कंपाइलेशन विफल: %s: %s"
@@ -2104,379 +2107,382 @@ msgstr "'%s' URL को एक मेजबान घटक की जरूर
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URL को एक पथ घटक की जरूरत है"
 
-#: ../camel/camel-session.c:292
+#: ../camel/camel-session.c:308
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
-"%s à¤¡à¤¾à¤¯à¤°à¥\87à¤\95à¥\8dà¤\9fरà¥\80 नहीं निर्मित कर सका:\n"
+"%s à¤¨à¤¿à¤°à¥\8dदà¥\87शिà¤\95ा नहीं निर्मित कर सका:\n"
 "%s"
 
-#: ../camel/camel-smime-context.c:229
+#: ../camel/camel-session.c:483
+#, c-format
+#| msgid "%sPlease enter the POP password for %s on host %s"
+msgid "Please enter the %s password for %s on host %s."
+msgstr "कृपया %s कूटशब्द %s के लिए %s मेजबान पर दाखिल करें."
+
+#: ../camel/camel-session.c:822
+msgid "Camel session doesn't support forwarding of a message."
+msgstr ""
+
+#: ../camel/camel-smime-context.c:440 ../camel/camel-smime-context.c:984
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' के लिये प्रमाणपत्र नहीं पा सकता है"
 
-#: ../camel/camel-smime-context.c:235
+#: ../camel/camel-smime-context.c:446
 msgid "Cannot create CMS message"
 msgstr "CMS संदेश नहीं निर्मित कर सकता है"
 
-#: ../camel/camel-smime-context.c:240
+#: ../camel/camel-smime-context.c:451
 msgid "Cannot create CMS signed data"
 msgstr "CMS हस्ताक्षरित आंकड़ा नहीं निर्मित कर सकता है"
 
-#: ../camel/camel-smime-context.c:246
+#: ../camel/camel-smime-context.c:457
 msgid "Cannot attach CMS signed data"
 msgstr "CMS हस्ताक्षरित आंकड़ा नहीं संलग्न कर सकता है"
 
-#: ../camel/camel-smime-context.c:253
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot attach CMS data"
 msgstr "CMS आंकड़ा नहीं संलग्न कर सकता है"
 
-#: ../camel/camel-smime-context.c:259
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot create CMS Signer information"
 msgstr "CMS हस्ताक्षरकर्ता सूचना नहीं निर्मित कर सकता है"
 
-#: ../camel/camel-smime-context.c:265
+#: ../camel/camel-smime-context.c:476
 msgid "Cannot find certificate chain"
 msgstr "प्रमाणपत्र श्रृंखला नहीं पा सकता है"
 
-#: ../camel/camel-smime-context.c:271
+#: ../camel/camel-smime-context.c:482
 msgid "Cannot add CMS Signing time"
 msgstr "CMS हस्ताक्षर समय नहीं जोड़ सकता"
 
-#: ../camel/camel-smime-context.c:293 ../camel/camel-smime-context.c:305
+#: ../camel/camel-smime-context.c:504 ../camel/camel-smime-context.c:516
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' के लिये गोपन प्रमाणपत्र मौजूद नहीं है"
 
-#: ../camel/camel-smime-context.c:312
+#: ../camel/camel-smime-context.c:523
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs गुण में जोड़ नहीं सकता है"
 
-#: ../camel/camel-smime-context.c:317
+#: ../camel/camel-smime-context.c:528
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs गुण में जोड़ नहीं सकता है"
 
-#: ../camel/camel-smime-context.c:322
+#: ../camel/camel-smime-context.c:533
 msgid "Cannot add encryption certificate"
 msgstr "गोपन प्रमाणपत्र जोड़ नहीं सकता है"
 
-#: ../camel/camel-smime-context.c:328
+#: ../camel/camel-smime-context.c:539
 msgid "Cannot add CMS Signer information"
 msgstr "CMS Signer सूचना जोड़ नहीं सकता है"
 
-#: ../camel/camel-smime-context.c:398 ../camel/camel-smime-context.c:846
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:1056
 msgid "Cannot create encoder context"
 msgstr "इनकोडर संदर्भ नहीं बना सकता"
 
-#: ../camel/camel-smime-context.c:404
+#: ../camel/camel-smime-context.c:615
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS इनकोडर में आंकड़े जोड़ने में विफल"
 
-#: ../camel/camel-smime-context.c:409 ../camel/camel-smime-context.c:863
+#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:1073
 msgid "Failed to encode data"
 msgstr "आंकड़ा इनकोड में विफल"
 
-#: ../camel/camel-smime-context.c:482
+#: ../camel/camel-smime-context.c:693
 msgid "Unverified"
 msgstr "अपरीक्षित"
 
-#: ../camel/camel-smime-context.c:484
+#: ../camel/camel-smime-context.c:695
 msgid "Good signature"
 msgstr "उत्तम हस्ताक्षर"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:697
 msgid "Bad signature"
 msgstr "गलत हस्ताक्षर"
 
-#: ../camel/camel-smime-context.c:488
+#: ../camel/camel-smime-context.c:699
 msgid "Content tampered with or altered in transit"
 msgstr "परिवहन में टैंपर हुये सामग्री"
 
-#: ../camel/camel-smime-context.c:490
+#: ../camel/camel-smime-context.c:701
 msgid "Signing certificate not found"
 msgstr "प्रमाणपत्र का हस्ताक्षर नहीं मिला"
 
-#: ../camel/camel-smime-context.c:492
+#: ../camel/camel-smime-context.c:703
 msgid "Signing certificate not trusted"
 msgstr "प्रमाणपत्र का हस्ताक्षर विश्वस्त नहीं"
 
-#: ../camel/camel-smime-context.c:494
+#: ../camel/camel-smime-context.c:705
 msgid "Signature algorithm unknown"
 msgstr "हस्ताक्षर एलागरिथम अज्ञात"
 
-#: ../camel/camel-smime-context.c:496
+#: ../camel/camel-smime-context.c:707
 msgid "Signature algorithm unsupported"
 msgstr "हस्ताक्षर एलागरिथम असमर्थित"
 
-#: ../camel/camel-smime-context.c:498
+#: ../camel/camel-smime-context.c:709
 msgid "Malformed signature"
 msgstr "कुरूप हस्ताक्षर "
 
-#: ../camel/camel-smime-context.c:500
+#: ../camel/camel-smime-context.c:711
 msgid "Processing error"
 msgstr "प्रक्रिया दोष"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:748
 msgid "No signed data in signature"
 msgstr "हस्ताक्षर में कोई हस्ताक्षरित आंकड़ा नहीं"
 
-#: ../camel/camel-smime-context.c:544
+#: ../camel/camel-smime-context.c:755
 msgid "Digests missing from enveloped data"
 msgstr "लिफाफाकृत आंकड़ों से डायजेस्ट नहीं मिल रहा है"
 
-#: ../camel/camel-smime-context.c:557 ../camel/camel-smime-context.c:567
+#: ../camel/camel-smime-context.c:768 ../camel/camel-smime-context.c:778
 msgid "Cannot calculate digests"
 msgstr "डायजेस्ट की गणना नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:572
+#: ../camel/camel-smime-context.c:783
 msgid "Cannot set message digests"
 msgstr "संदेश डायजेस्ट सेट नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:582 ../camel/camel-smime-context.c:587
+#: ../camel/camel-smime-context.c:793 ../camel/camel-smime-context.c:798
 msgid "Certificate import failed"
 msgstr "प्रमाणपत्र आयात असफल"
 
-#: ../camel/camel-smime-context.c:597
+#: ../camel/camel-smime-context.c:808
+#, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "सिर्फ संदेश को प्रमाणपत्र दें, प्रमाणपत्रों की जांच नहीं कर सकता"
 
-#: ../camel/camel-smime-context.c:600
+#: ../camel/camel-smime-context.c:811
+#, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "प्रमाणपत्र अकेला संदेश है, प्रमाणपत्र आयातित किया गया और जांच किया गया"
 
-#: ../camel/camel-smime-context.c:604
+#: ../camel/camel-smime-context.c:815
 msgid "Cannot find signature digests"
 msgstr "हस्ताक्षर डायजेस्ट प्राप्त नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:620
+#: ../camel/camel-smime-context.c:831
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "हस्ताक्षरकर्ता: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:721
+#: ../camel/camel-smime-context.c:932 ../camel/camel-smime-context.c:1156
 msgid "Decoder failed"
 msgstr "डिकोडर विफल"
 
-#: ../camel/camel-smime-context.c:773
-#, c-format
-msgid "Cannot find certificate for `%s'"
-msgstr "`%s' के लिये प्रमाणपत्र नहीं पा सकता है"
-
-#: ../camel/camel-smime-context.c:780
+#: ../camel/camel-smime-context.c:991
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "साझा इकट्ठा गोपन एलागरिथम प्राप्त नहीं कर सकता है"
 
-#. PORT_GetError(); ??
-#: ../camel/camel-smime-context.c:789
+#: ../camel/camel-smime-context.c:999
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "गोपन बल्क कुंजी के लिये स्थान प्रदान नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:1010
 msgid "Cannot create CMS Message"
 msgstr "CMS संदेश नहीं निर्मित कर सकता"
 
-#: ../camel/camel-smime-context.c:806
+#: ../camel/camel-smime-context.c:1016
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS लिफाफाकृत आंकड़ा बना नहीं सकता है"
 
-#: ../camel/camel-smime-context.c:812
+#: ../camel/camel-smime-context.c:1022
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS लिफाफाकृत आंकड़ा संलग्न नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:818
+#: ../camel/camel-smime-context.c:1028
 msgid "Cannot attach CMS data object"
 msgstr "CMS आंकड़ा वस्तु संलग्न नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:827
+#: ../camel/camel-smime-context.c:1037
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS प्राप्तकर्ता सूचना निर्मित नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:832
+#: ../camel/camel-smime-context.c:1042
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS प्राप्तकर्ता सूचना जोड़ नहीं सकता है"
 
-#: ../camel/camel-smime-context.c:857
+#: ../camel/camel-smime-context.c:1067
 msgid "Failed to add data to encoder"
 msgstr "इनकोडर में आंकड़ा जोड़ने में असफल"
 
-#: ../camel/camel-smime-context.c:944
-#, c-format
-msgid "Decoder failed, error %d"
-msgstr "डिकोडर असफल, %d त्रुटि"
-
-#: ../camel/camel-smime-context.c:951
+#: ../camel/camel-smime-context.c:1163
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME विगोपन करें: कोई गुप्त अंतरवस्तु प्राप्त नहीं हुई"
 
-#: ../camel/camel-smime-context.c:978
+#: ../camel/camel-smime-context.c:1190
 msgid "import keys: unimplemented"
 msgstr "आयात कुंजी: लागू नहीं हुआ"
 
-#: ../camel/camel-smime-context.c:986
+#: ../camel/camel-smime-context.c:1198
 msgid "export keys: unimplemented"
 msgstr "निर्यात कुंजी: लागू नहीं हुआ"
 
-#: ../camel/camel-store.c:214
+#: ../camel/camel-store.c:283
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:174
 msgid "Cannot get folder: Invalid operation on this store"
-msgstr "फोल्डर प्राप्त नहीं कर सकता है: इस स्टोर पर अवैध संक्रिया"
+msgstr "फ़à¥\8bलà¥\8dडर à¤ªà¥\8dरापà¥\8dत à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता à¤¹à¥\88: à¤\87स à¤¸à¥\8dà¤\9fà¥\8bर à¤ªà¤° à¤\85वà¥\88ध à¤¸à¤\82à¤\95à¥\8dरिया"
 
-#: ../camel/camel-store.c:246
+#: ../camel/camel-store.c:316
 #, c-format
-msgid "Cannot create folder `%s': folder exists"
-msgstr "`%s' फोल्डर निर्मित नहीं कर सकता है: फोल्डर मौजूद है"
+#| msgid "Cannot create folder `%s': folder exists"
+msgid "Cannot create folder '%s': folder exists"
+msgstr "'%s' फ़ोल्डर निर्मित नहीं कर सकता है: फ़ोल्डर मौजूद है"
 
-#: ../camel/camel-store.c:310
+#: ../camel/camel-store.c:395
 msgid "Cannot create folder: Invalid operation on this store"
-msgstr "फोल्डर निर्मित नहीं कर सकता है: इस स्टोर पर अवैध संक्रिया"
+msgstr "फ़à¥\8bलà¥\8dडर à¤¨à¤¿à¤°à¥\8dमित à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता à¤¹à¥\88: à¤\87स à¤¸à¥\8dà¤\9fà¥\8bर à¤ªà¤° à¤\85वà¥\88ध à¤¸à¤\82à¤\95à¥\8dरिया"
 
-#: ../camel/camel-store.c:338
+#: ../camel/camel-store.c:423
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
-msgstr "फà¥\8bलà¥\8dडर à¤¨à¤¿à¤°à¥\8dमित à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता à¤¹à¥\88: %s: à¤«ोल्डर मौजूद है"
+msgstr "फ़à¥\8bलà¥\8dडर à¤¨à¤¿à¤°à¥\8dमित à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता à¤¹à¥\88: %s: à¤«à¤¼ोल्डर मौजूद है"
 
-#: ../camel/camel-store.c:402 ../camel/camel-vee-store.c:368
-#: ../camel/providers/local/camel-maildir-store.c:217
+#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:384
+#: ../camel/providers/local/camel-maildir-store.c:219
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "फोल्डर विलोपिल नहीं कर सकता है: %s: अवैध संक्रिया"
+msgstr "फ़à¥\8bलà¥\8dडर à¤µà¤¿à¤²à¥\8bपिल à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता à¤¹à¥\88: %s: à¤\85वà¥\88ध à¤¸à¤\82à¤\95à¥\8dरिया"
 
-#: ../camel/camel-store.c:452 ../camel/camel-vee-store.c:405
-#: ../camel/providers/local/camel-maildir-store.c:289
+#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:421
+#: ../camel/providers/local/camel-maildir-store.c:291
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "फà¥\8bलà¥\8dडर à¤\95ा à¤ªà¥\81नà¤\83 à¤¨à¤¾à¤®à¤\95रण à¤¨à¤¹à¥\80à¤\82 à¤\95र सकता है: %s: अवैध संक्रिया"
+msgstr "फ़à¥\8bलà¥\8dडर à¤\95ा à¤¨à¤¾à¤® à¤¨à¤¹à¥\80à¤\82 à¤¬à¤¦à¤² सकता है: %s: अवैध संक्रिया"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:793 ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:899 ../camel/camel-vtrash-folder.c:54
+#: ../camel/providers/imap/camel-imap-store.c:1061
 msgid "Trash"
 msgstr "ट्रैश"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:796 ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-store.c:902 ../camel/camel-vtrash-folder.c:56
 msgid "Junk"
 msgstr "जंक"
 
-#: ../camel/camel-tcp-stream-openssl.c:568
+#: ../camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to get issuer's certificate"
 msgstr "निर्गमक के प्रमाणपत्र को पाने में असमर्थ"
 
-#: ../camel/camel-tcp-stream-openssl.c:570
+#: ../camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to get Certificate Revocation List"
 msgstr "प्रमाणपत्र निरसन सूची पाने में असमर्थ"
 
-#: ../camel/camel-tcp-stream-openssl.c:572
+#: ../camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decrypt certificate signature"
 msgstr "प्रमाणपत्र हस्ताक्षर के विगोपन में असमर्थ"
 
-#: ../camel/camel-tcp-stream-openssl.c:574
+#: ../camel/camel-tcp-stream-openssl.c:578
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "प्रमाणपत्र निरसन सूची हस्ताक्षर के विगोपन में असमर्थ"
 
-#: ../camel/camel-tcp-stream-openssl.c:576
+#: ../camel/camel-tcp-stream-openssl.c:580
 msgid "Unable to decode issuer's public key"
 msgstr "निर्गमक सार्वजनिक कुंजी डिकोड करने में असमर्थ"
 
-#: ../camel/camel-tcp-stream-openssl.c:578
+#: ../camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate signature failure"
 msgstr "प्रमाणपत्र हस्ताक्षर विफलता"
 
-#: ../camel/camel-tcp-stream-openssl.c:580
+#: ../camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate Revocation List signature failure"
 msgstr "प्रमाणपत्र निरसन सूची हस्ताक्षर असफलता"
 
-#: ../camel/camel-tcp-stream-openssl.c:582
+#: ../camel/camel-tcp-stream-openssl.c:586
 msgid "Certificate not yet valid"
 msgstr "प्रमाणपत्र अब वैध नहीं है"
 
-#: ../camel/camel-tcp-stream-openssl.c:584
+#: ../camel/camel-tcp-stream-openssl.c:588
 msgid "Certificate has expired"
 msgstr "प्रमाणपत्र की समय सीमा समाप्त हो चुकी है"
 
-#: ../camel/camel-tcp-stream-openssl.c:586
+#: ../camel/camel-tcp-stream-openssl.c:590
 msgid "CRL not yet valid"
 msgstr "CRL अब वैध नहीं है"
 
-#: ../camel/camel-tcp-stream-openssl.c:588
+#: ../camel/camel-tcp-stream-openssl.c:592
 msgid "CRL has expired"
 msgstr "CRL की समय सीमा समाप्त हो चुकी है"
 
-#: ../camel/camel-tcp-stream-openssl.c:593
+#: ../camel/camel-tcp-stream-openssl.c:597
 msgid "Error in CRL"
 msgstr "CRL में दोष"
 
-#: ../camel/camel-tcp-stream-openssl.c:595
+#: ../camel/camel-tcp-stream-openssl.c:599
 msgid "Out of memory"
 msgstr "स्मृति के बाहर"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
+#: ../camel/camel-tcp-stream-openssl.c:601
 msgid "Zero-depth self-signed certificate"
 msgstr "शून्य-गहरा स्व-हस्ताक्षरित प्रमाणपत्र"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
+#: ../camel/camel-tcp-stream-openssl.c:603
 msgid "Self-signed certificate in chain"
 msgstr "श्रृँखला में स्व-हस्ताक्षरित प्रमाणपत्र"
 
-#: ../camel/camel-tcp-stream-openssl.c:601
+#: ../camel/camel-tcp-stream-openssl.c:605
 msgid "Unable to get issuer's certificate locally"
 msgstr "निर्गमक के प्रमाणपत्र को स्थानीय स्तर पर पाने में असमर्थ"
 
-#: ../camel/camel-tcp-stream-openssl.c:603
+#: ../camel/camel-tcp-stream-openssl.c:607
 msgid "Unable to verify leaf signature"
 msgstr "लीफ हस्ताक्षर की जांच में असमर्थ"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
+#: ../camel/camel-tcp-stream-openssl.c:609
 msgid "Certificate chain too long"
 msgstr "प्रमाणपत्र श्रृँखला ज्यादा लंबी है"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
+#: ../camel/camel-tcp-stream-openssl.c:611
 msgid "Certificate Revoked"
 msgstr "प्रमाणपत्र निरसित"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
+#: ../camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid Certificate Authority (CA)"
 msgstr "अवैध प्रमाणपत्र प्राधिकार (CA)"
 
-#: ../camel/camel-tcp-stream-openssl.c:611
+#: ../camel/camel-tcp-stream-openssl.c:615
 msgid "Path length exceeded"
 msgstr "पथ लंबाई ज्यादा हो गया"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
+#: ../camel/camel-tcp-stream-openssl.c:617
 msgid "Invalid purpose"
 msgstr "अवैध उद्देश्य"
 
-#: ../camel/camel-tcp-stream-openssl.c:615
+#: ../camel/camel-tcp-stream-openssl.c:619
 msgid "Certificate untrusted"
 msgstr "प्रमाणपत्र पर विश्वास नहीं किया गया"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
+#: ../camel/camel-tcp-stream-openssl.c:621
 msgid "Certificate rejected"
 msgstr "प्रमाणपत्र अस्वीकृत"
 
-#: ../camel/camel-tcp-stream-openssl.c:620
+#: ../camel/camel-tcp-stream-openssl.c:624
 msgid "Subject/Issuer mismatch"
 msgstr "विषय/निर्गमक बेमेल"
 
-#: ../camel/camel-tcp-stream-openssl.c:622
+#: ../camel/camel-tcp-stream-openssl.c:626
 msgid "AKID/SKID mismatch"
 msgstr "AKID/SKID बेमेल"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
+#: ../camel/camel-tcp-stream-openssl.c:628
 msgid "AKID/Issuer serial mismatch"
 msgstr "AKID/निर्गमक श्रृंखला बेमेल"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
+#: ../camel/camel-tcp-stream-openssl.c:630
 msgid "Key usage does not support certificate signing"
 msgstr "कुंजी प्रयोग प्रमामपत्र हस्ताक्षर को समर्थन नहीं करता"
 
-#: ../camel/camel-tcp-stream-openssl.c:629
+#: ../camel/camel-tcp-stream-openssl.c:633
 msgid "Error in application verification"
 msgstr "आवेदन जांच में दोष"
 
-#: ../camel/camel-tcp-stream-openssl.c:696 ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2489,15 +2495,15 @@ msgstr ""
 "फिंगरप्रिंट:       %s\n"
 "हस्ताक्षर:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:702 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
 msgid "GOOD"
 msgstr "सही"
 
-#: ../camel/camel-tcp-stream-openssl.c:702 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
 msgid "BAD"
 msgstr "गलत"
 
-#: ../camel/camel-tcp-stream-openssl.c:704
+#: ../camel/camel-tcp-stream-openssl.c:708
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -2568,49 +2574,51 @@ msgstr ""
 "प्रमाणपत्र निरसन सूची की समय सीमा समाप्त हो चुकी है: %s\n"
 "निर्गमक: %s"
 
-#: ../camel/camel-url.c:293
+#: ../camel/camel-url.c:313
 #, c-format
-msgid "Could not parse URL `%s'"
-msgstr "`%s' URL का विश्लेषण नहीं कर सका"
+#| msgid "Could not parse URL `%s'"
+msgid "Could not parse URL '%s'"
+msgstr "'%s' URL का विश्लेषण नहीं कर सका"
 
-#: ../camel/camel-vee-folder.c:475
+#: ../camel/camel-vee-folder.c:582
 #, c-format
-msgid "Error storing `%s': %s"
-msgstr "`%s' को स्टोर करने में त्रुटि: %s"
+#| msgid "Error storing `%s': %s"
+msgid "Error storing '%s': %s"
+msgstr "'%s' को भंडार करने में त्रुटि: %s"
 
-#: ../camel/camel-vee-folder.c:517
+#: ../camel/camel-vee-folder.c:660
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s में %s कोई ऐसा संदेश नहीं"
 
-#: ../camel/camel-vee-folder.c:642 ../camel/camel-vee-folder.c:648
+#: ../camel/camel-vee-folder.c:820 ../camel/camel-vee-folder.c:826
 msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "आभासी फोल्डर में संदेशों को कापी या प्रतिस्थापित नहीं कर सकता है"
+msgstr "à¤\86भासà¥\80 à¤«à¤¼à¥\8bलà¥\8dडर à¤®à¥\87à¤\82 à¤¸à¤\82दà¥\87शà¥\8bà¤\82 à¤\95à¥\8b à¤\95ापà¥\80 à¤¯à¤¾ à¤ªà¥\8dरतिसà¥\8dथापित à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता à¤¹à¥\88"
 
-#: ../camel/camel-vee-store.c:101 ../camel/camel-vee-store.c:344
+#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115
+#: ../camel/camel-vee-store.c:360
 msgid "Unmatched"
 msgstr "बेमेल"
 
-#: ../camel/camel-vee-store.c:391
+#: ../camel/camel-vee-store.c:407
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
-msgstr "फà¥\8bलà¥\8dडर à¤µà¤¿à¤²à¥\8bपित à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता à¤¹à¥\88: %s:à¤\95à¥\8bà¤\88 à¤\90सा à¤«ोल्डर नहीं"
+msgstr "फ़à¥\8bलà¥\8dडर à¤µà¤¿à¤²à¥\8bपित à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता à¤¹à¥\88: %s:à¤\95à¥\8bà¤\88 à¤\90सा à¤«à¤¼ोल्डर नहीं"
 
-#: ../camel/camel-vee-store.c:413
+#: ../camel/camel-vee-store.c:429
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "फà¥\8bलà¥\8dडर à¤\95ा à¤ªà¥\81नà¤\83 à¤¨à¤¾à¤®à¤\95रण à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता à¤¹à¥\88: %s:à¤\95à¥\8bà¤\88 à¤\90सा à¤«ोल्डर नहीं"
+msgstr "फ़à¥\8bलà¥\8dडर à¤\95ा à¤¨à¤¾à¤® à¤¨à¤¹à¥\80à¤\82 à¤¬à¤¦à¤² à¤¸à¤\95ता à¤¹à¥\88: %s:à¤\95à¥\8bà¤\88 à¤\90सा à¤«à¤¼ोल्डर नहीं"
 
-#: ../camel/camel-vtrash-folder.c:49
+#: ../camel/camel-vtrash-folder.c:55
 msgid "Cannot copy messages to the Trash folder"
-msgstr "ट्रैश फोल्डर से संदेशों को कापी नहीं कर सकता है"
+msgstr "à¤\9fà¥\8dरà¥\88श à¤«à¤¼à¥\8bलà¥\8dडर à¤¸à¥\87 à¤¸à¤\82दà¥\87शà¥\8bà¤\82 à¤\95à¥\8b à¤\95ापà¥\80 à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता à¤¹à¥\88"
 
-#: ../camel/camel-vtrash-folder.c:51
+#: ../camel/camel-vtrash-folder.c:57
 msgid "Cannot copy messages to the Junk folder"
-msgstr "जंक फोल्डर से संदेशों को कापी नहीं कर सकता है"
+msgstr "à¤\9cà¤\82à¤\95 à¤«à¤¼à¥\8bलà¥\8dडर à¤¸à¥\87 à¤¸à¤\82दà¥\87शà¥\8bà¤\82 à¤\95à¥\8b à¤\95ापà¥\80 à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता à¤¹à¥\88"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:113
-#: ../camel/providers/imap/camel-imap-folder.c:2048
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2619,218 +2627,220 @@ msgstr ""
 "संदेश नहीं पा सकता है: %s\n"
 "  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:113
-#: ../camel/providers/imap/camel-imap-folder.c:2048
-#: ../camel/providers/local/camel-maildir-folder.c:245
-#: ../camel/providers/local/camel-mbox-folder.c:351
-#: ../camel/providers/local/camel-mh-folder.c:203
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/local/camel-maildir-folder.c:248
+#: ../camel/providers/local/camel-maildir-folder.c:275
+#: ../camel/providers/local/camel-mbox-folder.c:347
+#: ../camel/providers/local/camel-mbox-folder.c:399
+#: ../camel/providers/local/camel-mh-folder.c:214
 msgid "No such message"
 msgstr "ऐसा कोई संदेश नहीं"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:125
-#: ../camel/providers/imap4/camel-imap4-folder.c:788
-#: ../camel/providers/nntp/camel-nntp-folder.c:155
-#: ../camel/providers/nntp/camel-nntp-folder.c:231
-#: ../camel/providers/nntp/camel-nntp-folder.c:370
-#: ../camel/providers/pop3/camel-pop3-folder.c:263
-#: ../camel/providers/pop3/camel-pop3-folder.c:497
-#: ../camel/providers/pop3/camel-pop3-folder.c:558
-#: ../camel/providers/pop3/camel-pop3-folder.c:576
-#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
+#: ../camel/providers/imap4/camel-imap4-folder.c:821
+#: ../camel/providers/nntp/camel-nntp-folder.c:175
+#: ../camel/providers/nntp/camel-nntp-folder.c:251
+#: ../camel/providers/nntp/camel-nntp-folder.c:411
+#: ../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:132
-#: ../camel/providers/imap4/camel-imap4-folder.c:793
-#: ../camel/providers/nntp/camel-nntp-folder.c:146
-#: ../camel/providers/nntp/camel-nntp-folder.c:148
-#: ../camel/providers/nntp/camel-nntp-folder.c:157
-#: ../camel/providers/nntp/camel-nntp-folder.c:233
-#: ../camel/providers/pop3/camel-pop3-folder.c:500
-#: ../camel/providers/pop3/camel-pop3-folder.c:561
-#: ../camel/providers/pop3/camel-pop3-folder.c:568
-#: ../camel/providers/pop3/camel-pop3-folder.c:579
+msgstr "उपयोक्ता रद्द कर दिया गया"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
+#: ../camel/providers/imap4/camel-imap4-folder.c:826
+#: ../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:253
+#: ../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:149
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:157
-#: ../camel/providers/imap4/camel-imap4-folder.c:811
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2303
+#: ../camel/providers/imap4/camel-imap4-folder.c:844
 msgid "This message is not available in offline mode."
 msgstr "ऑफ़लाइन में संदेश उपलब्ध नहीं है."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:168
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:175
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1580
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1625
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:192
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:199
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1818
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1869
 msgid "Could not get message"
 msgstr "संदेश नहीं भेज सका"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:769
-#: ../camel/providers/imap/camel-imap-folder.c:247
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:883
+#: ../camel/providers/imap/camel-imap-folder.c:265
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s के लिये सारांश अधिभारित नहीं कर सका"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:999
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1143
 msgid "Trash Folder Full. Please Empty."
-msgstr ""
+msgstr "रद्दी फ़ोल्डर पूर्ण. कृपया खाली करें."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1166
-#: ../camel/providers/groupwise/camel-groupwise-store.c:629
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1352
+#: ../camel/providers/groupwise/camel-groupwise-store.c:617
 #: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:2368
-#: ../camel/providers/imap/camel-imap-folder.c:2438
-#, fuzzy, c-format
+#: ../camel/providers/imap/camel-imap-folder.c:3362
+#: ../camel/providers/imap/camel-imap-folder.c:3438
+#, c-format
 msgid "Fetching summary information for new messages in %s"
-msgstr "नए संदेश के लिये सारांश सूचना ला रहा है"
+msgstr "%s में नए संदेश के लिये सारांश सूचना ला रहा है"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1893
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1935
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2157
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2200
 #, c-format
-msgid "Cannot append message to folder `%s': %s"
-msgstr "फोल्डर में संदेश जोड़ नहीं सकता है:  %s: %s"
+#| msgid "Cannot append message to folder `%s': %s"
+msgid "Cannot append message to folder '%s': %s"
+msgstr "'%s' फ़ोल्डर में संदेश जोड़ नहीं सकता है: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1923
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2188
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "संदेश बना नहीं सकता: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:283
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
 #, c-format
 msgid "Cannot get folder container %s"
-msgstr "फोल्डर कंटेनर नहीं पा सकता है: %s"
+msgstr "फ़à¥\8bलà¥\8dडर à¤\95à¤\82à¤\9fà¥\87नर à¤¨à¤¹à¥\80à¤\82 à¤ªà¤¾ à¤¸à¤\95ता à¤¹à¥\88: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:347
-#: ../camel/providers/imap4/camel-imap4-journal.c:320
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
+#: ../camel/providers/imap4/camel-imap4-journal.c:319
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "ऑफलाइन मोड में संदेश जोड़ नहीं सकता: कैश अनुपलब्ध"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:363
-#: ../camel/providers/imap4/camel-imap4-journal.c:336
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
+#: ../camel/providers/imap4/camel-imap4-journal.c:335
 #, c-format
 msgid "Cannot append message in offline mode: %s"
 msgstr "ऑफलाइन मोड में संदेश जोड़ नहीं कर सकता: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:51
-#: ../camel/providers/imap4/camel-imap4-provider.c:36
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../camel/providers/imap4/camel-imap4-provider.c:39
 msgid "Checking for new mail"
 msgstr "नयी डाक के लिये जांच रहा है"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
-msgid "Check for new messages in all folders"
-msgstr "सभी फोल्डर में नये संदेश के लिये जांचें"
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
+#: ../camel/providers/hula/camel-hula-provider.c:51
+#: ../camel/providers/imap/camel-imap-provider.c:46
+#: ../camel/providers/imap4/camel-imap4-provider.c:41
+msgid "C_heck for new messages in all folders"
+msgstr "सभी फ़ोल्डर में नये संदेश के लिये जांचें (_h)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-#: ../camel/providers/local/camel-local-provider.c:45
-#: ../camel/providers/local/camel-local-provider.c:85
-#: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imap4/camel-imap4-provider.c:52
+#: ../camel/providers/local/camel-local-provider.c:46
+#: ../camel/providers/local/camel-local-provider.c:86
+#: ../camel/providers/local/camel-local-provider.c:106
 msgid "Options"
 msgstr "विकल्प"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:58
-msgid "Apply filters to new messages in Inbox on this server"
-msgstr "इस सर्वर पर इनबाक्स में नए संदेश के लिए निस्पंदक चलाएं"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
-msgid "Check new messages for Junk contents"
-msgstr "नये संदेश को जंक अंतर्वस्तु के लिये जांचें"
-
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:62
-msgid "Only check for Junk messages in the INBOX folder"
-msgstr "इनबाक्स फोल्डर में सिर्फ जंक संदेश के लिये जांचें"
+#| msgid "Apply filters to new messages in Inbox on this server"
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr "इस सर्वर पर इनबाक्स में नए संदेश के लिए फिल्टर चलाएँ (_A)"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:64
-msgid "Automatically synchronize account locally"
-msgstr "स्वचालित तुल्यकालन खाता स्थानीय रूप से"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
+#| msgid "Check new messages for Junk contents"
+msgid "Check new messages for J_unk contents"
+msgstr "नये संदेश को जंक अंतर्वस्तु के लिये जाँचें (_u)"
+
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
+#: ../camel/providers/imap/camel-imap-provider.c:74
+#| msgid "Only check for Junk messages in the INBOX folder"
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr "इनबाक्स फ़ोल्डर में सिर्फ जंक संदेश के लिये जांचें (_B)"
+
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+#| msgid "Automatically synchronize account locally"
+msgid "Automatically synchroni_ze account locally"
+msgstr "स्वचालित तुल्यकालन खाता स्थानीय रूप से (_z)"
+
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
 msgid "SOAP Settings"
 msgstr "SOAP जमावट"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Post Office Agent SOAP Port:"
-msgstr "डाक घर एजेंट SOAP पोर्ट:"
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
+#| msgid "Post Office Agent SOAP Port:"
+msgid "Post Office Agent SOAP _Port:"
+msgstr "डाक घर एजेंट SOAP पोर्ट (_P):"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:85
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
 msgid "For accessing Novell GroupWise servers"
 msgstr "Novell Groupwise servers के अभिगम के लिए"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:102
-#: ../camel/providers/hula/camel-hula-provider.c:92
-#: ../camel/providers/imap/camel-imap-provider.c:96
-#: ../camel/providers/imap4/camel-imap4-provider.c:81
-#: ../camel/providers/imapp/camel-imapp-provider.c:66
-#: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:71
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
+#: ../camel/providers/hula/camel-hula-provider.c:95
+#: ../camel/providers/imap/camel-imap-provider.c:100
+#: ../camel/providers/imap4/camel-imap4-provider.c:84
+#: ../camel/providers/imapp/camel-imapp-provider.c:67
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
+#: ../camel/providers/pop3/camel-pop3-provider.c:72
 msgid "Password"
-msgstr "शबà¥\8dदà¤\95à¥\82à¤\9f"
+msgstr "à¤\95à¥\82à¤\9fशबà¥\8dद"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
 msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr "पà¥\8dलà¥\87नà¤\9fà¥\87à¤\95à¥\8dसà¤\9f à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f के उपयोग से यह विकल्प ग्रूपवाइज सर्वर से जोड़ेगा."
+msgstr "पà¥\8dलà¥\87नà¤\9fà¥\87à¤\95à¥\8dसà¤\9f à¤\95à¥\82à¤\9fशबà¥\8dद के उपयोग से यह विकल्प ग्रूपवाइज सर्वर से जोड़ेगा."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:103
+#: ../camel/providers/groupwise/camel-groupwise-store.c:104
 msgid "Host or user not available in url"
 msgstr "url में मेजबान या उपयोक्ता उपलब्ध नहीं"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:205
-#, c-format
-msgid "%sPlease enter the GroupWise password for %s@%s"
-msgstr "%sकृपया ग्रूपवाइज शब्दकूट दाखिल करें %s@%s के लिये"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:219
-#: ../camel/providers/imap/camel-imap-store.c:1360
-#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1357
 msgid "You did not enter a password."
-msgstr "आपने शब्दकूट नहीं दाखिल किया."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:231
-#, fuzzy
-msgid "Unable to authenticate to GroupWise server. "
-msgstr "GroupWise सर्वर में प्रमाणित करने में विफल."
+msgstr "आपने कूटशब्द नहीं दाखिल किया."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:309
+#: ../camel/providers/groupwise/camel-groupwise-store.c:303
 msgid "Some features may not work correctly with your current server version"
 msgstr "आपके मौजूदा सर्वर संस्करण के लिये कुछ फीचर काम नहीं करते"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:537
-#: ../camel/providers/imap/camel-imap-store.c:1869
-#: ../camel/providers/imap/camel-imap-store.c:2060
+#: ../camel/providers/groupwise/camel-groupwise-store.c:524
+#: ../camel/providers/imap/camel-imap-store.c:1849
+#: ../camel/providers/imap/camel-imap-store.c:2047
 #, c-format
 msgid "No such folder %s"
-msgstr "ऐसा कोई %s फोल्डर नहीं"
+msgstr "à¤\90सा à¤\95à¥\8bà¤\88 %s à¤«à¤¼à¥\8bलà¥\8dडर à¤¨à¤¹à¥\80à¤\82"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1232
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "ऑफ़लाइन मोड में GroupWise फ़ोल्डर बना ले सकता."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1246
-#: ../camel/providers/imap/camel-imap-store.c:1944
-#: ../camel/providers/imap/camel-imap-store.c:2313
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
+#: ../camel/providers/imap/camel-imap-store.c:1924
+#: ../camel/providers/imap/camel-imap-store.c:2304
 msgid "The parent folder is not allowed to contain subfolders"
-msgstr "मातà¥\83 à¤«à¥\8bलà¥\8dडर à¤\95à¥\8b à¤\89पफोल्डर रखने की अनुमति नहीं है"
+msgstr "मातà¥\83 à¤«à¤¼à¥\8bलà¥\8dडर à¤\95à¥\8b à¤\89पफ़ोल्डर रखने की अनुमति नहीं है"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1323
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1344
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
 #, c-format
-msgid "Cannot rename Groupwise folder `%s' to `%s'"
-msgstr "समूह के आधार पर फोल्डर `%s' को `%s' में पुनर्नामकरण नहीं कर सकता"
+#| msgid "Cannot rename Groupwise folder `%s' to `%s'"
+msgid "Cannot rename GroupWise folder '%s' to '%s'"
+msgstr "समूहआधृत फ़ोल्डर '%s' को '%s' में नाम नहीं बदल सका"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1376
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:121
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise सर्वर %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1378
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "%s पर %s के लिए समूह के आधार पर सेवा"
@@ -2852,90 +2862,92 @@ msgid ""
 msgstr ""
 
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:206
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
 #, c-format
 msgid "Could not send message: %s"
 msgstr "संदेश नहीं भेज सका: %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:46
-#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/hula/camel-hula-provider.c:49
+#: ../camel/providers/imap/camel-imap-provider.c:44
 msgid "Checking for New Mail"
 msgstr "नयी डाक के लिये जांच"
 
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
-msgid "C_heck for new messages in all folders"
-msgstr "सभी फोल्डर में नये संदेश के लिये जांचें (_h)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:51
-#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/hula/camel-hula-provider.c:54
+#: ../camel/providers/imap/camel-imap-provider.c:52
 msgid "Connection to Server"
 msgstr "सर्वर से संबंध"
 
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/hula/camel-hula-provider.c:56
+#: ../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:55
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Command:"
-msgstr "समादेश:"
+msgstr "सर्वर से जुड़ने के लिए कस्टम कमांड का प्रयोग करें (_U)"
 
 #: ../camel/providers/hula/camel-hula-provider.c:58
 #: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
-#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Command:"
+msgstr "कमांड:"
+
+#: ../camel/providers/hula/camel-hula-provider.c:61
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imap4/camel-imap4-provider.c:44
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "फ़ोल्डर्स"
 
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
+#: ../camel/providers/hula/camel-hula-provider.c:63
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#: ../camel/providers/imap4/camel-imap4-provider.c:46
 msgid "_Show only subscribed folders"
-msgstr "सदस्यता लिए हुए फोल्डरों को दिखाएं (_S)"
+msgstr "सदसà¥\8dयता à¤²à¤¿à¤\8f à¤¹à¥\81à¤\8f à¤«à¤¼à¥\8bलà¥\8dडरà¥\8bà¤\82 à¤\95à¥\8b à¤¦à¤¿à¤\96ाà¤\8fà¤\82 (_S)"
 
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
+#: ../camel/providers/hula/camel-hula-provider.c:65
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imap4/camel-imap4-provider.c:48
 msgid "O_verride server-supplied folder namespace"
 msgstr "सर्वर आपूर्ति फ़ोल्डर नेमस्पेस अध्यारोहित करें (_v)"
 
-#: ../camel/providers/hula/camel-hula-provider.c:64
+#: ../camel/providers/hula/camel-hula-provider.c:67
 msgid "Namespace"
 msgstr "नामस्थान"
 
-#: ../camel/providers/hula/camel-hula-provider.c:75
+#: ../camel/providers/hula/camel-hula-provider.c:78
 msgid "Hula"
-msgstr ""
+msgstr "हुला"
 
-#: ../camel/providers/hula/camel-hula-provider.c:77
-#, fuzzy
+#: ../camel/providers/hula/camel-hula-provider.c:80
 msgid "For accessing Hula servers"
-msgstr "Novell Groupwise servers के अभिगम के लिए"
+msgstr "हुला सर्वर की पहुँच के लिए"
 
-#: ../camel/providers/hula/camel-hula-provider.c:94
-#, fuzzy
+#: ../camel/providers/hula/camel-hula-provider.c:97
 msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "प्लेनटेक्सट शब्दकूट के उपयोग से यह विकल्प IMAP सर्वर से जोड़ेगा."
-
-#: ../camel/providers/imap/camel-imap-command.c:222
-#: ../camel/providers/imap/camel-imap-command.c:264
-#: ../camel/providers/imap/camel-imap-command.c:470
-#: ../camel/providers/imap/camel-imap-store.c:3011
+msgstr "सादा पाठ कूटशब्द के उपयोग से यह विकल्प IMAP सर्वर से जोड़ेगा."
+
+#: ../camel/providers/imap/camel-imap-command.c:183
+#: ../camel/providers/imap/camel-imap-command.c:267
+msgid "No output stream"
+msgstr "कोई आउटपुट स्ट्रीम नहीं"
+
+#: ../camel/providers/imap/camel-imap-command.c:188
+#: ../camel/providers/imap/camel-imap-command.c:272
+msgid "No input stream"
+msgstr "कोई इनपुट स्ट्रीम नहीं"
+
+#: ../camel/providers/imap/camel-imap-command.c:231
+#: ../camel/providers/imap/camel-imap-command.c:280
+#: ../camel/providers/imap/camel-imap-command.c:494
+#: ../camel/providers/imap/camel-imap-store.c:3037
 msgid "Operation cancelled"
 msgstr "ऑपरेशन रद्द"
 
-#: ../camel/providers/imap/camel-imap-command.c:309
-#: ../camel/providers/imap/camel-imap-store.c:3014
+#: ../camel/providers/imap/camel-imap-command.c:333
+#: ../camel/providers/imap/camel-imap-store.c:3040
 #, 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:330
+#: ../camel/providers/imap/camel-imap-command.c:354
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -2944,235 +2956,263 @@ msgstr ""
 "IMAP सर्वर %s@%s से सचेत करें:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:399
+#: ../camel/providers/imap/camel-imap-command.c:423
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP सर्वर से अप्रत्याशित अनुक्रिया: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:409
+#: ../camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP command failed: %s"
-msgstr "IMAP à¤¸à¤®à¤¾à¤¦à¥\87श असफल: %s"
+msgstr "IMAP à¤\95माà¤\82ड असफल: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:484
+#: ../camel/providers/imap/camel-imap-command.c:508
 msgid "Server response ended too soon."
 msgstr "सर्नर अनुक्रिया बहुत जल्द समाप्त हो गई."
 
-#: ../camel/providers/imap/camel-imap-command.c:691
+#: ../camel/providers/imap/camel-imap-command.c:715
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP सर्वर अनुक्रिया के पास %s सूचना नहीं है"
 
-#: ../camel/providers/imap/camel-imap-command.c:727
+#: ../camel/providers/imap/camel-imap-command.c:751
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP सर्वर से अप्रत्याशित OK अनुक्रिया: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:228
+#: ../camel/providers/imap/camel-imap-folder.c:89
+#| msgid "Only check for Junk messages in the INBOX folder"
+msgid "Always check for new mail in this folder"
+msgstr "इस फ़ोल्डर में सिर्फ नए संदेश के लिये जांचें"
+
+#: ../camel/providers/imap/camel-imap-folder.c:246
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr "%s डायरेक्टरी निर्मित नहीं कर सका: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:332
-msgid "Folder was destroyed and recreated on server."
-msgstr "सर्वर पर फोल्डर नष्ट कर दिया गया और पुनर्निर्मित किया गया."
+msgstr "%s निर्देशिका निर्मित नहीं कर सका: %s"
 
 #. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:623
-#, fuzzy, c-format
+#: ../camel/providers/imap/camel-imap-folder.c:891
+#, c-format
 msgid "Scanning for changed messages in %s"
-msgstr "परिवर्तित संदेश के लिये स्कैनिंग"
+msgstr "%s में परिवर्तित संदेश के लिये स्कैनिंग"
+
+#: ../camel/providers/imap/camel-imap-folder.c:1950
+#, c-format
+msgid "Unexpected response status '%s' after APPEND command"
+msgstr ""
 
-#: ../camel/providers/imap/camel-imap-folder.c:2008
+#: ../camel/providers/imap/camel-imap-folder.c:1965
+msgid "No response on continuation after APPEND command"
+msgstr ""
+
+#: ../camel/providers/imap/camel-imap-folder.c:2010
+msgid "Unknown error occurred during APPEND command!"
+msgstr ""
+
+#: ../camel/providers/imap/camel-imap-folder.c:2842
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "संदेश पुनर्प्राप्त करने में असमर्थ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2087
-#: ../camel/providers/imap/camel-imap-folder.c:2696
-#: ../camel/providers/nntp/camel-nntp-folder.c:219
+#: ../camel/providers/imap/camel-imap-folder.c:2877
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get message with message ID %s: %s"
+msgstr "%s संदेश आईडी से संदेश प्राप्त नहीं कर सकता: %s"
+
+#: ../camel/providers/imap/camel-imap-folder.c:2878
+#| msgid "No such message"
+msgid "No such message available."
+msgstr "ऐसा कोई संदेश उपलब्ध नहीं"
+
+#: ../camel/providers/imap/camel-imap-folder.c:2932
+#: ../camel/providers/imap/camel-imap-folder.c:3753
+#: ../camel/providers/nntp/camel-nntp-folder.c:239
 msgid "This message is not currently available"
 msgstr "यह संदेश अभी उपलब्ध नहीं है"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2546
+#: ../camel/providers/imap/camel-imap-folder.c:3567
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "अपूर्ण सर्वर अनुक्रिया: %d संदेश के लिये कोई सूचना नहीं दी गई"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2554
+#: ../camel/providers/imap/camel-imap-folder.c:3575
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "अपूर्ण सर्वर अनुक्रिया: %d संदेश के लिये कोई UID नहीं दिया गया"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2567
-#, c-format
-msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
-msgstr "अप्रत्याशित सर्वर अनुक्रिया: %d और %d संदेश के लिये समान UIDs दिया गया"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2732
+#: ../camel/providers/imap/camel-imap-folder.c:3791
 msgid "Could not find message body in FETCH response."
 msgstr "फेच अनुक्रिया में संदेश शरीर को नहीं पा सका."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:160
+#: ../camel/providers/imap/camel-imap-message-cache.c:182
+#: ../camel/providers/imap/camel-imap-message-cache.c:246
 #, c-format
 msgid "Could not open cache directory: %s"
-msgstr "à¤\95à¥\88श à¤¡à¤¾à¤¯à¤°à¥\87à¤\95à¥\8dà¤\9fरà¥\80 खोल नहीं सका: %s"
+msgstr "à¤\95à¥\88श à¤¨à¤¿à¤°à¥\8dदà¥\87शिà¤\95ा खोल नहीं सका: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:266
-#: ../camel/providers/imap/camel-imap-message-cache.c:323
-#: ../camel/providers/imap/camel-imap-message-cache.c:354
-#: ../camel/providers/imap/camel-imap-message-cache.c:386
+#: ../camel/providers/imap/camel-imap-message-cache.c:333
+#: ../camel/providers/imap/camel-imap-message-cache.c:390
+#: ../camel/providers/imap/camel-imap-message-cache.c:421
+#: ../camel/providers/imap/camel-imap-message-cache.c:453
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "%s संदेश कैश करने में विफल: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:436
+#: ../camel/providers/imap/camel-imap-message-cache.c:533
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "%s कैश करने में विफल: %s"
 
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
-#, fuzzy
-msgid "Namespace:"
-msgstr "नामस्थान"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#| msgid "Check for new messages in all folders"
+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:51
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "इस सर्वर पर INBOX में नए संदेश के लिए निस्पंदक चलाएं (_A)"
-
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-msgid "Check new messages for _Junk contents"
-msgstr "नये संदेश को जंक अंतर्वस्तु के लिये जांचें (_J)"
+#: ../camel/providers/imap4/camel-imap4-provider.c:50
+msgid "Namespace:"
+msgstr "नामस्थान:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "à¤\87नबाà¤\95à¥\8dस à¤«à¥\8bलà¥\8dडर à¤®à¥\87à¤\82 à¤¸à¤¿à¤°à¥\8dफ à¤\9cà¤\82à¤\95 à¤¸à¤\82दà¥\87श à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87 à¤\9cाà¤\82à¤\9aà¥\87à¤\82 (_g)"
+#: ../camel/providers/imap4/camel-imap4-provider.c:54
+msgid "_Apply filters to new messages in INBOX on this server"
+msgstr "à¤\87स à¤¸à¤°à¥\8dवर à¤ªà¤° INBOX à¤®à¥\87à¤\82 à¤¨à¤\8f à¤¸à¤\82दà¥\87श à¤\95à¥\87 à¤²à¤¿à¤\8f à¤«à¤¿à¤²à¥\8dà¤\9fर à¤\9aलाà¤\8fà¤\82 (_A)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
+#| msgid "Check new messages for Junk contents"
+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:60
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "दूरस्थ डाक स्थानीय रूप से स्वतः तुल्यकालिक करें (_z)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imap/camel-imap-provider.c:83
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imap/camel-imap-provider.c:85
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP सर्वर पर डाक पढ़ने और स्टोर करने के लिए"
 
-#: ../camel/providers/imap/camel-imap-provider.c:98
-#: ../camel/providers/imapp/camel-imapp-provider.c:68
+#: ../camel/providers/imap/camel-imap-provider.c:102
+#: ../camel/providers/imapp/camel-imapp-provider.c:69
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "पà¥\8dलà¥\87नà¤\9fà¥\87à¤\95à¥\8dसà¤\9f à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f के उपयोग से यह विकल्प IMAP सर्वर से जोड़ेगा."
+msgstr "पà¥\8dलà¥\87नà¤\9fà¥\87à¤\95à¥\8dसà¤\9f à¤\95à¥\82à¤\9fशबà¥\8dद के उपयोग से यह विकल्प IMAP सर्वर से जोड़ेगा."
 
-#: ../camel/providers/imap/camel-imap-store.c:446
+#: ../camel/providers/imap/camel-imap-store.c:437
 #: ../camel/providers/imap4/camel-imap4-store.c:214
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP सर्वर %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:448
+#: ../camel/providers/imap/camel-imap-store.c:439
 #: ../camel/providers/imap4/camel-imap4-store.c:216
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s पर %s के लिए IMAP सेवा"
 
-#: ../camel/providers/imap/camel-imap-store.c:578
-#: ../camel/providers/imap/camel-imap-store.c:593
+#: ../camel/providers/imap/camel-imap-store.c:568
+#: ../camel/providers/imap/camel-imap-store.c:583
 #: ../camel/providers/imap4/camel-imap4-store.c:251
 #: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/nntp/camel-nntp-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:168
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:254
-#: ../camel/providers/smtp/camel-smtp-transport.c:269
+#: ../camel/providers/nntp/camel-nntp-store.c:183
+#: ../camel/providers/nntp/camel-nntp-store.c:198
+#: ../camel/providers/pop3/camel-pop3-store.c:172
+#: ../camel/providers/pop3/camel-pop3-store.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "%s में जुड़ नहीं सका: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:579
+#: ../camel/providers/imap/camel-imap-store.c:569
 #: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:185
-#: ../camel/providers/pop3/camel-pop3-store.c:169
-#: ../camel/providers/smtp/camel-smtp-transport.c:255
+#: ../camel/providers/nntp/camel-nntp-store.c:184
+#: ../camel/providers/pop3/camel-pop3-store.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:261
 msgid "SSL unavailable"
 msgstr "SSL अनुपलब्ध"
 
-#: ../camel/providers/imap/camel-imap-store.c:590
-#: ../camel/providers/imap/camel-imap-store.c:864
+#: ../camel/providers/imap/camel-imap-store.c:580
+#: ../camel/providers/imap/camel-imap-store.c:862
 msgid "Connection cancelled"
-msgstr "सà¤\82बà¤\82धन रद्द"
+msgstr "à¤\95नà¥\87à¤\95à¥\8dशन रद्द"
 
-#: ../camel/providers/imap/camel-imap-store.c:698
-#: ../camel/providers/imap/camel-imap-store.c:720
-#: ../camel/providers/imap/camel-imap-store.c:726
-#: ../camel/providers/imap4/camel-imap4-store.c:300
-#: ../camel/providers/imap4/camel-imap4-store.c:313
+#: ../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:314
 #: ../camel/providers/imap4/camel-imap4-store.c:329
+#: ../camel/providers/imap4/camel-imap4-store.c:338
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "सुरक्षित मोड में %s IMAP सर्वर से जुड़ने में विफल: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:699
-#: ../camel/providers/smtp/camel-smtp-transport.c:323
+#: ../camel/providers/imap/camel-imap-store.c:692
+#: ../camel/providers/smtp/camel-smtp-transport.c:333
 msgid "STARTTLS not supported"
 msgstr "STARTTLS समर्थित नहीं."
 
-#: ../camel/providers/imap/camel-imap-store.c:721
-#: ../camel/providers/imap4/camel-imap4-store.c:301
+#: ../camel/providers/imap/camel-imap-store.c:711
 msgid "SSL negotiations failed"
 msgstr "SSL समझौता विफल"
 
-#: ../camel/providers/imap/camel-imap-store.c:727
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/smtp/camel-smtp-transport.c:362
+#: ../camel/providers/imap/camel-imap-store.c:717
+#: ../camel/providers/imap4/camel-imap4-store.c:339
+#: ../camel/providers/smtp/camel-smtp-transport.c:372
 msgid "SSL is not available in this build"
 msgstr "एसएसएल नहीं उपलब्ध है इस बिल्ड में"
 
-#: ../camel/providers/imap/camel-imap-store.c:867
+#: ../camel/providers/imap/camel-imap-store.c:865
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
-msgstr "\"%s\" à¤¸à¤®à¤¾à¤¦à¥\87श से नहीं जुड़ सका: %s"
+msgstr "\"%s\" à¤\95माà¤\82ड से नहीं जुड़ सका: %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1051
-#: ../camel/providers/imap/camel-imap-store.c:2409
+#: ../camel/providers/imap/camel-imap-store.c:1053
+#: ../camel/providers/imap/camel-imap-store.c:2400
 #: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1313
-#: ../camel/providers/local/camel-maildir-folder.c:75
-#: ../camel/providers/local/camel-maildir-store.c:217
-#: ../camel/providers/local/camel-maildir-store.c:289
-#: ../camel/providers/local/camel-maildir-store.c:511
-#: ../camel/providers/local/camel-maildir-store.c:524
-#: ../camel/providers/local/camel-spool-store.c:461
+#: ../camel/providers/imap4/camel-imap4-store.c:1408
+#: ../camel/providers/local/camel-maildir-folder.c:78
+#: ../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:464
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
 msgid "Inbox"
 msgstr "इनबाक्स"
 
-#: ../camel/providers/imap/camel-imap-store.c:1313
+#: ../camel/providers/imap/camel-imap-store.c:1055
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
+msgid "Drafts"
+msgstr "प्रारूप"
+
+#: ../camel/providers/imap/camel-imap-store.c:1057
+#| msgid "Sleet"
+msgid "Sent"
+msgstr "गई डाक"
+
+#: ../camel/providers/imap/camel-imap-store.c:1059
+msgid "Templates"
+msgstr "प्रारूप"
+
+#: ../camel/providers/imap/camel-imap-store.c:1304
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP सर्वर निवेदित सत्यापन प्रकार %s को समर्थन नहीं देता"
 
-#: ../camel/providers/imap/camel-imap-store.c:1323
-#: ../camel/providers/smtp/camel-smtp-transport.c:493
+#: ../camel/providers/imap/camel-imap-store.c:1314
+#: ../camel/providers/smtp/camel-smtp-transport.c:507
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "सत्यापन प्रकार %s के लिये कोई समर्थन नहीं"
 
-#: ../camel/providers/imap/camel-imap-store.c:1346
-#: ../camel/providers/imapp/camel-imapp-store.c:364
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sकृपया %s@%s के लिये IMAP शब्दकूट दाखिल करें"
-
-#: ../camel/providers/imap/camel-imap-store.c:1389
+#: ../camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3183,304 +3223,381 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1881
-#: ../camel/providers/imap/camel-imap-store.c:2251
-#: ../camel/providers/imap4/camel-imap4-store.c:943
+#: ../camel/providers/imap/camel-imap-store.c:1861
+#: ../camel/providers/imap/camel-imap-store.c:2242
+#: ../camel/providers/imap4/camel-imap4-store.c:959
 #, c-format
 msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "फोल्डर नाम \"%s\" अवैध है क्योंकि यह \"%c\" कैरेक्टर रखता है"
+msgstr "फ़à¥\8bलà¥\8dडर à¤¨à¤¾à¤® \"%s\" à¤\85वà¥\88ध à¤¹à¥\88 à¤\95à¥\8dयà¥\8bà¤\82à¤\95ि à¤¯à¤¹ \"%c\" à¤\95à¥\88रà¥\87à¤\95à¥\8dà¤\9fर à¤°à¤\96ता à¤¹à¥\88"
 
-#: ../camel/providers/imap/camel-imap-store.c:1998
-#: ../camel/providers/local/camel-maildir-store.c:190
-#: ../camel/providers/local/camel-mbox-store.c:203
+#: ../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' फोल्डर निर्मित नहीं कर सकता है:फोल्डर मौजूद है."
+#| msgid "Cannot create folder `%s': folder exists."
+msgid "Cannot create folder '%s': folder exists."
+msgstr "'%s' फ़ोल्डर नहीं निर्मित कर सकता है: फ़ोल्डर मौजूद है."
 
-#: ../camel/providers/imap/camel-imap-store.c:2262
+#: ../camel/providers/imap/camel-imap-store.c:2253
 #, c-format
 msgid "Unknown parent folder: %s"
-msgstr "अज्ञात मातृ फोल्डर: %s"
+msgstr "à¤\85à¤\9cà¥\8dà¤\9eात à¤®à¤¾à¤¤à¥\83 à¤«à¤¼à¥\8bलà¥\8dडर: %s"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:549
-#: ../camel/providers/imap4/camel-imap4-command.c:556
+#: ../camel/providers/imap4/camel-imap4-command.c:576
+#: ../camel/providers/imap4/camel-imap4-command.c:583
 #, c-format
 msgid "Failed sending command to IMAP server %s: %s"
-msgstr "%s IMAP à¤¸à¤°à¥\8dवर à¤\95à¥\8b à¤¸à¤®à¤¾à¤¦à¥\87श भेजने में विफल:%s"
+msgstr "%s IMAP à¤¸à¤°à¥\8dवर à¤\95à¥\8b à¤\95माà¤\82ड भेजने में विफल:%s"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:659
+#: ../camel/providers/imap4/camel-imap4-command.c:686
 #, c-format
 msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr "IMAP4 सर्वर %s से अप्रत्याशित अनुक्रिया: %s"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:222
+#: ../camel/providers/imap4/camel-imap4-engine.c:221
 #, c-format
 msgid "Unexpected greeting from IMAP server %s."
 msgstr "IMAP सर्वर %s से अप्रत्याशित शुभकामना."
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:432
+#: ../camel/providers/imap4/camel-imap4-engine.c:450
+#, c-format
+#| msgid "Cannot select folder `%s': Invalid mailbox name"
+msgid "Cannot select folder '%s': Invalid mailbox name"
+msgstr "'%s' फ़ोल्डर का चयन नहीं कर सकता है: अवैध डाकपेटी नाम"
+
+#: ../camel/providers/imap4/camel-imap4-engine.c:456
 #, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "`%s' फोल्डर का चयन नहीं कर सकता है:अवैध डाकपेटी नाम"
+#| msgid "Cannot select folder `%s': Bad command"
+msgid "Cannot select folder '%s': Bad command"
+msgstr "'%s' फ़ोल्डर का चयन नहीं कर सकता है: गलत कमांड"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:438
+#: ../camel/providers/imap4/camel-imap4-engine.c:1433
 #, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "`%s' फोल्डर का चयन नहीं कर सकता है:गलत समादेश"
+#| msgid "Failed sending command to IMAP server %s: %s"
+msgid "Failed to send command to IMAP server %s: %s"
+msgstr "%s IMAP सर्वर को कमांड भेजने में विफल: %s"
+
+#: ../camel/providers/imap4/camel-imap4-engine.c:1435
+#| msgid "SSL unavailable"
+msgid "service unavailable"
+msgstr "सेवा अनुपलब्ध"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1549
-#: ../camel/providers/imap4/camel-imap4-engine.c:1588
-#: ../camel/providers/imap4/camel-imap4-engine.c:1633
-#: ../camel/providers/imap4/camel-imap4-engine.c:1689
+#: ../camel/providers/imap4/camel-imap4-engine.c:1569
+#: ../camel/providers/imap4/camel-imap4-engine.c:1608
+#: ../camel/providers/imap4/camel-imap4-engine.c:1653
+#: ../camel/providers/imap4/camel-imap4-engine.c:1709
 #, c-format
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr "IMAP4 सर्वर %s अप्रत्याशित रूप से असंबंधित हो गया: %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:86
-msgid "Enable Mailing-List detection required for some filter and vFolder rules"
-msgstr "कुछ फिल्टर और vFolder नियम के लिये मेलिंग सूची जांच सक्रिय करें"
+#: ../camel/providers/imap4/camel-imap4-folder.c:89
+#| msgid ""
+#| "Enable Mailing-List detection required for some filter and vFolder rules"
+msgid ""
+"Enable extended Mailing-List detection required for some filter and vFolder "
+"rules"
+msgstr "कुछ फिल्टर और vFolder नियम के लिये विस्तारित मेलिंग सूची जाँच सक्रिय करें"
+
+#: ../camel/providers/imap4/camel-imap4-folder.c:90
+msgid "Expire cached messages that haven't been read in X seconds"
+msgstr "X सेकेंड में कैश किए संदेश का समय समाप्त करें जो कि नहीं पढ़ा गया है"
+
+#: ../camel/providers/imap4/camel-imap4-folder.c:91
+msgid "Expire cached messages older than X seconds"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:399
+#: ../camel/providers/imap4/camel-imap4-folder.c:432
 #, c-format
-msgid "Cannot access folder `%s': %s"
-msgstr "`%s' फोल्डर नहीं प्राप्त कर सकता है: %s"
+#| msgid "Cannot access folder `%s': %s"
+msgid "Cannot access folder '%s': %s"
+msgstr "'%s' फ़ोल्डर में पहुँच नहीं ले सकता है: %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:458
+#: ../camel/providers/imap4/camel-imap4-folder.c:491
 #, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "`%s' फोल्डर में फ्लैग तुल्यकालन नहीं कर सकता है: अज्ञात"
+#| msgid "Cannot sync flags to folder `%s': Unknown"
+msgid "Cannot sync flags to folder '%s': Unknown error"
+msgstr "'%s' फ़ोल्डर में फ्लैग तुल्यकालित नहीं कर सकता है: अज्ञात त्रुटि"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:464
+#: ../camel/providers/imap4/camel-imap4-folder.c:497
 #, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "`%s' फोल्डर में फ्लैग तुल्यकालन नहीं कर सकता है: गलत समादेश"
+#| msgid "Cannot sync flags to folder `%s': Bad command"
+msgid "Cannot sync flags to folder '%s': Bad command"
+msgstr "'%s' फ़ोल्डर में फ्लैग तुल्यकालन नहीं कर सकता है: गलत कमांड"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:604
+#: ../camel/providers/imap4/camel-imap4-folder.c:637
 #, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "`%s' फोल्डर पूर्ण विलोपित नहीं कर सकता: अज्ञात"
+#| msgid "Cannot expunge folder `%s': Unknown"
+msgid "Cannot expunge folder '%s': Unknown error"
+msgstr "'%s' फ़ोल्डर पूर्ण विलोपित नहीं कर सकता: अज्ञात त्रुटि"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:609
+#: ../camel/providers/imap4/camel-imap4-folder.c:642
 #, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "`%s' फोल्डर पूर्ण विलोपित नहीं कर सकता है: गलत समादेश"
+#| msgid "Cannot expunge folder `%s': Bad command"
+msgid "Cannot expunge folder '%s': Bad command"
+msgstr "'%s' फ़ोल्डर पूर्ण विलोपित नहीं कर सकता है: गलत कमांड"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:865
+#: ../camel/providers/imap4/camel-imap4-folder.c:898
 #, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "`%s' फोल्डर से %s संदेश नहीं प्राप्त कर सकता है: ऐसा कोई संदेश नहीं"
+#| msgid "Cannot get message %s from folder `%s': No such message"
+msgid "Cannot get message %s from folder '%s': No such message"
+msgstr "'%s' फ़ोल्डर से %s संदेश नहीं प्राप्त कर सकता है: ऐसा कोई संदेश नहीं"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:870
+#: ../camel/providers/imap4/camel-imap4-folder.c:903
 #, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "`%s' फोल्डर से %s संदेश नहीं प्राप्त कर सकता है: गलत समादेश"
+#| msgid "Cannot get message %s from folder `%s': Bad command"
+msgid "Cannot get message %s from folder '%s': Bad command"
+msgstr "'%s' फ़ोल्डर से %s संदेश नहीं प्राप्त कर सकता है: गलत कमांड"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:914
+#: ../camel/providers/imap4/camel-imap4-folder.c:947
 #, c-format
-msgid "Cannot append message to folder `%s': Folder is read-only"
-msgstr "`%s' फोल्डर में संदेश जोड़ नहीं सकता: फोल्डर सिर्फ पढने के लिये है"
+#| msgid "Cannot append message to folder `%s': Folder is read-only"
+msgid "Cannot append message to folder '%s': Folder is read-only"
+msgstr "'%s' फ़ोल्डर में संदेश जोड़ नहीं सकता: फ़ोल्डर सिर्फ पठनीय है"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1007
+#: ../camel/providers/imap4/camel-imap4-folder.c:1040
 #, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "`%s' फोल्डर में संदेश जोड़ नहीं सकता: अज्ञात त्रुटि"
+#| msgid "Cannot append message to folder `%s': Unknown error"
+msgid "Cannot append message to folder '%s': Unknown error"
+msgstr "'%s' फ़ोल्डर में संदेश जोड़ नहीं सकता है: अज्ञात त्रुटि"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1037
+#: ../camel/providers/imap4/camel-imap4-folder.c:1070
 #, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "`%s' फोल्डर में संदेश जोड़ नहीं सकता: गलत समादेश"
+#| msgid "Cannot append message to folder `%s': Bad command"
+msgid "Cannot append message to folder '%s': Bad command"
+msgstr "'%s' फ़ोल्डर में संदेश जोड़ नहीं सकता: गलत कमांड"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1157
+#: ../camel/providers/imap4/camel-imap4-folder.c:1190
 #, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "`%s' फोल्डर से %s फोल्डर में संदेश विस्थापित नहीं कर सकता है: अज्ञात"
+#| msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+msgstr "'%s' फ़ोल्डर से '%s' फ़ोल्डर में संदेश खिसका नहीं कर सकता है: अज्ञात त्रुटि"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1161
+#: ../camel/providers/imap4/camel-imap4-folder.c:1194
 #, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "`%s' फोल्डर से %s फोल्डर में संदेश कापी नहीं कर सकता है: अज्ञात"
+#| msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+msgstr "'%s' फ़ोल्डर से '%s' फ़ोल्डर में संदेश कापी नहीं कर सकता है: अज्ञात त्रुटि"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1169
+#: ../camel/providers/imap4/camel-imap4-folder.c:1202
 #, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "`%s' फोल्डर से %s फोल्डर में संदेश विस्थापित नहीं कर सकता है: गलत समादेश"
+#| msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+msgstr "'%s' फ़ोल्डर से '%s' फ़ोल्डर में संदेश विस्थापित नहीं कर सकता है: गलत कमांड"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1173
+#: ../camel/providers/imap4/camel-imap4-folder.c:1206
 #, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "`%s' फोल्डर से %s फोल्डर में संदेश कापी नहीं कर सकता है: गलत समादेश"
+#| msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+msgstr "'%s' फ़ोल्डर से '%s' फ़ोल्डर में संदेश नक़ल नहीं कर सकता है: गलत कमांड"
+
+#: ../camel/providers/imap4/camel-imap4-provider.c:56
+msgid "Check new messages for _Junk contents"
+msgstr "नये संदेश को जंक अंतर्वस्तु के लिये जांचें (_J)"
+
+#: ../camel/providers/imap4/camel-imap4-provider.c:58
+msgid "Only check for Junk messa_ges in the INBOX folder"
+msgstr "इनबाक्स फ़ोल्डर में सिर्फ जंक संदेश के लिये जांचें (_g)"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:64
+#: ../camel/providers/imap4/camel-imap4-provider.c:67
 msgid "IMAP4rev1"
 msgstr "IMAP4rev1"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
+#: ../camel/providers/imap4/camel-imap4-provider.c:69
 msgid "For reading and storing mail on IMAPv4rev1 servers."
 msgstr "IMAPv4rev1 सर्वर पर डाक पढ़ने और स्टोर करने के लिए"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
+#: ../camel/providers/imap4/camel-imap4-provider.c:86
 msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "पà¥\8dलà¥\87नà¤\9fà¥\87à¤\95à¥\8dसà¤\9f à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f के उपयोग से यह विकल्प IMAPv4rev1 सर्वर से जोड़ेगा."
+msgstr "पà¥\8dलà¥\87नà¤\9fà¥\87à¤\95à¥\8dसà¤\9f à¤\95à¥\82à¤\9fशबà¥\8dद के उपयोग से यह विकल्प IMAPv4rev1 सर्वर से जोड़ेगा."
 
 #: ../camel/providers/imap4/camel-imap4-store.c:263
-#: ../camel/providers/imapp/camel-imapp-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:196
-#: ../camel/providers/nntp/camel-nntp-store.c:215
-#: ../camel/providers/pop3/camel-pop3-store.c:180
-#: ../camel/providers/smtp/camel-smtp-transport.c:266
-#, fuzzy
+#: ../camel/providers/imapp/camel-imapp-store.c:249
+#: ../camel/providers/nntp/camel-nntp-store.c:195
+#: ../camel/providers/nntp/camel-nntp-store.c:214
+#: ../camel/providers/pop3/camel-pop3-store.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:272
 msgid "Connection canceled"
-msgstr "संबंधन रद्द"
+msgstr "कनेक्शन रद्द"
+
+#: ../camel/providers/imap4/camel-imap4-store.c:300
+#, fuzzy, c-format
+#| msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "सुरक्षित मोड में %s IMAP सर्वर से जुड़ने में विफल: %s"
+
+#: ../camel/providers/imap4/camel-imap4-store.c:330
+#: ../camel/providers/pop3/camel-pop3-store.c:251
+msgid "TLS negotiations failed"
+msgstr "TLS समझौता विफल"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:406
+#: ../camel/providers/imap4/camel-imap4-store.c:415
 #, c-format
 msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr "%s सत्यापन यांत्रिकी के प्रयोग से %s IMAP सर्वर को सत्यापित नहीं कर सकता है"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:455
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%s कृपया मेजबान %s पर %s के लिये IMAP शब्दकूट दाखिल करें"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:522
+#: ../camel/providers/imap4/camel-imap4-store.c:538
 #, c-format
 msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr "%s के प्रयोग से %s IMAP सर्वर को सत्यापित नहीं कर सकता है"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:685
-#: ../camel/providers/imap4/camel-imap4-store.c:953
+#: ../camel/providers/imap4/camel-imap4-store.c:701
+#: ../camel/providers/imap4/camel-imap4-store.c:969
 msgid "Cannot create IMAP folders in offline mode."
-msgstr "ऑफलाइन मोड में IMAP फोल्डर नहीं बना सकता."
+msgstr "à¤\91फलाà¤\87न à¤®à¥\8bड à¤®à¥\87à¤\82 IMAP à¤«à¤¼à¥\8bलà¥\8dडर à¤¨à¤¹à¥\80à¤\82 à¤¬à¤¨à¤¾ à¤¸à¤\95ता."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:724
+#: ../camel/providers/imap4/camel-imap4-store.c:740
 #, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "%s IMAP सर्वर पर `%s' फोल्डर नहीं पा सकता है: अज्ञात"
+#| msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+msgstr "%s IMAP सर्वर पर '%s' फ़ोल्डर नहीं पा सकता है: अज्ञात त्रुटि"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:805
-#, fuzzy, c-format
-msgid "Cannot get LIST information for `%s' on IMAP server %s: %s"
-msgstr "%s IMAP सर्वर पर `%s' पैटर्न के लिये `%s' सूचना नहीं प्राप्त कर सकता: %s"
+#: ../camel/providers/imap4/camel-imap4-store.c:821
+#, c-format
+msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+msgstr "Cannot get LIST information for '%s' on IMAP server %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:807
-#: ../camel/providers/imap4/camel-imap4-store.c:1482
+#: ../camel/providers/imap4/camel-imap4-store.c:823
+#: ../camel/providers/imap4/camel-imap4-store.c:1579
 msgid "Bad command"
-msgstr "à¤\97लत à¤¸à¤®à¤¾à¤¦à¥\87श"
+msgstr "à¤\97लत à¤\95माà¤\82ड"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:886
+#: ../camel/providers/imap4/camel-imap4-store.c:902
 #, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "`%s' फोल्डर नहीं निर्मित कर सकता: अवैध डाकपेटी नाम"
+#| msgid "Cannot create folder `%s': Invalid mailbox name"
+msgid "Cannot create folder '%s': Invalid mailbox name"
+msgstr "'%s' फ़ोल्डर नहीं निर्मित कर सकता: अवैध डाकपेटी नाम"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:891
+#: ../camel/providers/imap4/camel-imap4-store.c:907
 #, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "`%s' फोल्डर नहीं निर्मित कर सकता: गलत समादेश"
+#| msgid "Cannot create folder `%s': Bad command"
+msgid "Cannot create folder '%s': Bad command"
+msgstr "'%s' फ़ोल्डर नहीं निर्मित कर सकता: गलत कमांड"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:997
+#: ../camel/providers/imap4/camel-imap4-store.c:1013
 #, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "`%s' फोल्डर नहीं निर्मित कर सकता: विशेष फोल्डर"
+#| msgid "Cannot delete folder `%s': Special folder"
+msgid "Cannot delete folder '%s': Special folder"
+msgstr "'%s' फ़ोल्डर नहीं निर्मित कर सकता: विशेष फ़ोल्डर"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1004
+#: ../camel/providers/imap4/camel-imap4-store.c:1020
 msgid "Cannot delete IMAP folders in offline mode."
-msgstr "ऑफलाइन मोड में IMA फोल्डर का विलोपन नहीं कर सकते हैं."
+msgstr "à¤\91फलाà¤\87न à¤®à¥\8bड à¤®à¥\87à¤\82 IMA à¤«à¤¼à¥\8bलà¥\8dडर à¤\95ा à¤µà¤¿à¤²à¥\8bपन à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95तà¥\87 à¤¹à¥\88à¤\82."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1063
+#: ../camel/providers/imap4/camel-imap4-store.c:1079
 #, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "`%s' फोल्डर नहीं निर्मित कर सकता: अवैध डाकपेटी नाम"
+#| msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgid "Cannot delete folder '%s': Invalid mailbox name"
+msgstr "'%s' फ़ोल्डर नहीं निर्मित कर सकता: अवैध डाकपेटी नाम"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1068
+#: ../camel/providers/imap4/camel-imap4-store.c:1084
 #, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "`%s' फोल्डर विलोपित नहीं कर सकता: गलत समादेश"
+#| msgid "Cannot delete folder `%s': Bad command"
+msgid "Cannot delete folder '%s': Bad command"
+msgstr "'%s' फ़ोल्डर विलोपित नहीं कर सकता: गलत कमांड"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1088
+#: ../camel/providers/imap4/camel-imap4-store.c:1104
 #, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "फोल्डर `%s' से `%s' में पुनः नामकरण नहीं कर सकता: विशेष फोल्डर"
+#| msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgid "Cannot rename folder '%s' to '%s': Special folder"
+msgstr "फ़ोल्डर '%s' से '%s' में नाम नहीं बदल सकता: विशेष फ़ोल्डर"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1095
+#: ../camel/providers/imap4/camel-imap4-store.c:1111
 msgid "Cannot rename IMAP folders in offline mode."
-msgstr "ऑफलाइन मोड में IMA फोल्डर का पुनर्नामकरण नहीं कर सकते हैं."
+msgstr "à¤\91फलाà¤\87न à¤®à¥\8bड à¤®à¥\87à¤\82 IMA à¤«à¤¼à¥\8bलà¥\8dडर à¤\95ा à¤ªà¥\81नरà¥\8dनामà¤\95रण à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95तà¥\87 à¤¹à¥\88à¤\82."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1126
+#: ../camel/providers/imap4/camel-imap4-store.c:1142
 #, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "फोल्डर `%s' से `%s' में पुनः नामकरण नहीं कर सकता: अवैध डाकपेटी नाम"
+#| msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+msgstr "फ़ोल्डर '%s' से '%s' में नाम नहीं बदल सकता: अवैध डाकपेटी नाम"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1131
+#: ../camel/providers/imap4/camel-imap4-store.c:1147
 #, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "फोल्डर`%s' को `%s' नाम नहीं दे सकता: गलत समादेश"
+#| msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgid "Cannot rename folder '%s' to '%s': Bad command"
+msgstr "फ़ोल्डर'%s' को '%s' नाम नहीं बदल सकता: गलत कमांड"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1480
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr "%s IMAP सर्वर पर `%s' पैटर्न के लिये `%s' सूचना नहीं प्राप्त कर सकता: %s"
+#. 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:1577
+#, fuzzy, c-format
+#| msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+msgstr "%s IMAP सर्वर पर '%s' पैटर्न के लिये '%s' सूचना नहीं प्राप्त कर सकता: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1520
+#: ../camel/providers/imap4/camel-imap4-store.c:1638
 msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "ऑफलाइन मोड में IMAP फोल्डर का सदस्य नहीं बन सकता है"
+msgstr "à¤\91फलाà¤\87न à¤®à¥\8bड à¤®à¥\87à¤\82 IMAP à¤«à¤¼à¥\8bलà¥\8dडर à¤\95ा à¤¸à¤¦à¤¸à¥\8dय à¤¨à¤¹à¥\80à¤\82 à¤¬à¤¨ à¤¸à¤\95ता à¤¹à¥\88"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1565
+#: ../camel/providers/imap4/camel-imap4-store.c:1683
 #, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "`%s' फोल्डर का सदस्य नहीं बन सकता है: अवैध डाकपेटी नाम"
+#| msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+msgstr "'%s' फ़ोल्डर का सदस्य नहीं बन सकता है: अवैध डाकपेटी नाम"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1570
+#: ../camel/providers/imap4/camel-imap4-store.c:1688
 #, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "`%s' फोल्डर का सदस्य नहीं बन सकता है: गलत समादेश"
+#| msgid "Cannot subscribe to folder `%s': Bad command"
+msgid "Cannot subscribe to folder '%s': Bad command"
+msgstr "'%s' फ़ोल्डर का सदस्य नहीं बन सकता है: गलत कमांड"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1592
+#: ../camel/providers/imap4/camel-imap4-store.c:1710
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "IMAP फोल्डर से ऑफलाइन मोड में सदस्यता वापस नहीं ले सकता है"
+msgstr "IMAP à¤«à¤¼à¥\8bलà¥\8dडर à¤¸à¥\87 à¤\91फलाà¤\87न à¤®à¥\8bड à¤®à¥\87à¤\82 à¤¸à¤¦à¤¸à¥\8dयता à¤µà¤¾à¤ªà¤¸ à¤¨à¤¹à¥\80à¤\82 à¤²à¥\87 à¤¸à¤\95ता à¤¹à¥\88"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1637
+#: ../camel/providers/imap4/camel-imap4-store.c:1755
 #, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "`%s' फोल्डर से सदस्यता वापस नहीं ले सकता है:अवैध डाकपेटी नाम"
+#| msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+msgstr "'%s' फ़ोल्डर से सदस्यता वापस नहीं ले सकता है:अवैध डाकपेटी नाम"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1642
+#: ../camel/providers/imap4/camel-imap4-store.c:1760
 #, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "`%s' फोल्डर से सदस्यता वापस नहीं ले सकता है:गलत समादेश"
+#| msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgid "Cannot unsubscribe from folder '%s': Bad command"
+msgstr "'%s' फ़ोल्डर से सदस्यता वापस नहीं ले सकता है:गलत कमांड"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1484
+#: ../camel/providers/imap4/camel-imap4-summary.c:1596
 msgid "Scanning for changed messages"
 msgstr "परिवर्तित संदेश के लिये स्कैनिंग"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1509
-msgid "Fetching envelopes for new messages"
-msgstr "नए संदेश के लिये लिफाफा ला रहा है"
+#: ../camel/providers/imap4/camel-imap4-summary.c:1617
+#, c-format
+msgid "IMAP server %s is in an inconsistent state."
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:368
+#: ../camel/providers/imap4/camel-imap4-summary.c:1644
+#| msgid "Fetching envelopes for new messages"
+msgid "Fetching envelopes of new messages"
+msgstr "नए संदेश का लिफाफा ला रहा है"
+
+#: ../camel/providers/imap4/camel-imap4-utils.c:437
 #, c-format
 msgid "Unexpected token in response from IMAP server %s: "
 msgstr "IMAP सर्वर से अनुक्रिया में अप्रत्याशित टोकन %s: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:391
+#: ../camel/providers/imap4/camel-imap4-utils.c:460
 msgid "No data"
 msgstr "कोई आंकड़ा नहीं"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:574
+#: ../camel/providers/imap4/camel-imap4-utils.c:623
 #, c-format
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "IMAP सर्वर %s अप्रत्याशित रूप से असंबंधित हो गया: %s"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:40
-#: ../camel/providers/pop3/camel-pop3-provider.c:40
+#: ../camel/providers/imapp/camel-imapp-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "Message storage"
 msgstr "संदेश भंडारन"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:48
+#: ../camel/providers/imapp/camel-imapp-provider.c:49
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:50
+#: ../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"
@@ -3492,12 +3609,12 @@ msgstr ""
 "\n"
 " !!! उत्पादन ईडाक के लिए इसका प्रयोग नहीं करें  !!!\n"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:251
+#: ../camel/providers/imapp/camel-imapp-store.c:252
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "%s (पोर्ट %s) से जोड़ नहीं सका : %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:348
+#: ../camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "%s पर POP सर्वर से जोड़ नहीं सका"
@@ -3507,579 +3624,622 @@ msgid "Index message body data"
 msgstr "सूची संदेश बॉडी पाठ"
 
 #. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:384
+#: ../camel/providers/local/camel-local-folder.c:392
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:388
-#: ../camel/providers/local/camel-local-folder.c:391
+#: ../camel/providers/local/camel-local-folder.c:396
+#: ../camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "डाकपेटी:%s (%s)"
 
 #. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:395
+#: ../camel/providers/local/camel-local-folder.c:403
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:47
-msgid "Use the `.folders' folder summary file (exmh)"
-msgstr "फोल्डर सारांश संचिका `.folders' (exmh) का प्रयोग करें"
+#: ../camel/providers/local/camel-local-provider.c:48
+#| msgid "Use the `.folders' folder summary file (exmh)"
+msgid "_Use the '.folders' folder summary file (exmh)"
+msgstr "फ़ोल्डर सारांश फ़ाइल `.folders' (exmh) का प्रयोग करें (_U)"
 
-#: ../camel/providers/local/camel-local-provider.c:54
+#: ../camel/providers/local/camel-local-provider.c:55
 msgid "MH-format mail directories"
-msgstr "MH-पà¥\8dरारà¥\82प à¤¡à¤¾à¤\95 à¤¡à¤¾à¤¯à¤°à¥\87à¤\95à¥\8dà¤\9fरà¥\80"
+msgstr "MH-पà¥\8dरारà¥\82प à¤¡à¤¾à¤\95 à¤¨à¤¿à¤°à¥\8dदà¥\87शिà¤\95ा"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:56
 msgid "For storing local mail in MH-like mail directories."
-msgstr "MH-सदà¥\83श à¤¡à¤¾à¤\95 à¤¡à¤¾à¤¯à¤°à¥\87à¤\95à¥\8dà¤\9fरà¥\80 में स्थानीय डाक को स्टोर करने के लिए."
+msgstr "MH-सदà¥\83श à¤¡à¤¾à¤\95 à¤¨à¤¿à¤°à¥\8dदà¥\87शिà¤\95ा में स्थानीय डाक को स्टोर करने के लिए."
 
-#: ../camel/providers/local/camel-local-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:73
 msgid "Local delivery"
 msgstr "स्थानीय डेलिवरी"
 
-#: ../camel/providers/local/camel-local-provider.c:73
-#, fuzzy
+#: ../camel/providers/local/camel-local-provider.c:74
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr ""
-"मानक mbox संरूपित स्पूल से एवोल्यूशन द्वारा प्रबंधित फोल्डर में स्थानीय डाक की पुनर्प्राप्ति "
+"मानà¤\95 mbox à¤¸à¤\82रà¥\82पित à¤¸à¥\8dपà¥\82ल à¤¸à¥\87 à¤\8fवà¥\8bलà¥\8dयà¥\82शन à¤¦à¥\8dवारा à¤ªà¥\8dरबà¤\82धित à¤«à¤¼à¥\8bलà¥\8dडर à¤®à¥\87à¤\82 à¤¸à¥\8dथानà¥\80य à¤¡à¤¾à¤\95 à¤\95à¥\80 à¤ªà¥\81नरà¥\8dपà¥\8dरापà¥\8dति "
 "(विस्थापन) के लिए."
 
-#: ../camel/providers/local/camel-local-provider.c:87
-#: ../camel/providers/local/camel-local-provider.c:106
-msgid "Apply filters to new messages in INBOX"
-msgstr "INBOX में नए संदेश पर निस्पंदक चलाएं"
+#: ../camel/providers/local/camel-local-provider.c:88
+#: ../camel/providers/local/camel-local-provider.c:107
+#| msgid "Apply filters to new messages in INBOX"
+msgid "_Apply filters to new messages in INBOX"
+msgstr "INBOX में नए संदेश पर फिल्टर चलाएँ"
 
-#: ../camel/providers/local/camel-local-provider.c:94
+#: ../camel/providers/local/camel-local-provider.c:95
 msgid "Maildir-format mail directories"
-msgstr "Maildir- à¤ªà¥\8dरारà¥\82प à¤¡à¤¾à¤\95 à¤¡à¤¾à¤¯à¤°à¥\87à¤\95à¥\8dà¤\9fरà¥\80"
+msgstr "Maildir- à¤ªà¥\8dरारà¥\82प à¤¡à¤¾à¤\95 à¤¨à¤¿à¤°à¥\8dदà¥\87शिà¤\95ा"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:96
 msgid "For storing local mail in maildir directories."
-msgstr "maildir डायरेक्टरी में स्थानीय डाक के भंडारण के लिए."
-
-#: ../camel/providers/local/camel-local-provider.c:107
-msgid "Store status headers in Elm/Pine/Mutt format"
-msgstr "Elm/Pine/Mutt प्रारूप में स्थिति शीर्षों को स्टोर करें"
+msgstr "maildir निर्देशिका में स्थानीय डाक के भंडारण के लिए."
 
-#: ../camel/providers/local/camel-local-provider.c:114
-msgid "Standard Unix mbox spool or directory"
-msgstr "मानक Unix mbox स्पूल या डायरेक्टरी"
+#: ../camel/providers/local/camel-local-provider.c:108
+#| msgid "Store status headers in Elm/Pine/Mutt format"
+msgid "_Store status headers in Elm/Pine/Mutt format"
+msgstr "Elm/Pine/Mutt प्रारूप में स्थिति शीर्षों को जमा करें (_S)"
 
 #: ../camel/providers/local/camel-local-provider.c:115
+#| msgid "Standard Unix mbox spool or directory"
+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
 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."
 msgstr ""
-"बाहà¥\8dय à¤®à¤¾à¤¨à¤\95 Unix mbox à¤¸à¥\8dपà¥\82ल à¤¸à¤\82à¤\9aिà¤\95ा में स्थानीय डाक को स्टोर करने और पढ़ने के लिए.\n"
-"Elm, Pine, या Mutt शैली फोल्डरों के तरू को पढ़ने में भी प्रयुक्त हो सकता है."
+"बाहà¥\8dय à¤®à¤¾à¤¨à¤\95 Unix mbox à¤¸à¥\8dपà¥\82ल à¤«à¤¼à¤¾à¤\87ल में स्थानीय डाक को स्टोर करने और पढ़ने के लिए.\n"
+"Elm, Pine, à¤¯à¤¾ Mutt à¤¶à¥\88लà¥\80 à¤«à¤¼à¥\8bलà¥\8dडरà¥\8bà¤\82 à¤\95à¥\87 à¤¤à¤°à¥\82 à¤\95à¥\8b à¤ªà¤¢à¤¼à¤¨à¥\87 à¤®à¥\87à¤\82 à¤­à¥\80 à¤ªà¥\8dरयà¥\81à¤\95à¥\8dत à¤¹à¥\8b à¤¸à¤\95ता à¤¹à¥\88."
 
-#: ../camel/providers/local/camel-local-store.c:156
-#: ../camel/providers/local/camel-local-store.c:267
-#: ../camel/providers/local/camel-mbox-store.c:346
-#: ../camel/providers/local/camel-spool-store.c:126
+#: ../camel/providers/local/camel-local-provider.c:126
+#| msgid "Standard Unix mbox spool or directory"
+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:129
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "स्टोर रूट %s एक आत्यंतिक पथ नहीं है"
 
-#: ../camel/providers/local/camel-local-store.c:163
+#: ../camel/providers/local/camel-local-store.c:172
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr "सà¥\8dà¤\9fà¥\8bर à¤°à¥\82à¤\9f %s à¤\8fà¤\95 à¤°à¥\87à¤\97à¥\81लर à¤¡à¤¾à¤¯à¤°à¥\87à¤\95à¥\8dà¤\9fरà¥\80 नहीं है"
+msgstr "सà¥\8dà¤\9fà¥\8bर à¤°à¥\82à¤\9f %s à¤\8fà¤\95 à¤°à¥\87à¤\97à¥\81लर à¤¨à¤¿à¤°à¥\8dदà¥\87शिà¤\95ा नहीं है"
 
-#: ../camel/providers/local/camel-local-store.c:172
-#: ../camel/providers/local/camel-local-store.c:180
-#: ../camel/providers/local/camel-local-store.c:278
+#: ../camel/providers/local/camel-local-store.c:181
+#: ../camel/providers/local/camel-local-store.c:189
+#: ../camel/providers/local/camel-local-store.c:287
 #, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr "फोल्डर नहीं पा सकता है: %s: %s"
+msgstr "फ़à¥\8bलà¥\8dडर à¤¨à¤¹à¥\80à¤\82 à¤ªà¤¾ à¤¸à¤\95ता à¤¹à¥\88: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:192
+#: ../camel/providers/local/camel-local-store.c:201
 msgid "Local stores do not have an inbox"
 msgstr "स्थानीय स्टोर इनबाक्स नहीं रखता है "
 
-#: ../camel/providers/local/camel-local-store.c:238
+#: ../camel/providers/local/camel-local-store.c:247
 #, c-format
 msgid "Local mail file %s"
-msgstr "सà¥\8dथानà¥\80य à¤¡à¤¾à¤\95 à¤¸à¤\82à¤\9aिà¤\95ा %s"
+msgstr "सà¥\8dथानà¥\80य à¤¡à¤¾à¤\95 à¤«à¤¼à¤¾à¤\87ल %s"
 
-#: ../camel/providers/local/camel-local-store.c:356
+#: ../camel/providers/local/camel-local-store.c:342
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
-msgstr "फोल्डर `%s' से `%s' में पुनः नामकरण नहीं कर सका: %s"
+msgstr "फ़à¥\8bलà¥\8dडर `%s' à¤¸à¥\87 `%s' à¤®à¥\87à¤\82 à¤ªà¥\81नà¤\83 à¤¨à¤¾à¤®à¤\95रण à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ा: %s"
 
-#: ../camel/providers/local/camel-local-store.c:421
+#: ../camel/providers/local/camel-local-store.c:410
 #, c-format
 msgid "Could not rename '%s': %s"
-msgstr "`%s' का पुनः नामकरण नहीं कर सका: %s"
-
-#: ../camel/providers/local/camel-local-store.c:446
-#: ../camel/providers/local/camel-mbox-store.c:275
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "`%s' फोल्डर सारांश संचिका विलोपित नहीं कर सका: %s"
-
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:287
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "`%s' फोल्डर इंडेक्स संचिका विलोपित नहीं कर सका: %s"
+msgstr "'%s' का पुनः नामकरण नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-local-store.c:479
-#: ../camel/providers/local/camel-mbox-store.c:311
+#: ../camel/providers/local/camel-local-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:300
 #, c-format
-msgid "Could not delete folder meta file `%s': %s"
-msgstr "`%s' फोल्डर मेटा संचिका विलोपित नहीं कर सका: %s"
+#| msgid "Could not delete folder index file `%s': %s"
+msgid "Could not delete folder index file '%s': %s"
+msgstr "'%s' फ़ोल्डर इंडेक्स फ़ाइल विलोपित नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:409
+#: ../camel/providers/local/camel-local-store.c:458
+#: ../camel/providers/local/camel-mbox-store.c:324
 #, c-format
-msgid "Could not save summary: %s: %s"
-msgstr "सारांश संग्रहित नहीं कर सका: %s: %s"
+#| msgid "Could not delete folder meta file `%s': %s"
+msgid "Could not delete folder meta file '%s': %s"
+msgstr "'%s' फ़ोल्डर मेटा फ़ाइल विलोपित नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:467
+#: ../camel/providers/local/camel-local-summary.c:515
 msgid "Unable to add message to summary: unknown reason"
 msgstr "सारांश में संदेश जोड़ने में अक्षम:अज्ञात कारण"
 
-#: ../camel/providers/local/camel-maildir-folder.c:215
-#, fuzzy
+#: ../camel/providers/local/camel-maildir-folder.c:222
 msgid "Maildir append message canceled"
-msgstr "मेल योग संदेश रद्द"
+msgstr "Maildir संयोजक संदेश रद्द"
 
-#: ../camel/providers/local/camel-maildir-folder.c:218
+#: ../camel/providers/local/camel-maildir-folder.c:225
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "maildir फोल्डर में संदेश नहीं जोड़ सकता: %s: %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:244
-#: ../camel/providers/local/camel-maildir-folder.c:258
-#: ../camel/providers/local/camel-maildir-folder.c:267
-#: ../camel/providers/local/camel-mbox-folder.c:350
-#: ../camel/providers/local/camel-mbox-folder.c:369
-#: ../camel/providers/local/camel-mbox-folder.c:400
-#: ../camel/providers/local/camel-mbox-folder.c:408
-#: ../camel/providers/local/camel-mh-folder.c:202
+msgstr "maildir फ़ोल्डर में संदेश नहीं जोड़ सकता: %s: %s"
+
+#: ../camel/providers/local/camel-maildir-folder.c:247
+#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:288
+#: ../camel/providers/local/camel-maildir-folder.c:297
+#: ../camel/providers/local/camel-mbox-folder.c:346
+#: ../camel/providers/local/camel-mbox-folder.c:398
+#: ../camel/providers/local/camel-mbox-folder.c:419
+#: ../camel/providers/local/camel-mbox-folder.c:450
+#: ../camel/providers/local/camel-mbox-folder.c:458
 #: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:222
+#: ../camel/providers/local/camel-mh-folder.c:224
+#: ../camel/providers/local/camel-mh-folder.c:233
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
-"संदेश नहीं प्राप्त कर सकता है: %s फोल्डर से %s\n"
+"सà¤\82दà¥\87श à¤¨à¤¹à¥\80à¤\82 à¤ªà¥\8dरापà¥\8dत à¤\95र à¤¸à¤\95ता à¤¹à¥\88: %s à¤«à¤¼à¥\8bलà¥\8dडर à¤¸à¥\87 %s\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:298
 msgid "Invalid message contents"
 msgstr "अवैध संदेश अंतर्वस्तु"
 
-#: ../camel/providers/local/camel-maildir-store.c:146
-#: ../camel/providers/local/camel-maildir-store.c:171
-#: ../camel/providers/local/camel-mbox-store.c:175
-#: ../camel/providers/local/camel-mbox-store.c:187
+#: ../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
 #, c-format
-msgid "Cannot create folder `%s': %s"
-msgstr "`%s' फोल्डर निर्मित नहीं कर सकता है: %s"
+#| msgid "Cannot create folder `%s': %s"
+msgid "Cannot create folder '%s': %s"
+msgstr "'%s' फ़ोल्डर नहीं बना सकता है: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:159
-#: ../camel/providers/local/camel-mbox-store.c:146
+#: ../camel/providers/local/camel-maildir-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:147
 #: ../camel/providers/local/camel-mh-store.c:217
 #, c-format
-msgid "Cannot get folder `%s': %s"
-msgstr "`%s' फोल्डर नहीं प्राप्त कर सकता है: %s"
+#| msgid "Cannot get folder `%s': %s"
+msgid "Cannot get folder '%s': %s"
+msgstr "'%s' फ़ोल्डर नहीं प्राप्त कर सकता है: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:163
-#: ../camel/providers/local/camel-mbox-store.c:154
+#: ../camel/providers/local/camel-maildir-store.c:165
+#: ../camel/providers/local/camel-mbox-store.c:155
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
-msgid "Cannot get folder `%s': folder does not exist."
-msgstr "`%s' फोल्डर नहीं प्राप्त कर सकता है: फोल्डर उपस्थित नहीं है."
+#| msgid "Cannot get folder `%s': folder does not exist."
+msgid "Cannot get folder '%s': folder does not exist."
+msgstr "'%s' फ़ोल्डर नहीं प्राप्त कर सकता है: फ़ोल्डर उपस्थित नहीं है."
 
-#: ../camel/providers/local/camel-maildir-store.c:187
+#: ../camel/providers/local/camel-maildir-store.c:189
 #, c-format
-msgid "Cannot get folder `%s': not a maildir directory."
-msgstr "`%s' फोल्डर नहीं पा सकता है: maildir डायरेक्टरी नहीं है."
+#| msgid "Cannot get folder `%s': not a maildir directory."
+msgid "Cannot get folder '%s': not a maildir directory."
+msgstr "'%s' फ़ोल्डर नहीं पा सकता है: maildir निर्देशिका नहीं है."
 
-#: ../camel/providers/local/camel-maildir-store.c:232
-#: ../camel/providers/local/camel-maildir-store.c:270
+#: ../camel/providers/local/camel-maildir-store.c:234
+#: ../camel/providers/local/camel-maildir-store.c:272
 #: ../camel/providers/local/camel-mh-store.c:273
 #, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "`%s' फोल्डर विलोपित नहीं कर सकता है: %s"
+#| msgid "Could not delete folder `%s': %s"
+msgid "Could not delete folder '%s': %s"
+msgstr "'%s' फ़ोल्डर विलोपित नहीं कर सकता है: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:234
+#: ../camel/providers/local/camel-maildir-store.c:236
 msgid "not a maildir directory"
-msgstr "maildir à¤¡à¤¾à¤¯à¤°à¥\87à¤\95à¥\8dà¤\9fरà¥\80 नहीं है"
+msgstr "maildir à¤¨à¤¿à¤°à¥\8dदà¥\87शिà¤\95ा नहीं है"
 
-#: ../camel/providers/local/camel-maildir-store.c:436
-#: ../camel/providers/local/camel-spool-store.c:328
-#: ../camel/providers/local/camel-spool-store.c:342
+#: ../camel/providers/local/camel-maildir-store.c:440
+#: ../camel/providers/local/camel-spool-store.c:331
+#: ../camel/providers/local/camel-spool-store.c:345
 #, c-format
-msgid "Could not scan folder `%s': %s"
-msgstr "`%s' फोल्डर स्कैन नहीं कर सकता है: %s"
+#| msgid "Could not scan folder `%s': %s"
+msgid "Could not scan folder '%s': %s"
+msgstr "'%s' फ़ोल्डर स्कैन नहीं कर सकता है: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:425
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:439
+#: ../camel/providers/local/camel-maildir-summary.c:558
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "maildir à¤¡à¤¾à¤¯à¤°à¥\87à¤\95à¥\8dà¤\9fरà¥\80 पथ खोल नहीं सकता है: %s: %s"
+msgstr "maildir à¤¨à¤¿à¤°à¥\8dदà¥\87शिà¤\95ा पथ खोल नहीं सकता है: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:551
 msgid "Checking folder consistency"
-msgstr "फोल्डर संगतता की जांच कर रहा है"
+msgstr "फ़à¥\8bलà¥\8dडर à¤¸à¤\82à¤\97तता à¤\95à¥\80 à¤\9cाà¤\82à¤\9a à¤\95र à¤°à¤¹à¤¾ à¤¹à¥\88"
 
-#: ../camel/providers/local/camel-maildir-summary.c:652
+#: ../camel/providers/local/camel-maildir-summary.c:656
 msgid "Checking for new messages"
 msgstr "नए संदेश के लिये जांच कर रहा है"
 
-#: ../camel/providers/local/camel-maildir-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:433
-#: ../camel/providers/local/camel-mbox-summary.c:606
-#: ../camel/providers/local/camel-mbox-summary.c:701
-#: ../camel/providers/local/camel-spool-summary.c:139
+#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../camel/providers/local/camel-mbox-summary.c:529
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-mbox-summary.c:831
+#: ../camel/providers/local/camel-spool-summary.c:150
 msgid "Storing folder"
-msgstr "फोल्डर स्टोर कर रहा है"
+msgstr "फ़à¥\8bलà¥\8dडर à¤¸à¥\8dà¤\9fà¥\8bर à¤\95र à¤°à¤¹à¤¾ à¤¹à¥\88"
 
-#: ../camel/providers/local/camel-mbox-folder.c:156
-#: ../camel/providers/local/camel-spool-folder.c:148
+#: ../camel/providers/local/camel-mbox-folder.c:159
+#: ../camel/providers/local/camel-spool-folder.c:150
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
-msgstr "%s पर फोल्डर ताला नहीं निर्मित कर सकता: %s"
+msgstr "%s à¤ªà¤° à¤«à¤¼à¥\8bलà¥\8dडर à¤¤à¤¾à¤²à¤¾ à¤¨à¤¹à¥\80à¤\82 à¤¨à¤¿à¤°à¥\8dमित à¤\95र à¤¸à¤\95ता: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:217
+#: ../camel/providers/local/camel-mbox-folder.c:220
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "डाकपेटी खोल नहीं सकता है: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:277
-#, fuzzy
+#: ../camel/providers/local/camel-mbox-folder.c:281
 msgid "Mail append canceled"
-msgstr "मà¥\87ल à¤¯à¥\8bà¤\97 रद्द"
+msgstr "मà¥\87ल à¤¸à¤\82यà¥\8bà¤\9cन रद्द"
 
-#: ../camel/providers/local/camel-mbox-folder.c:280
+#: ../camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
-msgstr "mbox à¤¸à¤\82à¤\9aिà¤\95ा में संदेश जोड़ नहीं सकता: %s: %s"
+msgstr "mbox à¤«à¤¼à¤¾à¤\87ल में संदेश जोड़ नहीं सकता: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:401
+#: ../camel/providers/local/camel-mbox-folder.c:451
 msgid "The folder appears to be irrecoverably corrupted."
-msgstr "फोल्डर पुनर्प्राप्त नहीं किए जा सकने की स्थिति में खराब हो चुका है."
+msgstr "फ़à¥\8bलà¥\8dडर à¤ªà¥\81नरà¥\8dपà¥\8dरापà¥\8dत à¤¨à¤¹à¥\80à¤\82 à¤\95िà¤\8f à¤\9cा à¤¸à¤\95नà¥\87 à¤\95à¥\80 à¤¸à¥\8dथिति à¤®à¥\87à¤\82 à¤\96राब à¤¹à¥\8b à¤\9aà¥\81à¤\95ा à¤¹à¥\88."
 
-#: ../camel/providers/local/camel-mbox-folder.c:409
-#: ../camel/providers/local/camel-mh-folder.c:223
+#: ../camel/providers/local/camel-mbox-folder.c:459
+#: ../camel/providers/local/camel-mh-folder.c:234
 msgid "Message construction failed."
 msgstr "संदेश संरचना असफल."
 
-#: ../camel/providers/local/camel-mbox-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:352
+#: ../camel/providers/local/camel-mbox-store.c:166
+#: ../camel/providers/local/camel-mbox-store.c:365
 msgid "Cannot create a folder by this name."
-msgstr "इस नाम से फोल्डर नहीं बना सकता है."
+msgstr "à¤\87स à¤¨à¤¾à¤® à¤¸à¥\87 à¤«à¤¼à¥\8bलà¥\8dडर à¤¨à¤¹à¥\80à¤\82 à¤¬à¤¨à¤¾ à¤¸à¤\95ता à¤¹à¥\88."
 
-#: ../camel/providers/local/camel-mbox-store.c:197
+#: ../camel/providers/local/camel-mbox-store.c:198
 #, c-format
-msgid "Cannot get folder `%s': not a regular file."
-msgstr "`%s' फोल्डर नहीं प्राप्त कर सकता है: रेगुलर संचिका नहीं है."
+#| msgid "Cannot get folder `%s': not a regular file."
+msgid "Cannot get folder '%s': not a regular file."
+msgstr "'%s' फ़ोल्डर नहीं प्राप्त कर सकता है: नियमित फ़ाइल नहीं है."
 
-#: ../camel/providers/local/camel-mbox-store.c:227
-#: ../camel/providers/local/camel-mbox-store.c:238
-#: ../camel/providers/local/camel-mbox-store.c:261
+#: ../camel/providers/local/camel-mbox-store.c:228
+#: ../camel/providers/local/camel-mbox-store.c:239
+#: ../camel/providers/local/camel-mbox-store.c:262
 #, c-format
+#| msgid ""
+#| "Could not delete folder `%s':\n"
+#| "%s"
 msgid ""
-"Could not delete folder `%s':\n"
+"Could not delete folder '%s':\n"
 "%s"
 msgstr ""
-"`%s' फोल्डर मिटा नहीं सकता:\n"
+"'%s' फ़ोल्डर मिटा नहीं सकता:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:246
+#: ../camel/providers/local/camel-mbox-store.c:247
 #, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' एक रेगुलर संचिका नहीं है."
+#| msgid "`%s' is not a regular file."
+msgid "'%s' is not a regular file."
+msgstr "'%s' एक नियमित फ़ाइल नहीं है."
 
-#: ../camel/providers/local/camel-mbox-store.c:253
+#: ../camel/providers/local/camel-mbox-store.c:254
 #, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "`%s' फोल्डर खाली नहीं है. विलोपित नहीं किया गया है."
+#| msgid "Folder `%s' is not empty. Not deleted."
+msgid "Folder '%s' is not empty. Not deleted."
+msgstr "'%s' फ़ोल्डर खाली नहीं है. मिटाया नहीं गया है."
 
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:276
+#: ../camel/providers/local/camel-mbox-store.c:288
+#, c-format
+#| msgid "Could not delete folder summary file `%s': %s"
+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."
+#| msgid "Cannot create directory `%s': %s."
+msgid "Cannot create directory '%s': %s."
+msgstr "'%s' निर्देशिका निर्मित नहीं कर सकता है: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:379
+#: ../camel/providers/local/camel-mbox-store.c:392
 #, c-format
 msgid "Cannot create folder: %s: %s"
-msgstr "`%s' फोल्डर निर्मित नहीं कर सकता है: %s."
+msgstr "`%s' à¤«à¤¼à¥\8bलà¥\8dडर à¤¨à¤¿à¤°à¥\8dमित à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता à¤¹à¥\88: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:381
+#: ../camel/providers/local/camel-mbox-store.c:394
 msgid "Folder already exists"
-msgstr "फोल्डर पहले से उपस्थित है"
+msgstr "फ़à¥\8bलà¥\8dडर à¤ªà¤¹à¤²à¥\87 à¤¸à¥\87 à¤\89पसà¥\8dथित à¤¹à¥\88"
 
-#: ../camel/providers/local/camel-mbox-store.c:472
+#: ../camel/providers/local/camel-mbox-store.c:485
 msgid "The new folder name is illegal."
-msgstr "नए फोल्डर का नाम अवैध है."
+msgstr "नà¤\8f à¤«à¤¼à¥\8bलà¥\8dडर à¤\95ा à¤¨à¤¾à¤® à¤\85वà¥\88ध à¤¹à¥\88."
 
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:498
 #, c-format
-msgid "Could not rename `%s': `%s': %s"
-msgstr "का पुनर्नामकरण नहीं कर सका: `%s': `%s': %s"
+#| msgid "Could not rename `%s': `%s': %s"
+msgid "Could not rename '%s': '%s': %s"
+msgstr "'%s' का नाम नहीं बदल सकता है: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:560
+#: ../camel/providers/local/camel-mbox-store.c:579
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "`%s' का %s यह पुनर्नामकरण नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:439
+#: ../camel/providers/local/camel-mbox-summary.c:535
 #, c-format
 msgid "Could not open folder: %s: %s"
-msgstr "फोल्डर नहीं खोल सकता: %s: %s"
+msgstr "फ़à¥\8bलà¥\8dडर à¤¨à¤¹à¥\80à¤\82 à¤\96à¥\8bल à¤¸à¤\95ता: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:487
+#: ../camel/providers/local/camel-mbox-summary.c:585
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "%ld स्थिति में गंभीर मेल विश्लेषण त्रुटि %s में"
 
-#: ../camel/providers/local/camel-mbox-summary.c:543
+#: ../camel/providers/local/camel-mbox-summary.c:648
 #, c-format
 msgid "Cannot check folder: %s: %s"
-msgstr "फोल्डर की जांच नहीं कर सकता है: %s: %s"
+msgstr "फ़à¥\8bलà¥\8dडर à¤\95à¥\80 à¤\9cाà¤\82à¤\9a à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ता à¤¹à¥\88: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:611
-#: ../camel/providers/local/camel-mbox-summary.c:706
-#: ../camel/providers/local/camel-spool-summary.c:144
+#: ../camel/providers/local/camel-mbox-summary.c:716
+#: ../camel/providers/local/camel-mbox-summary.c:836
+#: ../camel/providers/local/camel-spool-summary.c:155
 #, c-format
 msgid "Could not open file: %s: %s"
-msgstr "सà¤\82à¤\9aिà¤\95ा को खोल नहीं सका: %s: %s"
+msgstr "फ़ाà¤\87ल को खोल नहीं सका: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:623
-#: ../camel/providers/local/camel-spool-summary.c:164
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-spool-summary.c:168
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "अस्थायी डाकपेटी नहीं खोल सकता है: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:636
-#: ../camel/providers/local/camel-mbox-summary.c:812
+#: ../camel/providers/local/camel-mbox-summary.c:741
+#: ../camel/providers/local/camel-mbox-summary.c:945
 #, c-format
 msgid "Could not close source folder %s: %s"
-msgstr "श्रोत फोल्डर %s बंद नहीं कर सका: %s"
+msgstr "शà¥\8dरà¥\8bत à¤«à¤¼à¥\8bलà¥\8dडर %s à¤¬à¤\82द à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ा: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:645
+#: ../camel/providers/local/camel-mbox-summary.c:750
 #, c-format
-msgid "Could not close temp folder: %s"
-msgstr "अस्थायी फोल्डर बंद नहीं कर सका: %s"
+#| msgid "Could not close temp folder: %s"
+msgid "Could not close temporary folder: %s"
+msgstr "अस्थायी फ़ोल्डर बंद नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:660
+#: ../camel/providers/local/camel-mbox-summary.c:765
 #, c-format
 msgid "Could not rename folder: %s"
-msgstr "फोल्डर का पुनः नामकरण नहीं कर सका: %s"
+msgstr "फ़à¥\8bलà¥\8dडर à¤\95ा à¤ªà¥\81नà¤\83 à¤¨à¤¾à¤®à¤\95रण à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ा: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:717
-#: ../camel/providers/local/camel-mbox-summary.c:923
+#: ../camel/providers/local/camel-mbox-summary.c:847
+#: ../camel/providers/local/camel-mbox-summary.c:1075
 #, c-format
 msgid "Could not store folder: %s"
-msgstr "फोल्डर स्टोर नहीं कर सका: %s"
+msgstr "फ़à¥\8bलà¥\8dडर à¤¸à¥\8dà¤\9fà¥\8bर à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ा: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:754
-#: ../camel/providers/local/camel-mbox-summary.c:762
-#: ../camel/providers/local/camel-mbox-summary.c:954
-#: ../camel/providers/local/camel-mbox-summary.c:962
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:894
+#: ../camel/providers/local/camel-mbox-summary.c:1105
+#: ../camel/providers/local/camel-mbox-summary.c:1113
 msgid "Summary and folder mismatch, even after a sync"
-msgstr "सारांश और फोल्डर बेमेल है, तुल्यकालन के पश्चात भी"
+msgstr "साराà¤\82श à¤\94र à¤«à¤¼à¥\8bलà¥\8dडर à¤¬à¥\87मà¥\87ल à¤¹à¥\88, à¤¤à¥\81लà¥\8dयà¤\95ालन à¤\95à¥\87 à¤ªà¤¶à¥\8dà¤\9aात à¤­à¥\80"
 
-#: ../camel/providers/local/camel-mbox-summary.c:888
+#: ../camel/providers/local/camel-mbox-summary.c:1038
 #: ../camel/providers/local/camel-spool-summary.c:336
 #, c-format
 msgid "Unknown error: %s"
 msgstr "अज्ञात दोष:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1017
-#: ../camel/providers/local/camel-mbox-summary.c:1043
+#: ../camel/providers/local/camel-mbox-summary.c:1181
+#: ../camel/providers/local/camel-mbox-summary.c:1207
 #, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "temp डाकपेटी में लिखने में त्रुटि: %s"
+#| msgid "Writing to tmp mailbox failed: %s: %s"
+msgid "Writing to temporary mailbox failed: %s"
+msgstr "अस्थाई डाकपेटी में लिखने में विफल: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1034
+#: ../camel/providers/local/camel-mbox-summary.c:1198
 #, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "temp डाकपेटी में लिखने में विफल: %s: %s"
+#| msgid "Writing to tmp mailbox failed: %s: %s"
+msgid "Writing to temporary mailbox failed: %s: %s"
+msgstr "अस्थाई डाकपेटी में लिखने में विफल: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:175
-#, fuzzy
+#: ../camel/providers/local/camel-mh-folder.c:178
 msgid "MH append message canceled"
 msgstr "MH योग संदेश रद्द"
 
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-mh-folder.c:181
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
-msgstr "mh फोल्डर में संदेश जोड़ नहीं सकता है:  %s: %s"
+msgstr "mh à¤«à¤¼à¥\8bलà¥\8dडर à¤®à¥\87à¤\82 à¤¸à¤\82दà¥\87श à¤\9cà¥\8bड़ à¤¨à¤¹à¥\80à¤\82 à¤¸à¤\95ता à¤¹à¥\88:  %s: %s"
 
 #: ../camel/providers/local/camel-mh-store.c:232
 #, c-format
-msgid "Could not create folder `%s': %s"
-msgstr "फोल्डर `%s' निर्मित नहीं कर सका: %s"
+#| msgid "Could not create folder `%s': %s"
+msgid "Could not create folder '%s': %s"
+msgstr "फ़ोल्डर '%s' निर्मित नहीं कर सका: %s"
 
 #: ../camel/providers/local/camel-mh-store.c:244
 #, c-format
-msgid "Cannot get folder `%s': not a directory."
-msgstr "`%s' फोल्डर नहीं पा सकता है:डायरेक्टरी नहीं है."
+#| msgid "Cannot get folder `%s': not a directory."
+msgid "Cannot get folder '%s': not a directory."
+msgstr "'%s' फ़ोल्डर नहीं पा सकता है:निर्देशिका नहीं है."
 
-#: ../camel/providers/local/camel-mh-summary.c:246
+#: ../camel/providers/local/camel-mh-summary.c:264
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "MH à¤¡à¤¾à¤¯à¤°à¥\87à¤\95à¥\8dà¤\9fरà¥\80 पथ खोल नहीं सकता है: %s: %s"
+msgstr "MH à¤¨à¤¿à¤°à¥\8dदà¥\87शिà¤\95ा पथ खोल नहीं सकता है: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:135
 #, c-format
-msgid "Spool `%s' cannot be opened: %s"
-msgstr "`%s' स्पूल खोल नहीं सकता है: %s"
+#| msgid "Spool `%s' cannot be opened: %s"
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "'%s' स्पूल खोल नहीं सकता है: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:144
+#: ../camel/providers/local/camel-spool-store.c:147
 #, c-format
-msgid "Spool `%s' is not a regular file or directory"
-msgstr "`%s' स्पूल एक रेगुलर संचिका या डायरेक्टरी नहीं है"
+#| msgid "Spool `%s' is not a regular file or directory"
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "'%s' स्पूल एक नियमित फ़ाइल या निर्देशिका नहीं है"
 
-#: ../camel/providers/local/camel-spool-store.c:163
+#: ../camel/providers/local/camel-spool-store.c:166
 #, c-format
-msgid "Folder `%s/%s' does not exist."
-msgstr "`%s/%s' फोल्डर मौजूद नहीं है."
+#| msgid "Folder `%s/%s' does not exist."
+msgid "Folder '%s/%s' does not exist."
+msgstr "'%s/%s' फ़ोल्डर मौजूद नहीं है."
 
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
+#| msgid ""
+#| "Could not open folder `%s':\n"
+#| "%s"
 msgid ""
-"Could not open folder `%s':\n"
+"Could not open folder '%s':\n"
 "%s"
 msgstr ""
-"`%s' फोल्डर खोल नहीं सका:\n"
+"'%s' फ़ोल्डर खोल नहीं सका:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:177
+#: ../camel/providers/local/camel-spool-store.c:180
 #, c-format
-msgid "Folder `%s' does not exist."
-msgstr "`%s' फोल्डर मौजूद नहीं है."
+#| msgid "Folder `%s' does not exist."
+msgid "Folder '%s' does not exist."
+msgstr "'%s' फ़ोल्डर मौजूद नहीं है."
 
-#: ../camel/providers/local/camel-spool-store.c:182
+#: ../camel/providers/local/camel-spool-store.c:185
 #, c-format
+#| msgid ""
+#| "Could not create folder `%s':\n"
+#| "%s"
 msgid ""
-"Could not create folder `%s':\n"
+"Could not create folder '%s':\n"
 "%s"
 msgstr ""
-"`%s' फोल्डर निर्मित नहीं सका:\n"
+"'%s' फ़ोल्डर निर्मित नहीं सका:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:190
+#: ../camel/providers/local/camel-spool-store.c:193
 #, c-format
-msgid "`%s' is not a mailbox file."
-msgstr "`%s' एक डाकपेटी संचिका है."
+#| msgid "`%s' is not a mailbox file."
+msgid "'%s' is not a mailbox file."
+msgstr "'%s' एक डाकपेटी फ़ाइल है."
 
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:210
 msgid "Store does not support an INBOX"
 msgstr "एक INBOX को स्टोर समर्थन नहीं करता है"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:222
 #, c-format
 msgid "Spool mail file %s"
-msgstr "%s à¤¸à¥\8dपà¥\82ल à¤¡à¤¾à¤\95 à¤¸à¤\82à¤\9aिà¤\95ा"
+msgstr "%s à¤¸à¥\8dपà¥\82ल à¤¡à¤¾à¤\95 à¤«à¤¼à¤¾à¤\87ल"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:222
 #, c-format
 msgid "Spool folder tree %s"
-msgstr "%s स्पूल फोल्डर तरू"
+msgstr "%s à¤¸à¥\8dपà¥\82ल à¤«à¤¼à¥\8bलà¥\8dडर à¤¤à¤°à¥\82"
 
-#: ../camel/providers/local/camel-spool-store.c:227
+#: ../camel/providers/local/camel-spool-store.c:230
 msgid "Spool folders cannot be renamed"
-msgstr "स्पूल फोल्डर का पुनःनामकरण नहीं किया जा सकता है"
+msgstr "सà¥\8dपà¥\82ल à¤«à¤¼à¥\8bलà¥\8dडर à¤\95ा à¤ªà¥\81नà¤\83नामà¤\95रण à¤¨à¤¹à¥\80à¤\82 à¤\95िया à¤\9cा à¤¸à¤\95ता à¤¹à¥\88"
 
-#: ../camel/providers/local/camel-spool-store.c:235
+#: ../camel/providers/local/camel-spool-store.c:238
 msgid "Spool folders cannot be deleted"
-msgstr "स्पूल फोल्डर विलोपित नहीं किया जा सकता है"
+msgstr "सà¥\8dपà¥\82ल à¤«à¤¼à¥\8bलà¥\8dडर à¤µà¤¿à¤²à¥\8bपित à¤¨à¤¹à¥\80à¤\82 à¤\95िया à¤\9cा à¤¸à¤\95ता à¤¹à¥\88"
 
-#: ../camel/providers/local/camel-spool-summary.c:177
-#: ../camel/providers/local/camel-spool-summary.c:187
-#: ../camel/providers/local/camel-spool-summary.c:197
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:191
+#: ../camel/providers/local/camel-spool-summary.c:201
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
-msgstr "%s अस्थायी फोल्डर का तुल्यकालन नहीं कर सका: %s"
+msgstr "%s à¤\85सà¥\8dथायà¥\80 à¤«à¤¼à¥\8bलà¥\8dडर à¤\95ा à¤¤à¥\81लà¥\8dयà¤\95ालन à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ा: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:213
+#: ../camel/providers/local/camel-spool-summary.c:217
 #, c-format
 msgid "Could not sync spool folder %s: %s"
-msgstr "%s स्पूल फोल्डर का तुल्यकालन नहीं कर सका: %s"
+msgstr "%s à¤¸à¥\8dपà¥\82ल à¤«à¤¼à¥\8bलà¥\8dडर à¤\95ा à¤¤à¥\81लà¥\8dयà¤\95ालन à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ा: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:244
-#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:248
+#: ../camel/providers/local/camel-spool-summary.c:265
 #: ../camel/providers/local/camel-spool-summary.c:276
 #, 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"
-"Folder may be corrupt, copy saved in `%s'"
+"Folder may be corrupt, copy saved in '%s'"
 msgstr ""
-"%s स्पूल फोल्डर का तुल्यकालन नहीं कर सका: %s\n"
-"फà¥\8bलà¥\8dडर à¤\96राब à¤¹à¥\8b à¤¸à¤\95ता à¤¹à¥\88, `%s' à¤®à¥\87à¤\82 à¤\95ापà¥\80 सुरक्षित है"
+"%s à¤¸à¥\8dपà¥\82ल à¤«à¤¼à¥\8bलà¥\8dडर à¤\95ा à¤¤à¥\81लà¥\8dयà¤\95ालन à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95ा: %s\n"
+"फ़à¥\8bलà¥\8dडर à¤\96राब à¤¹à¥\8b à¤¸à¤\95ता à¤¹à¥\88, `%s' à¤®à¥\87à¤\82 à¤¨à¤\95़ल सुरक्षित है"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:207
-#, fuzzy, c-format
+#: ../camel/providers/nntp/camel-nntp-folder.c:137
+#: ../camel/providers/nntp/camel-nntp-folder.c:195
+#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#, c-format
 msgid "Internal error: UID in invalid format: %s"
-msgstr "आंतरिक त्रुटि:अवैध प्रारूप में uid: %s"
+msgstr "आंतरिक त्रुटि:अवैध प्रारूप में UID: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:327
-#: ../camel/providers/nntp/camel-nntp-folder.c:330
-#: ../camel/providers/nntp/camel-nntp-folder.c:372
-#: ../camel/providers/nntp/camel-nntp-folder.c:374
+#: ../camel/providers/nntp/camel-nntp-folder.c:368
+#: ../camel/providers/nntp/camel-nntp-folder.c:371
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/nntp/camel-nntp-folder.c:415
 #, c-format
 msgid "Posting failed: %s"
 msgstr "प्रेषण विफल: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:392
+#: ../camel/providers/nntp/camel-nntp-folder.c:433
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ऑफलाइन काम करते हुए आप NNTP संदेश प्रेषित नहीं कर सकते हैं!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:403
+#: ../camel/providers/nntp/camel-nntp-folder.c:444
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "NNTP फोल्डर से आप संदेश कापी नहीं कर सकते हैं!"
-
-#: ../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 "संक्षिप्त प्रतीक में फोल्डर दिखायें (उदा. c.o.linux बजाय comp.os.linux के)"
+msgstr "NNTP फ़ोल्डर से आप संदेश कापी नहीं कर सकते हैं!"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
-msgid "In the subscription dialog, show relative folder names"
-msgstr "सदस्यता वार्तालाप में सापेक्ष फोल्डर नामों को दिखाए"
+#| msgid ""
+#| "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr "संक्षिप्त प्रतीक में फ़ोल्डर दिखायें (उदा. c.o.linux बजाय comp.os.linux के) (_S)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#| msgid "In the subscription dialog, show relative folder names"
+msgid "In the subscription _dialog, show relative folder names"
+msgstr "सदस्यता वार्तालाप में सापेक्ष फ़ोल्डर नामों को दिखाएँ (_d)"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "USENET news"
 msgstr "USENET समाचार"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "यह USENET समाचार समूह से पढ़ने और प्रेषित करने के लिये प्रस्तुतकर्ता है."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
+#: ../camel/providers/nntp/camel-nntp-provider.c:76
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
-msgstr "पà¥\8dलà¥\87नà¤\9fà¥\87à¤\95à¥\8dसà¤\9f à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f के प्रयोग से यह विकल्प NNTP सर्वर के साथ सत्यापन करेगा."
+msgstr "पà¥\8dलà¥\87नà¤\9fà¥\87à¤\95à¥\8dसà¤\9f à¤\95à¥\82à¤\9fशबà¥\8dद के प्रयोग से यह विकल्प NNTP सर्वर के साथ सत्यापन करेगा."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:218
+#: ../camel/providers/nntp/camel-nntp-store.c:217
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "%s से प्राप्त शुभकामना पत्र नहीं पढ़ सका: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:230
+#: ../camel/providers/nntp/camel-nntp-store.c:229
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "%s NNTP सर्वर ने त्रुटि कूट दिया %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:407
+#: ../camel/providers/nntp/camel-nntp-store.c:406
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s के द्वारा USENET समाचार"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:797
+#: ../camel/providers/nntp/camel-nntp-store.c:815
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4090,7 +4250,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:891
+#: ../camel/providers/nntp/camel-nntp-store.c:909
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4098,9 +4258,9 @@ msgid ""
 msgstr ""
 "आप इस समाचार समूह की सदस्यता नहीं ले सकते:\n"
 "\n"
-"ऐसा कोई समाचार समूह नहीं है. चयनित मद संभवतः मातृ फोल्डर है."
+"à¤\90सा à¤\95à¥\8bà¤\88 à¤¸à¤®à¤¾à¤\9aार à¤¸à¤®à¥\82ह à¤¨à¤¹à¥\80à¤\82 à¤¹à¥\88. à¤\9aयनित à¤®à¤¦ à¤¸à¤\82भवतà¤\83 à¤®à¤¾à¤¤à¥\83 à¤«à¤¼à¥\8bलà¥\8dडर à¤¹à¥\88."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:923
+#: ../camel/providers/nntp/camel-nntp-store.c:941
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4110,215 +4270,209 @@ msgstr ""
 "\n"
 "समाचार समूह मौजूद नहीं है!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:948
+#: ../camel/providers/nntp/camel-nntp-store.c:966
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "समाचार स्टोर में आप एक फोल्डर नहीं बना सकते हैं: बदले में सदस्यता लें."
+msgstr "समाà¤\9aार à¤¸à¥\8dà¤\9fà¥\8bर à¤®à¥\87à¤\82 à¤\86प à¤\8fà¤\95 à¤«à¤¼à¥\8bलà¥\8dडर à¤¨à¤¹à¥\80à¤\82 à¤¬à¤¨à¤¾ à¤¸à¤\95तà¥\87 à¤¹à¥\88à¤\82: à¤¬à¤¦à¤²à¥\87 à¤®à¥\87à¤\82 à¤¸à¤¦à¤¸à¥\8dयता à¤²à¥\87à¤\82."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:956
+#: ../camel/providers/nntp/camel-nntp-store.c:974
 msgid "You cannot rename a folder in a News store."
-msgstr "समाचार स्टोर में आप एक फोल्डर का पुनर्नामकरण नहीं कर सकते हैं."
+msgstr "समाà¤\9aार à¤¸à¥\8dà¤\9fà¥\8bर à¤®à¥\87à¤\82 à¤\86प à¤\8fà¤\95 à¤«à¤¼à¥\8bलà¥\8dडर à¤\95ा à¤ªà¥\81नरà¥\8dनामà¤\95रण à¤¨à¤¹à¥\80à¤\82 à¤\95र à¤¸à¤\95तà¥\87 à¤¹à¥\88à¤\82."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:964
+#: ../camel/providers/nntp/camel-nntp-store.c:982
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "समाचार स्टोर में आप एक फोल्डर नहीं हटा सकते हैं: बदले में सदस्यता लें."
+msgstr "समाà¤\9aार à¤¸à¥\8dà¤\9fà¥\8bर à¤®à¥\87à¤\82 à¤\86प à¤\8fà¤\95 à¤«à¤¼à¥\8bलà¥\8dडर à¤¨à¤¹à¥\80à¤\82 à¤¹à¤\9fा à¤¸à¤\95तà¥\87 à¤¹à¥\88à¤\82: à¤¬à¤¦à¤²à¥\87 à¤®à¥\87à¤\82 à¤¸à¤¦à¤¸à¥\8dयता à¤²à¥\87à¤\82."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1145
+#: ../camel/providers/nntp/camel-nntp-store.c:1171
 msgid "Authentication requested but no username provided"
 msgstr "सत्यापन निवेदन लेकिन उपभोक्ता नाम नहीं दिया गया"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1153
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "कृपया %s@%s के लिये NNTP शब्दकूट दाखिल करें"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1157
+#: ../camel/providers/nntp/camel-nntp-store.c:1183
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "सर्वर से सत्यापन नहीं हो सका: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1273
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
 #, c-format
 msgid "NNTP Command failed: %s"
-msgstr "NNTP à¤¸à¤®à¤¾à¤¦à¥\87श असफल: %s"
+msgstr "NNTP à¤\95माà¤\82ड असफल: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1329
+#: ../camel/providers/nntp/camel-nntp-store.c:1360
 msgid "Not connected."
 msgstr "संबंधित नहीं."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1382
+#: ../camel/providers/nntp/camel-nntp-store.c:1413
 #, c-format
 msgid "No such folder: %s"
-msgstr "ऐसा कोई फोल्डर नहीं है: %s"
+msgstr "à¤\90सा à¤\95à¥\8bà¤\88 à¤«à¤¼à¥\8bलà¥\8dडर à¤¨à¤¹à¥\80à¤\82 à¤¹à¥\88: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:221
-#: ../camel/providers/nntp/camel-nntp-summary.c:317
+#: ../camel/providers/nntp/camel-nntp-summary.c:271
+#: ../camel/providers/nntp/camel-nntp-summary.c:364
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: नया संदेश स्कैन कर रहा है"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:228
+#: ../camel/providers/nntp/camel-nntp-summary.c:278
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover से अप्रत्याशित सर्वर अनुक्रिया: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:331
+#: ../camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "शीर्ष से अप्रत्याशित सर्वर अनुक्रिया: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:371
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
 msgid "Use cancel"
 msgstr "cancel का प्रयोग करें"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:373
+#: ../camel/providers/nntp/camel-nntp-summary.c:416
 #, c-format
 msgid "Operation failed: %s"
 msgstr "संक्रिया असफल: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:247
+#: ../camel/providers/pop3/camel-pop3-folder.c:253
 msgid "Retrieving POP summary"
 msgstr "POP सारांश पुनर्प्राप्त कर रहा है"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:266
+#: ../camel/providers/pop3/camel-pop3-folder.c:271
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "POP सारांश नहीं प्राप्त कर सकता है: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:308
-#, fuzzy
+#: ../camel/providers/pop3/camel-pop3-folder.c:314
 msgid "Expunging old messages"
-msgstr "विलà¥\8bपित à¤¸à¤\82दà¥\87शà¥\8bà¤\82 à¤\95à¥\8b à¤¨à¤·à¥\8dà¤\9f à¤\95रà¥\87à¤\82"
+msgstr "पà¥\81रानà¥\87 à¤¸à¤\82दà¥\87शà¥\8bà¤\82 à¤\95à¥\8b à¤ªà¥\82रà¥\80 à¤¤à¤°à¤¹ à¤®à¤¿à¤\9fाà¤\8fà¤\81"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:316
+#: ../camel/providers/pop3/camel-pop3-folder.c:322
 msgid "Expunging deleted messages"
 msgstr "विलोपित संदेशों को नष्ट करें"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:471
-#, fuzzy, c-format
+#: ../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 "%s uid से कोई संदेश नहीं"
+msgstr "%s UID से कोई संदेश नहीं"
 
 #. 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:478
+#: ../camel/providers/pop3/camel-pop3-folder.c:559
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP सारांश पुनर्प्राप्त कर रहा है"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:568
+#: ../camel/providers/pop3/camel-pop3-folder.c:649
 msgid "Unknown reason"
 msgstr "अज्ञात कारण"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:42
-msgid "Leave messages on server"
-msgstr "सर्वर पर संदेश छोड़ें"
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#| msgid "Leave messages on server"
+msgid "_Leave messages on server"
+msgstr "सर्वर पर संदेश छोड़ें (_L)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:44
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 #, c-format
-msgid "Delete after %s day(s)"
-msgstr "%s दिन(नों) के पश्चात मिटाएँ"
+#| msgid "Delete after %s day(s)"
+msgid "_Delete after %s day(s)"
+msgstr "%s दिन के पश्चात मिटाएँ (_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:46
-msgid "Disable support for all POP3 extensions"
-msgstr "सभी POP3 विस्तार के लिये समर्थन को निष्क्रिय करें"
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#| msgid "Disable support for all POP3 extensions"
+msgid "Disable _support for all POP3 extensions"
+msgstr "सभी POP3 विस्तार के लिये समर्थन को निष्क्रिय करें (_s)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:54
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:56
+#: ../camel/providers/pop3/camel-pop3-provider.c:57
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "POP सर्वर से जोड़ने और डाक अधिभारण के लिए."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:73
+#: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"पà¥\8dलà¥\87नà¤\9fà¥\87à¤\95à¥\8dसà¤\9f à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f के प्रयोग से यह विकल्प POP सर्वर से जोड़ेगा. यह POP सर्वर द्वारा समर्थित "
+"पà¥\8dलà¥\87नà¤\9fà¥\87à¤\95à¥\8dसà¤\9f à¤\95à¥\82à¤\9fशबà¥\8dद के प्रयोग से यह विकल्प POP सर्वर से जोड़ेगा. यह POP सर्वर द्वारा समर्थित "
 "एकमात्र विकल्प है."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
+#: ../camel/providers/pop3/camel-pop3-provider.c:84
 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 à¤ªà¥\8dरà¥\8bà¤\9fà¥\8bà¤\95ाल à¤\95à¥\87 à¤¦à¥\8dवारा à¤\97à¥\81पà¥\8dत à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f के प्रयोग से यह विकल्प POP सर्वर से जोड़ेगा. यह सभी "
+"APOP à¤ªà¥\8dरà¥\8bà¤\9fà¥\8bà¤\95ाल à¤\95à¥\87 à¤¦à¥\8dवारा à¤\97à¥\81पà¥\8dत à¤\95à¥\82à¤\9fशबà¥\8dद के प्रयोग से यह विकल्प POP सर्वर से जोड़ेगा. यह सभी "
 "उपभोक्ताओं के लिए काम नहीं करेगा, उन सर्वरों पर भी जो इसको समर्थन करने का दावा करते हैं."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:206
+#: ../camel/providers/pop3/camel-pop3-store.c:209
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP सर्वर %s से वैध शुभकामना पाने में विफल"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:220
-#: ../camel/providers/pop3/camel-pop3-store.c:237
-#: ../camel/providers/pop3/camel-pop3-store.c:247
-#: ../camel/providers/pop3/camel-pop3-store.c:253
+#: ../camel/providers/pop3/camel-pop3-store.c:226
+#: ../camel/providers/pop3/camel-pop3-store.c:240
+#: ../camel/providers/pop3/camel-pop3-store.c:250
+#: ../camel/providers/pop3/camel-pop3-store.c:256
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "POP सर्वर %s से सुरक्षित मोड में जोड़ने में विफल: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:221
-#, fuzzy
+#: ../camel/providers/pop3/camel-pop3-store.c:227
 msgid "STLS not supported by server"
-msgstr "SSLS समर्थित नहीं."
-
-#: ../camel/providers/pop3/camel-pop3-store.c:248
-#, fuzzy
-msgid "TLS negotiations failed"
-msgstr "SSL समझौता विफल"
+msgstr "SSLS सर्वर द्वारा समर्थित नहीं"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:254
-#, fuzzy
+#: ../camel/providers/pop3/camel-pop3-store.c:257
 msgid "TLS is not available in this build"
-msgstr "à¤\8fसà¤\8fसà¤\8fल नहीं उपलब्ध है इस बिल्ड में"
+msgstr "à¤\9fà¥\80à¤\8fलà¤\8fस नहीं उपलब्ध है इस बिल्ड में"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:360
+#: ../camel/providers/pop3/camel-pop3-store.c:363
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "POP सर्वर %s से नहीं जोड़ सका"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:401
-#: ../camel/providers/pop3/camel-pop3-store.c:515
+#: ../camel/providers/pop3/camel-pop3-store.c:404
+#: ../camel/providers/pop3/camel-pop3-store.c:537
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "POP सर्वर %s से जोड़ने में विफल: निवेदित सत्यापन यांत्रिकी के लिए कोई समर्थन नहीं."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:417
+#: ../camel/providers/pop3/camel-pop3-store.c:420
 #, 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 "SASL '%s' POP सर्वर %s के लिए लॉगिन विफल: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:429
+#: ../camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP सर्वर %s से लॉगिन नहीं कर सकता: SASL प्रोटोकॉल त्रुटि"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:448
+#: ../camel/providers/pop3/camel-pop3-store.c:451
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "%s POP सर्वर के सत्यापन में असफल: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:474
+#: ../camel/providers/pop3/camel-pop3-store.c:510
 #, c-format
-msgid "%sPlease enter the POP password for %s on host %s"
-msgstr "%s कृपया %s मेजबान पर %s के लिये POP शब्दकूट दाखिल करें"
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:529
-#: ../camel/providers/pop3/camel-pop3-store.c:542
+#: ../camel/providers/pop3/camel-pop3-store.c:551
+#: ../camel/providers/pop3/camel-pop3-store.c:564
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "%s POP सर्वर से जोड़ने में असमर्थ.\n"
-"शबà¥\8dदà¤\95à¥\82à¤\9f भेजने में त्रुटि: %s"
+"à¤\95à¥\82à¤\9fशबà¥\8dद भेजने में त्रुटि: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:536
+#: ../camel/providers/pop3/camel-pop3-store.c:558
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4327,193 +4481,189 @@ msgstr ""
 "%s POP सर्वर से जोड़ने में असमर्थ.\n"
 "उपभोक्ता नाम भेजने में त्रुटि: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:642
+#: ../camel/providers/pop3/camel-pop3-store.c:671
 #, c-format
-msgid "No such folder `%s'."
-msgstr "ऐसा को फोल्डर नहीं `%s'."
+#| msgid "No such folder `%s'."
+msgid "No such folder '%s'."
+msgstr "'%s' जैसा कोई फ़ोल्डर नहीं."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:37
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:39
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "स्थानीय सिस्टम पर \"sendmail\" में भेजकर मेल देने के लिये."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:114
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
 msgid "Could not parse recipient list"
 msgstr "प्राप्तकर्ता सूची का विश्लेषण नहीं कर सकता"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:145
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "sendmail के लिए पाइप बना नहीं सका: %s:डाक नहीं भेजा गया"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:166
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail को fork नहीं कर सका:%s:डाक नहीं भेजा गया"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail %s संकेत से उत्तेजित है: डाक नहीं भेजा गया"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:241
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s का निष्पादन नहीं कर सकता: डाक नहीं भेजा गया."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:246
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail अवस्थिति से उत्तेजित %d: डाक नहीं भेजा गया"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:260
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:262
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
 msgid "Mail delivery via the sendmail program"
 msgstr "डाक भेजें प्रोग्राम के द्वारा डाक डेलिवरी"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:38
+#: ../camel/providers/smtp/camel-smtp-provider.c:39
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:40
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP का प्रयोग करते हुए दूरस्थ mailhub से जोड़ते हुए डाक पहुंचाने के लिए."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:168
 msgid "Syntax error, command unrecognized"
-msgstr "वाà¤\95à¥\8dय à¤°à¤\9aना à¤¤à¥\8dरà¥\81à¤\9fि, à¤¸à¤®à¤¾à¤¦à¥\87श अपरिचित"
+msgstr "वाà¤\95à¥\8dय à¤°à¤\9aना à¤¤à¥\8dरà¥\81à¤\9fि, à¤\95माà¤\82ड अपरिचित"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:164
+#: ../camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error in parameters or arguments"
 msgstr "पैरामीटर या तर्क में वाक्य रचना त्रुटि"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Command not implemented"
-msgstr "समादà¥\87श लागू नहीं किया गया"
+msgstr "à¤\95माà¤\82ड लागू नहीं किया गया"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command parameter not implemented"
-msgstr "समादà¥\87श पैरामीटर लागू नहीं किया गया"
+msgstr "à¤\95माà¤\82ड पैरामीटर लागू नहीं किया गया"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:176
 msgid "System status, or system help reply"
 msgstr "सिस्टम स्थिति, सिस्टम सहायता जबाव"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Help message"
 msgstr "सहायता संदेश"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Service ready"
 msgstr "सेवा तैयार"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service closing transmission channel"
 msgstr "सेवा समाप्ति प्रेषण चैनल"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service not available, closing transmission channel"
 msgstr "सेवा अनुपल"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Requested mail action okay, completed"
 msgstr "निवेदित डाक क्रिया ओके, समाप्त"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:188
 msgid "User not local; will forward to <forward-path>"
 msgstr "उपभोक्ता स्थानीय नहीं;इसे अग्रसारित किया जायेगा <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "निवेदित मेल कार्रवाई नहीं की गई: मेलबॉक्स अनुपलब्ध"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "निवेदित कार्रवाई नहीं की गई: मेलबॉक्स अनुपलब्ध"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action aborted: error in processing"
 msgstr "निवेदित कार्रवाई नहीं की गई: प्रक्रिया में त्रुटि"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
 msgid "User not local; please try <forward-path>"
 msgstr "उपभोक्ता स्थानीय नहीं; कृपया प्रयास करें <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: insufficient system storage"
 msgstr "निवेदित कार्रवाई नहीं की गई: अपर्याप्त सिस्टम भंडारण"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "निवेदित मेल क्रिया रोकी गई: भंडारण संभाजन से ज्यादा"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "निवेदित कार्रवाई नहीं की गई: मेलबॉक्स नाम की अनुमति नहीं"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "मेल आगत शुरू करें; <CRLF>.<CRLF> के साथ अंत"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Transaction failed"
 msgstr "लेन देन असफल"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:210
 msgid "A password transition is needed"
-msgstr "शबà¥\8dदà¤\95à¥\82à¤\9f संक्रमण की आवश्यकता है"
+msgstr "à¤\95à¥\82à¤\9fशबà¥\8dद संक्रमण की आवश्यकता है"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Authentication mechanism is too weak"
 msgstr "सत्यापन यांत्रिकी काफी कमजोर है"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:208
+#: ../camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Encryption required for requested authentication mechanism"
 msgstr "निवेदित सत्यापन यांत्रिकी के लिये गोपन की आवश्यकता है"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Temporary authentication failure"
 msgstr "अस्थायी सत्यापन विफलता"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:291
+#: ../camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr "अनुक्रिया त्रुटि का स्वागत करें"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:322
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/smtp/camel-smtp-transport.c:365
+#: ../camel/providers/smtp/camel-smtp-transport.c:371
 #, 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:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:341
 #, c-format
 msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS à¤¸à¤®à¤¾à¤¦à¥\87श असफल: %s"
+msgstr "STARTTLS à¤\95माà¤\82ड असफल: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:346
+#: ../camel/providers/smtp/camel-smtp-transport.c:356
 msgid "STARTTLS command failed"
-msgstr "STARTTLS à¤¸à¤®à¤¾à¤¦à¥\87श असफल"
+msgstr "STARTTLS à¤\95माà¤\82ड असफल"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:483
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "%s SMTP सर्वर मांगे गए सत्यापन प्रकार %s को समर्थन नहीं देता है."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:521
-#, c-format
-msgid "%sPlease enter the SMTP password for %s on host %s"
-msgstr "%s कृपया मेजबान %s पर %s के लिये SMTP शब्दकूट दाखिल करें"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:540
+#: ../camel/providers/smtp/camel-smtp-transport.c:568
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4524,201 +4674,202 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:664
+#: ../camel/providers/smtp/camel-smtp-transport.c:701
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP सर्वर %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:666
+#: ../camel/providers/smtp/camel-smtp-transport.c:703
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s के द्वारा SMTP डाक ............"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:684
+#: ../camel/providers/smtp/camel-smtp-transport.c:721
 msgid "Cannot send message: service not connected."
 msgstr "संदेश नहीं भेज सकता है: सेवा जुड़ी हुई नहीं है."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:690
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Cannot send message: sender address not valid."
 msgstr "संदेश नहीं भेज सकता:प्रेषक का पता सही नहीं है."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:694
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Sending message"
 msgstr "संदेश भेज रहा है"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:709
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
 msgid "Cannot send message: no recipients defined."
 msgstr "संदेश नहीं भेज सकता है: कोई प्राप्तकर्ता परिभाषित नहीं है."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "संदेश नहीं भेज सकता है: एक या अधिक अवैध प्राप्तकर्ता"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:890
+#: ../camel/providers/smtp/camel-smtp-transport.c:986
 msgid "SMTP Greeting"
 msgstr "SMTP ग्रीटिंग"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:915
+#: ../camel/providers/smtp/camel-smtp-transport.c:1011
 #, c-format
 msgid "HELO command failed: %s"
-msgstr "HELO à¤¸à¤®à¤¾à¤¦à¥\87श असफल: %s"
+msgstr "HELO à¤\95माà¤\82ड असफल: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:932
+#: ../camel/providers/smtp/camel-smtp-transport.c:1028
 msgid "HELO command failed"
-msgstr "HELO à¤¸à¤®à¤¾à¤¦à¥\87श असफल"
+msgstr "HELO à¤\95माà¤\82ड असफल"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:998
+#: ../camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "SMTP Authentication"
 msgstr "SMTP सत्यापन"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1004
+#: ../camel/providers/smtp/camel-smtp-transport.c:1100
 msgid "Error creating SASL authentication object."
 msgstr "SASL सत्यापन अभिलक्ष्य निर्माण में दोष."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1021
-#: ../camel/providers/smtp/camel-smtp-transport.c:1032
+#: ../camel/providers/smtp/camel-smtp-transport.c:1117
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "AUTH command failed: %s"
-msgstr "AUTH à¤¸à¤®à¤¾à¤¦à¥\87श असफल: %s"
+msgstr "AUTH à¤\95माà¤\82ड असफल: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1038
+#: ../camel/providers/smtp/camel-smtp-transport.c:1134
 msgid "AUTH command failed"
-msgstr "AUTH à¤¸à¤®à¤¾à¤¦à¥\87श असफल"
+msgstr "AUTH à¤\95माà¤\82ड असफल"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../camel/providers/smtp/camel-smtp-transport.c:1204
 msgid "Bad authentication response from server.\n"
 msgstr "सर्वर से गलत सत्यापन अनुक्रिया.\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1125
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM à¤¸à¤®à¤¾à¤¦à¥\87श असफल:  %s: डाक नहीं भेजा गया"
+msgstr "MAIL FROM à¤\95माà¤\82ड असफल:  %s: डाक नहीं भेजा गया"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1142
+#: ../camel/providers/smtp/camel-smtp-transport.c:1248
 msgid "MAIL FROM command failed"
-msgstr "MAIL FROM à¤¸à¤®à¤¾à¤¦à¥\87श असफल"
+msgstr "MAIL FROM à¤\95माà¤\82ड असफल"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1166
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO à¤¸à¤®à¤¾à¤¦à¥\87श असफल: %s: डाक नहीं भेजा गया"
+msgstr "RCPT TO à¤\95माà¤\82ड असफल: %s: डाक नहीं भेजा गया"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1185
+#: ../camel/providers/smtp/camel-smtp-transport.c:1291
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> असफल"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1224
-#: ../camel/providers/smtp/camel-smtp-transport.c:1282
-#: ../camel/providers/smtp/camel-smtp-transport.c:1301
+#: ../camel/providers/smtp/camel-smtp-transport.c:1331
+#: ../camel/providers/smtp/camel-smtp-transport.c:1400
+#: ../camel/providers/smtp/camel-smtp-transport.c:1419
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
-msgstr "à¤\86à¤\82à¤\95ड़ा à¤¸à¤®à¤¾à¤¦à¥\87श असफल: %s: डाक नहीं भेजा गया"
+msgstr "à¤\86à¤\82à¤\95ड़ा à¤\95माà¤\82ड असफल: %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:1241
-#: ../camel/providers/smtp/camel-smtp-transport.c:1317
+#: ../camel/providers/smtp/camel-smtp-transport.c:1348
+#: ../camel/providers/smtp/camel-smtp-transport.c:1435
 msgid "DATA command failed"
-msgstr "à¤\86à¤\82à¤\95ड़ा à¤¸à¤®à¤¾à¤¦à¥\87श असफल"
+msgstr "à¤\86à¤\82à¤\95ड़ा à¤\95माà¤\82ड असफल"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1340
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
 #, c-format
 msgid "RSET command failed: %s"
-msgstr "RSET à¤¸à¤®à¤¾à¤¦à¥\87श असफल: %s"
+msgstr "RSET à¤\95माà¤\82ड असफल: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1356
+#: ../camel/providers/smtp/camel-smtp-transport.c:1474
 msgid "RSET command failed"
-msgstr "RSET à¤¸à¤®à¤¾à¤¦à¥\87श असफल"
+msgstr "RSET à¤\95माà¤\82ड असफल"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
 #, c-format
 msgid "QUIT command failed: %s"
-msgstr "QUIT à¤¸à¤®à¤¾à¤¦à¥\87श असफल %s"
+msgstr "QUIT à¤\95माà¤\82ड असफल %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1393
+#: ../camel/providers/smtp/camel-smtp-transport.c:1511
 msgid "QUIT command failed"
-msgstr "QUIT à¤¸à¤®à¤¾à¤¦à¥\87श असफल"
+msgstr "QUIT à¤\95माà¤\82ड असफल"
 
-#: ../libedataserver/e-categories.c:248
+#: ../libedataserver/e-categories.c:45
 msgid "Business"
 msgstr "व्यवसाय"
 
-#: ../libedataserver/e-categories.c:249
+#: ../libedataserver/e-categories.c:46
 msgid "Competition"
 msgstr "प्रतियोगिता"
 
-#: ../libedataserver/e-categories.c:250
+#: ../libedataserver/e-categories.c:47
 msgid "Favorites"
 msgstr "प्रिय"
 
-#: ../libedataserver/e-categories.c:251
+#: ../libedataserver/e-categories.c:48
 msgid "Gifts"
 msgstr "उपहार"
 
-#: ../libedataserver/e-categories.c:252
+#: ../libedataserver/e-categories.c:49
 msgid "Goals/Objectives"
 msgstr "लक्ष्य / उद्देश्य"
 
-#: ../libedataserver/e-categories.c:253
+#: ../libedataserver/e-categories.c:50
 msgid "Holiday"
 msgstr "अवकाश"
 
-#: ../libedataserver/e-categories.c:254
+#: ../libedataserver/e-categories.c:51
 msgid "Holiday Cards"
 msgstr "अवकाश कार्ड"
 
-#. important people (e.g. new business partners) you should pay attention to/observe
-#: ../libedataserver/e-categories.c:256
+#. important people (e.g. new business partners)
+#: ../libedataserver/e-categories.c:53
 msgid "Hot Contacts"
 msgstr "महत्वपूर्ण संपर्क"
 
-#: ../libedataserver/e-categories.c:257
+#: ../libedataserver/e-categories.c:54
 msgid "Ideas"
 msgstr "विचार"
 
-#: ../libedataserver/e-categories.c:258
+#: ../libedataserver/e-categories.c:55
 msgid "International"
 msgstr "अंतर्राष्ट्रीय"
 
-#: ../libedataserver/e-categories.c:259
+#: ../libedataserver/e-categories.c:56
 msgid "Key Customer"
 msgstr "कुंजी ग्राहक"
 
-#: ../libedataserver/e-categories.c:260
+#: ../libedataserver/e-categories.c:57
 msgid "Miscellaneous"
 msgstr "विविध"
 
-#: ../libedataserver/e-categories.c:261
+#: ../libedataserver/e-categories.c:58
 msgid "Personal"
 msgstr "व्यक्तिगत"
 
-#: ../libedataserver/e-categories.c:262
+#: ../libedataserver/e-categories.c:59
 msgid "Phone Calls"
 msgstr "फोन काल्स"
 
-#: ../libedataserver/e-categories.c:263
+#. Translators: "Status" is a category name; it can mean anything user wants to
+#: ../libedataserver/e-categories.c:61
 msgid "Status"
 msgstr "स्तर"
 
-#: ../libedataserver/e-categories.c:264
+#: ../libedataserver/e-categories.c:62
 msgid "Strategies"
 msgstr "रणनीति"
 
-#: ../libedataserver/e-categories.c:265
+#: ../libedataserver/e-categories.c:63
 msgid "Suppliers"
 msgstr "सप्लायर्स"
 
-#: ../libedataserver/e-categories.c:266
+#: ../libedataserver/e-categories.c:64
 msgid "Time & Expenses"
 msgstr "समय व खर्च"
 
-#: ../libedataserver/e-categories.c:267
+#: ../libedataserver/e-categories.c:65
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:268
+#: ../libedataserver/e-categories.c:66
 msgid "Waiting"
 msgstr "प्रतीक्षारत"
 
@@ -4726,7 +4877,7 @@ msgstr "प्रतीक्षारत"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1601 ../libedataserver/e-time-utils.c:1848
+#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1911
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -4734,7 +4885,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:1606 ../libedataserver/e-time-utils.c:1839
+#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
@@ -4742,7 +4893,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:1611 ../libedataserver/e-time-utils.c:1844
+#: ../libedataserver/e-time-utils.c:1654 ../libedataserver/e-time-utils.c:1907
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -4750,78 +4901,78 @@ 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:1616 ../libedataserver/e-time-utils.c:1835
+#: ../libedataserver/e-time-utils.c:1659 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1621
+#: ../libedataserver/e-time-utils.c:1664
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1626
+#: ../libedataserver/e-time-utils.c:1669
 msgid "%a %m/%d/%Y %H"
 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:1629 ../libedataserver/e-time-utils.c:1725
-#: ../libedataserver/e-time-utils.c:1830
+#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1773
+#: ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1637
+#: ../libedataserver/e-time-utils.c:1680
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1641
+#: ../libedataserver/e-time-utils.c:1684
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1646
+#: ../libedataserver/e-time-utils.c:1689
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1651
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1656
+#: ../libedataserver/e-time-utils.c:1699
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1661
+#: ../libedataserver/e-time-utils.c:1704
 msgid "%m/%d/%Y %H"
 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:1664 ../libedataserver/e-time-utils.c:1728
+#: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1776
 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:1774 ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1834 ../libedataserver/e-time-utils.c:1956
 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:1778 ../libedataserver/e-time-utils.c:1885
+#: ../libedataserver/e-time-utils.c:1838 ../libedataserver/e-time-utils.c:1948
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4829,38 +4980,48 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1783 ../libedataserver/e-time-utils.c:1890
+#: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953
 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:1787 ../libedataserver/e-time-utils.c:1882
+#: ../libedataserver/e-time-utils.c:1847 ../libedataserver/e-time-utils.c:1945
 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:1850
+#| msgid "%H:%M"
+msgid "%H%M"
+msgstr "%H%M"
+
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1791
+#: ../libedataserver/e-time-utils.c:1854
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:89
+#: ../libedataserverui/e-book-auth-util.c:90
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP सर्वर को अज्ञात रूप से Access कर रहा है"
 
-#: ../libedataserverui/e-book-auth-util.c:191
+#: ../libedataserverui/e-book-auth-util.c:192
 msgid "Failed to authenticate.\n"
 msgstr "प्रमाणीकरण में असफल.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:265
+#: ../libedataserverui/e-categories-dialog.c:362
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "पहले से एक '%s' श्रेणी है विन्यास में. कृपया अन्य नाम प्रयोग कर"
 
-#: ../libedataserverui/e-categories-dialog.c:435
+#: ../libedataserverui/e-categories-dialog.c:526
+msgid "Icon"
+msgstr "प्रतीक"
+
+#: ../libedataserverui/e-categories-dialog.c:531
 msgid "Category"
 msgstr "वर्ग"
 
@@ -4873,73 +5034,86 @@ msgid "Category Properties"
 msgstr "श्रेणी गुण"
 
 #: ../libedataserverui/e-categories-dialog.glade.h:3
-msgid "Category _Color"
-msgstr "श्रेणी रंग (_C)"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:4
 msgid "Category _Icon"
 msgstr "श्रेणी नाम (_I)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
+#: ../libedataserverui/e-categories-dialog.glade.h:4
 msgid "Category _Name"
 msgstr "श्रेणी नाम (_N)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.glade.h:5
 msgid "Item(s) belong to these _categories:"
 msgstr "मद(दों) इन श्रेणियों का है (_c):"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.glade.h:6
 msgid "_Available Categories:"
 msgstr "उपलब्ध कोटियाँ (_A)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.glade.h:7
 msgid "_Edit"
 msgstr "संपादन (_E)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:9
+#: ../libedataserverui/e-categories-dialog.glade.h:8
 msgid "categories"
 msgstr "कोटियां"
 
-#: ../libedataserverui/e-name-selector-dialog.c:295
+#: ../libedataserverui/e-category-completion.c:290
+#, c-format
+#| msgid "Category List"
+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:278
 msgid "Select Contacts from Address Book"
 msgstr "पता पुस्तिका से संपर्कों को चुनें"
 
-#: ../libedataserverui/e-name-selector-dialog.c:597
+#: ../libedataserverui/e-name-selector-dialog.c:565
 msgid "_Add"
 msgstr "जोड़ें (_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:622
+#: ../libedataserverui/e-name-selector-dialog.c:590
 msgid "_Remove"
 msgstr "मिटाएँ (_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "\t\t\t\t\t\t"
-msgstr "\t\t\t\t\t\t"
+#: ../libedataserverui/e-name-selector-dialog.c:767
+#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#| msgid "Category"
+msgid "Any Category"
+msgstr "कोई श्रेणी"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
+#: ../libedataserverui/e-name-selector-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
+#: ../libedataserverui/e-name-selector-dialog.glade.h:2
+#| msgid "<b>_Contacts</b>"
+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.glade.h:4
-msgid "<b>_Contacts</b>"
-msgstr "<b>संपर्क (_C)</b>"
+#| msgid "Address _Book:"
+msgid "Address B_ook:"
+msgstr "पता पुस्तिका (_o):"
 
 #: ../libedataserverui/e-name-selector-dialog.glade.h:5
 msgid "Address Book"
 msgstr "पता पुस्तिका"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
-msgid "Address _Book:"
-msgstr "पता पुस्तिका (_B):"
-
 #: ../libedataserverui/e-name-selector-dialog.glade.h:7
-#, fuzzy
-msgid "C_ategory:"
-msgstr "वर्ग"
+msgid "Cate_gory:"
+msgstr "श्रेणी (_g):"
 
 #: ../libedataserverui/e-name-selector-dialog.glade.h:8
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
@@ -4955,59 +5129,79 @@ msgid "_Search:"
 msgstr "ढूंढें (_S):"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2043
+#: ../libedataserverui/e-name-selector-entry.c:2456
 #, c-format
 msgid "E_xpand %s Inline"
-msgstr ""
+msgstr "%s इनलाइन फैलाएँ (_x)"
+
+#. Copy Contact Item
+#: ../libedataserverui/e-name-selector-entry.c:2471
+#, c-format
+msgid "Cop_y %s"
+msgstr "%s की नक़ल लें (_y)"
+
+#. Cut Contact Item
+#: ../libedataserverui/e-name-selector-entry.c:2481
+#, c-format
+#| msgid "_Edit %s"
+msgid "C_ut %s"
+msgstr "%s काटें (_u)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2059
+#: ../libedataserverui/e-name-selector-entry.c:2498
 #, c-format
 msgid "_Edit %s"
 msgstr "संपादन (_E) %s"
 
-#: ../libedataserverui/e-name-selector-list.c:479
-#, fuzzy, c-format
+#: ../libedataserverui/e-name-selector-list.c:472
+#, c-format
 msgid "_Delete %s"
-msgstr "विलोपित वस्तुएँ"
+msgstr "%s मिटाएँ (_D)"
+
+#: ../libedataserverui/e-passwords.c:234
+#, c-format
+msgid "Keyring key is unusable: no user or host name"
+msgstr ""
+
+#: ../libedataserverui/e-passwords.c:1094
+msgid "You have the Caps Lock key on."
+msgstr "आपके पास कैप्स लॉक कुंजी चालू है."
 
-#: ../libedataserverui/e-passwords.c:854
-#, fuzzy
+#: ../libedataserverui/e-passwords.c:1216
 msgid "_Remember this passphrase"
-msgstr "à¤\87स à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f को याद रखें (_R)"
+msgstr "à¤\87स à¤\95à¥\82à¤\9fशबà¥\8dद को याद रखें (_R)"
 
-#: ../libedataserverui/e-passwords.c:855
-#, fuzzy
+#: ../libedataserverui/e-passwords.c:1217
 msgid "_Remember this passphrase for the remainder of this session"
-msgstr "à¤\87स à¤¸à¤¤à¥\8dर à¤®à¥\87à¤\82 à¤¶à¥\87ष à¤­à¤¾à¤\97 à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87 à¤\87स à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f को याद रखें (_R)"
+msgstr "à¤\87स à¤¸à¤¤à¥\8dर à¤®à¥\87à¤\82 à¤¶à¥\87ष à¤­à¤¾à¤\97 à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87 à¤\87स à¤\95à¥\82à¤\9fशबà¥\8dद को याद रखें (_R)"
 
-#: ../libedataserverui/e-passwords.c:858
+#: ../libedataserverui/e-passwords.c:1222
 msgid "_Remember this password"
-msgstr "à¤\87स à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f को याद रखें (_R)"
+msgstr "à¤\87स à¤\95à¥\82à¤\9fशबà¥\8dद को याद रखें (_R)"
 
-#: ../libedataserverui/e-passwords.c:859
+#: ../libedataserverui/e-passwords.c:1223
 msgid "_Remember this password for the remainder of this session"
-msgstr "à¤\87स à¤¸à¤¤à¥\8dर à¤®à¥\87à¤\82 à¤¶à¥\87ष à¤­à¤¾à¤\97 à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87 à¤\87स à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f को याद रखें (_R)"
+msgstr "à¤\87स à¤¸à¤¤à¥\8dर à¤®à¥\87à¤\82 à¤¶à¥\87ष à¤­à¤¾à¤\97 à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87 à¤\87स à¤\95à¥\82à¤\9fशबà¥\8dद को याद रखें (_R)"
 
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:101
+#: ../libedataserverui/e-source-selector-dialog.c:100
 msgid "Select destination"
 msgstr "गंतव्य चुनें"
 
-#: ../libedataserverui/e-source-selector-dialog.c:154
+#: ../libedataserverui/e-source-selector-dialog.c:156
 msgid "_Destination"
 msgstr "गंतव्य (_D)"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1645
-#: ../servers/exchange/storage/exchange-account.c:935
+#: ../servers/exchange/lib/e2k-autoconfig.c:1698
+#: ../servers/exchange/storage/exchange-account.c:959
 #, c-format
 msgid "Enter password for %s"
-msgstr "%s à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87 à¤¶à¤¬à¥\8dदà¤\95à¥\82à¤\9f डालें"
+msgstr "%s à¤\95à¥\87 à¤²à¤¿à¤¯à¥\87 à¤\95à¥\82à¤\9fशबà¥\8dद डालें"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1646
-#: ../servers/exchange/storage/exchange-account.c:940
+#: ../servers/exchange/lib/e2k-autoconfig.c:1699
+#: ../servers/exchange/storage/exchange-account.c:964
 msgid "Enter password"
-msgstr "शबà¥\8dदà¤\95à¥\82à¤\9f दाखिल करें"
+msgstr "à¤\95à¥\82à¤\9fशबà¥\8dद दाखिल करें"
 
 #. i18n: These are Outlook's words for the default roles in
 #. the folder permissions dialog.
@@ -5051,92 +5245,84 @@ msgstr "कोई नहीं"
 msgid "Custom"
 msgstr "मनपसंद"
 
-#: ../servers/exchange/lib/e2k-user-dialog.c:144
-msgid "Select User"
-msgstr "उपयोक्ता चुनें"
-
-#: ../servers/exchange/lib/e2k-user-dialog.c:182
-msgid "Addressbook..."
-msgstr "पता-पुस्तिका..."
-
-#: ../servers/exchange/storage/e-storage.c:556
+#: ../servers/exchange/storage/e-storage.c:555
 msgid "Generic error"
 msgstr "ज़ेनेरिक त्रुटि"
 
-#: ../servers/exchange/storage/e-storage.c:558
+#: ../servers/exchange/storage/e-storage.c:557
 msgid "A folder with the same name already exists"
 msgstr "एक फ़ोल्डर समान नाम से पहले उपस्थित है"
 
-#: ../servers/exchange/storage/e-storage.c:560
+#: ../servers/exchange/storage/e-storage.c:559
 msgid "The specified folder type is not valid"
 msgstr "निर्दिष्ट फ़ोल्डर प्रकार उपलब्ध नहीं है"
 
-#: ../servers/exchange/storage/e-storage.c:562
+#: ../servers/exchange/storage/e-storage.c:561
 msgid "I/O error"
 msgstr "I/O त्रुटि"
 
-#: ../servers/exchange/storage/e-storage.c:564
+#: ../servers/exchange/storage/e-storage.c:563
 msgid "Not enough space to create the folder"
 msgstr "फ़ोल्डर बनाने के लिये पर्याप्त स्थान नहीं"
 
-#: ../servers/exchange/storage/e-storage.c:566
+#: ../servers/exchange/storage/e-storage.c:565
 msgid "The folder is not empty"
 msgstr "फ़ोल्डर खाली नहीं है"
 
-#: ../servers/exchange/storage/e-storage.c:568
+#: ../servers/exchange/storage/e-storage.c:567
 msgid "The specified folder was not found"
 msgstr "निर्दिष्ट फ़ोल्डर नहीं मिला"
 
-#: ../servers/exchange/storage/e-storage.c:570
+#: ../servers/exchange/storage/e-storage.c:569
 msgid "Function not implemented in this storage"
 msgstr "फंक्शन इस भंडारण में नहीं लागू है"
 
-#: ../servers/exchange/storage/e-storage.c:574
+#: ../servers/exchange/storage/e-storage.c:573
 msgid "Operation not supported"
 msgstr "ऑपरेशन समर्थित नहीं है"
 
-#: ../servers/exchange/storage/e-storage.c:576
+#: ../servers/exchange/storage/e-storage.c:575
 msgid "The specified type is not supported in this storage"
 msgstr "निर्दिष्ट प्रकार इस भंडारण में समर्थित नहीं है"
 
-#: ../servers/exchange/storage/e-storage.c:578
+#: ../servers/exchange/storage/e-storage.c:577
 msgid "The specified folder cannot be modified or removed"
 msgstr "निर्दिष्ट फ़ोल्डर परिवर्धित या हटाया नहीं जा सकता"
 
-#: ../servers/exchange/storage/e-storage.c:580
+#: ../servers/exchange/storage/e-storage.c:579
 msgid "Cannot make a folder a child of one of its descendants"
-msgstr "इसके संतति के शिशु का फोल्डर नहीं बना सकता"
+msgstr "à¤\87सà¤\95à¥\87 à¤¸à¤\82तति à¤\95à¥\87 à¤¶à¤¿à¤¶à¥\81 à¤\95ा à¤«à¤¼à¥\8bलà¥\8dडर à¤¨à¤¹à¥\80à¤\82 à¤¬à¤¨à¤¾ à¤¸à¤\95ता"
 
-#: ../servers/exchange/storage/e-storage.c:582
+#: ../servers/exchange/storage/e-storage.c:581
 msgid "Cannot create a folder with that name"
 msgstr "एक फ़ोल्डर उस नाम से नहीं बना सकता"
 
-#: ../servers/exchange/storage/e-storage.c:584
+#: ../servers/exchange/storage/e-storage.c:583
 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:635
+#: ../servers/exchange/storage/exchange-account.c:642
 #, c-format
 msgid "%s's Folders"
-msgstr "%s' का फोल्डर"
+msgstr "%s' à¤\95ा à¤«à¤¼à¥\8bलà¥\8dडर"
 
-#: ../servers/exchange/storage/exchange-account.c:1241
+#: ../servers/exchange/storage/exchange-account.c:1265
 msgid "Personal Folders"
 msgstr "व्यक्तिगत फ़ोल्डर"
 
-#: ../servers/exchange/storage/exchange-account.c:1255
+#: ../servers/exchange/storage/exchange-account.c:1280
 msgid "Favorite Public Folders"
 msgstr "पसंदीदा सार्वजनिक फ़ोल्डर"
 
 #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1272
+#: ../servers/exchange/storage/exchange-account.c:1297
 msgid "All Public Folders"
 msgstr "सभी सार्वजनिक फ़ोल्डर"
 
 #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1286
+#: ../servers/exchange/storage/exchange-account.c:1311
 msgid "Global Address List"
 msgstr "वैश्विक पता सूची"
 
@@ -5144,10 +5330,6 @@ msgstr "वैश्विक पता सूची"
 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 "जर्नल"
@@ -5168,19 +5350,19 @@ msgstr "भेजी-डाक वस्तुएँ"
 msgid "Tasks"
 msgstr "कार्य"
 
-#: ../servers/groupwise/e-gw-connection.c:167
+#: ../servers/groupwise/e-gw-connection.c:225
 msgid "Invalid connection"
 msgstr "अवैध संपर्क."
 
-#: ../servers/groupwise/e-gw-connection.c:171
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid response from server"
 msgstr "सर्वर से गलत अनुक्रिया."
 
-#: ../servers/groupwise/e-gw-connection.c:173
+#: ../servers/groupwise/e-gw-connection.c:231
 msgid "No response from the server"
 msgstr "सर्वर से कोई अनुक्रिया नहीं."
 
-#: ../servers/groupwise/e-gw-connection.c:179
+#: ../servers/groupwise/e-gw-connection.c:237
 msgid "Bad parameter"
 msgstr "खराब पैरामीटर"
 
@@ -5190,19 +5372,19 @@ msgstr "एवोल्यूशन पता पुस्तिका फाइ
 
 #: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
 msgid "Evolution Calendar file and webcal backend"
-msgstr "à¤\8fवà¥\8bलà¥\8dयà¥\82शन à¤\95à¥\88लà¥\87à¤\82डर फाइल एवं वेबकैल बैकेंड"
+msgstr "à¤\8fवà¥\8bलà¥\8dयà¥\82शन à¤ªà¤\82à¤\9aाà¤\82à¤\97 फाइल एवं वेबकैल बैकेंड"
 
 #: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
 msgid "Evolution Data Server interface check service"
-msgstr "à¤\8fवà¥\8bलà¥\8dयà¥\82शन à¤\95à¥\88लà¥\87à¤\82डर अंतरफलक जांच सेवा"
+msgstr "à¤\8fवà¥\8bलà¥\8dयà¥\82शन à¤ªà¤\82à¤\9aाà¤\82à¤\97 अंतरफलक जांच सेवा"
 
 #: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
 msgid "Evolution Data Server logging service"
-msgstr "à¤\8fवà¥\8bलà¥\8dयà¥\82शन à¤\95à¥\88लà¥\87à¤\82डर सर्वर लॉगिंग सेवा"
+msgstr "à¤\8fवà¥\8bलà¥\8dयà¥\82शन à¤ªà¤\82à¤\9aाà¤\82à¤\97 सर्वर लॉगिंग सेवा"
 
 #. dialog display isn't working out
-#: ../src/server.c:106
-#, fuzzy, c-format
+#: ../src/server.c:109
+#, c-format
 msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-msgstr "बहुमुखी खंड त्रुटि उत्पन्न हुई, त्रुटि संवाद दिखा नहीं सकता\n"
+msgstr "बहुमुखी खंड त्रुटि उत्पन्न हुई, त्रुटि संवाद दिखा नहीं सकता\n"