hindi updated

author: Rajesh Ranjan <rranjan@redhat.com> 2011-03-31 17:26:05 +0530
committer: Rajesh Ranjan <rranjan@redhat.com> 2011-03-31 17:26:05 +0530
commit: 3a72bb6e91450a49c10bfeba93b40ae6b8865d07 (patch)
tree: 4e4dbdc3a645c632bc6a93e51ff26f8bef3484eb
parent: 3528029e57a29f65a93a8803fa3c25a86e4d4354 (diff)
download: evolution-data-server-3a72bb6e91450a49c10bfeba93b40ae6b8865d07.tar.gz
1 files changed, 2560 insertions, 2637 deletions
diff --git a/po/hi.po b/po/hi.po
index 158c6685c..ad1dd9637 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,192 +1,192 @@
-# translation of evolution-data-server.HEAD.po to Hindi
+# translation of evolution-data-server.gnome-3-0.hi.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, 2009.
 msgid ""
 msgstr ""
-"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 <hindi.sf.net>\n"
+"Project-Id-Version: evolution-data-server.gnome-3-0.hi\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
+"POT-Creation-Date: 2011-03-21 19:01+0000\n"
+"PO-Revision-Date: 2011-03-31 16:31+0530\n"
+"Last-Translator: Rajesh Ranjan\n"
+"Language-Team: Hindi <Indlinux>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
 "\n"
 "\n"
 "\n"
 "\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
+#: ../addressbook/backends/file/e-book-backend-file.c:570
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "लोड कर रहा है..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c: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/file/e-book-backend-file.c:573
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "खोज रहा है..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+msgid "Querying for updated contacts…"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:624
+msgid "Personal"
+msgstr "व्यक्तिगत"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+#| msgid "Favorites"
+msgid "Friends"
+msgstr "प्रिय"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+#| msgid "Family Name"
+msgid "Family"
+msgstr "परिवार"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr ""
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groups…"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+msgid "Creating new contact…"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contact…"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+msgid "Modifying contact…"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1199
+#| msgid "Loading..."
+msgid "Loading…"
+msgstr "लोड कर रहा है..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1346
+#| msgid "Authentication required"
+msgid "Authenticating with the server…"
+msgstr "सत्यापन सर्वर से..."
+
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "संपर्क डाउनलोड कर रहा है (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2849
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "संपर्क कैश अद्यतन कर रहा है (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+#| msgid "Not connected."
+msgid "Not connected"
+msgstr "कनेक्टेड नहीं"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
 msgid "Using Distinguished Name (DN)"
 msgstr "विशिष्ट नाम का उपयोग कर रहा है (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
 msgid "Using Email Address"
 msgstr "ईमेल पता का उपयोग कर रहा है"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP सर्वर से जोड़ रहा है..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
+#| msgid "Invalid argument"
+msgid "Invalid DN syntax"
+msgstr "अवैध डीएन वाक्यांश"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP सर्वर में संपर्क जोड़ रहा है..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP सर्वर से संपर्क हटा रहा है..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP सर्वर से संपर्क रूपांतरित रहा है..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
 msgid "Receiving LDAP search results..."
 msgstr "LDAP खोज परिणाम पा रहा है..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
 msgid "Error performing search"
 msgstr "ढूंढ़ने में त्रुटि"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c: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: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: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:2526
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: कोई मौजूदा ऑपरेशन नहीं"
-
-#: ../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:2671 ../addressbook/libebook/e-book.c:2675
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "\"%s\" पर \"%s\" बाद बुक करें"
-
-#: ../addressbook/libebook/e-book.c:2739
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: रद्द"
-
-#: ../addressbook/libebook/e-book.c:3318
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: अमान्य श्रोत"
-
-#: ../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' के लिये कोई फैक्टरी उपलब्ध नहीं"
-
-#: ../addressbook/libebook/e-book.c:3338
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: EBookListener बना नहीं सका"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
+#: ../calendar/backends/http/e-cal-backend-http.c:435
+#: ../calendar/libecal/e-cal.c:4177
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "अज्ञात त्रुटि"
 
-#: ../addressbook/libebook/e-book.c:3605
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
 #, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: कोई स्व संपर्क UID gconf में भंडारित नहीं था"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3738
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
+#: ../addressbook/libebook/e-book.c:3160
+#, fuzzy, c-format
+#| msgid "%s: there was no source for uid `%s' stored in gconf."
+msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: कोई स्व संपर्क uid `%s' के लिये gconf में भंडारित नहीं था"
 
+#: ../addressbook/libebook/e-book.c:3516
+#: ../addressbook/libedata-book/e-data-book.c:183
+#| msgid "Folder '%s/%s' does not exist."
+msgid "Address book does not exist"
+msgstr "पता पुस्तिका मौजूद नहीं है."
+
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "अद्वितीय ID"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "इसके अंतर्गत फाइल करें"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "पुस्तक URI"
 
@@ -194,818 +194,1087 @@ msgstr "पुस्तक URI"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "पूरा नाम"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "दिया गया नाम"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "परिवार का नाम"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "उपनाम"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
 msgstr "Email 1"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
 msgstr "Email 2"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
 msgstr "Email 3"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
 msgstr "Email 4"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "मेलर"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "घर पता लेबल"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "कार्य पता लेबल"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "अन्य पता लेबल"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "सहायक फोन"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "व्यापार फोन"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
 msgstr "व्यापार फोन २"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "व्यापार फैक्स"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "कालबैक फोन"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "कार फोन"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "कंपनी फोन"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "आवास फोन"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
 msgstr "आवास फोन २"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "आवासह फैक्स"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "मोबाइल फोन"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "अन्य फोन"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "अन्य फैक्स"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "पेजर"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "प्रारंभिक फोन"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "रेडियो"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "टेलेक्स"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "संगठन"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "संगठनात्मक इकाई"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "कार्यालय"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "शीर्षक"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "भूमिका"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "प्रबंधक"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "सहायक"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "होमपेज URL"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "वेब्लाग "
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:757
 msgid "Categories"
 msgstr "कोटियाँ"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "पंचांग URI"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "रिक्त/व्यस्त URI"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "ICS पंचांग"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "वीडियो सम्मेलन URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "पति/पत्नी का नामः"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "टिप्पणी"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
 msgstr "AIM होम स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "AIM होम स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "AIM होम स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "AIM कार्य स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "AIM कार्य स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "AIM कार्य स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
 msgstr "समूह अनुसार होम स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
 msgstr "समूह अनुसार होम स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
 msgstr "समूह अनुसार होम स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
 msgstr "समूह अनुसार कार्य स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
 msgstr "समूह अनुसार कार्य स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
 msgstr "समूह अनुसार कार्य स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "जैबर होम Id 1"
-
-#: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "जैबर होम Id 2"
-
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "जैबर होम Id 3"
+#| msgid "Jabber Home Id 1"
+msgid "Jabber Home ID 1"
+msgstr "जैबर होम ID 1"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "जैबर कार्य Id 1"
+#| msgid "Jabber Home Id 2"
+msgid "Jabber Home ID 2"
+msgstr "जैबर होम ID 2"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "जैबर कार्य Id 2"
+#| msgid "Jabber Home Id 3"
+msgid "Jabber Home ID 3"
+msgstr "जैबर होम ID 3"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "जैबर कार्य Id 3"
+#| msgid "Jabber Work Id 1"
+msgid "Jabber Work ID 1"
+msgstr "जैबर कार्य ID 1"
 
 #: ../addressbook/libebook/e-contact.c:207
+#| msgid "Jabber Work Id 2"
+msgid "Jabber Work ID 2"
+msgstr "जैबर कार्य ID 2"
+
+#: ../addressbook/libebook/e-contact.c:208
+#| msgid "Jabber Work Id 3"
+msgid "Jabber Work ID 3"
+msgstr "जैबर कार्य ID 3"
+
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! होम स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! होम स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! होम स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! कार्य स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! कार्य स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! कार्य स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
 msgstr "MSN होम स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
 msgstr "MSN होम स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
 msgstr "MSN होम स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
 msgstr "MSN कार्य स्क्रीन नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
 msgstr "MSN कार्य स्क्रीन नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
 msgstr "MSN कार्य स्क्रीन नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "ICQ होम Id 1"
-
-#: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "ICQ होम Id 2"
-
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "ICQ होम Id 3"
+#| msgid "ICQ Home Id 1"
+msgid "ICQ Home ID 1"
+msgstr "ICQ होम ID 1"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "ICQ कार्य Id 1"
+#| msgid "ICQ Home Id 2"
+msgid "ICQ Home ID 2"
+msgstr "ICQ होम ID 2"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "ICQ कार्य Id 2"
+#| msgid "ICQ Home Id 3"
+msgid "ICQ Home ID 3"
+msgstr "ICQ होम ID 3"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "ICQ कार्य Id 3"
+#| msgid "ICQ Work Id 1"
+msgid "ICQ Work ID 1"
+msgstr "ICQ कार्य ID 1"
+
+#: ../addressbook/libebook/e-contact.c:225
+#| msgid "ICQ Work Id 2"
+msgid "ICQ Work ID 2"
+msgstr "ICQ कार्य ID 2"
+
+#: ../addressbook/libebook/e-contact.c:226
+#| msgid "ICQ Work Id 3"
+msgid "ICQ Work ID 3"
+msgstr "ICQ कार्य ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "अंतिम पुनरीक्षण"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "नाम या संगठन"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "पता सूची"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "घर का पता"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "आफिस का पता"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "अन्य पता"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
 msgstr "श्रेणी सूची"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "फोटो"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "लोगो"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "नाम"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
 msgstr "ईमेल सूची"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr "AIM स्क्रीन नाम सूची"
 
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "समूह अनुसार Id सूची"
+#: ../addressbook/libebook/e-contact.c:250
+#| msgid "GroupWise Id List"
+msgid "GroupWise ID List"
+msgstr "समूह अनुसार ID सूची"
 
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "जैबर Id सूची"
+#: ../addressbook/libebook/e-contact.c:251
+#| msgid "Jabber Id List"
+msgid "Jabber ID List"
+msgstr "जैबर ID सूची"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! स्क्रीन नाम सूची"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:253
 msgid "MSN Screen Name List"
 msgstr "MSN स्क्रीन नाम सूची"
 
-#: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
-msgstr "ICQ Id सूची"
-
 #: ../addressbook/libebook/e-contact.c:254
+#| msgid "ICQ Id List"
+msgid "ICQ ID List"
+msgstr "ICQ ID सूची"
+
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "HTML डाक चाहता है"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
 msgstr "सूची"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
 msgstr "दिखायें पता सूची"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "जन्मदिन"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Anniversary"
 msgstr "वर्षगांठ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "X.509 प्रमाणपत्र"
 
-#: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
-msgstr "गाडू-गाडू होम Id 1"
-
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "गाडू-गाडू होम Id 2"
-
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "गाडू-गाडू होम Id 3"
+#| msgid "Gadu-Gadu Home Id 1"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "गाडू-गाडू होम ID 1"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "गाडू-गाडू कार्य Id 1"
+#| msgid "Gadu-Gadu Home Id 2"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "गाडू-गाडू होम ID 2"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "गाडू-गाडू कार्य Id 2"
+#| msgid "Gadu-Gadu Home Id 3"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "गाडू-गाडू होम ID 3"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "गाडू-गाडू कार्य Id 3"
+#| msgid "Gadu-Gadu Work Id 1"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "गाडू-गाडू कार्य ID 1"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "गाडू-गाडू Id सूची"
+#| msgid "Gadu-Gadu Work Id 2"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "गाडू-गाडू कार्य ID 2"
+
+#: ../addressbook/libebook/e-contact.c:272
+#| msgid "Gadu-Gadu Work Id 3"
+msgid "Gadu-Gadu Work ID 3"
+msgstr "गाडू-गाडू कार्य ID 3"
+
+#: ../addressbook/libebook/e-contact.c:273
+#| msgid "Gadu-Gadu Id List"
+msgid "Gadu-Gadu ID List"
+msgstr "गाडू-गाडू ID सूची"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "भौगोलिक सूचना"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "टेलिफोन"
 
-#: ../addressbook/libebook/e-contact.c:278
-#| msgid "MSN Home Screen Name 1"
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
 msgstr "स्काइप होम नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:279
-#| msgid "MSN Home Screen Name 2"
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
 msgstr "स्काइप होम नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:280
-#| msgid "MSN Home Screen Name 3"
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
 msgstr "स्काइप होम नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:281
-#| msgid "MSN Work Screen Name 1"
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
 msgstr "स्काइप कार्य नाम 1"
 
-#: ../addressbook/libebook/e-contact.c:282
-#| msgid "MSN Work Screen Name 2"
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
 msgstr "स्काइप कार्य नाम नाम 2"
 
-#: ../addressbook/libebook/e-contact.c:283
-#| msgid "MSN Work Screen Name 3"
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
 msgstr "स्काइप कार्य नाम नाम 3"
 
-#: ../addressbook/libebook/e-contact.c:284
-#| msgid "AIM Screen Name List"
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
 msgstr "स्काइप नाम सूची"
 
-#: ../addressbook/libebook/e-contact.c:286
-#| msgid "Home Address"
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "SIP पता"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1517
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "बेनामी सूची"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
+#: ../addressbook/libedata-book/e-data-book-factory.c:301
+#: ../addressbook/libedata-book/e-data-book-factory.c:334
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
+#, c-format
+msgid "Empty URI"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:320
+#: ../addressbook/libedata-book/e-data-book-factory.c:370
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#, c-format
+#| msgid "%s: Invalid source."
+msgid "Invalid source"
+msgstr "अमान्य श्रोत"
+
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:108
+msgid "Success"
+msgstr "सफल"
+
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:109
+#| msgid "Repository is offline"
+msgid "Repository offline"
+msgstr "अभिलेखागार ऑफलाइन"
+
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libecal/e-cal.c:4159 ../calendar/libedata-cal/e-data-cal.c:110
+msgid "Permission denied"
+msgstr "अनुमति निषेधित"
+
+#: ../addressbook/libedata-book/e-data-book.c:176
+#| msgid "Object not found"
+msgid "Contact not found"
+msgstr "संपर्क नहीं मिला"
+
+#: ../addressbook/libedata-book/e-data-book.c:177
+#| msgid "Object ID already exists"
+msgid "Contact ID already exists"
+msgstr "वस्तु ID पहले से मौजूद"
+
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:115
+#| msgid "Authentication failed"
+msgid "Authentication Failed"
+msgstr "अनुमोदन असफल"
+
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:116
+#| msgid "Authentication required"
+msgid "Authentication Required"
+msgstr "सत्यापन आवश्यक"
+
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:117
+msgid "Unsupported field"
+msgstr "असमर्थित क्षेत्र"
+
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:119
+msgid "Unsupported authentication method"
+msgstr "असमर्थित सत्यापन विधि"
+
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "TLS not available"
+msgstr "TLS अनुपलब्ध"
+
+#: ../addressbook/libedata-book/e-data-book.c:184
+msgid "Book removed"
+msgstr "पुस्तक हटायी गई"
+
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:123
+#| msgid "This message is not available in offline mode."
+msgid "Not available in offline mode"
+msgstr "ऑफ़लाइन मोड में उपलब्ध नहीं है"
+
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Search size limit exceeded"
+msgstr "खोज आकार सीमा ज्यादा हो गया"
+
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "Search time limit exceeded"
+msgstr "खोज सयम सीमा बढ़ गई"
+
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Invalid query"
+msgstr "अवैध प्रश्न"
+
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Query refused"
+msgstr "प्रश्न अस्वीकृत"
+
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:128
+#| msgid "%s: could not cancel"
+msgid "Could not cancel"
+msgstr "रद्द नहीं कर सका"
+
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:130
+msgid "Invalid server version"
+msgstr "अवैध सर्वर संस्करण"
+
+#: ../addressbook/libedata-book/e-data-book.c:193
+#| msgid "Namespace"
+msgid "No space"
+msgstr "नाम स्थान"
+
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4143 ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Invalid argument"
+msgstr "अवैध तर्क"
+
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libecal/e-cal.c:4182 ../calendar/libedata-cal/e-data-cal.c:133
+#| msgid "Protocol not supported"
+msgid "Not supported"
+msgstr "समर्थित नहीं"
+
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:141
+#| msgid "I/O error"
+msgid "Other error"
+msgstr "अन्य त्रुटि"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:325
+#, c-format
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot open book: %s"
+msgstr "पुस्तिका खोल नहीं सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:347
+#, c-format
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot remove book: %s"
+msgstr "पुस्तिका हटा नहीं सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
+#, c-format
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact: %s"
+msgstr "संपर्क नहीं पा सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:402
+#, c-format
+msgid "Empty query: %s"
+msgstr ""
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:418
+#, c-format
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact list: %s"
+msgstr "संपर्क सूची नहीं पा सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:457
+#, c-format
+#| msgid "Cannot authenticate to server: %s"
+msgid "Cannot authenticate user: %s"
+msgstr "उपयोक्ता का सत्यापन नहीं कर सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:472
+#: ../addressbook/libedata-book/e-data-book.c:491
+#, c-format
+#| msgid "Cannot get folder container %s"
+msgid "Cannot add contact: %s"
+msgstr "संपर्क जोड़ नहीं सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:513
+#: ../addressbook/libedata-book/e-data-book.c:532
+#, c-format
+#| msgid "Cannot get folder container %s"
+msgid "Cannot modify contact: %s"
+msgstr "संपर्क नहीं बदल सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:571
+#, c-format
+#| msgid "Cannot get folder container %s"
+msgid "Cannot remove contacts: %s"
+msgstr "संपर्क नहीं हटा सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get supported fields: %s"
+msgstr "समर्थित क्षेत्र पा नहीं सकता: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:625
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get required fields: %s"
+msgstr "जरूरी क्षेत्र प्राप्त नहीं सकता: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:640
+#, c-format
+#| msgid "Unsupported authentication method"
+msgid "Cannot get supported authentication methods: %s"
+msgstr "समर्थित सत्यापन विधि पा नहीं सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:666
+#: ../addressbook/libedata-book/e-data-book.c:677
+#, c-format
+#| msgid "Invalid query"
+msgid "Invalid query: %s"
+msgstr "अवैध प्रश्न: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:713
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get changes: %s"
+msgstr "परिवर्तन नहीं पा सकता: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:755
+#, c-format
+#| msgid "Operation failed: %s"
+msgid "Cancel operation failed: %s"
+msgstr "संक्रिया रद्द करना असफल: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr "सर्वर पहुँच से बाहर है (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, c-format
+#| msgid ""
+#| "Unexpected GnuPG status message encountered:\n"
+#| "\n"
+#| "%s"
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "अप्रत्याशित HTTP स्थिति संदेश %d वापस (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2096
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
+msgid "Calendar doesn't support Free/Busy"
+msgstr ""
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
 msgid "Birthday"
 msgstr "जन्मदिन"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
 #, c-format
 msgid "Birthday: %s"
 msgstr "जन्मदिन: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
 #, c-format
 msgid "Anniversary: %s"
 msgstr "वर्षगांठ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
+#: ../calendar/backends/file/e-cal-backend-file.c:251
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "पंचांग डाटा सहेज नहीं सका: विरूपित URI."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
 msgid "Cannot save calendar data"
 msgstr "पंचांग डाटा सहेज नहीं सका"
 
-#: ../calendar/backends/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:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1917
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2101
 msgid "Reply Requested: by "
 msgstr "जबाव निवेदित: इनके द्वारा"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1922
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
 msgid "Reply Requested: When convenient"
 msgstr "जबाव निवेदित: जब सुविधा हो"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
-#, c-format
-msgid "Loading %s items"
-msgstr "%s मद लोड कर रहा है"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
+#| msgid "Loading %s items"
+msgid "Loading Appointment items"
+msgstr "मुलाकात मद लोड कर रहा है"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
+#| msgid "Loading %s items"
+msgid "Loading Task items"
+msgstr "कार्य मद लोड कर रहा है"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
+#| msgid "Loading %s items"
+msgid "Loading Note items"
+msgstr "नोट मद लोड कर रहा है"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
+#| msgid "Loading %s items"
+msgid "Loading items"
+msgstr "मद लोड कर रहा है"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
 msgid "Calendar"
 msgstr "पंचांग"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
 msgid "Invalid server URI"
 msgstr "अमान्य सर्वर URI"
 
-#: ../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-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
-msgid "Authentication failed"
-msgstr "अनुमोदन असफल"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
+#: ../calendar/backends/http/e-cal-backend-http.c:783
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
+msgid "Could not create cache file"
+msgstr "कैश फाइल नहीं बना सका"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
+msgid "Could not create thread for populating cache"
+msgstr "कैश भरने के लिये थ्रेड नहीं बना सका"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:268
+#: ../calendar/backends/http/e-cal-backend-http.c:423
 msgid "Redirected to Invalid URI"
 msgstr "अमान्य URI में पुनर्प्रेषित"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:289
+#: ../calendar/backends/http/e-cal-backend-http.c:456
 msgid "Bad file format."
 msgstr "गलत फाइल प्रारूप"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
+#: ../calendar/backends/http/e-cal-backend-http.c:463
 msgid "Not a calendar."
 msgstr "पंचांग नहीं"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
 msgid "Could not retrieve weather data"
 msgstr "मौसम डाटा नहीं पा सका"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Fog"
 msgstr "मौसम: कुहरा"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "मौसम: बदली"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-#| msgid "Weather: Cloudy"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy Night"
 msgstr "मौसम: बदली युक्त रात"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-#| msgid "Weather: Thunderstorms"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+msgid "Weather: Cloudy"
+msgstr "मौसम: बदली"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Overcast"
 msgstr "मौसम: ओवरकास्ट"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-#| msgid "Weather: Snow"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Showers"
 msgstr "मौसम: बर्षा"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Snow"
 msgstr "मौसम: बर्फ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "मौसम: साफ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-#| msgid "Weather: Rain"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Clear Night"
 msgstr "मौसम: साफ रात"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+msgid "Weather: Sunny"
+msgstr "मौसम: साफ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
 msgid "Weather: Thunderstorms"
 msgstr "मौसम: थंडरस्टार्म"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
 msgid "Forecast"
 msgstr "पूर्वानुमान"
 
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../calendar/libecal/e-cal-component.c:1299
 msgid "Untitled appointment"
 msgstr "व्यस्तता शीर्षकहीन"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "1st"
 msgstr "पहला"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "2nd"
 msgstr "दूसरा"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "3rd"
 msgstr "तीसरा"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "4th"
 msgstr "चौथा"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "5th"
 msgstr "पांचवा"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "6th"
 msgstr "छठा"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "7th"
 msgstr "सातवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "8th"
 msgstr "आठवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "9th"
 msgstr "नवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "10th"
 msgstr "दसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "11th"
 msgstr "ग्यारहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "12th"
 msgstr "बारहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "13th"
 msgstr "तेरहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "14th"
 msgstr "चौदहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "15th"
 msgstr "पंद्रहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "16th"
 msgstr "सोलहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "17th"
 msgstr "सत्रहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "18th"
 msgstr "अठारहवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "19th"
 msgstr "उन्नीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "20th"
 msgstr "बीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "21st"
 msgstr "इक्कीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "22nd"
 msgstr "बाइसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "23rd"
 msgstr "तेइसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "24th"
 msgstr "चौबीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "25th"
 msgstr "पच्चीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "26th"
 msgstr "छब्बीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "27th"
 msgstr "सत्ताइसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "28th"
 msgstr "अट्ठाइसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "29th"
 msgstr "उनतीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "30th"
 msgstr "तीसवां"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "31st"
 msgstr "इकतीसवां"
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
 msgid "High"
 msgstr "ज्यादा"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
 msgid "Normal"
 msgstr "सामान्य"
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
 msgid "Low"
 msgstr "कम"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:703
 msgid "Undefined"
 msgstr "अपरिभाषित"
 
-#: ../calendar/libecal/e-cal.c:1677 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:440
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s के लिये कूटशब्द डालें (उपयोक्ता %s)"
@@ -1014,187 +1283,158 @@ msgstr "%s के लिये कूटशब्द डालें (उपय�
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1691
+#: ../calendar/libecal/e-cal.c:1250
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "%s के लिये कूटशब्द दाखिल करें उपभोक्ता %s के लिये प्रॉक्सी समर्थ करने के लिये"
 
-#: ../calendar/libecal/e-cal.c:5070
-msgid "Invalid argument"
-msgstr "अवैध तर्क"
-
-#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libecal/e-cal.c:4145
 msgid "Backend is busy"
 msgstr "पश्चशिरा व्यस्त"
 
-#: ../calendar/libecal/e-cal.c:5074
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4147
 msgid "Repository is offline"
 msgstr "अभिलेखागार ऑफलाइन"
 
-#: ../calendar/libecal/e-cal.c:5076
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4149
 msgid "No such calendar"
 msgstr "कोई ऐसा पंचांग नहीं"
 
-#: ../calendar/libecal/e-cal.c:5078
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:4151 ../calendar/libedata-cal/e-data-cal.c:112
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "वस्तु नहीं मिला"
 
-#: ../calendar/libecal/e-cal.c:5080
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4153 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "अवैध वस्तु"
 
-#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libecal/e-cal.c:4155
 msgid "URI not loaded"
 msgstr "URI भारित नहीं"
 
-#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libecal/e-cal.c:4157
 msgid "URI already loaded"
 msgstr "URI पहले से लोड"
 
-#: ../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:5088
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4161 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "अज्ञात उपयोक्ता"
 
-#: ../calendar/libecal/e-cal.c:5090
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4163 ../calendar/libedata-cal/e-data-cal.c:114
 msgid "Object ID already exists"
 msgstr "वस्तु ID पहले से मौजूद"
 
-#: ../calendar/libecal/e-cal.c:5092
+#: ../calendar/libecal/e-cal.c:4165
 msgid "Protocol not supported"
 msgstr "प्रोटोकाल समर्थित नहीं"
 
-#: ../calendar/libecal/e-cal.c:5094
+#: ../calendar/libecal/e-cal.c:4167
 msgid "Operation has been canceled"
 msgstr "ऑपरेशन रद्द किया गया"
 
-#: ../calendar/libecal/e-cal.c:5096
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4169
 msgid "Could not cancel operation"
 msgstr "ऑपरेशन रद्द नहीं कर सका"
 
-#: ../calendar/libecal/e-cal.c:5100
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../calendar/libecal/e-cal.c:4171
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
+#: ../camel/providers/groupwise/camel-groupwise-store.c:628
+#: ../camel/providers/groupwise/camel-groupwise-store.c:810
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#, c-format
+msgid "Authentication failed"
+msgstr "अनुमोदन असफल"
+
+#: ../calendar/libecal/e-cal.c:4173
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 msgid "Authentication required"
 msgstr "सत्यापन आवश्यक"
 
-#: ../calendar/libecal/e-cal.c:5102
-msgid "A CORBA exception has occurred"
-msgstr "CORBA अपवाद पैदा हुआ"
-
-#: ../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: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:4175
+#| msgid "A CORBA exception has occurred"
+msgid "A D-Bus exception has occurred"
+msgstr "D-Bus अपवाद पैदा हुआ"
 
-#: ../calendar/libecal/e-cal.c:5106
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:553
+#: ../calendar/libecal/e-cal.c:4179
 msgid "No error"
 msgstr "कोई गलती नहीं"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" किसी तर्क की आशा नहीं करता"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" एक तर्क की आशा करता"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" पहले तर्क की स्ट्रिंग होने की आशा करता"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "\"%s\" पहले तर्क को ISO 8601 date/time स्ट्रिंग होने की आशा करता है"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" दो तर्क की आशा करता"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" पहले तर्क time_t होने की आशा करता"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" दूसरे तर्क की एक पूर्णांक की आशा करता है"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" दूसरे तर्क की एक time_t की आशा करता है"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" दूसरे तर्क की एक स्ट्रिंग होने की आशा करता है"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
-#, fuzzy, c-format
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
+#, c-format
 #| msgid ""
 #| "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
 #| "\"description\", or \"location\""
@@ -1203,15 +1443,16 @@ msgid ""
 "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
 "\"classification\""
 msgstr ""
-"\"%s\" पहले तर्क को \"any\", \"summary\", or \"description\", या \"location\" "
-"में से किसी रूप में आशा करता है"
+"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" कम से कम एक तर्क की आशा करता है"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1220,114 +1461,264 @@ msgstr ""
 "\"%s\" सारे तर्क को स्ट्रिंग होने की आशा करता है या एक व सिर्फ एक तर्क बुलियन गलत (#f) "
 "होने के लिये"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-#| msgid "Invalid argument"
+#: ../calendar/libedata-cal/e-data-cal.c:111
 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."
+#: ../calendar/libedata-cal/e-data-cal.c:118
 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-data-cal.c:121
+#| msgid "Folder '%s' does not exist."
+msgid "Calendar does not exist"
+msgstr "पंचांग मौजूद नहीं है."
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-#| msgid "SSL unavailable"
-msgid "TLS not available"
-msgstr "TLS अनुपलब्ध"
+#: ../calendar/libedata-cal/e-data-cal.c:122
+#| msgid "Unknown User"
+msgid "Unknown user"
+msgstr "अज्ञात उपयोक्ता"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-#| msgid "SSL unavailable"
-msgid "Offline mode unavailable"
-msgstr "ऑफलाइन विधि अनुपलब्ध"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:608
+#, c-format
+#| msgid "Cannot create folder: %s: %s"
+msgid "Cannot retrieve calendar address: %s"
+msgstr "पंचांग पता पा नहीं सकता है: %s."
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-#| msgid "Path length exceeded"
-msgid "Search size limit exceeded"
-msgstr "खोज आकार सीमा ज्यादा हो गया"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:633
+#, fuzzy, c-format
+#| msgid "Cannot save calendar data: Malformed URI."
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "पंचांग डाटा सहेज नहीं सका: विरूपित URI."
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-#| msgid "Path length exceeded"
-msgid "Search time limit exceeded"
-msgstr "खोज सयम सीमा बढ़ गई"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:658
+#, fuzzy, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "पंचांग डाटा सहेज नहीं सका"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-#| msgid "Invalid purpose"
-msgid "Invalid query"
-msgstr "अवैध प्रश्न"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:683
+#, fuzzy, c-format
+#| msgid "Cannot create CMS Recipient information"
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "CMS प्राप्तकर्ता सूचना निर्मित नहीं कर सकता है"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "प्रश्न अस्वीकृत"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:707
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot open calendar: %s"
+msgstr "पंचांग डाटा खोल नहीं सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:728
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot refresh calendar: %s"
+msgstr "पंचांग डाटा ताजा नहीं सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:747
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar: %s"
+msgstr "पंचांग हटा नहीं सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:768
+#, fuzzy, c-format
+#| msgid "Cannot create message: %s"
+msgid "Cannot create calendar object: %s"
+msgstr "संदेश बना नहीं सकता: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:796
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot modify calendar object: %s"
+msgstr "पंचांग वस्तु बदल सहेज नहीं सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:822
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar object: %s"
+msgstr "पंचांग वस्तु बदल हटा नहीं सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:843
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot receive calendar objects: %s"
+msgstr "पंचांग वस्तु पा नहीं सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:862
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot discard calendar alarm: %s"
+msgstr "पंचांग अलार्म छोड़ नहीं सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:883
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot send calendar objects: %s"
+msgstr "पंचांग वस्तु भेज नहीं सकता है: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:910
+#, c-format
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr ""
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:935
+#, fuzzy, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "पंचांग डाटा सहेज नहीं सका"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:960
+#, fuzzy, c-format
+#| msgid "Cannot create folder lock on %s: %s"
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "%s पर फ़ोल्डर ताला नहीं निर्मित कर सकता: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:988
+#, fuzzy, c-format
+#| msgid "Could not remove cache entry: %s: %s"
+msgid "Could not retrieve attachment list: %s"
+msgstr "कैश प्रविष्टि नहीं हटा सकता: %s: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1014
+#, fuzzy, c-format
+#| msgid "Could not open cache directory: %s"
+msgid "Could not complete calendar query: %s"
+msgstr "कैश निर्देशिका खोल नहीं सका: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1039
+#, fuzzy, c-format
+#| msgid "Could not rename folder: %s"
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "फ़ोल्डर का पुनः नामकरण नहीं कर सका: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1064
+#, fuzzy, c-format
+#| msgid "Could not rename folder: %s"
+msgid "Could not add calendar time zone: %s"
+msgstr "फ़ोल्डर का पुनः नामकरण नहीं कर सका: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1083
+#, fuzzy, c-format
+#| msgid "Could not send message: %s"
+msgid "Could not set default calendar time zone: %s"
+msgstr "संदेश नहीं भेज सका: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1106
+#, fuzzy, c-format
+#| msgid "Cannot create folder: %s: %s"
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "`%s' फ़ोल्डर निर्मित नहीं कर सकता है: %s."
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1137
+#, c-format
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr ""
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:375
+#, c-format
 #| msgid "Invalid server URI"
-msgid "Invalid server version"
-msgstr "अवैध सर्वर संस्करण"
+msgid "Invalid URI"
+msgstr "अमान्य URI"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:393
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr ""
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:443
+#, fuzzy, c-format
+#| msgid "Could not create cache file"
+msgid "Could not instantiate backend"
+msgstr "कैश फाइल नहीं बना सका"
 
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:200
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "हस्ताक्षर इस सिफर के द्वारा समर्थित नहीं है"
 
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "संदेश पर हस्ताक्षर कर रहा है"
-
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:213
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "जांच इस सिफर के द्वारा समर्थित नहीं है"
 
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "संदेश की जांच कर रहा है"
-
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:229
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "गोपन इस सिफर के द्वारा समर्थित नहीं है"
 
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "संदेश का गोपन कर रहा है"
-
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:243
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "विगोपन इस सिफर के द्वारा समर्थित नहीं है"
 
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "संदेश का विगोपन कर रहा है"
-
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:256
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "इस सिफर से आप कुंजी आयात नहीं कर सकते हैं"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:270
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "इस सिफर से आप कुंजी निर्यात नहीं कर सकते हैं"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-cipher-context.c:812
+msgid "Signing message"
+msgstr "संदेश पर हस्ताक्षर कर रहा है"
+
+#: ../camel/camel-cipher-context.c:1053
+msgid "Encrypting message"
+msgstr "संदेश का गोपन कर रहा है"
+
+#: ../camel/camel-cipher-context.c:1180
+msgid "Decrypting message"
+msgstr "संदेश का विगोपन कर रहा है"
+
+#: ../camel/camel-data-cache.c:178
+#, c-format
 msgid "Unable to create cache path"
 msgstr "कैश पथ निर्माण में अक्षम"
 
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:496
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "कैश प्रविष्टि नहीं हटा सकता: %s: %s"
 
-#: ../camel/camel-db.c:469
+#: ../camel/camel-data-wrapper.c:143
+#, fuzzy, c-format
+#| msgid "No such message available."
+msgid "No stream available"
+msgstr "ऐसा कोई संदेश उपलब्ध नहीं"
+
+#: ../camel/camel-db.c:455
+#, c-format
 msgid "Insufficient memory"
 msgstr "अपर्याप्त स्मृति"
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1338,13 +1729,9 @@ msgstr ""
 "इस सर्वर पर आगे की संक्रिया पुनः नहीं चलायी जायेगी जब आप\n"
 "संजाल से पुनर्संबंध जोड़ेंगे."
 
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:300
 #, 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"
 "%s\n"
@@ -1354,101 +1741,112 @@ msgstr ""
 "%s\n"
 "इस फ़ोल्डर में किया गया परिवर्तन पुनर्तुल्यकालिक नहीं हो पायेगा."
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:304
 msgid "Resynchronizing with server"
 msgstr "सर्वर से पुनर्तुल्यकालन"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52
-msgid "Copy folder content locally for offline operation"
-msgstr "ऑफलाइन संक्रिया के लिए फ़ोल्डर अंतर्वस्तु की स्थानीय रूप से कापी करें"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:111
+#: ../camel/camel-disco-folder.c:63 ../camel/camel-offline-folder.c:79
 msgid "Downloading new messages for offline mode"
 msgstr "ऑफलाइन मोड के लिये नए संदेश को अधिभारित कर रहा है"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:398
 #, c-format
 msgid "Preparing folder '%s' for offline"
 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
+#: ../camel/camel-disco-folder.c:464 ../camel/camel-offline-folder.c:312
+msgid "Copy folder content locally for offline operation"
+msgstr "ऑफलाइन संक्रिया के लिए फ़ोल्डर अंतर्वस्तु की स्थानीय रूप से कापी करें"
+
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1298
+#: ../camel/providers/imapx/camel-imapx-store.c:1386
+#: ../camel/providers/imapx/camel-imapx-store.c:1421
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "इस संक्रिया को समाप्त करने के लिए आपको निश्चित रूप से ऑनलाइन काम करना पड़ेगा"
 
-#: ../camel/camel-exception.c:262
-msgid "No description available"
-msgstr "कोई वर्णन उपलब्ध नहीं"
+#: ../camel/camel-file-utils.c:722
+#, c-format
+msgid "Canceled"
+msgstr "रद्द"
 
-#: ../camel/camel-filter-driver.c:795 ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:817 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "'%s' बाल प्रक्रिया बनाने में विफल: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:864
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s से अवैध संदेश धारा प्राप्त: %s"
 
-#: ../camel/camel-filter-driver.c:1026 ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1051 ../camel/camel-filter-driver.c:1060
 msgid "Syncing folders"
 msgstr "फ़ोल्डर का तुल्यकालन कर रहा है"
 
-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "निस्पंदन विश्लेषण में दोष: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133 ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1159 ../camel/camel-filter-driver.c:1609
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "निस्पंदन निस्पादन में त्रुटि: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1256
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "स्पूल फ़ोल्डर को खोलने में अक्षम"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1267
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "स्पूल फ़ोल्डर की प्रक्रिया में अक्षम"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1285
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) संदेश प्राप्त कर रहा है"
 
-#: ../camel/camel-filter-driver.c:1250
-msgid "Cannot open message"
-msgstr "संदेश नहीं खोल सकता है"
-
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1292 ../camel/camel-filter-driver.c:1314
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d संदेश पर असफल"
 
-#: ../camel/camel-filter-driver.c:1283 ../camel/camel-filter-driver.c:1374
+#: ../camel/camel-filter-driver.c:1329 ../camel/camel-filter-driver.c:1434
 msgid "Syncing folder"
 msgstr "फ़ोल्डर का तुल्यकालन कर रहा है"
 
-#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
 msgid "Complete"
 msgstr "पूर्ण"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1398
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d का %d संदेश प्राप्त कर रहा है"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1416
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d के %d संदेश पर असफल"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "संदेश प्राप्त करने में असफल"
 
@@ -1460,14 +1858,13 @@ msgstr "इससे अवैध तर्क (सिस्टम-ध्वज�
 msgid "Invalid arguments to (user-tag)"
 msgstr "इससे अवैध तर्क (उपभोक्ता-टैग)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737 ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "निस्पंदन खोज के निस्पादन में त्रुटि: %s: %s"
 
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:624
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1476,8 +1873,8 @@ msgstr ""
 "खोज अभिव्यक्ति का विश्लेषण नहीं कर सकता: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:636
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1486,78 +1883,83 @@ msgstr ""
 "खोज अभिव्यक्ति के क्रियान्वयन में दोष: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
 #, c-format
-#| msgid "(match-all) requires a single bool result"
 msgid "(%s) requires a single bool result"
 msgstr "(%s) के लिए एकल बूल परिणाम जरूरी है"
 
-#: ../camel/camel-folder-search.c:906
+#: ../camel/camel-folder-search.c:935
 #, c-format
-#| msgid "(match-threads) not allowed inside match-all"
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) स्वीकृत नहीं है %s के अंदर"
 
-#: ../camel/camel-folder-search.c:912 ../camel/camel-folder-search.c:919
+#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
 #, c-format
-#| msgid "(match-threads) requires a match type string"
 msgid "(%s) requires a match type string"
 msgstr "(%s) के लिए मिलान प्रकार स्ट्रिंग की जरूरत है"
 
-#: ../camel/camel-folder-search.c:946
+#: ../camel/camel-folder-search.c:975
 #, c-format
-#| msgid "(match-threads) expects an array result"
 msgid "(%s) expects an array result"
 msgstr "(%s) एक सरणी परिणाम की आशा करता है"
 
-#: ../camel/camel-folder-search.c:955
+#: ../camel/camel-folder-search.c:984
 #, c-format
-#| msgid "(match-threads) requires the folder set"
 msgid "(%s) requires the folder set"
 msgstr "(%s) के लिए फ़ोल्डर सेट की जरूरत है"
 
-#: ../camel/camel-folder.c:696
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "असमर्थित संक्रिया: संदेश जोड़ें: %s के लिए"
-
-#: ../camel/camel-folder.c:1398
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "असमर्थित संक्रिया: भाव से खोजें: %s के लिए"
-
-#: ../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:216
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "%s में परिवर्तित संदेश के लिये स्कैनिंग"
+msgstr[1] "%s में परिवर्तित संदेश के लिये स्कैनिंग"
 
-#: ../camel/camel-folder.c:1480
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "असमर्थित संक्रिया: UID से खोजें: %s के लिए"
+#: ../camel/camel-folder.c:240
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "%s में परिवर्तित संदेश के लिये स्कैनिंग"
+msgstr[1] "%s में परिवर्तित संदेश के लिये स्कैनिंग"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:266
+#, fuzzy, c-format
+#| msgid "Filtering new message(s)"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "नए संदेश(शों) का निस्पंदन कर रहा है"
+msgstr[1] "नए संदेश(शों) का निस्पंदन कर रहा है"
+
+#: ../camel/camel-folder.c:875
+#: ../camel/providers/local/camel-maildir-folder.c:293
 msgid "Moving messages"
 msgstr "संदेश प्रतिस्थापित कर रहा है"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:878
 msgid "Copying messages"
 msgstr "संदेश कापी कर रहा है"
 
-#: ../camel/camel-folder.c:1942
-msgid "Learning junk"
-msgstr "जंक को समझ रहा है"
+#: ../camel/camel-folder.c:3247
+#, fuzzy, c-format
+#| msgid "Retrieving POP message %d"
+msgid "Retrieving message '%s'"
+msgstr "%d POP सारांश पुनर्प्राप्त कर रहा है"
 
-#: ../camel/camel-folder.c:1959
-msgid "Learning non-junk"
-msgstr "गैर-जंक को समझ रहा है"
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "gpg के निस्पादन में विफल: %s"
 
-#: ../camel/camel-folder.c:1978
-msgid "Filtering new message(s)"
-msgstr "नए संदेश(शों) का निस्पंदन कर रहा है"
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
+msgid "Unknown"
+msgstr "अज्ञात"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1568,15 +1970,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:728
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid इशारे के विश्लेषण में विफल."
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg कूटशब्द आग्रह के विश्लेषण में असफल."
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1585,7 +1989,7 @@ msgstr ""
 "आपको अपने स्मार्ट कार्ड को खोलने के लिए\n"
 "पिन की जरूरत है: \"%s\""
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1594,139 +1998,132 @@ msgstr ""
 "आपको उपभोक्ता के लिए कुंजी खोलने के लिए\n"
 "कूटशब्द की जरूरत है: \"%s\""
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG से '%s' के लिए अप्रत्याशित आग्रह"
 
-#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1304
-msgid "Canceled."
+#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4892
+#: ../camel/providers/imapx/camel-imapx-server.c:4909
+#: ../camel/providers/imapx/camel-imapx-store.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:506
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+#| msgid "Canceled"
+msgid "Cancelled"
 msgstr "रद्द"
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:846
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "गुप्त कुंजी खोलने में असफल:३ गलत कूटशब्द दिया गया."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG से अप्रत्याशित अनुक्रिया: %s"
 
-#: ../camel/camel-gpg-context.c:947
+#: ../camel/camel-gpg-context.c:989
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "गोपन में असफल: कोई वैध प्राप्तकर्ता नहीं."
 
-#. always called on an i/o error
-#: ../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:1305 ../camel/camel-smime-context.c:598
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "हस्ताक्षर आंकड़ा उत्पन्न नहीं कर सका: %s"
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+#| msgid "Could not generate signing data: %s"
+msgid "Could not generate signing data: "
+msgstr "हस्ताक्षर आंकड़ा उत्पन्न नहीं कर सका:"
 
-#: ../camel/camel-gpg-context.c: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
+#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
+#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
 msgid "Failed to execute gpg."
 msgstr "gpg के निस्पादन में विफल."
 
-#: ../camel/camel-gpg-context.c:1371
-msgid "This is a digitally signed message part"
-msgstr "यह डिजिटल रूप से हस्ताक्षरित संदेश का हिस्सा है"
-
-#: ../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
+#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
+#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
+#: ../camel/camel-smime-context.c:971
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "संदेश हस्ताक्षर की जांच नहीं कर सकता: अशुद्ध संदेश प्रारूप"
 
-#: ../camel/camel-gpg-context.c:1524
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "संदेश हस्ताक्षर की जांच नहीं कर सकता: अस्थायी फ़ाइल नहीं निर्मित कर सकता: %s"
+#: ../camel/camel-gpg-context.c:1737
+#| msgid "Cannot verify message signature: Incorrect message format"
+msgid "Cannot verify message signature: "
+msgstr "संदेश हस्ताक्षर की जांच नहीं कर सकता: "
 
-#: ../camel/camel-gpg-context.c:1623
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "गोपन आंकड़ा उत्पन्न नहीं सका: %s"
+#: ../camel/camel-gpg-context.c:1858
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not generate encrypting data: "
+msgstr "गोपन आंकड़ा उत्पन्न नहीं सका:"
 
-#: ../camel/camel-gpg-context.c:1673
+#: ../camel/camel-gpg-context.c:1911
 msgid "This is a digitally encrypted message part"
 msgstr "यह डिजिटल रूप से गुप्त संदेश का हिस्सा है"
 
-#: ../camel/camel-gpg-context.c:1726 ../camel/camel-gpg-context.c:1734
-#: ../camel/camel-gpg-context.c:1753
+#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
+#: ../camel/camel-gpg-context.c:2001
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "संदेश हस्ताक्षर की जांच नहीं कर सकता: अशुद्ध संदेश प्रारूप"
 
-#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1989
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME हिस्से के विगोपन में विफल: प्रोटोकाल त्रुटि"
 
-#: ../camel/camel-gpg-context.c:1808 ../camel/camel-smime-context.c:1176
+#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
 msgid "Encrypted content"
 msgstr "गुप्त अंतर्वस्तु"
 
-#: ../camel/camel-gpg-context.c:1827
-msgid "Unable to parse message content"
-msgstr "संदेश अंतर्वस्तु के विश्लेषण में अक्षम"
-
-#: ../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:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "सहायता पाइप के लॉकिंग बिल्ड नहीं कर सकता: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "सहायक को लॉक करना फॉर्क नहीं कर सकता: %s"
 
-#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "'%s' पर ताला नहीं लगा सका: ताला सहायक के साथ प्रोटोकाल त्रुटि"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "'%s' पर ताला नहीं लगा सका"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s के लिए ताला फ़ाइल नहीं बना सका: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+#| msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "%s पर लॉक फाइल पाने के लिये कोशिश में समय समाप्त. फिर कोशिश करें."
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2) के प्रयोग से ताला पाने में विफल: %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) के प्रयोग से ताला पाने में विफल: %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "%s डाक फ़ाइल की जांच नहीं कर सका: %s"
@@ -1736,145 +2133,146 @@ msgstr "%s डाक फ़ाइल की जांच नहीं कर स
 msgid "Could not open mail file %s: %s"
 msgstr "%s डाक फ़ाइल को नहीं खोल सका: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "%s अस्थायी डाक फ़ाइल को नहीं खोल सका: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "%s अस्थायी फ़ाइल में डाक संग्रहन में असफल: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "पाइप नहीं बना सका: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "फोर्क नहीं कर सका: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail प्रोग्राम विफल हो गया: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(अज्ञात त्रुटि)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "डाक फ़ाइल पढ़ने में दोष: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "डाक अस्थायी फ़ाइल को लिखने में दोष: %s"
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "डाक अस्थायी फ़ाइल को कापी करने में दोष: %s"
 
-#: ../camel/camel-multipart-signed.c:593
-msgid "parse error"
-msgstr "त्रुटि विश्लेषण करें"
+#: ../camel/camel-multipart-signed.c:327
+#, c-format
+#| msgid "No description available"
+msgid "No content available"
+msgstr "कोई सामग्री उपलब्ध नहीं"
 
-#: ../camel/camel-net-utils.c: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-multipart-signed.c:335
+#, c-format
+#| msgid "No description available"
+msgid "No signature available"
+msgstr "कोई हस्ताक्षर उपलब्ध नहीं"
 
-#: ../camel/camel-net-utils.c:524
-msgid "cannot create thread"
-msgstr "थ्रेड नहीं निर्मित कर सकता"
+#: ../camel/camel-multipart-signed.c:663
+#, c-format
+msgid "parse error"
+msgstr "त्रुटि विश्लेषण करें"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
 msgstr "हल कर रहा है: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:718
 msgid "Host lookup failed"
 msgstr "मेजबान देखने में असफलता"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "मेजबान देखने में असफलता: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:845
 msgid "Resolving address"
 msgstr "पता हल कर रहा है"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
 msgstr "नाम देखना विफल"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:872
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "नाम देखना विफल: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:189
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "%s फ़ोल्डर से डिस्क में संदेश तुल्यकालित कर रहा है"
 
-#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
-#| 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:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "आभासी फ़ोल्डर ईडाक प्रस्तोता"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "अन्य फ़ोल्डर समुच्चय के प्रश्न के रूप में डाक पढ़ने के लिए"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s अधिभारित नहीं कर सका: इस सिस्टम पर मोड्यूल अधिभारण को समर्थन नहीं है."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s को अधिभारित नहीं कर सका: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s को अधिभारित नहीं कर सका: मोड्यूल में कोई आरंभीकरण कूट नहीं है."
 
-#: ../camel/camel-provider.c:373 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:202
 #, c-format
-#| msgid "No provider available for protocol `%s'"
 msgid "No provider available for protocol '%s'"
 msgstr "'%s' प्रोटोकॉल के लिये कोई प्रदाता उपलब्ध नहीं"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "अज्ञात"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "अज्ञात लागिन के उपयोग से यह विकल्प सर्वर से जोड़ेगा."
 
-#: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
 msgid "Authentication failed."
 msgstr "सत्यापन असफल"
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1883,7 +2281,7 @@ msgstr ""
 "अवैध ईडाक पता अनुरेखी सूचना:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1892,7 +2290,7 @@ msgstr ""
 "अवैध अपारदर्शी पता अनुरेखी सूचना:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1901,11 +2299,11 @@ msgstr ""
 "अवैध अनुरेखी सूचना:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -1913,11 +2311,11 @@ msgstr ""
 "सुरक्षित CRAM-MD5 कूटशब्द के उपयोग से यह विकल्प सर्वर से जोड़ेगा, अगर सर्वर इसे समर्थन देता "
 "है."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -1925,39 +2323,45 @@ msgstr ""
 "सुरक्षित DIGEST-MD5 कूटशब्द के उपयोग से यह विकल्प सर्वर से जोड़ेगा, अगर सर्वर इसे समर्थन "
 "देता है."
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:817
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "सर्वर चुनौती काफी लंबी है (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:828
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "सर्वर चुनौती अवैध है\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:836
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "सर्वर चुनौती के पास अवैध \"सुरक्षा की गुणवत्ता \" टोकन है"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:871
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "सर्वर अनुक्रिया के पास प्राधिकार आंकड़ा नहीं है"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:892
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "सर्वर अनुक्रिया के पास अपूर्ण प्राधिकार आंकड़ा है"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:905
+#, c-format
 msgid "Server response does not match"
 msgstr "सर्वर अनुक्रिया मेल नहीं खाता है"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Kerberos 5 सत्यापन के उपयोग से यह विकल्प सर्वर से जोड़ेगा."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -1965,17 +2369,17 @@ msgstr ""
 "दिये गये श्रेय के द्वारा निर्दिष्ट यांत्रिकी समर्थित नहीं है, या कार्यान्वयन के द्वारा "
 "अपरिचित है."
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "दिया गया लक्ष्यनाम पैरामीटर कु-रूप था."
 
-#: ../camel/camel-sasl-gssapi.c:172
+#: ../camel/camel-sasl-gssapi.c:137
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "दिया गया लक्ष्यनाम पैरामीटर एक अवैध या असमर्थित नाम के प्रकार को समाहित करता है."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:141
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -1983,13 +2387,13 @@ msgstr ""
 "input_token अलग चैनल बाइंडिंग को उनमें समाहित करता है input_chan_bindings पैरामीटर "
 "से होकर."
 
-#: ../camel/camel-sasl-gssapi.c:181
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "आगतटोकन के पास एक अवैध हस्ताक्षर है, या एक हस्ताक्षर है जिसको जांचा नहीं जा सका है."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:150
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -1997,117 +2401,106 @@ msgstr ""
 "संदर्भ आरंभ के लिये दी गई महत्व मान्य नहीं था, या महत्व नियंत्रण किसी महत्व का संदर्भ नहीं "
 "लेता है."
 
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "दी गई संदर्भ नियंत्रण मान्य संदर्भ का सहारा नहीं लेती."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "सुसंगतता जांच input_token पर विफल रही."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
 msgstr "महत्व पर किया सुसंगतता जांच विफल रही."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "सदर्भ महत्व का समय समाप्त हो गया."
 
-#: ../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
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "सर्वर से गलत सत्यापन अनुक्रिया."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:383
+#, c-format
 msgid "Unsupported security layer."
 msgstr "असमर्थित सुरक्षा परत."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Kerberos 4 सत्यापन के उपयोग से यह विकल्प सर्वर से जोड़ेगा."
-
-#: ../camel/camel-sasl-kerberos4.c:174
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberos टिकट नहीं पा सका:\n"
-"%s"
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "लागिन"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "साधारण कूटशब्द के उपयोग से यह विकल्प सर्वर से जोड़ेगा."
 
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:91
+#, c-format
 msgid "Unknown authentication state."
 msgstr "अज्ञात सत्यापन स्थिति."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:37
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:39
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr "NTLM / सुरक्षित कूटशब्द सत्यापन के उपयोग से यह विकल्प विंडो आधारित सर्वर से जोड़ेगा."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "SMTP के पहले POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "SMTP पर प्रयास के पहले यह विकल्प एक POP कनेक्शन को प्राधिकृत करेगा"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:79
 msgid "POP Source URI"
 msgstr "POP श्रोत URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
+#: ../camel/camel-sasl-popb4smtp.c:86
+#, fuzzy, c-format
+#| msgid "POP Before SMTP auth using an unknown transport"
+msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "एक अज्ञात परिवहन के प्रयोग से SMTP प्राधिकार के पूर्व POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
+#: ../camel/camel-sasl-popb4smtp.c:94
+#, fuzzy, c-format
+#| msgid "POP Before SMTP auth using a non-pop source"
+msgid "POP Before SMTP authentication using a non-POP source"
 msgstr "एक गैर pop श्रोत के प्रयोग से SMTP प्राधिकार के पूर्व POP"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "सामान्या एक्स्रेषन कंपाइलेशन विफल: %s: %s"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:85
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URL को एक उपभोक्तानाम घटक की जरूरत है"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:89
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URL को एक मेजबान घटक की जरूरत है"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:93
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URL को एक पथ घटक की जरूरत है"
 
-#: ../camel/camel-session.c:308
+#: ../camel/camel-session.c:256
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2116,373 +2509,324 @@ msgstr ""
 "%s निर्देशिका नहीं निर्मित कर सका:\n"
 "%s"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:753
 #, 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
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1048
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' के लिये प्रमाणपत्र नहीं पा सकता है"
 
-#: ../camel/camel-smime-context.c:446
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
 msgstr "CMS संदेश नहीं निर्मित कर सकता है"
 
-#: ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
 msgstr "CMS हस्ताक्षरित आंकड़ा नहीं निर्मित कर सकता है"
 
-#: ../camel/camel-smime-context.c:457
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
 msgstr "CMS हस्ताक्षरित आंकड़ा नहीं संलग्न कर सकता है"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr "CMS आंकड़ा नहीं संलग्न कर सकता है"
 
-#: ../camel/camel-smime-context.c:470
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr "CMS हस्ताक्षरकर्ता सूचना नहीं निर्मित कर सकता है"
 
-#: ../camel/camel-smime-context.c:476
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
 msgstr "प्रमाणपत्र श्रृंखला नहीं पा सकता है"
 
-#: ../camel/camel-smime-context.c:482
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
 msgstr "CMS हस्ताक्षर समय नहीं जोड़ सकता"
 
-#: ../camel/camel-smime-context.c:504 ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' के लिये गोपन प्रमाणपत्र मौजूद नहीं है"
 
-#: ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs गुण में जोड़ नहीं सकता है"
 
-#: ../camel/camel-smime-context.c:528
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs गुण में जोड़ नहीं सकता है"
 
-#: ../camel/camel-smime-context.c:533
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
 msgstr "गोपन प्रमाणपत्र जोड़ नहीं सकता है"
 
-#: ../camel/camel-smime-context.c:539
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
 msgstr "CMS Signer सूचना जोड़ नहीं सकता है"
 
-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:1056
-msgid "Cannot create encoder context"
-msgstr "इनकोडर संदर्भ नहीं बना सकता"
-
-#: ../camel/camel-smime-context.c:615
-msgid "Failed to add data to CMS encoder"
-msgstr "CMS इनकोडर में आंकड़े जोड़ने में विफल"
-
-#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:1073
-msgid "Failed to encode data"
-msgstr "आंकड़ा इनकोड में विफल"
-
-#: ../camel/camel-smime-context.c:693
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
 msgstr "अपरीक्षित"
 
-#: ../camel/camel-smime-context.c:695
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "उत्तम हस्ताक्षर"
 
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "गलत हस्ताक्षर"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "परिवहन में टैंपर हुये सामग्री"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
 msgstr "प्रमाणपत्र का हस्ताक्षर नहीं मिला"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
 msgstr "प्रमाणपत्र का हस्ताक्षर विश्वस्त नहीं"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "हस्ताक्षर एलागरिथम अज्ञात"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
 msgstr "हस्ताक्षर एलागरिथम असमर्थित"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "कुरूप हस्ताक्षर "
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "प्रक्रिया दोष"
 
-#: ../camel/camel-smime-context.c:748
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "हस्ताक्षर में कोई हस्ताक्षरित आंकड़ा नहीं"
 
-#: ../camel/camel-smime-context.c:755
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "लिफाफाकृत आंकड़ों से डायजेस्ट नहीं मिल रहा है"
 
-#: ../camel/camel-smime-context.c:768 ../camel/camel-smime-context.c:778
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "डायजेस्ट की गणना नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:783
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "संदेश डायजेस्ट सेट नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:793 ../camel/camel-smime-context.c:798
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "प्रमाणपत्र आयात असफल"
 
-#: ../camel/camel-smime-context.c:808
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "सिर्फ संदेश को प्रमाणपत्र दें, प्रमाणपत्रों की जांच नहीं कर सकता"
 
-#: ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "प्रमाणपत्र अकेला संदेश है, प्रमाणपत्र आयातित किया गया और जांच किया गया"
 
-#: ../camel/camel-smime-context.c:815
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "हस्ताक्षर डायजेस्ट प्राप्त नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:831
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "हस्ताक्षरकर्ता: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:932 ../camel/camel-smime-context.c:1156
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
+msgid "Cannot create encoder context"
+msgstr "इनकोडर संदर्भ नहीं बना सकता"
+
+#: ../camel/camel-smime-context.c:841
+msgid "Failed to add data to CMS encoder"
+msgstr "CMS इनकोडर में आंकड़े जोड़ने में विफल"
+
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
+msgid "Failed to encode data"
+msgstr "आंकड़ा इनकोड में विफल"
+
+#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
 msgid "Decoder failed"
 msgstr "डिकोडर विफल"
 
-#: ../camel/camel-smime-context.c:991
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "साझा इकट्ठा गोपन एलागरिथम प्राप्त नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:999
+#: ../camel/camel-smime-context.c:1064
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "गोपन बल्क कुंजी के लिये स्थान प्रदान नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:1010
+#: ../camel/camel-smime-context.c:1075
 msgid "Cannot create CMS Message"
 msgstr "CMS संदेश नहीं निर्मित कर सकता"
 
-#: ../camel/camel-smime-context.c:1016
+#: ../camel/camel-smime-context.c:1081
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS लिफाफाकृत आंकड़ा बना नहीं सकता है"
 
-#: ../camel/camel-smime-context.c:1022
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS लिफाफाकृत आंकड़ा संलग्न नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:1028
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot attach CMS data object"
 msgstr "CMS आंकड़ा वस्तु संलग्न नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS प्राप्तकर्ता सूचना निर्मित नहीं कर सकता है"
 
-#: ../camel/camel-smime-context.c:1042
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS प्राप्तकर्ता सूचना जोड़ नहीं सकता है"
 
-#: ../camel/camel-smime-context.c:1067
+#: ../camel/camel-smime-context.c:1132
 msgid "Failed to add data to encoder"
 msgstr "इनकोडर में आंकड़ा जोड़ने में असफल"
 
-#: ../camel/camel-smime-context.c:1163
+#: ../camel/camel-smime-context.c:1240
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME विगोपन करें: कोई गुप्त अंतरवस्तु प्राप्त नहीं हुई"
 
-#: ../camel/camel-smime-context.c:1190
-msgid "import keys: unimplemented"
-msgstr "आयात कुंजी: लागू नहीं हुआ"
-
-#: ../camel/camel-smime-context.c:1198
-msgid "export keys: unimplemented"
-msgstr "निर्यात कुंजी: लागू नहीं हुआ"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "फ़ोल्डर प्राप्त नहीं कर सकता है: इस स्टोर पर अवैध संक्रिया"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:2181
 #, c-format
-#| msgid "Cannot create folder `%s': folder exists"
 msgid "Cannot create folder '%s': folder exists"
 msgstr "'%s' फ़ोल्डर निर्मित नहीं कर सकता है: फ़ोल्डर मौजूद है"
 
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "फ़ोल्डर निर्मित नहीं कर सकता है: इस स्टोर पर अवैध संक्रिया"
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:2372 ../camel/camel-store.c:2382
+#: ../camel/camel-vtrash-folder.c:48
+msgid "Trash"
+msgstr "ट्रैश"
+
+#. the name of the Junk folder, used for spam messages
+#: ../camel/camel-store.c:2375 ../camel/camel-store.c:2386
+#: ../camel/camel-vtrash-folder.c:50
+msgid "Junk"
+msgstr "जंक"
 
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:2829
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "फ़ोल्डर निर्मित नहीं कर सकता है: %s: फ़ोल्डर मौजूद है"
 
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:384
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:2956 ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "फ़ोल्डर विलोपिल नहीं कर सकता है: %s: अवैध संक्रिया"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:421
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:3097 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:668
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "फ़ोल्डर का नाम नहीं बदल सकता है: %s: अवैध संक्रिया"
 
-#. the name of the Trash folder, used for deleted messages
-#: ../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:902 ../camel/camel-vtrash-folder.c:56
-msgid "Junk"
-msgstr "जंक"
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to get issuer's certificate"
-msgstr "निर्गमक के प्रमाणपत्र को पाने में असमर्थ"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to get Certificate Revocation List"
-msgstr "प्रमाणपत्र निरसन सूची पाने में असमर्थ"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decrypt certificate signature"
-msgstr "प्रमाणपत्र हस्ताक्षर के विगोपन में असमर्थ"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "प्रमाणपत्र निरसन सूची हस्ताक्षर के विगोपन में असमर्थ"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Unable to decode issuer's public key"
-msgstr "निर्गमक सार्वजनिक कुंजी डिकोड करने में असमर्थ"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate signature failure"
-msgstr "प्रमाणपत्र हस्ताक्षर विफलता"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List signature failure"
-msgstr "प्रमाणपत्र निरसन सूची हस्ताक्षर असफलता"
-
-#: ../camel/camel-tcp-stream-openssl.c:586
-msgid "Certificate not yet valid"
-msgstr "प्रमाणपत्र अब वैध नहीं है"
-
-#: ../camel/camel-tcp-stream-openssl.c:588
-msgid "Certificate has expired"
-msgstr "प्रमाणपत्र की समय सीमा समाप्त हो चुकी है"
-
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL अब वैध नहीं है"
-
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "CRL की समय सीमा समाप्त हो चुकी है"
-
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "CRL में दोष"
-
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Out of memory"
-msgstr "स्मृति के बाहर"
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Zero-depth self-signed certificate"
-msgstr "शून्य-गहरा स्व-हस्ताक्षरित प्रमाणपत्र"
+#: ../camel/camel-tcp-stream-raw.c:771
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Self-signed certificate in chain"
-msgstr "श्रृँखला में स्व-हस्ताक्षरित प्रमाणपत्र"
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
-msgstr "निर्गमक के प्रमाणपत्र को स्थानीय स्तर पर पाने में असमर्थ"
+#: ../camel/camel-tcp-stream-raw.c:879
+#, fuzzy, c-format
+#| msgid "No support for authentication type %s"
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "सत्यापन प्रकार %s के लिये कोई समर्थन नहीं"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr "लीफ हस्ताक्षर की जांच में असमर्थ"
+#: ../camel/camel-tcp-stream-raw.c:891
+msgid "General SOCKS server failure"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr "प्रमाणपत्र श्रृँखला ज्यादा लंबी है"
+#: ../camel/camel-tcp-stream-raw.c:892
+msgid "SOCKS server's rules do not allow connection"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "प्रमाणपत्र निरसित"
+#: ../camel/camel-tcp-stream-raw.c:893
+msgid "Network is unreachable from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "अवैध प्रमाणपत्र प्राधिकार (CA)"
+#: ../camel/camel-tcp-stream-raw.c:894
+msgid "Host is unreachable from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "पथ लंबाई ज्यादा हो गया"
+#: ../camel/camel-tcp-stream-raw.c:895
+#| msgid "Connection canceled"
+msgid "Connection refused"
+msgstr "कनेक्शन असीवकृत"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "अवैध उद्देश्य"
+#: ../camel/camel-tcp-stream-raw.c:896
+msgid "Time-to-live expired"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "प्रमाणपत्र पर विश्वास नहीं किया गया"
+#: ../camel/camel-tcp-stream-raw.c:897
+#, fuzzy
+#| msgid "STLS not supported by server"
+msgid "Command not supported by SOCKS server"
+msgstr "SSLS सर्वर द्वारा समर्थित नहीं"
 
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "प्रमाणपत्र अस्वीकृत"
+#: ../camel/camel-tcp-stream-raw.c:898
+#, fuzzy
+#| msgid "STLS not supported by server"
+msgid "Address type not supported by SOCKS server"
+msgstr "SSLS सर्वर द्वारा समर्थित नहीं"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "विषय/निर्गमक बेमेल"
+#: ../camel/camel-tcp-stream-raw.c:899
+#, fuzzy
+#| msgid "Unknown error: %s"
+msgid "Unknown error from SOCKS server"
+msgstr "अज्ञात दोष:%s"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID बेमेल"
+#: ../camel/camel-tcp-stream-raw.c:932
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/निर्गमक श्रृंखला बेमेल"
+#: ../camel/camel-tcp-stream-raw.c:950
+#, fuzzy, c-format
+#| msgid "Invalid response from server"
+msgid "Incomplete reply from SOCKS server"
+msgstr "सर्वर से गलत अनुक्रिया."
 
-#: ../camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
-msgstr "कुंजी प्रयोग प्रमामपत्र हस्ताक्षर को समर्थन नहीं करता"
+#: ../camel/camel-tcp-stream-raw.c:970
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "आवेदन जांच में दोष"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
+#, fuzzy, c-format
+#| msgid "Invalid response from server"
+msgid "Invalid reply from proxy server"
+msgstr "सर्वर से गलत अनुक्रिया."
 
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2495,35 +2839,16 @@ msgstr ""
 "फिंगरप्रिंट:       %s\n"
 "हस्ताक्षर:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "सही"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "गलत"
 
-#: ../camel/camel-tcp-stream-openssl.c:708
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"%s से गलत प्रमाणपत्र:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"क्या आप किसी तरह स्वीकार करना चाहते हैं?"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2538,7 +2863,7 @@ msgstr ""
 "\n"
 "क्या आप स्वीकार करना चाहते हैं?"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2547,7 +2872,7 @@ msgstr ""
 "प्रमाणपत्र समस्या: %s\n"
 "निर्गमक: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2556,7 +2881,7 @@ msgstr ""
 "गलत प्रमाणपत्र डोमेन: %s\n"
 "निर्गमक: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2565,7 +2890,7 @@ msgstr ""
 "प्रमाणपत्र समाप्त हो गया: %s\n"
 "निर्गमक: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2574,380 +2899,320 @@ msgstr ""
 "प्रमाणपत्र निरसन सूची की समय सीमा समाप्त हो चुकी है: %s\n"
 "निर्गमक: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:316
 #, c-format
-#| msgid "Could not parse URL `%s'"
 msgid "Could not parse URL '%s'"
 msgstr "'%s' URL का विश्लेषण नहीं कर सका"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:1235 ../camel/camel-vee-folder.c:1398
 #, c-format
-#| msgid "Error storing `%s': %s"
-msgid "Error storing '%s': %s"
-msgstr "'%s' को भंडार करने में त्रुटि: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "आभासी फ़ोल्डर में संदेशों को कापी या प्रतिस्थापित नहीं कर सकता है"
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:1271
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s में %s कोई ऐसा संदेश नहीं"
 
-#: ../camel/camel-vee-folder.c:820 ../camel/camel-vee-folder.c:826
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "आभासी फ़ोल्डर में संदेशों को कापी या प्रतिस्थापित नहीं कर सकता है"
+#: ../camel/camel-vee-folder.c:1339
+#, c-format
+#| msgid "Error storing '%s': %s"
+msgid "Error storing '%s': "
+msgstr ""
 
-#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:322
 msgid "Unmatched"
 msgstr "बेमेल"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:393
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "फ़ोल्डर विलोपित नहीं कर सकता है: %s:कोई ऐसा फ़ोल्डर नहीं"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:427
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "फ़ोल्डर का नाम नहीं बदल सकता है: %s:कोई ऐसा फ़ोल्डर नहीं"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ट्रैश फ़ोल्डर से संदेशों को कापी नहीं कर सकता है"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "जंक फ़ोल्डर से संदेशों को कापी नहीं कर सकता है"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"संदेश नहीं पा सकता है: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c: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: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: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: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: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:883
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:954
+#: ../camel/providers/imap/camel-imap-folder.c:392
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s के लिये सारांश अधिभारित नहीं कर सका"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1143
-msgid "Trash Folder Full. Please Empty."
-msgstr "रद्दी फ़ोल्डर पूर्ण. कृपया खाली करें."
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
+#, fuzzy, c-format
+#| msgid "Checking for new messages"
+msgid "Checking for deleted messages %s"
+msgstr "नए संदेश के लिये जांच कर रहा है"
 
-#: ../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:3362
-#: ../camel/providers/imap/camel-imap-folder.c:3438
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1517
+#: ../camel/providers/groupwise/camel-groupwise-store.c:665
+#: ../camel/providers/groupwise/camel-groupwise-store.c:796
+#: ../camel/providers/imap/camel-imap-folder.c:3962
+#: ../camel/providers/imap/camel-imap-folder.c:4044
+#: ../camel/providers/imapx/camel-imapx-server.c:3871
+#: ../camel/providers/imapx/camel-imapx-server.c:4002
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s में नए संदेश के लिये सारांश सूचना ला रहा है"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2200
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1987
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
+#, c-format
+msgid "Could not get message"
+msgstr "संदेश नहीं भेज सका"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
 #, c-format
-#| msgid "Cannot append message to folder `%s': %s"
 msgid "Cannot append message to folder '%s': %s"
 msgstr "'%s' फ़ोल्डर में संदेश जोड़ नहीं सकता है: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2188
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2460
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "संदेश बना नहीं सकता: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"संदेश नहीं पा सकता है: %s\n"
+"  %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:307
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "ऐसा कोई संदेश नहीं"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2659
+#: ../camel/providers/nntp/camel-nntp-folder.c:246
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get message %s: "
+msgstr "%s संदेश प्राप्त नहीं कर सकता:"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
+#, c-format
+msgid "This message is not available in offline mode."
+msgstr "ऑफ़लाइन में संदेश उपलब्ध नहीं है."
+
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "फ़ोल्डर कंटेनर नहीं पा सकता है: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "ऑफलाइन मोड में संदेश जोड़ नहीं सकता: कैश अनुपलब्ध"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c: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-journal.c:335
+#| msgid "Cannot append message in offline mode: %s"
+msgid "Cannot append message in offline mode: "
+msgstr "ऑफलाइन मोड में संदेश जोड़ नहीं कर सकता:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
 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
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "C_heck for new messages in all folders"
 msgstr "सभी फ़ोल्डर में नये संदेश के लिये जांचें (_h)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c: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
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "विकल्प"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
-#| msgid "Apply filters to new messages in Inbox on this server"
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "इस सर्वर पर इनबाक्स में नए संदेश के लिए फिल्टर चलाएँ (_A)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
-#| msgid "Check new messages for Junk contents"
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "नये संदेश को जंक अंतर्वस्तु के लिये जाँचें (_u)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#| msgid "Only check for Junk messages in the INBOX folder"
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "इनबाक्स फ़ोल्डर में सिर्फ जंक संदेश के लिये जांचें (_B)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
-#| msgid "Automatically synchronize account locally"
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "स्वचालित तुल्यकालन खाता स्थानीय रूप से (_z)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "SOAP जमावट"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
-#| msgid "Post Office Agent SOAP Port:"
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "डाक घर एजेंट SOAP पोर्ट (_P):"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
 msgstr "Novell Groupwise servers के अभिगम के लिए"
 
-#: ../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
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:104
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:73
 msgid "Password"
 msgstr "कूटशब्द"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
 msgid "This option will connect to the GroupWise server using a plaintext password."
 msgstr "प्लेनटेक्सट कूटशब्द के उपयोग से यह विकल्प ग्रूपवाइज सर्वर से जोड़ेगा."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:103
+#, c-format
 msgid "Host or user not available in url"
 msgstr "url में मेजबान या उपयोक्ता उपलब्ध नहीं"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3085
+#, c-format
 msgid "You did not enter a password."
 msgstr "आपने कूटशब्द नहीं दाखिल किया."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr "आपके मौजूदा सर्वर संस्करण के लिये कुछ फीचर काम नहीं करते"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:524
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/groupwise/camel-groupwise-store.c:556
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:341
 #, c-format
 msgid "No such folder %s"
 msgstr "ऐसा कोई %s फ़ोल्डर नहीं"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "ऑफ़लाइन मोड में GroupWise फ़ोल्डर बना ले सकता."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1226
+#, c-format
+#| msgid "Cannot delete folder '%s': Special folder"
+msgid "Cannot create a special system folder"
+msgstr "विशेष फ़ोल्डर नहीं निर्मित कर सकता: "
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1236
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1340
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "मातृ फ़ोल्डर को उपफ़ोल्डर रखने की अनुमति नहीं है"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1321
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
 #, c-format
-#| msgid "Cannot rename Groupwise folder `%s' to `%s'"
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "समूहआधृत फ़ोल्डर '%s' को '%s' में नाम नहीं बदल सका"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1380
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise सर्वर %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "%s पर %s के लिए समूह के आधार पर सेवा"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "%s के द्वारा समूह के आधार पर डाक प्रदाय"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
 msgid "Sending Message"
 msgstr "संदेश भेज रहा है"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
+#, c-format
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "फ़ोल्डर प्राप्त नहीं कर सकता है: इस स्टोर पर अवैध संक्रिया"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#, c-format
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
 "of your mail.\n"
 msgstr ""
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
 #, c-format
 msgid "Could not send message: %s"
 msgstr "संदेश नहीं भेज सका: %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:49
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "नयी डाक के लिये जांच"
-
-#: ../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: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:58
-#: ../camel/providers/imap/camel-imap-provider.c:56
-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:63
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
-msgid "_Show only subscribed folders"
-msgstr "सदस्यता लिए हुए फ़ोल्डरों को दिखाएं (_S)"
-
-#: ../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:67
-msgid "Namespace"
-msgstr "नामस्थान"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "Hula"
-msgstr "हुला"
-
-#: ../camel/providers/hula/camel-hula-provider.c:80
-msgid "For accessing Hula servers"
-msgstr "हुला सर्वर की पहुँच के लिए"
-
-#: ../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:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
+#, c-format
 msgid "No output stream"
 msgstr "कोई आउटपुट स्ट्रीम नहीं"
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
+#, c-format
 msgid "No input stream"
 msgstr "कोई इनपुट स्ट्रीम नहीं"
 
-#: ../camel/providers/imap/camel-imap-command.c: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
+#: ../camel/providers/imap/camel-imap-command.c:255
+#, c-format
 msgid "Operation cancelled"
 msgstr "ऑपरेशन रद्द"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "सर्वर अप्रत्याशित रूप से असंबंधित हो गया: %s"
 
 #. for imap ALERT codes, account user@host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:354
+#: ../camel/providers/imap/camel-imap-command.c:394
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -2956,263 +3221,252 @@ msgstr ""
 "IMAP सर्वर %s@%s से सचेत करें:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:468
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP सर्वर से अप्रत्याशित अनुक्रिया: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:480
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP कमांड असफल: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:560
+#, c-format
 msgid "Server response ended too soon."
 msgstr "सर्नर अनुक्रिया बहुत जल्द समाप्त हो गई."
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:771
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP सर्वर अनुक्रिया के पास %s सूचना नहीं है"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:809
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP सर्वर से अप्रत्याशित OK अनुक्रिया: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
-#| msgid "Only check for Junk messages in the INBOX folder"
+#: ../camel/providers/imap/camel-imap-folder.c:292
 msgid "Always check for new mail in this folder"
 msgstr "इस फ़ोल्डर में सिर्फ नए संदेश के लिये जांचें"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:369
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s निर्देशिका निर्मित नहीं कर सका: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:891
+#: ../camel/providers/imap/camel-imap-folder.c:992
+#: ../camel/providers/imapx/camel-imapx-server.c:3915
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s में परिवर्तित संदेश के लिये स्कैनिंग"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1950
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr ""
-
-#: ../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:3369
+#| msgid "Unable to retrieve message: %s"
+msgid "Unable to retrieve message: "
+msgstr "संदेश पुनर्प्राप्त करने में असमर्थ:"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2842
+#: ../camel/providers/imap/camel-imap-folder.c:3404
+#: ../camel/providers/imapx/camel-imapx-server.c:5193
 #, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "संदेश पुनर्प्राप्त करने में असमर्थ: %s"
-
-#: ../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"
+#: ../camel/providers/imap/camel-imap-folder.c:3405
+#: ../camel/providers/imapx/camel-imapx-server.c:5194
 msgid "No such message available."
 msgstr "ऐसा कोई संदेश उपलब्ध नहीं"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2932
-#: ../camel/providers/imap/camel-imap-folder.c:3753
-#: ../camel/providers/nntp/camel-nntp-folder.c:239
+#: ../camel/providers/imap/camel-imap-folder.c:3480
+#: ../camel/providers/imap/camel-imap-folder.c:4375
+#: ../camel/providers/nntp/camel-nntp-folder.c:402
+#, c-format
 msgid "This message is not currently available"
 msgstr "यह संदेश अभी उपलब्ध नहीं है"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3567
+#: ../camel/providers/imap/camel-imap-folder.c:4176
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "अपूर्ण सर्वर अनुक्रिया: %d संदेश के लिये कोई सूचना नहीं दी गई"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3575
+#: ../camel/providers/imap/camel-imap-folder.c:4186
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "अपूर्ण सर्वर अनुक्रिया: %d संदेश के लिये कोई UID नहीं दिया गया"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../camel/providers/imap/camel-imap-folder.c:4415
+#, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "फेच अनुक्रिया में संदेश शरीर को नहीं पा सका."
 
-#: ../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 "कैश निर्देशिका खोल नहीं सका: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+#| msgid "Could not open cache directory: %s"
+msgid "Could not open cache directory: "
+msgstr "कैश निर्देशिका खोल नहीं सका:"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c: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
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "%s संदेश कैश करने में विफल: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "%s कैश करने में विफल: %s"
+#| msgid "Failed to cache message %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "%s संदेश कैश करने में विफल: "
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#| msgid "Check for new messages in all folders"
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#, c-format
+#| msgid "Failed to cache %s: %s"
+msgid "Failed to cache %s: "
+msgstr "%s कैश करने में विफल: "
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "नयी डाक के लिये जांच"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "सदस्यता वाले फ़ोल्डर में नये संदेश के लिये जांचें (_e)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
-msgid "Namespace:"
-msgstr "नामस्थान:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "सर्वर से संबंध"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "इस सर्वर पर INBOX में नए संदेश के लिए फिल्टर चलाएं (_A)"
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+msgid "_Use custom command to connect to server"
+msgstr "सर्वर से जुड़ने के लिए कस्टम कमांड का प्रयोग करें (_U)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#| msgid "Check new messages for Junk contents"
+#: ../camel/providers/imap/camel-imap-provider.c:52
+#| msgid "Command:"
+msgid "Co_mmand:"
+msgstr "कमांड:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "फ़ोल्डर्स"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "सदस्यता लिए हुए फ़ोल्डरों को दिखाएं (_S)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+msgid "O_verride server-supplied folder namespace"
+msgstr "सर्वर आपूर्ति फ़ोल्डर नेमस्पेस अध्यारोहित करें (_v)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#| msgid "Namespace:"
+msgid "Names_pace:"
+msgstr "नामस्थान:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "नये संदेश को जंक अंतर्वस्तु के लिये जांचें (_k)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "दूरस्थ डाक स्थानीय रूप से स्वतः तुल्यकालिक करें (_z)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP सर्वर पर डाक पढ़ने और स्टोर करने के लिए"
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "प्लेनटेक्सट कूटशब्द के उपयोग से यह विकल्प IMAP सर्वर से जोड़ेगा."
 
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP सर्वर %s"
-
-#: ../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: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: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
+#: ../camel/providers/imap/camel-imap-store.c:243
+#: ../camel/providers/nntp/camel-nntp-store.c:342
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "%s में जुड़ नहीं सका: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap/camel-imap-store.c:244
+#: ../camel/providers/nntp/camel-nntp-store.c:343
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "SSL unavailable"
 msgstr "SSL अनुपलब्ध"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "कनेक्शन रद्द"
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:362
+#, c-format
+#| msgid "Could not connect to %s: %s"
+msgid "Could not connect to %s: "
+msgstr "%s में जुड़ नहीं सका: "
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../camel/providers/imap/camel-imap-store.c:370
+#: ../camel/providers/imap/camel-imap-store.c:390
+#: ../camel/providers/imap/camel-imap-store.c:397
+#: ../camel/providers/imap/camel-imap-store.c:424
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/imapx/camel-imapx-server.c:2967
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "सुरक्षित मोड में %s IMAP सर्वर से जुड़ने में विफल: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "STARTTLS not supported"
 msgstr "STARTTLS समर्थित नहीं."
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
 msgid "SSL negotiations failed"
 msgstr "SSL समझौता विफल"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../camel/providers/imap/camel-imap-store.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
 msgid "SSL is not available in this build"
 msgstr "एसएसएल नहीं उपलब्ध है इस बिल्ड में"
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
+#, c-format
+msgid "Connection cancelled"
+msgstr "कनेक्शन रद्द"
+
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "\"%s\" कमांड से नहीं जुड़ सका: %s"
 
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../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: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
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP सर्वर निवेदित सत्यापन प्रकार %s को समर्थन नहीं देता"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
+#: ../camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "सत्यापन प्रकार %s के लिये कोई समर्थन नहीं"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3223,443 +3477,198 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:182
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP सर्वर %s"
+
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:184
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s पर %s के लिए IMAP सेवा"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:371
+#: ../camel/providers/imapx/camel-imapx-store.c:793
+#: ../camel/providers/local/camel-maildir-folder.c:409
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:615
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:669
+#: ../camel/providers/local/camel-spool-store.c:289
+msgid "Inbox"
+msgstr "इनबाक्स"
+
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1319
 #, c-format
 msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "फ़ोल्डर नाम \"%s\" अवैध है क्योंकि यह \"%c\" कैरेक्टर रखता है"
 
-#: ../camel/providers/imap/camel-imap-store.c:1978
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:407
+#: ../camel/providers/local/camel-mh-store.c:504
 #, c-format
-#| msgid "Cannot create folder `%s': folder exists."
 msgid "Cannot create folder '%s': folder exists."
 msgstr "'%s' फ़ोल्डर नहीं निर्मित कर सकता है: फ़ोल्डर मौजूद है."
 
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1330
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "अज्ञात मातृ फ़ोल्डर: %s"
 
-#: ../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 सर्वर को कमांड भेजने में विफल:%s"
-
-#: ../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:221
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "IMAP सर्वर %s से अप्रत्याशित शुभकामना."
-
-#: ../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': Bad command"
-msgid "Cannot select folder '%s': Bad command"
-msgstr "'%s' फ़ोल्डर का चयन नहीं कर सकता है: गलत कमांड"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
-#, c-format
-#| 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: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: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:432
-#, c-format
-#| msgid "Cannot access folder `%s': %s"
-msgid "Cannot access folder '%s': %s"
-msgstr "'%s' फ़ोल्डर में पहुँच नहीं ले सकता है: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:491
-#, c-format
-#| 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:497
-#, c-format
-#| 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:637
-#, c-format
-#| msgid "Cannot expunge folder `%s': Unknown"
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "'%s' फ़ोल्डर पूर्ण विलोपित नहीं कर सकता: अज्ञात त्रुटि"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:642
-#, c-format
-#| msgid "Cannot expunge folder `%s': Bad command"
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "'%s' फ़ोल्डर पूर्ण विलोपित नहीं कर सकता है: गलत कमांड"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:898
-#, c-format
-#| 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:903
-#, c-format
-#| 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:947
+#: ../camel/providers/imap/camel-imap-store.c:3137
 #, c-format
-#| msgid "Cannot append message to folder `%s': Folder is read-only"
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "'%s' फ़ोल्डर में संदेश जोड़ नहीं सकता: फ़ोल्डर सिर्फ पठनीय है"
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected"
+msgstr "सर्वर अप्रत्याशित रूप से असंबंधित हो गया: "
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
-#, c-format
-#| 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:1070
-#, c-format
-#| msgid "Cannot append message to folder `%s': Bad command"
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "'%s' फ़ोल्डर में संदेश जोड़ नहीं सकता: गलत कमांड"
+#: ../camel/providers/imap/camel-imap-store.c:3140
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected: "
+msgstr "सर्वर अप्रत्याशित रूप से असंबंधित हो गया: "
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1190
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
 #, c-format
-#| 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:1194
-#, c-format
-#| 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:1202
-#, c-format
-#| 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:1206
-#, c-format
-#| 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:67
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../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:86
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "प्लेनटेक्सट कूटशब्द के उपयोग से यह विकल्प IMAPv4rev1 सर्वर से जोड़ेगा."
+#| msgid "Could not load summary for %s"
+msgid "Could not create folder summary for %s"
+msgstr "%s के लिये सारांश फोल्डर बना नहीं कर सका"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:263
-#: ../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 "कनेक्शन रद्द"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:300
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
 #, 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: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:538
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "%s के प्रयोग से %s IMAP सर्वर को सत्यापित नहीं कर सकता है"
-
-#: ../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 फ़ोल्डर नहीं बना सकता."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:740
-#, c-format
-#| 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: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:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-msgid "Bad command"
-msgstr "गलत कमांड"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-#| 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:907
-#, c-format
-#| msgid "Cannot create folder `%s': Bad command"
-msgid "Cannot create folder '%s': Bad command"
-msgstr "'%s' फ़ोल्डर नहीं निर्मित कर सकता: गलत कमांड"
+#| msgid "Could not create cache file"
+msgid "Could not create cache for %s: "
+msgstr "कैश फाइल नहीं बना सका"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
-#, c-format
-#| msgid "Cannot delete folder `%s': Special folder"
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "'%s' फ़ोल्डर नहीं निर्मित कर सकता: विशेष फ़ोल्डर"
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+msgid "Use _Quick Resync if the server supports it"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "ऑफलाइन मोड में IMA फ़ोल्डर का विलोपन नहीं कर सकते हैं."
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-#| msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "'%s' फ़ोल्डर नहीं निर्मित कर सकता: अवैध डाकपेटी नाम"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "कमांड:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
-#, c-format
-#| msgid "Cannot delete folder `%s': Bad command"
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "'%s' फ़ोल्डर विलोपित नहीं कर सकता: गलत कमांड"
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
-#, c-format
-#| msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "फ़ोल्डर '%s' से '%s' में नाम नहीं बदल सकता: विशेष फ़ोल्डर"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "नामस्थान:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "ऑफलाइन मोड में IMA फ़ोल्डर का पुनर्नामकरण नहीं कर सकते हैं."
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-#| 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/imapx/camel-imapx-server.c:1404
+#, fuzzy
+#| msgid "Error writing mail temp file: %s"
+msgid "Error writing to cache stream: "
+msgstr "डाक अस्थायी फ़ाइल को लिखने में दोष: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
 #, c-format
-#| msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "फ़ोल्डर'%s' को '%s' नाम नहीं बदल सकता: गलत कमांड"
+#| msgid "Failed to authenticate.\n"
+msgid "Not authenticated"
+msgstr "प्रमाणीकरण में असफल"
 
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
 #, 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:1638
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "ऑफलाइन मोड में IMAP फ़ोल्डर का सदस्य नहीं बन सकता है"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-#| 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:1688
-#, c-format
-#| 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:1710
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "IMAP फ़ोल्डर से ऑफलाइन मोड में सदस्यता वापस नहीं ले सकता है"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-#| 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:1760
-#, c-format
-#| 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:1596
-msgid "Scanning for changed messages"
-msgstr "परिवर्तित संदेश के लिये स्कैनिंग"
+#| msgid "Could not connect to %s (port %s): %s"
+msgid "Could not connect to %s (port %s): "
+msgstr "%s (पोर्ट %s) से जोड़ नहीं सका : %s"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr ""
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
+#, fuzzy
+#| msgid "Posting failed: %s"
+msgid "Closing tmp stream failed: "
+msgstr "प्रेषण विफल: %s"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
-#| msgid "Fetching envelopes for new messages"
-msgid "Fetching envelopes of new messages"
-msgstr "नए संदेश का लिफाफा ला रहा है"
+#: ../camel/providers/imapx/camel-imapx-server.c:5343
+#: ../camel/providers/imapx/camel-imapx-server.c:5358
+#, fuzzy
+#| msgid "Cannot create message: %s"
+msgid "Cannot create spool file: "
+msgstr "संदेश बना नहीं सकता: %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
+#: ../camel/providers/imapx/camel-imapx-store.c:1135
+#: ../camel/providers/nntp/camel-nntp-store.c:1666
 #, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "IMAP सर्वर से अनुक्रिया में अप्रत्याशित टोकन %s: "
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
-msgid "No data"
-msgstr "कोई आंकड़ा नहीं"
+msgid "No such folder: %s"
+msgstr "ऐसा कोई फ़ोल्डर नहीं है: %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP सर्वर %s अप्रत्याशित रूप से असंबंधित हो गया: %s"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
-msgid "Message storage"
-msgstr "संदेश भंडारन"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgid "Source stream returned no data"
 msgstr ""
-"प्रायोगिक IMAP 4(.1) ग्राहक\n"
-"यह अपरीक्षित और असमर्थित कूट है, बदले में आप प्लेन imap का प्रयोग करना चाहते हैं.\n"
-"\n"
-" !!! उत्पादन ईडाक के लिए इसका प्रयोग नहीं करें  !!!\n"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:252
-#, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "%s (पोर्ट %s) से जोड़ नहीं सका : %s"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:349
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "%s पर POP सर्वर से जोड़ नहीं सका"
 
-#: ../camel/providers/local/camel-local-folder.c:176
-msgid "Index message body data"
-msgstr "सूची संदेश बॉडी पाठ"
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
+#, fuzzy, c-format
+#| msgid "service unavailable"
+msgid "Source stream unavailable"
+msgstr "सेवा अनुपलब्ध"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
+#: ../camel/providers/local/camel-local-folder.c:178
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:396
-#: ../camel/providers/local/camel-local-folder.c:399
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
-msgid "mailbox:%s (%s)"
-msgstr "डाकपेटी:%s (%s)"
+#| msgid "mailbox:%s (%s)"
+msgid "mailbox: %s (%s)"
+msgstr "डाकपेटी: %s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:403
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
-#| msgid "Use the `.folders' folder summary file (exmh)"
+#: ../camel/providers/local/camel-local-folder.c:466
+msgid "Index message body data"
+msgstr "सूची संदेश बॉडी पाठ"
+
+#: ../camel/providers/local/camel-local-folder.c:700
+#, fuzzy, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"संदेश नहीं प्राप्त कर सकता है: %s फ़ोल्डर से %s\n"
+"  %s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "फ़ोल्डर सारांश फ़ाइल `.folders' (exmh) का प्रयोग करें (_U)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "MH-प्रारूप डाक निर्देशिका"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
 msgstr "MH-सदृश डाक निर्देशिका में स्थानीय डाक को स्टोर करने के लिए."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "स्थानीय डेलिवरी"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3667,32 +3676,29 @@ msgstr ""
 "मानक mbox संरूपित स्पूल से एवोल्यूशन द्वारा प्रबंधित फ़ोल्डर में स्थानीय डाक की पुनर्प्राप्ति "
 "(विस्थापन) के लिए."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
-#| msgid "Apply filters to new messages in INBOX"
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "INBOX में नए संदेश पर फिल्टर चलाएँ"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
 msgstr "Maildir- प्रारूप डाक निर्देशिका"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
 msgstr "maildir निर्देशिका में स्थानीय डाक के भंडारण के लिए."
 
-#: ../camel/providers/local/camel-local-provider.c:108
-#| msgid "Store status headers in Elm/Pine/Mutt format"
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "Elm/Pine/Mutt प्रारूप में स्थिति शीर्षों को जमा करें (_S)"
 
-#: ../camel/providers/local/camel-local-provider.c:115
-#| msgid "Standard Unix mbox spool or directory"
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
 msgstr "मानक Unix mbox स्पूल फ़ाइल"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3700,221 +3706,233 @@ msgstr ""
 "बाह्य मानक Unix mbox स्पूल फ़ाइल में स्थानीय डाक को स्टोर करने और पढ़ने के लिए.\n"
 "Elm, Pine, या Mutt शैली फ़ोल्डरों के तरू को पढ़ने में भी प्रयुक्त हो सकता है."
 
-#: ../camel/providers/local/camel-local-provider.c:126
-#| msgid "Standard Unix mbox spool or directory"
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
 msgstr "मानक Unix mbox स्पूल या निर्देशिका"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-local-store.c:174
+#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-maildir-store.c:92
+#: ../camel/providers/local/camel-mbox-store.c:526
+#: ../camel/providers/local/camel-spool-store.c:318
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "स्टोर रूट %s एक आत्यंतिक पथ नहीं है"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "स्टोर रूट %s एक रेगुलर निर्देशिका नहीं है"
 
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "फ़ोल्डर नहीं पा सकता है: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:220
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "स्थानीय स्टोर इनबाक्स नहीं रखता है "
 
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:281
 #, c-format
 msgid "Local mail file %s"
 msgstr "स्थानीय डाक फ़ाइल %s"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:393
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "फ़ोल्डर `%s' से `%s' में पुनः नामकरण नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:467
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' का पुनः नामकरण नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:695
 #, c-format
-#| msgid "Could not delete folder index file `%s': %s"
 msgid "Could not delete folder index file '%s': %s"
 msgstr "'%s' फ़ोल्डर इंडेक्स फ़ाइल विलोपित नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:724
 #, c-format
-#| msgid "Could not delete folder meta file `%s': %s"
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "'%s' फ़ोल्डर मेटा फ़ाइल विलोपित नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:548
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "सारांश में संदेश जोड़ने में अक्षम:अज्ञात कारण"
 
-#: ../camel/providers/local/camel-maildir-folder.c:222
-msgid "Maildir append message canceled"
-msgstr "Maildir संयोजक संदेश रद्द"
-
-#: ../camel/providers/local/camel-maildir-folder.c:225
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
+#: ../camel/providers/local/camel-maildir-folder.c:198
+#, fuzzy, c-format
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot append message to maildir folder: %s: "
 msgstr "maildir फ़ोल्डर में संदेश नहीं जोड़ सकता: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c: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:224
-#: ../camel/providers/local/camel-mh-folder.c:233
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+#: ../camel/providers/local/camel-maildir-folder.c:246
+#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
+#, fuzzy, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid "Cannot get message %s from folder %s: "
 msgstr ""
 "संदेश नहीं प्राप्त कर सकता है: %s फ़ोल्डर से %s\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
-msgid "Invalid message contents"
-msgstr "अवैध संदेश अंतर्वस्तु"
+#: ../camel/providers/local/camel-maildir-folder.c:326
+#, fuzzy, c-format
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "maildir फ़ोल्डर में संदेश नहीं जोड़ सकता: %s: %s"
+
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, fuzzy, c-format
+#| msgid "Cannot create folder: %s: folder exists"
+msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgstr "फ़ोल्डर निर्मित नहीं कर सकता है: %s: फ़ोल्डर मौजूद है"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:686
+#, c-format
+#| msgid "Folder already exists"
+msgid "Folder %s already exists"
+msgstr "फ़ोल्डर %s पहले से उपस्थित है"
+
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:389
 #, c-format
-#| msgid "Cannot create folder `%s': %s"
 msgid "Cannot create folder '%s': %s"
 msgstr "'%s' फ़ोल्डर नहीं बना सकता है: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:341
+#: ../camel/providers/local/camel-mh-store.c:464
 #, c-format
-#| msgid "Cannot get folder `%s': %s"
 msgid "Cannot get folder '%s': %s"
 msgstr "'%s' फ़ोल्डर नहीं प्राप्त कर सकता है: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:351
+#: ../camel/providers/local/camel-mh-store.c:473
 #, c-format
-#| msgid "Cannot get folder `%s': folder does not exist."
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "'%s' फ़ोल्डर नहीं प्राप्त कर सकता है: फ़ोल्डर उपस्थित नहीं है."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:239
 #, c-format
-#| msgid "Cannot get folder `%s': not a maildir directory."
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "'%s' फ़ोल्डर नहीं पा सकता है: maildir निर्देशिका नहीं है."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:584
 #, c-format
-#| msgid "Could not delete folder `%s': %s"
 msgid "Could not delete folder '%s': %s"
 msgstr "'%s' फ़ोल्डर विलोपित नहीं कर सकता है: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
 msgstr "maildir निर्देशिका नहीं है"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../camel/providers/local/camel-maildir-store.c:508
+#: ../camel/providers/local/camel-maildir-store.c:825
+#: ../camel/providers/local/camel-spool-store.c:143
+#: ../camel/providers/local/camel-spool-store.c:159
 #, c-format
-#| msgid "Could not scan folder `%s': %s"
 msgid "Could not scan folder '%s': %s"
 msgstr "'%s' फ़ोल्डर स्कैन नहीं कर सकता है: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-store.c:677
+#, fuzzy, c-format
+#| msgid "Cannot create folder: %s: folder exists"
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "फ़ोल्डर निर्मित नहीं कर सकता है: %s: फ़ोल्डर मौजूद है"
+
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir निर्देशिका पथ खोल नहीं सकता है: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
 msgstr "फ़ोल्डर संगतता की जांच कर रहा है"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
 msgstr "नए संदेश के लिये जांच कर रहा है"
 
-#: ../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
+#: ../camel/providers/local/camel-maildir-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
 msgstr "फ़ोल्डर स्टोर कर रहा है"
 
-#: ../camel/providers/local/camel-mbox-folder.c:159
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:183
 #, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "%s पर फ़ोल्डर ताला नहीं निर्मित कर सकता: %s"
-
-#: ../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:281
-msgid "Mail append canceled"
-msgstr "मेल संयोजन रद्द"
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot open mailbox: %s: "
+msgstr "डाकपेटी खोल नहीं सकता है: %s:"
 
-#: ../camel/providers/local/camel-mbox-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:249
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "mbox फ़ाइल में संदेश जोड़ नहीं सकता: %s: %s"
+#| msgid "Cannot append message to mbox file: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "mbox फ़ाइल में संदेश जोड़ नहीं सकता: %s:"
 
-#: ../camel/providers/local/camel-mbox-folder.c:451
+#: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "फ़ोल्डर पुनर्प्राप्त नहीं किए जा सकने की स्थिति में खराब हो चुका है."
 
-#: ../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-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "%s पर फ़ोल्डर ताला नहीं निर्मित कर सकता: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
+#, c-format
 msgid "Cannot create a folder by this name."
 msgstr "इस नाम से फ़ोल्डर नहीं बना सकता है."
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:400
 #, c-format
-#| msgid "Cannot get folder `%s': not a regular file."
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "'%s' फ़ोल्डर नहीं प्राप्त कर सकता है: नियमित फ़ाइल नहीं है."
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:550
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "'%s' निर्देशिका निर्मित नहीं कर सकता है: %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:566
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "`%s' फ़ोल्डर निर्मित नहीं कर सकता है: %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:568
+msgid "Folder already exists"
+msgstr "फ़ोल्डर पहले से उपस्थित है"
+
+#: ../camel/providers/local/camel-mbox-store.c:609
+#: ../camel/providers/local/camel-mbox-store.c:622
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
-#| msgid ""
-#| "Could not delete folder `%s':\n"
-#| "%s"
 msgid ""
 "Could not delete folder '%s':\n"
 "%s"
@@ -3922,181 +3940,167 @@ msgstr ""
 "'%s' फ़ोल्डर मिटा नहीं सकता:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:632
 #, c-format
-#| msgid "`%s' is not a regular file."
 msgid "'%s' is not a regular file."
 msgstr "'%s' एक नियमित फ़ाइल नहीं है."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:641
 #, c-format
-#| msgid "Folder `%s' is not empty. Not deleted."
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "'%s' फ़ोल्डर खाली नहीं है. मिटाया नहीं गया है."
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:667
+#: ../camel/providers/local/camel-mbox-store.c:681
 #, c-format
-#| msgid "Could not delete folder summary file `%s': %s"
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "'%s' फ़ोल्डर सारांश फ़ाइल विलोपित नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:761
 #, c-format
-#| msgid "Cannot create directory `%s': %s."
-msgid "Cannot create directory '%s': %s."
-msgstr "'%s' निर्देशिका निर्मित नहीं कर सकता है: %s."
-
-#: ../camel/providers/local/camel-mbox-store.c:392
-#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "`%s' फ़ोल्डर निर्मित नहीं कर सकता है: %s."
-
-#: ../camel/providers/local/camel-mbox-store.c:394
-msgid "Folder already exists"
-msgstr "फ़ोल्डर पहले से उपस्थित है"
-
-#: ../camel/providers/local/camel-mbox-store.c:485
 msgid "The new folder name is illegal."
 msgstr "नए फ़ोल्डर का नाम अवैध है."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:776
 #, c-format
-#| msgid "Could not rename `%s': `%s': %s"
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' का नाम नहीं बदल सकता है: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:859
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "`%s' का %s यह पुनर्नामकरण नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:476
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "फ़ोल्डर नहीं खोल सकता: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:585
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
+#: ../camel/providers/local/camel-mbox-summary.c:537
+#, fuzzy, c-format
+#| msgid "Fatal mail parser error near position %ld in folder %s"
+msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "%ld स्थिति में गंभीर मेल विश्लेषण त्रुटि %s में"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:622
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "फ़ोल्डर की जांच नहीं कर सकता है: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:697
+#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "फ़ाइल को खोल नहीं सका: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "अस्थायी डाकपेटी नहीं खोल सकता है: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:949
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "श्रोत फ़ोल्डर %s बंद नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #, c-format
-#| msgid "Could not close temp folder: %s"
 msgid "Could not close temporary folder: %s"
 msgstr "अस्थायी फ़ोल्डर बंद नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:756
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "फ़ोल्डर का पुनः नामकरण नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:846
+#: ../camel/providers/local/camel-mbox-summary.c:1099
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "फ़ोल्डर स्टोर नहीं कर सका: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c: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
+#: ../camel/providers/local/camel-mbox-summary.c:1131
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+
+#: ../camel/providers/local/camel-mbox-summary.c:895
+#: ../camel/providers/local/camel-mbox-summary.c:1140
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "सारांश और फ़ोल्डर बेमेल है, तुल्यकालन के पश्चात भी"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1038
-#: ../camel/providers/local/camel-spool-summary.c:336
+#: ../camel/providers/local/camel-mbox-summary.c:1052
+#: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "अज्ञात दोष:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1210
+#: ../camel/providers/local/camel-mbox-summary.c:1240
 #, c-format
-#| msgid "Writing to tmp mailbox failed: %s: %s"
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "अस्थाई डाकपेटी में लिखने में विफल: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1229
 #, c-format
-#| 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:178
-msgid "MH append message canceled"
-msgstr "MH योग संदेश रद्द"
-
-#: ../camel/providers/local/camel-mh-folder.c:181
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
+#: ../camel/providers/local/camel-mh-folder.c:115
+#, fuzzy, c-format
+#| msgid "Cannot append message to mh folder: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
 msgstr "mh फ़ोल्डर में संदेश जोड़ नहीं सकता है:  %s: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:483
 #, c-format
-#| msgid "Could not create folder `%s': %s"
 msgid "Could not create folder '%s': %s"
 msgstr "फ़ोल्डर '%s' निर्मित नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:497
 #, c-format
-#| msgid "Cannot get folder `%s': not a directory."
 msgid "Cannot get folder '%s': not a directory."
 msgstr "'%s' फ़ोल्डर नहीं पा सकता है:निर्देशिका नहीं है."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH निर्देशिका पथ खोल नहीं सकता है: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:327
 #, c-format
-#| msgid "Spool `%s' cannot be opened: %s"
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "'%s' स्पूल खोल नहीं सकता है: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:341
 #, c-format
-#| 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:166
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "%s स्पूल डाक फ़ाइल"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "%s स्पूल फ़ोल्डर तरू"
+
+#: ../camel/providers/local/camel-spool-store.c:391
 #, c-format
-#| msgid "Folder `%s/%s' does not exist."
 msgid "Folder '%s/%s' does not exist."
 msgstr "'%s/%s' फ़ोल्डर मौजूद नहीं है."
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:403
 #, c-format
-#| msgid ""
-#| "Could not open folder `%s':\n"
-#| "%s"
 msgid ""
 "Could not open folder '%s':\n"
 "%s"
@@ -4104,17 +4108,13 @@ msgstr ""
 "'%s' फ़ोल्डर खोल नहीं सका:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:409
 #, c-format
-#| msgid "Folder `%s' does not exist."
 msgid "Folder '%s' does not exist."
 msgstr "'%s' फ़ोल्डर मौजूद नहीं है."
 
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
-#| msgid ""
-#| "Could not create folder `%s':\n"
-#| "%s"
 msgid ""
 "Could not create folder '%s':\n"
 "%s"
@@ -4122,124 +4122,142 @@ msgstr ""
 "'%s' फ़ोल्डर निर्मित नहीं सका:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:426
 #, c-format
-#| msgid "`%s' is not a mailbox file."
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' एक डाकपेटी फ़ाइल है."
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:462
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "एक INBOX को स्टोर समर्थन नहीं करता है"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:476
 #, c-format
-msgid "Spool mail file %s"
-msgstr "%s स्पूल डाक फ़ाइल"
+msgid "Spool folders cannot be deleted"
+msgstr "स्पूल फ़ोल्डर विलोपित नहीं किया जा सकता है"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:491
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "%s स्पूल फ़ोल्डर तरू"
-
-#: ../camel/providers/local/camel-spool-store.c:230
 msgid "Spool folders cannot be renamed"
 msgstr "स्पूल फ़ोल्डर का पुनःनामकरण नहीं किया जा सकता है"
 
-#: ../camel/providers/local/camel-spool-store.c:238
-msgid "Spool folders cannot be deleted"
-msgstr "स्पूल फ़ोल्डर विलोपित नहीं किया जा सकता है"
-
+#: ../camel/providers/local/camel-spool-summary.c:169
 #: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../camel/providers/local/camel-spool-summary.c:193
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
+#| msgid "Could not sync temporary folder %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
 msgstr "%s अस्थायी फ़ोल्डर का तुल्यकालन नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:217
+#: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
-msgid "Could not sync spool folder %s: %s"
+#| msgid "Could not sync spool folder %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
 msgstr "%s स्पूल फ़ोल्डर का तुल्यकालन नहीं कर सका: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:248
-#: ../camel/providers/local/camel-spool-summary.c:265
-#: ../camel/providers/local/camel-spool-summary.c:276
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
 #, c-format
 #| msgid ""
 #| "Could not sync spool folder %s: %s\n"
-#| "Folder may be corrupt, copy saved in `%s'"
+#| "Folder may be corrupt, copy saved in '%s'"
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
 "%s स्पूल फ़ोल्डर का तुल्यकालन नहीं कर सका: %s\n"
 "फ़ोल्डर खराब हो सकता है, `%s' में नक़ल सुरक्षित है"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
 #: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "आंतरिक त्रुटि:अवैध प्रारूप में UID: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c: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
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:240
+#: ../camel/providers/pop3/camel-pop3-folder.c:371
+#: ../camel/providers/pop3/camel-pop3-folder.c:436
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:697
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "%s संदेश प्राप्त नहीं कर सकता: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:472
+#: ../camel/providers/nntp/camel-nntp-folder.c:478
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 #, c-format
 msgid "Posting failed: %s"
 msgstr "प्रेषण विफल: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:520
+#| msgid "Posting failed: %s"
+msgid "Posting failed: "
+msgstr "प्रेषण विफल:"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:549
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ऑफलाइन काम करते हुए आप NNTP संदेश प्रेषित नहीं कर सकते हैं!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:569
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP फ़ोल्डर से आप संदेश कापी नहीं कर सकते हैं!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
-#| msgid ""
-#| "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+#: ../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 के) (_S)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
-#| msgid "In the subscription dialog, show relative folder names"
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "सदस्यता वार्तालाप में सापेक्ष फ़ोल्डर नामों को दिखाएँ (_d)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "USENET समाचार"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "यह USENET समाचार समूह से पढ़ने और प्रेषित करने के लिये प्रस्तुतकर्ता है."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "प्लेनटेक्सट कूटशब्द के प्रयोग से यह विकल्प NNTP सर्वर के साथ सत्यापन करेगा."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:73
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "%s से प्राप्त शुभकामना पत्र नहीं पढ़ सका: %s"
+msgid "Authentication requested but no username provided"
+msgstr "सत्यापन निवेदन लेकिन उपभोक्ता नाम नहीं दिया गया"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:85
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "सर्वर से सत्यापन नहीं हो सका: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:375
+#, c-format
+#| msgid "Could not read greeting from %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "%s से प्राप्त शुभकामना पत्र नहीं पढ़ सका: "
+
+#: ../camel/providers/nntp/camel-nntp-store.c:388
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "%s NNTP सर्वर ने त्रुटि कूट दिया %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:582
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s के द्वारा USENET समाचार"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:815
+#: ../camel/providers/nntp/camel-nntp-store.c:1100
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4250,7 +4268,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:909
+#: ../camel/providers/nntp/camel-nntp-store.c:1215
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4260,7 +4279,8 @@ msgstr ""
 "\n"
 "ऐसा कोई समाचार समूह नहीं है. चयनित मद संभवतः मातृ फ़ोल्डर है."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:941
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4270,125 +4290,115 @@ msgstr ""
 "\n"
 "समाचार समूह मौजूद नहीं है!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:966
+#: ../camel/providers/nntp/camel-nntp-store.c:1290
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "समाचार स्टोर में आप एक फ़ोल्डर नहीं बना सकते हैं: बदले में सदस्यता लें."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:974
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "समाचार स्टोर में आप एक फ़ोल्डर का पुनर्नामकरण नहीं कर सकते हैं."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:982
+#: ../camel/providers/nntp/camel-nntp-store.c:1323
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "समाचार स्टोर में आप एक फ़ोल्डर नहीं हटा सकते हैं: बदले में सदस्यता लें."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1171
-msgid "Authentication requested but no username provided"
-msgstr "सत्यापन निवेदन लेकिन उपभोक्ता नाम नहीं दिया गया"
-
-#: ../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:1535
+#| msgid "NNTP Command failed: %s"
+msgid "NNTP Command failed: "
+msgstr "NNTP कमांड असफल: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#: ../camel/providers/nntp/camel-nntp-store.c:1609
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP कमांड असफल: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1360
 msgid "Not connected."
 msgstr "संबंधित नहीं."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1413
-#, c-format
-msgid "No such folder: %s"
-msgstr "ऐसा कोई फ़ोल्डर नहीं है: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../camel/providers/nntp/camel-nntp-summary.c:232
+#: ../camel/providers/nntp/camel-nntp-summary.c:348
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: नया संदेश स्कैन कर रहा है"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover से अप्रत्याशित सर्वर अनुक्रिया: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:365
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "शीर्ष से अप्रत्याशित सर्वर अनुक्रिया: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-msgid "Use cancel"
-msgstr "cancel का प्रयोग करें"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:410
 #, c-format
 msgid "Operation failed: %s"
 msgstr "संक्रिया असफल: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:277
+#: ../camel/providers/pop3/camel-pop3-folder.c:336
+#, c-format
+msgid "No message with UID %s"
+msgstr "%s UID से कोई संदेश नहीं"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "%d POP सारांश पुनर्प्राप्त कर रहा है"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
+msgid "Unknown reason"
+msgstr "अज्ञात कारण"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:488
 msgid "Retrieving POP summary"
 msgstr "POP सारांश पुनर्प्राप्त कर रहा है"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:511
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "POP सारांश नहीं प्राप्त कर सकता है: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
 msgid "Expunging old messages"
 msgstr "पुराने संदेशों को पूरी तरह मिटाएँ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:577
 msgid "Expunging deleted messages"
 msgstr "विलोपित संदेशों को नष्ट करें"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
-#, c-format
-msgid "No message with UID %s"
-msgstr "%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:559
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "%d POP सारांश पुनर्प्राप्त कर रहा है"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-msgid "Unknown reason"
-msgstr "अज्ञात कारण"
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr "संदेश भंडारन"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-#| msgid "Leave messages on server"
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "सर्वर पर संदेश छोड़ें (_L)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
-#| msgid "Delete after %s day(s)"
 msgid "_Delete after %s day(s)"
 msgstr "%s दिन के पश्चात मिटाएँ (_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
-#| msgid "Disable support for all POP3 extensions"
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
 msgstr "सभी POP3 विस्तार के लिये समर्थन को निष्क्रिय करें (_s)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:58
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "POP सर्वर से जोड़ने और डाक अधिभारण के लिए."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/pop3/camel-pop3-provider.c:75
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4396,7 +4406,7 @@ msgstr ""
 "प्लेनटेक्सट कूटशब्द के प्रयोग से यह विकल्प POP सर्वर से जोड़ेगा. यह POP सर्वर द्वारा समर्थित "
 "एकमात्र विकल्प है."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4405,65 +4415,76 @@ msgstr ""
 "APOP प्रोटोकाल के द्वारा गुप्त कूटशब्द के प्रयोग से यह विकल्प POP सर्वर से जोड़ेगा. यह सभी "
 "उपभोक्ताओं के लिए काम नहीं करेगा, उन सर्वरों पर भी जो इसको समर्थन करने का दावा करते हैं."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr ": "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:181
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP सर्वर %s से वैध शुभकामना पाने में विफल"
 
-#: ../camel/providers/pop3/camel-pop3-store.c: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
+#: ../camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "POP सर्वर %s से सुरक्षित मोड में जोड़ने में विफल: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:200
 msgid "STLS not supported by server"
 msgstr "SSLS सर्वर द्वारा समर्थित नहीं"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:257
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:218
+#, c-format
+#| msgid "Failed to connect to POP server %s in secure mode: %s"
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "POP सर्वर %s से सुरक्षित मोड में जोड़ने में विफल: %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:231
+msgid "TLS negotiations failed"
+msgstr "TLS समझौता विफल"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:238
 msgid "TLS is not available in this build"
 msgstr "टीएलएस नहीं उपलब्ध है इस बिल्ड में"
 
-#: ../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:404
-#: ../camel/providers/pop3/camel-pop3-store.c:537
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "POP सर्वर %s से जोड़ने में विफल: निवेदित सत्यापन यांत्रिकी के लिए कोई समर्थन नहीं."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:420
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, c-format
-#| msgid "SASL `%s' Login failed for POP server %s: %s"
-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:432
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP सर्वर %s से लॉगिन नहीं कर सकता: SASL प्रोटोकॉल त्रुटि"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:374
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "%s POP सर्वर के सत्यापन में असफल: %s"
+#| msgid "Failed to authenticate on POP server %s: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "%s POP सर्वर के सत्यापन में असफल: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:439
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4472,404 +4493,490 @@ msgstr ""
 "%s POP सर्वर से जोड़ने में असमर्थ.\n"
 "कूटशब्द भेजने में त्रुटि: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending username: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
 msgstr ""
 "%s POP सर्वर से जोड़ने में असमर्थ.\n"
-"उपभोक्ता नाम भेजने में त्रुटि: %s"
+"उपभोक्ता%s नाम भेजने में त्रुटि"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:518
+#, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending password: %s"
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password%s"
+msgstr ""
+"%s POP सर्वर से जोड़ने में असमर्थ.\n"
+"कूटशब्द भेजने में त्रुटि %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:558
+#, c-format
+#| msgid "IMAP server %s"
+msgid "POP3 server %s"
+msgstr "POP3 सर्वर %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:562
+#, fuzzy, c-format
+#| msgid "IMAP service for %s on %s"
+msgid "POP3 server for %s on %s"
+msgstr "%s पर %s के लिए IMAP सेवा"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:693
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "POP सर्वर %s से नहीं जोड़ सका"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#: ../camel/providers/pop3/camel-pop3-store.c:720
 #, c-format
-#| msgid "No such folder `%s'."
 msgid "No such folder '%s'."
 msgstr "'%s' जैसा कोई फ़ोल्डर नहीं."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:737
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr ""
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "स्थानीय सिस्टम पर \"sendmail\" में भेजकर मेल देने के लिये."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "डाक भेजें प्रोग्राम के द्वारा डाक डेलिवरी"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "प्राप्तकर्ता सूची का विश्लेषण नहीं कर सकता"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "sendmail के लिए पाइप बना नहीं सका: %s:डाक नहीं भेजा गया"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail को fork नहीं कर सका:%s:डाक नहीं भेजा गया"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#, fuzzy
+#| msgid "Could not send message: %s"
+msgid "Could not send message: "
+msgstr "संदेश नहीं भेज सका: %s"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail %s संकेत से उत्तेजित है: डाक नहीं भेजा गया"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s का निष्पादन नहीं कर सकता: डाक नहीं भेजा गया."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail अवस्थिति से उत्तेजित %d: डाक नहीं भेजा गया"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "sendmail"
-msgstr "sendmail"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
-msgid "Mail delivery via the sendmail program"
-msgstr "डाक भेजें प्रोग्राम के द्वारा डाक डेलिवरी"
-
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP का प्रयोग करते हुए दूरस्थ mailhub से जोड़ते हुए डाक पहुंचाने के लिए."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#, fuzzy
+#| msgid "Welcome response error"
+msgid "Welcome response error: "
+msgstr "अनुक्रिया त्रुटि का स्वागत करें"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "सुरक्षित मोड़ में %s SMTP सर्वर से जुड़ने में असफल: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+#| msgid "STARTTLS command failed: %s"
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS कमांड असफल: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP सर्वर %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "%s के द्वारा SMTP डाक ............"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "%s SMTP सर्वर मांगे गए सत्यापन प्रकार %s को समर्थन नहीं देता है."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:495
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"SMTP सर्वर सत्यापन में असफल.\n"
+"%s\n"
+"\n"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "संदेश नहीं भेज सकता है: सेवा जुड़ी हुई नहीं है."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "संदेश नहीं भेज सकता:प्रेषक का पता सही नहीं है."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
+msgid "Sending message"
+msgstr "संदेश भेज रहा है"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "संदेश नहीं भेज सकता है: कोई प्राप्तकर्ता परिभाषित नहीं है."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "संदेश नहीं भेज सकता है: एक या अधिक अवैध प्राप्तकर्ता"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
 msgid "Syntax error, command unrecognized"
 msgstr "वाक्य रचना त्रुटि, कमांड अपरिचित"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Syntax error in parameters or arguments"
 msgstr "पैरामीटर या तर्क में वाक्य रचना त्रुटि"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Command not implemented"
 msgstr "कमांड लागू नहीं किया गया"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Command parameter not implemented"
 msgstr "कमांड पैरामीटर लागू नहीं किया गया"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
 msgid "System status, or system help reply"
 msgstr "सिस्टम स्थिति, सिस्टम सहायता जबाव"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Help message"
 msgstr "सहायता संदेश"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 msgid "Service ready"
 msgstr "सेवा तैयार"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 msgid "Service closing transmission channel"
 msgstr "सेवा समाप्ति प्रेषण चैनल"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
 msgid "Service not available, closing transmission channel"
 msgstr "सेवा अनुपल"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
 msgid "Requested mail action okay, completed"
 msgstr "निवेदित डाक क्रिया ओके, समाप्त"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "User not local; will forward to <forward-path>"
 msgstr "उपभोक्ता स्थानीय नहीं;इसे अग्रसारित किया जायेगा <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "निवेदित मेल कार्रवाई नहीं की गई: मेलबॉक्स अनुपलब्ध"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "निवेदित कार्रवाई नहीं की गई: मेलबॉक्स अनुपलब्ध"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
 msgid "Requested action aborted: error in processing"
 msgstr "निवेदित कार्रवाई नहीं की गई: प्रक्रिया में त्रुटि"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
 msgid "User not local; please try <forward-path>"
 msgstr "उपभोक्ता स्थानीय नहीं; कृपया प्रयास करें <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
 msgid "Requested action not taken: insufficient system storage"
 msgstr "निवेदित कार्रवाई नहीं की गई: अपर्याप्त सिस्टम भंडारण"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "निवेदित मेल क्रिया रोकी गई: भंडारण संभाजन से ज्यादा"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "निवेदित कार्रवाई नहीं की गई: मेलबॉक्स नाम की अनुमति नहीं"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "मेल आगत शुरू करें; <CRLF>.<CRLF> के साथ अंत"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
 msgid "Transaction failed"
 msgstr "लेन देन असफल"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
 msgid "A password transition is needed"
 msgstr "कूटशब्द संक्रमण की आवश्यकता है"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
 msgid "Authentication mechanism is too weak"
 msgstr "सत्यापन यांत्रिकी काफी कमजोर है"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
 msgid "Encryption required for requested authentication mechanism"
 msgstr "निवेदित सत्यापन यांत्रिकी के लिये गोपन की आवश्यकता है"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
 msgid "Temporary authentication failure"
 msgstr "अस्थायी सत्यापन विफलता"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
-msgid "Welcome response error"
-msgstr "अनुक्रिया त्रुटि का स्वागत करें"
-
-#: ../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:341
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS कमांड असफल: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
-msgid "STARTTLS command failed"
-msgstr "STARTTLS कमांड असफल"
-
-#: ../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:568
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"SMTP सर्वर सत्यापन में असफल.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP सर्वर %s"
-
-#: ../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:721
-msgid "Cannot send message: service not connected."
-msgstr "संदेश नहीं भेज सकता है: सेवा जुड़ी हुई नहीं है."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
-msgid "Cannot send message: sender address not valid."
-msgstr "संदेश नहीं भेज सकता:प्रेषक का पता सही नहीं है."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
-msgid "Sending message"
-msgstr "संदेश भेज रहा है"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
-msgid "Cannot send message: no recipients defined."
-msgstr "संदेश नहीं भेज सकता है: कोई प्राप्तकर्ता परिभाषित नहीं है."
-
-#: ../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:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:1030
 msgid "SMTP Greeting"
 msgstr "SMTP ग्रीटिंग"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO कमांड असफल: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
-msgid "HELO command failed"
-msgstr "HELO कमांड असफल"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+#| msgid "HELO command failed: %s"
+msgid "HELO command failed: "
+msgstr "HELO कमांड असफल:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "SMTP Authentication"
 msgstr "SMTP सत्यापन"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
+#, c-format
 msgid "Error creating SASL authentication object."
 msgstr "SASL सत्यापन अभिलक्ष्य निर्माण में दोष."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH कमांड असफल: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
-msgid "AUTH command failed"
-msgstr "AUTH कमांड असफल"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
-msgid "Bad authentication response from server.\n"
-msgstr "सर्वर से गलत सत्यापन अनुक्रिया.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM कमांड असफल:  %s: डाक नहीं भेजा गया"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1248
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM कमांड असफल"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO कमांड असफल: %s: डाक नहीं भेजा गया"
-
-#: ../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: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 "आंकड़ा कमांड असफल: %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:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
-msgid "DATA command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1187
+#: ../camel/providers/smtp/camel-smtp-transport.c:1196
+#| msgid "AUTH command failed: %s"
+msgid "AUTH command failed: "
+msgstr "AUTH कमांड असफल: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1304
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
+#: ../camel/providers/smtp/camel-smtp-transport.c:1327
+#| msgid "MAIL FROM command failed"
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM कमांड असफल "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#| msgid "RSET command failed: %s"
+msgid "RCPT TO command failed: "
+msgstr "RCPT TO कमांड असफल: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#, c-format
+#| msgid "RCPT TO <%s> failed"
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> असफल:"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1421
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1441
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1532
+#: ../camel/providers/smtp/camel-smtp-transport.c:1540
+#| msgid "DATA command failed"
+msgid "DATA command failed: "
 msgstr "आंकड़ा कमांड असफल"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET कमांड असफल: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1565
+#: ../camel/providers/smtp/camel-smtp-transport.c:1579
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+#| msgid "RSET command failed: %s"
+msgid "RSET command failed: "
+msgstr "RSET कमांड असफल:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
-msgid "RSET command failed"
-msgstr "RSET कमांड असफल"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
+#| msgid "QUIT command failed: %s"
+msgid "QUIT command failed: "
+msgstr "QUIT कमांड असफल :"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT कमांड असफल %s"
+#: ../libedataserver/e-categories.c:47
+#| msgid "Anniversary"
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "वर्षगांठ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-msgid "QUIT command failed"
-msgstr "QUIT कमांड असफल"
+#: ../libedataserver/e-categories.c:48
+#| msgid "Birthday"
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "जन्मदिन"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:49
+#| msgid "Business"
+msgctxt "CategoryName"
 msgid "Business"
 msgstr "व्यवसाय"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:50
+#| msgid "Competition"
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "प्रतियोगिता"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:51
+#| msgid "Favorites"
+msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "प्रिय"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:52
+#| msgid "Gifts"
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "उपहार"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:53
+#| msgid "Goals/Objectives"
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "लक्ष्य / उद्देश्य"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:54
+#| msgid "Holiday"
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "अवकाश"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:55
+#| msgid "Holiday Cards"
+msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "अवकाश कार्ड"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:57
+#| msgid "Hot Contacts"
+msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "महत्वपूर्ण संपर्क"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:58
+#| msgid "Ideas"
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "विचार"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:59
+#| msgid "International"
+msgctxt "CategoryName"
 msgid "International"
 msgstr "अंतर्राष्ट्रीय"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:60
+#| msgid "Key Customer"
+msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "कुंजी ग्राहक"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:61
+#| msgid "Miscellaneous"
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "विविध"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:62
+#| msgid "Personal"
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "व्यक्तिगत"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:63
+#| msgid "Phone Calls"
+msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "फोन काल्स"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:65
+#| msgid "Status"
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "स्तर"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:66
+#| msgid "Strategies"
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "रणनीति"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:67
+#| msgid "Suppliers"
+msgctxt "CategoryName"
 msgid "Suppliers"
-msgstr "सप्लायर्स"
+msgstr "आपूर्तिकर्ता"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:68
+#| msgid "Time & Expenses"
+msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "समय व खर्च"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:69
+#| msgid "VIP"
+msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:70
+#| msgid "Waiting"
+msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "प्रतीक्षारत"
 
@@ -4877,7 +4984,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:1644 ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -4885,7 +4992,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:1649 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1922
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
@@ -4893,7 +5000,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:1654 ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -4901,78 +5008,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:1659 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1918
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1664
+#: ../libedataserver/e-time-utils.c:1655
 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:1669
+#: ../libedataserver/e-time-utils.c:1660
 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:1672 ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1783
+#: ../libedataserver/e-time-utils.c:1913
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1680
+#: ../libedataserver/e-time-utils.c:1670
 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:1684
+#: ../libedataserver/e-time-utils.c:1674
 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:1689
+#: ../libedataserver/e-time-utils.c:1679
 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:1694
+#: ../libedataserver/e-time-utils.c:1684
 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:1699
+#: ../libedataserver/e-time-utils.c:1689
 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:1704
+#: ../libedataserver/e-time-utils.c:1694
 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:1707 ../libedataserver/e-time-utils.c:1776
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1786
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1834 ../libedataserver/e-time-utils.c:1956
+#: ../libedataserver/e-time-utils.c:1855 ../libedataserver/e-time-utils.c:1975
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1838 ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1859 ../libedataserver/e-time-utils.c:1967
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4980,206 +5087,202 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953
+#: ../libedataserver/e-time-utils.c:1864 ../libedataserver/e-time-utils.c:1972
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1847 ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1964
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1850
-#| msgid "%H:%M"
+#: ../libedataserver/e-time-utils.c:1871
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
+#: ../libedataserver/e-time-utils.c:1875
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:673
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP सर्वर को अज्ञात रूप से Access कर रहा है"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:435
 msgid "Failed to authenticate.\n"
 msgstr "प्रमाणीकरण में असफल.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:362
-#, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "पहले से एक '%s' श्रेणी है विन्यास में. कृपया अन्य नाम प्रयोग कर"
+#: ../libedataserverui/e-categories-dialog.c:127
+msgid "Category Properties"
+msgstr "श्रेणी गुण"
 
-#: ../libedataserverui/e-categories-dialog.c:526
-msgid "Icon"
-msgstr "प्रतीक"
+#: ../libedataserverui/e-categories-dialog.c:138
+msgid "Category _Name"
+msgstr "श्रेणी नाम (_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:531
-msgid "Category"
-msgstr "वर्ग"
+#: ../libedataserverui/e-categories-dialog.c:144
+msgid "Category _Icon"
+msgstr "श्रेणी नाम (_I)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
+#: ../libedataserverui/e-categories-dialog.c:185
 msgid "Category Icon"
 msgstr "श्रेणी आइकन"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:2
-msgid "Category Properties"
-msgstr "श्रेणी गुण"
+#: ../libedataserverui/e-categories-dialog.c:191
+msgid "_No Image"
+msgstr "कोई छवि नहीं (_N)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
-msgid "Category _Icon"
-msgstr "श्रेणी नाम (_I)"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:4
-msgid "Category _Name"
-msgstr "श्रेणी नाम (_N)"
+#: ../libedataserverui/e-categories-dialog.c:406
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "पहले से एक '%s' श्रेणी है विन्यास में. कृपया अन्य नाम प्रयोग कर"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "मद(दों) इन श्रेणियों का है (_c):"
+#: ../libedataserverui/e-categories-dialog.c:661
+msgid "Currently _used categories:"
+msgstr "अभी प्रयुक्त श्रेणी (_u):"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.c:668
 msgid "_Available Categories:"
 msgstr "उपलब्ध कोटियाँ (_A)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.c:711
 msgid "_Edit"
 msgstr "संपादन (_E)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
-msgid "categories"
-msgstr "कोटियां"
+#: ../libedataserverui/e-categories-dialog.c:768
+msgid "Icon"
+msgstr "प्रतीक"
+
+#: ../libedataserverui/e-categories-dialog.c:773
+msgid "Category"
+msgstr "वर्ग"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:294
 #, c-format
-#| msgid "Category List"
 msgid "Create category \"%s\""
 msgstr "\"%s\" श्रेणी बनाएँ"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "रंग सूचना"
+#: ../libedataserverui/e-name-selector-dialog.c:176
+#| msgid "Hot Contacts"
+msgid "Show Contacts"
+msgstr "संपर्क दिखाएँ"
 
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "रेंडर का रंग"
-
-#: ../libedataserverui/e-name-selector-dialog.c:278
-msgid "Select Contacts from Address Book"
-msgstr "पता पुस्तिका से संपर्कों को चुनें"
+#: ../libedataserverui/e-name-selector-dialog.c:198
+msgid "Address B_ook:"
+msgstr "पता पुस्तिका (_o):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
-msgid "_Add"
-msgstr "जोड़ें (_A)"
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Cate_gory:"
+msgstr "श्रेणी (_g):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
-msgid "_Remove"
-msgstr "मिटाएँ (_R)"
+#: ../libedataserverui/e-name-selector-dialog.c:224
+msgid "_Search:"
+msgstr "ढूंढें (_S):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
-#| msgid "Category"
+#: ../libedataserverui/e-name-selector-dialog.c:242
+#: ../libedataserverui/e-name-selector-dialog.c:977
 msgid "Any Category"
 msgstr "कोई श्रेणी"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
-#| msgid "<b>_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.c:244
+#| msgid "Contacts"
+msgid "Co_ntacts"
+msgstr "संपर्क"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
-#| msgid "Address _Book:"
-msgid "Address B_ook:"
-msgstr "पता पुस्तिका (_o):"
+#: ../libedataserverui/e-name-selector-dialog.c:289
+msgid "Search"
+msgstr "ढूंढें"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Address Book"
 msgstr "पता पुस्तिका"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
-msgid "Cate_gory:"
-msgstr "श्रेणी (_g):"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: ../libedataserverui/e-name-selector-dialog.c:295
 msgid "Contacts"
 msgstr "संपर्क"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
-msgid "Search"
-msgstr "ढूंढें"
+#: ../libedataserverui/e-name-selector-dialog.c:412
+msgid "Select Contacts from Address Book"
+msgstr "पता पुस्तिका से संपर्कों को चुनें"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
-msgid "_Search:"
-msgstr "ढूंढें (_S):"
+#: ../libedataserverui/e-name-selector-dialog.c:747
+msgid "_Add"
+msgstr "जोड़ें (_A)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:751
+msgid "_Remove"
+msgstr "मिटाएँ (_R)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:891
+#, c-format
+#| msgid "Error reading mail file: %s"
+msgid "Error loading address book: %s"
+msgstr "पता पुस्तिका लोड करने में त्रुटि: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2456
+#: ../libedataserverui/e-name-selector-entry.c:2661
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s इनलाइन फैलाएँ (_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
+#: ../libedataserverui/e-name-selector-entry.c:2676
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s की नक़ल लें (_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
+#: ../libedataserverui/e-name-selector-entry.c:2686
 #, c-format
-#| msgid "_Edit %s"
 msgid "C_ut %s"
 msgstr "%s काटें (_u)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2703
 #, c-format
 msgid "_Edit %s"
 msgstr "संपादन (_E) %s"
 
-#: ../libedataserverui/e-name-selector-list.c:472
+#: ../libedataserverui/e-name-selector-list.c:509
 #, c-format
 msgid "_Delete %s"
 msgstr "%s मिटाएँ (_D)"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:127
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr ""
 
-#: ../libedataserverui/e-passwords.c:1094
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "आपके पास कैप्स लॉक कुंजी चालू है."
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "इस कूटशब्द को याद रखें (_R)"
 
-#: ../libedataserverui/e-passwords.c:1217
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "इस सत्र में शेष भाग के लिये इस कूटशब्द को याद रखें (_R)"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "इस कूटशब्द को याद रखें (_R)"
 
-#: ../libedataserverui/e-passwords.c:1223
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "इस सत्र में शेष भाग के लिये इस कूटशब्द को याद रखें (_R)"
 
@@ -5188,203 +5291,23 @@ msgstr "इस सत्र में शेष भाग के लिये �
 msgid "Select destination"
 msgstr "गंतव्य चुनें"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:170
 msgid "_Destination"
 msgstr "गंतव्य (_D)"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1698
-#: ../servers/exchange/storage/exchange-account.c:959
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s के लिये कूटशब्द डालें"
-
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
-msgid "Enter password"
-msgstr "कूटशब्द दाखिल करें"
-
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
-msgid "Owner"
-msgstr "मालिक"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr "प्रकाशक संपादक"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-msgstr "संपादक"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-msgstr "प्रकाशक लेखक"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "लेखक"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr "गैर संपादन लेखक"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
-msgid "Reviewer"
-msgstr "समीक्षक"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "सहयोगी"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
-msgid "None"
-msgstr "कोई नहीं"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "मनपसंद"
-
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "ज़ेनेरिक त्रुटि"
-
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "एक फ़ोल्डर समान नाम से पहले उपस्थित है"
-
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "निर्दिष्ट फ़ोल्डर प्रकार उपलब्ध नहीं है"
-
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "I/O त्रुटि"
-
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "फ़ोल्डर बनाने के लिये पर्याप्त स्थान नहीं"
-
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "फ़ोल्डर खाली नहीं है"
-
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "निर्दिष्ट फ़ोल्डर नहीं मिला"
-
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "फंक्शन इस भंडारण में नहीं लागू है"
-
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "ऑपरेशन समर्थित नहीं है"
-
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "The specified type is not supported in this storage"
-msgstr "निर्दिष्ट प्रकार इस भंडारण में समर्थित नहीं है"
-
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified folder cannot be modified or removed"
-msgstr "निर्दिष्ट फ़ोल्डर परिवर्धित या हटाया नहीं जा सकता"
-
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "इसके संतति के शिशु का फ़ोल्डर नहीं बना सकता"
-
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "एक फ़ोल्डर उस नाम से नहीं बना सकता"
-
-#: ../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:642
-#, c-format
-msgid "%s's Folders"
-msgstr "%s' का फ़ोल्डर"
-
-#: ../servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "व्यक्तिगत फ़ोल्डर"
-
-#: ../servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "पसंदीदा सार्वजनिक फ़ोल्डर"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
-msgid "All Public Folders"
-msgstr "सभी सार्वजनिक फ़ोल्डर"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
-msgid "Global Address List"
-msgstr "वैश्विक पता सूची"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "विलोपित वस्तुएँ"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "जर्नल"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "टिप्पणी"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "आउटबॉक्स"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "भेजी-डाक वस्तुएँ"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "कार्य"
-
-#: ../servers/groupwise/e-gw-connection.c:225
+#: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid connection"
 msgstr "अवैध संपर्क."
 
-#: ../servers/groupwise/e-gw-connection.c:229
+#: ../servers/groupwise/e-gw-connection.c:231
 msgid "Invalid response from server"
 msgstr "सर्वर से गलत अनुक्रिया."
 
-#: ../servers/groupwise/e-gw-connection.c:231
+#: ../servers/groupwise/e-gw-connection.c:233
 msgid "No response from the server"
 msgstr "सर्वर से कोई अनुक्रिया नहीं."
 
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../servers/groupwise/e-gw-connection.c:239
 msgid "Bad parameter"
 msgstr "खराब पैरामीटर"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "एवोल्यूशन पता पुस्तिका फाइल बैकेंड"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "एवोल्यूशन पंचांग फाइल एवं वेबकैल बैकेंड"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "एवोल्यूशन पंचांग अंतरफलक जांच सेवा"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "एवोल्यूशन पंचांग सर्वर लॉगिंग सेवा"
-
-#. dialog display isn't working out
-#: ../src/server.c:109
-#, c-format
-msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-msgstr "बहुमुखी खंडन त्रुटि उत्पन्न हुई, त्रुटि संवाद दिखा नहीं सकता\n"
-
author	Rajesh Ranjan <rranjan@redhat.com>	2011-03-31 17:26:05 +0530
committer	Rajesh Ranjan <rranjan@redhat.com>	2011-03-31 17:26:05 +0530
commit	3a72bb6e91450a49c10bfeba93b40ae6b8865d07 (patch)
tree	4e4dbdc3a645c632bc6a93e51ff26f8bef3484eb
parent	3528029e57a29f65a93a8803fa3c25a86e4d4354 (diff)
download	evolution-data-server-3a72bb6e91450a49c10bfeba93b40ae6b8865d07.tar.gz