[evolution-data-server] update translation for Punjabi after correcting error



commit ae0284310777de6ece63f7edae5d0a5fc1362469
Author: A S Alam <aalam users sf net>
Date:   Tue Aug 17 06:31:01 2010 +0530

    update translation for Punjabi after correcting error

 po/pa.po | 4027 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 2166 insertions(+), 1861 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index 81b5cf7..a2eba58 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,81 +10,97 @@ 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: 2010-03-22 20:40+0000\n"
-"PO-Revision-Date: 2010-03-28 09:36+0530\n"
+"cgi?product=evolution-data-server&component=Misc.\n"
+"POT-Creation-Date: 2010-08-12 23:04+0000\n"
+"PO-Revision-Date: 2010-08-17 06:29+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
-"Language-Team: Punjabi/Panjabi <kde-i18n-doc kde org>\n"
+"Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../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:474
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../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:4553
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4491
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "��� �ਾਰ� ਹ�..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4650
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "ਸੰਪਰ� (%d) ਡਾ�ਨਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2846
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "ਸੰਪਰ� ����� (%d) �ੱਪਡ�� ��ਤ� �ਾ ਰਹ� ਹ�... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+#| msgid "Not connected."
+msgid "Not connected"
+msgstr "��ਨ��� ਨਹ�� ਹ�"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
 msgid "Using Distinguished Name (DN)"
 msgstr "ਵੱ�ਰਾ ਨਾ� ਵਰਤ�� (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
 msgid "Using Email Address"
 msgstr "�ਮ�ਲ �ਡਰ�ੱਸ ਵਰਤ ��"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1031
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ���ਿ� �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1156
+#| msgid "Invalid argument"
+msgid "Invalid DN syntax"
+msgstr "�ਲਤ DN ਸੰ���ਸ"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1672
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਸ਼ਾਮਿਲ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1804
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਹ�ਾ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2238
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4341
 msgid "Receiving LDAP search results..."
 msgstr "LDAP ਤ�� ��� ਨਤ��� ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4513
 msgid "Error performing search"
 msgstr "��� �ਲਾ�ਣ ਵਿੱ� �ਲਤ�"
 
-#: ../addressbook/libebook/e-book.c:2152
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
+#, c-format
+msgid "Create resource '%s' failed with http status: %d"
+msgstr "'%s' ਬਣਾ�ਣ ਲ� ਫ�ਲ�ਹ, http ਹਾਲਤ ਨਾਲ: %d"
+
+#: ../addressbook/libebook/e-book.c:2940
 #, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: ��-�ਾਨਫ ਵਿੱ� UID `%s' ਲ� ��� ਸਰ�ਤ ਨਹ�� ਹ�।"
+#| 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' ਲ� ��� ਸਰ�ਤ ਨਹ�� ਹ�।"
 
 #. Dummy row as EContactField starts from 1
 #: ../addressbook/libebook/e-contact.c:115
@@ -272,7 +288,7 @@ msgstr "ਵ�ਬਲਾ� URL"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:671
+#: ../libedataserverui/e-categories-dialog.c:667
 msgid "Categories"
 msgstr "���ਾ�ਰ�"
 
@@ -352,28 +368,34 @@ msgid "GroupWise Work Screen Name 3"
 msgstr "�ਰ�ਪਵਾ�� �ੰਮ ਸ�ਰ�ਨ ਨਾ� ੩"
 
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 1"
-msgstr "Jabber Home Id ੧"
+#| msgid "Jabber Home Id 1"
+msgid "Jabber Home ID 1"
+msgstr "Jabber Home ID ੧"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Home Id 2"
-msgstr "Jabber Home Id ੨"
+#| msgid "Jabber Home Id 2"
+msgid "Jabber Home ID 2"
+msgstr "Jabber Home ID ੨"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Home Id 3"
-msgstr "Jabber Home Id à©©"
+#| msgid "Jabber Home Id 3"
+msgid "Jabber Home ID 3"
+msgstr "Jabber Home ID à©©"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 1"
-msgstr "Jabber Work Id ੧"
+#| msgid "Jabber Work Id 1"
+msgid "Jabber Work ID 1"
+msgstr "Jabber Work ID ੧"
 
 #: ../addressbook/libebook/e-contact.c:207
-msgid "Jabber Work Id 2"
-msgstr "Jabber Work Id ੨"
+#| msgid "Jabber Work Id 2"
+msgid "Jabber Work ID 2"
+msgstr "Jabber Work ID ੨"
 
 #: ../addressbook/libebook/e-contact.c:208
-msgid "Jabber Work Id 3"
-msgstr "Jabber Work Id à©©"
+#| msgid "Jabber Work Id 3"
+msgid "Jabber Work ID 3"
+msgstr "Jabber Work ID à©©"
 
 #: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
@@ -424,28 +446,34 @@ msgid "MSN Work Screen Name 3"
 msgstr "MSN Work Screen Name à©©"
 
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 1"
-msgstr "ICQ Home Id ੧"
+#| msgid "ICQ Home Id 1"
+msgid "ICQ Home ID 1"
+msgstr "ICQ Home ID ੧"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Home Id 2"
-msgstr "ICQ Home Id ੨"
+#| msgid "ICQ Home Id 2"
+msgid "ICQ Home ID 2"
+msgstr "ICQ Home ID ੨"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Home Id 3"
-msgstr "ICQ Home Id à©©"
+#| msgid "ICQ Home Id 3"
+msgid "ICQ Home ID 3"
+msgstr "ICQ Home ID à©©"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 1"
-msgstr "ICQ Work Id ੧"
+#| msgid "ICQ Work Id 1"
+msgid "ICQ Work ID 1"
+msgstr "ICQ Work ID ੧"
 
 #: ../addressbook/libebook/e-contact.c:225
-msgid "ICQ Work Id 2"
-msgstr "ICQ Work Id ੨"
+#| msgid "ICQ Work Id 2"
+msgid "ICQ Work ID 2"
+msgstr "ICQ Work ID ੨"
 
 #: ../addressbook/libebook/e-contact.c:226
-msgid "ICQ Work Id 3"
-msgstr "ICQ Work Id à©©"
+#| msgid "ICQ Work Id 3"
+msgid "ICQ Work ID 3"
+msgstr "ICQ Work ID à©©"
 
 #. Last modified time
 #: ../addressbook/libebook/e-contact.c:229
@@ -501,12 +529,14 @@ msgid "AIM Screen Name List"
 msgstr "AIM ਸ�ਰ�ਨ ਨਾ� ਲਿਸ�"
 
 #: ../addressbook/libebook/e-contact.c:250
-msgid "GroupWise Id List"
-msgstr "�ਰ�ੱਵਾ�� Id ਲਿਸ�"
+#| msgid "GroupWise Id List"
+msgid "GroupWise ID List"
+msgstr "�ਰ�ੱਵਾ�� ID ਲਿਸ�"
 
 #: ../addressbook/libebook/e-contact.c:251
-msgid "Jabber Id List"
-msgstr "Jabber Id ਲਿਸ�"
+#| msgid "Jabber Id List"
+msgid "Jabber ID List"
+msgstr "Jabber ID ਲਿਸ�"
 
 #: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
@@ -517,8 +547,9 @@ msgid "MSN Screen Name List"
 msgstr "MSN Screen ਨਾ� ਲਿਸ�"
 
 #: ../addressbook/libebook/e-contact.c:254
-msgid "ICQ Id List"
-msgstr "ICQ Id ਲਿਸ�"
+#| msgid "ICQ Id List"
+msgid "ICQ ID List"
+msgstr "ICQ ID ਲਿਸ�"
 
 #: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
@@ -537,8 +568,8 @@ msgid "Birth Date"
 msgstr "�ਨਮ ਦਿਨ"
 
 #: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
-#: ../libedataserver/e-categories.c:45
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:44
 msgid "Anniversary"
 msgstr "ਵਰ�-�ੰਢ"
 
@@ -548,32 +579,39 @@ msgid "X.509 Certificate"
 msgstr "X.509 ਸਰ��ਫਿ���"
 
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu �ਰ Id ੧"
+#| msgid "Gadu-Gadu Home Id 1"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "Gadu-Gadu �ਰ ID ੧"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu �ਰ Id ੨"
+#| msgid "Gadu-Gadu Home Id 2"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "Gadu-Gadu �ਰ ID ੨"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu �ਰ Id ੩"
+#| msgid "Gadu-Gadu Home Id 3"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "Gadu-Gadu �ਰ ID ੩"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu �ੰਮ Id ੧"
+#| msgid "Gadu-Gadu Work Id 1"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "Gadu-Gadu �ੰਮ ID ੧"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu �ੰਮ Id ੨"
+#| msgid "Gadu-Gadu Work Id 2"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "Gadu-Gadu �ੰਮ ID ੨"
 
 #: ../addressbook/libebook/e-contact.c:272
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu �ੰਮ Id ੩"
+#| msgid "Gadu-Gadu Work Id 3"
+msgid "Gadu-Gadu Work ID 3"
+msgstr "Gadu-Gadu �ੰਮ ID ੩"
 
 #: ../addressbook/libebook/e-contact.c:273
-msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu Id ਲਿਸ�"
+#| msgid "Gadu-Gadu Id List"
+msgid "Gadu-Gadu ID List"
+msgstr "Gadu-Gadu ID ਲਿਸ�"
 
 #. Geo information
 #: ../addressbook/libebook/e-contact.c:276
@@ -616,214 +654,380 @@ msgstr "Skype Name ਲਿਸ�"
 msgid "SIP address"
 msgstr "SIP �ਡਰ�ੱਸ"
 
-#: ../addressbook/libebook/e-contact.c:1515
+#: ../addressbook/libebook/e-contact.c:1517
 #: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "ਬਿਨਾ� ਨਾ� ਸ���"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#: ../addressbook/libedata-book/e-data-book-factory.c:287
 #, c-format
 msgid "Empty URI"
 msgstr "�ਾਲ� URI"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:305
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:323
-#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#: ../addressbook/libedata-book/e-data-book-factory.c:306
+#: ../addressbook/libedata-book/e-data-book-factory.c:344
+#: ../calendar/libedata-cal/e-data-cal-factory.c:331
+#: ../calendar/libedata-cal/e-data-cal-factory.c:343
 #, c-format
-#| msgid "%s: Invalid source."
 msgid "Invalid source"
 msgstr "�ਲਤ ਸਰ�ਤ"
 
-#: ../addressbook/libedata-book/e-data-book.c:301
-#| msgid "Cannot open message"
-msgid "Cannot open book"
-msgstr "ਬ�ੱ� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ�ਦ�"
+#: ../addressbook/libedata-book/e-data-book.c:166
+#: ../calendar/libedata-cal/e-data-cal.c:104
+msgid "Success"
+msgstr "ਸਫ਼ਲ"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-msgid "Cannot remove book"
-msgstr "ਬ�ੱ� ਹ�ਾ� �ਾ ਨਹ�� �ਾ ਸ�ਦਾ"
+#: ../addressbook/libedata-book/e-data-book.c:167
+#: ../calendar/libedata-cal/e-data-cal.c:105
+#| msgid "Repository is offline"
+msgid "Repository offline"
+msgstr "Repository �ਫਲਾ�ਨ ਹ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../addressbook/libedata-book/e-data-book.c:346
-#| msgid "Cannot get folder container %s"
-msgid "Cannot get contact"
-msgstr "ਸੰਪਰ� ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
-
-#: ../addressbook/libedata-book/e-data-book.c:358
-msgid "Empty query"
-msgstr "�ਿ�ਰ� �ਾਲ� ਹ�"
-
-#: ../addressbook/libedata-book/e-data-book.c:402
-#| msgid "Cannot authenticate to server: %s"
-msgid "Cannot authenticate user"
-msgstr "ਯ��਼ਰ ਪਰਮਾਣਿਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
-
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../addressbook/libedata-book/e-data-book.c:429
-#| msgid "Cannot add encryption certificate"
-msgid "Cannot add contact"
-msgstr "ਸੰਪਰ� ਸ਼ਾਮਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
-
-#: ../addressbook/libedata-book/e-data-book.c:444
-#: ../addressbook/libedata-book/e-data-book.c:459
-#| msgid "Cannot create encoder context"
-msgid "Cannot modify contact"
-msgstr "ਸੰਪਰ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
-
-#: ../addressbook/libedata-book/e-data-book.c:494
-#| msgid "Cannot create encoder context"
-msgid "Cannot remove contacts"
-msgstr "ਸੰਪਰ� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
-
-#: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../addressbook/libedata-book/e-data-book.c:168
+#: ../calendar/libecal/e-cal.c:3945 ../calendar/libedata-cal/e-data-cal.c:106
+msgid "Permission denied"
+msgstr "�ਧਿ�ਾਰ ਪਾਬੰਦ� ਹ�"
+
+#: ../addressbook/libedata-book/e-data-book.c:169
+#| msgid "Object not found"
+msgid "Contact not found"
+msgstr "ਸੰਪਰ� ਨਹ�� ਲੱਭਿ�"
+
+#: ../addressbook/libedata-book/e-data-book.c:170
+#| msgid "Object ID already exists"
+msgid "Contact ID already exists"
+msgstr "ਸੰਪਰ� ID ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
+
+#: ../addressbook/libedata-book/e-data-book.c:171
+#: ../calendar/libedata-cal/e-data-cal.c:111
+#| msgid "Authentication failed"
+msgid "Authentication Failed"
+msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਫ�ਲ�ਹ ਹ��"
+
+#: ../addressbook/libedata-book/e-data-book.c:172
+#: ../calendar/libedata-cal/e-data-cal.c:112
+#| msgid "Authentication required"
+msgid "Authentication Required"
+msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�"
+
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:113
+msgid "Unsupported field"
+msgstr "��ਰ-ਸਹਾ�� ��ਤਰ"
+
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Unsupported authentication method"
+msgstr "�਼�ਰ-ਸਹਾ�� ਪਰਮਾਣ�ਿਤਾ ਢੰ�"
+
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libedata-cal/e-data-cal.c:116
+msgid "TLS not available"
+msgstr "TLS �ਪਲੱਬਧ ਨਹ��"
+
+#: ../addressbook/libedata-book/e-data-book.c:176
+#| msgid "Folder '%s/%s' does not exist."
+msgid "Address Book does not exist"
+msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਮ���ਦ ਨਹ�� ਹ�"
+
+#: ../addressbook/libedata-book/e-data-book.c:177
+msgid "Book removed"
+msgstr "�ਿਤਾਬ ਹ�ਾ�"
+
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:119
+#| msgid "This message is not available in offline mode."
+msgid "Not available in offline mode"
+msgstr "�ਫਲਾ�ਨ ਵਿੱ� �ਪਲੱਬਧ ਨਹ�� ਹ�।"
+
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "Search size limit exceeded"
+msgstr "��� ਸਾ��਼ ਲਿਮ� ਵੱਧ ��"
+
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Search time limit exceeded"
+msgstr "��� �ਾ�ਮ ਲਿਮ� ਵੱਧ ��"
+
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:122
 msgid "Invalid query"
 msgstr "�ਲਤ �ਿ�ਰ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:598
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Query refused"
+msgstr "�ਿ�ਰ� ਤ�� �ਨ�ਾਰ ��ਤਾ �ਿ�"
+
+#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../calendar/libedata-cal/e-data-cal.c:124
+#| 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:185
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Invalid server version"
+msgstr "�ਲਤ ਸਰਵਰ ਵਰ�ਨ"
+
+#: ../addressbook/libedata-book/e-data-book.c:186
+#| msgid "Namespace"
+msgid "No space"
+msgstr "ਥਾ� ਨਹ�� ਬਾ��"
+
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libecal/e-cal.c:3929 ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Invalid argument"
+msgstr "�ਲਤ �ਰ��ਮਿੰ�"
+
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libecal/e-cal.c:3967 ../calendar/libedata-cal/e-data-cal.c:128
+#| msgid "Protocol not supported"
+msgid "Not supported"
+msgstr "ਸਹਾ�� ਨਹ��"
+
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libedata-cal/e-data-cal.c:136
+#| 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:307
+#, c-format
+#| msgid "Cannot open book"
+msgid "Cannot open book: %s"
+msgstr "%s: ਬ�ੱ� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ�ਦ�"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:329
+#, c-format
+#| msgid "Cannot remove book"
+msgid "Cannot remove book: %s"
+msgstr "%s: ਬ�ੱ� ਹ�ਾ� �ਾ ਨਹ�� �ਾ ਸ�ਦ�"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:346
+#: ../addressbook/libedata-book/e-data-book.c:365
+#, c-format
+#| msgid "Cannot get contact"
+msgid "Cannot get contact: %s"
+msgstr "%s: ਸੰਪਰ� ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:380
+#, c-format
+#| msgid "Empty query"
+msgid "Empty query: %s"
+msgstr "%s: �ਿ�ਰ� �ਾਲ� ਹ�"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:396
+#, c-format
+#| msgid "Cannot get contact"
+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:433
+#, c-format
+#| msgid "Cannot authenticate user"
+msgid "Cannot authenticate user: %s"
+msgstr "%s: ਪਰਮਾਣਿਤ ਹ��� ਯ��਼ਰ ਨਹ�� ਹ�"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:448
+#: ../addressbook/libedata-book/e-data-book.c:467
+#, c-format
+#| msgid "Cannot add contact"
+msgid "Cannot add contact: %s"
+msgstr "%s: ਸੰਪਰ� ਸ਼ਾਮਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:485
+#: ../addressbook/libedata-book/e-data-book.c:504
+#, c-format
+#| msgid "Cannot modify contact"
+msgid "Cannot modify contact: %s"
+msgstr "%s: ਸੰਪਰ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:543
+#, c-format
+#| msgid "Cannot remove contacts"
+msgid "Cannot remove contacts: %s"
+msgstr "%s: ਸੰਪਰ� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:580
+#, c-format
 #| msgid "Cannot get message %s: %s"
-msgid "Cannot get changes"
-msgstr "ਬਦਲਾ� ਨਹ�� ਲ� �ਾ ਸ�ਦ�"
+msgid "Cannot get supported fields: %s"
+msgstr "%s: ਸਹਾ�� ��ਤਰ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../addressbook/libedata-book/e-data-book.c:699
-#| msgid "Could not cancel operation"
-msgid "Cannot complete operation"
-msgstr "�ਪਰ�ਸ਼ਨ ਪ�ਰਾ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:595
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get required fields: %s"
+msgstr "%s: ਲ���ਦ� ��ਤਰ ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:46
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+#| msgid "Unsupported authentication method"
+msgid "Cannot get supported auth methods: %s"
+msgstr "%s: ਸਹਾ�� ਪਰਮਾਣ�ਿਤਾ ਢੰ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:636
+#: ../addressbook/libedata-book/e-data-book.c:647
+#, 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:683
+#, c-format
+#| msgid "Cannot get changes"
+msgid "Cannot get changes: %s"
+msgstr "%s: ਬਦਲਾ� ਨਹ�� ਲ� �ਾ ਸ�ਦ�"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:722
+#, c-format
+#| msgid "Operation failed: %s"
+msgid "Cancel operation failed: %s"
+msgstr "%s: �ਪਰ�ਸ਼ਨ ਰੱਦ �ਰਨ ਲ� ਫ�ਲ�ਹ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:498
+#, c-format
+#| msgid ""
+#| "Unexpected GnuPG status message encountered:\n"
+#| "\n"
+#| "%s"
+msgid "Unexpected HTTP status code %d returned"
+msgstr "�ਲਤ HTTP ਹਾਲਤ ��ਡ %d ਮਿਲਿ�"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4094
+msgid "Calendar doesn't support Free/Busy"
+msgstr "��ਲੰਡਰ ਵਿਹਲ�/ਰ��ਿ� ਲ� ਸਹਾ�� ਨਹ��"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
+#: ../libedataserver/e-categories.c:45
 msgid "Birthday"
 msgstr "�ਨਮਦਿਨ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
 #, c-format
 msgid "Birthday: %s"
 msgstr "�ਨਮਦਿਨ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ਵਰ��ੰਢ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:236
+#: ../calendar/backends/file/e-cal-backend-file.c:239
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "��ਲੰਡਰ ਡਾ�� ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: ਨਿ�ਾਰਾ URI"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:243
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:246
+#: ../calendar/backends/file/e-cal-backend-file.c:252
 msgid "Cannot save calendar data"
 msgstr "��ਲੰਡਰ ਡਾ�� ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
-msgid "Could not create thread for getting deltas"
-msgstr "����� ਥਰਿੱਡ ਨ�ੰ ਵਿ�ਸਤ ਨਹ�� �ਾ ਸ�ਿ�"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
-#: ../calendar/backends/google/e-cal-backend-google.c:1144
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1105
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1403
-#: ../calendar/backends/http/e-cal-backend-http.c:678
-#: ../calendar/backends/weather/e-cal-backend-weather.c:492
-msgid "Could not create cache file"
-msgstr "����� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1118
-msgid "Could not create thread for populating cache"
-msgstr "����� ਥਰਿੱਡ ਨ�ੰ ਵਿ�ਸਤ ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2121
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1121
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
 msgid "Reply Requested: by "
 msgstr "�ਵਾਬ ਦ� ਬ�ਨਤ�: ਵਲ��"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2126
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1126
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
 msgid "Reply Requested: When convenient"
 msgstr "�ਵਾਬ ਲ� ਬ�ਨਤ�: �ਦ�� ਠ�� ਲੱ��"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:280
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:295
 #, c-format
 msgid "Loading %s items"
 msgstr "��ਾ��� %s ਲ�ਡ ��ਤ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:944
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:926
 msgid "Calendar"
 msgstr "��ਲੰਡਰ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1002
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:989
 msgid "Invalid server URI"
 msgstr "�ਲਤ ਸਰਵਰ URI"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1021
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1030
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
-#: ../calendar/libecal/e-cal.c:4024
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1334
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1370
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1385
-#: ../camel/providers/groupwise/camel-groupwise-store.c:591
-#: ../camel/providers/groupwise/camel-groupwise-store.c:766
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
-msgid "Authentication failed"
-msgstr "ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1082
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1343
+#: ../calendar/backends/http/e-cal-backend-http.c:659
+#: ../calendar/backends/weather/e-cal-backend-weather.c:487
+msgid "Could not create cache file"
+msgstr "����� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
+msgid "Could not create thread for populating cache"
+msgstr "����� ਥਰਿੱਡ ਨ�ੰ ਵਿ�ਸਤ ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:335
+#: ../calendar/backends/http/e-cal-backend-http.c:327
 msgid "Redirected to Invalid URI"
 msgstr "�ਲਤ URI ਲ� ਭ��ਿ� "
 
-#: ../calendar/backends/http/e-cal-backend-http.c:358
+#: ../calendar/backends/http/e-cal-backend-http.c:350
 msgid "Bad file format."
 msgstr "�ਲਤ ਫਾ�ਲ ਫਾਰਮਿ�"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:365
+#: ../calendar/backends/http/e-cal-backend-http.c:357
 msgid "Not a calendar."
 msgstr "��� ��ਲੰਡਰ ਨਹ��"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:152
+#: ../calendar/backends/weather/e-cal-backend-weather.c:154
 msgid "Could not retrieve weather data"
 msgstr "����� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
 msgid "Weather: Fog"
 msgstr "ਮ�ਸਮ: ਧ�ੰਦ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Cloudy Night"
 msgstr "ਮ�ਸਮ: ਬੱਦਲਵਾ� ਵਾਲ� ਰਾਤ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Cloudy"
 msgstr "ਮ�ਸਮ: ਬੱਦਲਵਾ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Overcast"
 msgstr "ਮ�ਸਮ: �ਵਰ�ਾਸ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Showers"
 msgstr "ਮ�ਸਮ: ਫ�ਹਾਰ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
 msgid "Weather: Snow"
 msgstr "ਮ�ਸਮ: ਬਰ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Clear Night"
 msgstr "ਮ�ਸਮ: ਸਾਫ਼ ਰਾਤ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:260
 msgid "Weather: Sunny"
 msgstr "ਮ�ਸਮ: �ਿ�ਿ� ਦਿਨ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:261
 msgid "Weather: Thunderstorms"
 msgstr "ਮ�ਸਮ: ਬਰ��ਲਾ ਤ�ਫਾਨ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:405
+#: ../calendar/backends/weather/e-cal-backend-weather.c:407
 msgid "Forecast"
 msgstr "�ਨ�ਮਾਨ"
 
@@ -972,7 +1176,7 @@ msgstr "ਨਿ�ਨਤਮ"
 msgid "Undefined"
 msgstr "ਨਾ-ਪ�ਰਭਾਸ਼ਿਤ"
 
-#: ../calendar/libecal/e-cal.c:1173 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1128 ../libedataserverui/e-book-auth-util.c:206
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਦਿ� (ਯ��਼ਰ %s)"
@@ -981,108 +1185,92 @@ msgstr "%s ਲ� ਪਾਸਵਰਡ ਦਿ� (ਯ��਼ਰ %s)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1187
+#: ../calendar/libecal/e-cal.c:1142
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਯ��਼ਰ %s ਲ� ਪਰਾ�ਸ� ਯ�� �ਰਨ ਲ� ਦਿ�"
 
-#: ../calendar/libecal/e-cal.c:3996
-msgid "Invalid argument"
-msgstr "�ਲਤ �ਰ��ਮਿੰ�"
-
-#: ../calendar/libecal/e-cal.c:3998
+#: ../calendar/libecal/e-cal.c:3931
 msgid "Backend is busy"
 msgstr "ਪਿੱ�ਲਾ ਤਾ� ਰ��ਿ� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4000
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:3933
 msgid "Repository is offline"
 msgstr "Repository �ਫਲਾ�ਨ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4002
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
+#: ../calendar/libecal/e-cal.c:3935
 msgid "No such calendar"
 msgstr "�ੱਦਾ� ਦਾ ��� ��ਲੰਡਰ ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4004
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../calendar/libecal/e-cal.c:3937 ../calendar/libedata-cal/e-data-cal.c:108
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "��ਾ� ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4006
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:3939 ../calendar/libedata-cal/e-data-cal.c:109
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "�ਲਤ ��ਾ�"
 
-#: ../calendar/libecal/e-cal.c:4008
+#: ../calendar/libecal/e-cal.c:3941
 msgid "URI not loaded"
 msgstr "URI ਲ�ਡ ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4010
+#: ../calendar/libecal/e-cal.c:3943
 msgid "URI already loaded"
 msgstr "URI ਪਹਿਲਾ� ਹ� ਲ�ਡ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4012
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-msgid "Permission denied"
-msgstr "�ਧਿ�ਾਰ ਪਾਬੰਦ� ਹ�"
-
-#: ../calendar/libecal/e-cal.c:4014
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:3947 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "�ਣ�ਾਣ ਯ��਼ਰ"
 
-#: ../calendar/libecal/e-cal.c:4016
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
+#: ../calendar/libecal/e-cal.c:3949 ../calendar/libedata-cal/e-data-cal.c:110
 msgid "Object ID already exists"
 msgstr "��ਾ� ID ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4018
+#: ../calendar/libecal/e-cal.c:3951
 msgid "Protocol not supported"
 msgstr "ਪਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4020
+#: ../calendar/libecal/e-cal.c:3953
 msgid "Operation has been canceled"
 msgstr "�ਾਰਵਾ� ਰੱਦ ��ਤ� �� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4022
-#: ../calendar/libedata-cal/e-cal-backend-util.c:145
+#: ../calendar/libecal/e-cal.c:3955
 msgid "Could not cancel operation"
 msgstr "�ਾਰਵਾ� ਨ�ੰ ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4026
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../calendar/libecal/e-cal.c:3957
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
+#: ../camel/providers/groupwise/camel-groupwise-store.c:618
+#: ../camel/providers/groupwise/camel-groupwise-store.c:793
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#, c-format
+msgid "Authentication failed"
+msgstr "ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ"
+
+#: ../calendar/libecal/e-cal.c:3959
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Authentication required"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4028
-msgid "A CORBA exception has occurred"
-msgstr "�ੱ� CORBA �ਪਵਾਦ ��� ਹ�|"
-
-#: ../calendar/libecal/e-cal.c:4030
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-#: ../camel/camel-net-utils.c:523
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:741
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1585
-#: ../camel/providers/imap4/camel-imap4-engine.c:1629
-#: ../camel/providers/imap4/camel-imap4-engine.c:1684
-#: ../camel/providers/imap4/camel-imap4-store.c:311
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:584
+#: ../calendar/libecal/e-cal.c:3961
+#| msgid "A CORBA exception has occurred"
+msgid "A DBUS exception has occurred"
+msgstr "DBUS �ਪਵਾਦ ਮਿਲਿ�"
+
+#: ../calendar/libecal/e-cal.c:3963
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
+#: ../camel/providers/imap/camel-imap-command.c:457
+#: ../camel/providers/imap/camel-imap-store.c:627
+#: ../camel/providers/pop3/camel-pop3-store.c:474
 #: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "�ਣਪ�ਾਤ� �ਲਤ�"
 
-#: ../calendar/libecal/e-cal.c:4032
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:3965
 msgid "No error"
 msgstr "��� �ਲਤ� ਨਹ��"
 
@@ -1179,266 +1367,280 @@ msgid ""
 "be a boolean false (#f)"
 msgstr "\"%s\" ਲ� ਸਭ �ਰ��ਮਿੰ� �ਾ� ਤਾ� ਸਤਰ ਹ�ਣ �ਾ� ਸਿਰਫ �ੱ� �ਰ��ਮਿੰ� ਬ�ਲ��ਨ (�ਲਤ) ਹ�ਵ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../calendar/libedata-cal/e-data-cal.c:107
 msgid "Invalid range"
 msgstr "�ਲਤ ਰ��਼"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
-msgid "Unsupported field"
-msgstr "��ਰ-ਸਹਾ�� ��ਤਰ"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-data-cal.c:114
 msgid "Unsupported method"
 msgstr "�਼�ਰ-ਸਹਾ�� ਢੰ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "Unsupported authentication method"
-msgstr "�਼�ਰ-ਸਹਾ�� ਪਰਮਾਣ�ਿਤਾ ਢੰ�"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
-msgid "TLS not available"
-msgstr "TLS �ਪਲੱਬਧ ਨਹ��"
+#: ../calendar/libedata-cal/e-data-cal.c:117
+#| msgid "Folder '%s' does not exist."
+msgid "Calendar does not exist"
+msgstr "��ਲੰਡਰ ਮ���ਦ ਨਹ��"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Offline mode unavailable"
-msgstr "�ਫਲਾ�ਨ ਮ�ਡ �ਪਲੱਬਧ ਨਹ��"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search size limit exceeded"
-msgstr "��� ਸਾ��਼ ਲਿਮ� ਵੱਧ ��"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Search time limit exceeded"
-msgstr "��� �ਾ�ਮ ਲਿਮ� ਵੱਧ ��"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
-msgid "Query refused"
-msgstr "�ਿ�ਰ� ਤ�� �ਨ�ਾਰ ��ਤਾ �ਿ�"
+#: ../calendar/libedata-cal/e-data-cal.c:118
+#| msgid "Unknown User"
+msgid "UnknownUser"
+msgstr "�ਣ�ਾਣ-ਯ��਼ਰ"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:150
-msgid "Invalid server version"
-msgstr "�ਲਤ ਸਰਵਰ ਵਰ�ਨ"
-
-#: ../calendar/libedata-cal/e-data-cal.c:501
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:589
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar address"
-msgstr "��ਲੰਡਰ �ਡਰ�ੱਸ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+#| msgid "Cannot retrieve calendar address"
+msgid "Cannot retrieve calendar address: %s"
+msgstr "��ਲੰਡਰ �ਡਰ�ੱਲ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:519
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:609
 #, c-format
-#| msgid "Cannot save calendar data: Malformed URI."
-msgid "Cannot retrieve calendar alarm e-mail address"
-msgstr "��ਲੰਡਰ �ਲਾਰਮ �ਮ�ਲ �ਡਰ�ੱਸ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+#| msgid "Cannot retrieve calendar alarm e-mail address"
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "%s: ��ਲੰਡਰ �ਲਾਰਮ �ਮ�ਲ �ਡਰ�ੱਸ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:537
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:629
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar's ldap attribute"
-msgstr "��ਲੰਡਰ ਦਾ ldap ��ਣ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+#| msgid "Cannot retrieve calendar's ldap attribute"
+msgid "Cannot retrieve calendar's ldap attribute: %s"
+msgstr "%s: ��ਲੰਡਰ ਦਾ ldap ��ਣ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:555
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:649
 #, c-format
-#| msgid "Cannot create CMS Recipient information"
-msgid "Cannot retrieve calendar scheduling information"
-msgstr "��ਲੰਡਰ ਸ�ਡ��ਲ �ਾਣ�ਾਰ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
+#| msgid "Cannot retrieve calendar scheduling information"
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "%s: ��ਲੰਡਰ ਸ�ਡ��ਲ �ਾਣ�ਾਰ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../calendar/libedata-cal/e-data-cal.c:572
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:668
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot open calendar"
-msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+#| msgid "Cannot open calendar"
+msgid "Cannot open calendar: %s"
+msgstr "%s: ��ਲੰਡਰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:591
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:689
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot refresh calendar"
-msgstr "��ਲੰਡਰ ਤਾ�਼ਾ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
+#| msgid "Cannot refresh calendar"
+msgid "Cannot refresh calendar: %s"
+msgstr "%s: ��ਲੰਡਰ ਤਾ�਼ਾ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:608
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:708
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot remove calendar"
-msgstr "��ਲੰਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
+#| msgid "Cannot remove calendar"
+msgid "Cannot remove calendar: %s"
+msgstr "%s: ��ਲੰਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:627
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:729
 #, c-format
-#| msgid "Cannot create encoder context"
-msgid "Cannot create calendar object"
-msgstr "��ਲੰਡਰ �ਬ���� ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
+#| msgid "Cannot create calendar object"
+msgid "Cannot create calendar object: %s"
+msgstr "%s: ��ਲੰਡਰ �ਬ���� ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:649
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:753
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot modify calendar object"
-msgstr "��ਲੰਡਰ �ਬ���� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+#| msgid "Cannot modify calendar object"
+msgid "Cannot modify calendar object: %s"
+msgstr "%s: ��ਲੰਡਰ �ਬ���� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:673
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:779
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot remove calendar object"
-msgstr "��ਲੰਡਰ �ਬ���� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
+#| msgid "Cannot remove calendar object"
+msgid "Cannot remove calendar object: %s"
+msgstr "%s: ��ਲੰਡਰ �ਬ���� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:692
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:800
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot receive calendar objects"
-msgstr "��ਲੰਡਰ �ਬ���� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
+#| msgid "Cannot receive calendar objects"
+msgid "Cannot receive calendar objects: %s"
+msgstr "%s: ��ਲੰਡਰ �ਬ���� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../calendar/libedata-cal/e-data-cal.c:709
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:819
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot discard calendar alarm"
-msgstr "��ਲੰਡਰ �ਲਾਰਮ �ਣਡਿੱਠਾ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦ�"
+#| msgid "Cannot discard calendar alarm"
+msgid "Cannot discard calendar alarm: %s"
+msgstr "%s: ��ਲੰਡਰ �ਲਾਰਮ �ਣਡਿੱਠਾ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦ�"
 
-#: ../calendar/libedata-cal/e-data-cal.c:728
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:840
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot send calendar objects"
-msgstr "��ਲੰਡਰ �ਬ���� ਭ��� ਨਹ�� �ਾ ਸ�ਦ�"
+#| msgid "Cannot send calendar objects"
+msgid "Cannot send calendar objects: %s"
+msgstr "%s: ��ਲੰਡਰ �ਬ���� ਭ��� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../calendar/libedata-cal/e-data-cal.c:763
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:865
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve default calendar object path"
-msgstr "ਡਿਫਾਲ� ��ਲੰਡਰ �ਬ���� ਪਾਥ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+#| msgid "Cannot retrieve default calendar object path"
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "%s: ਡਿਫਾਲ� ��ਲੰਡਰ �ਬ���� ਪਾਥ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:781
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:885
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar object path"
-msgstr "��ਲੰਡਰ �ਬ���� ਪਾਥ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+#| msgid "Cannot retrieve calendar object path"
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "%s: ��ਲੰਡਰ �ਬ���� ਪਾਥ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:799
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:905
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar object list"
-msgstr "��ਲੰਡਰ �ਬ���� ਲਿਸ� ਨਹ�� ਲ� �ਾ ਸ�ਦ�"
+#| msgid "Cannot retrieve calendar object list"
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "%s: ��ਲੰਡਰ �ਬ���� ਲਿਸ� ਨਹ�� ਲ� �ਾ ਸ�ਦ�"
 
-#: ../calendar/libedata-cal/e-data-cal.c:837
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:933
 #, c-format
-#| msgid "Could not retrieve weather data"
-msgid "Could not retrieve attachment list"
-msgstr "����ਮ��� ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
+#| msgid "Could not retrieve attachment list"
+msgid "Could not retrieve attachment list: %s"
+msgstr "%s: ����ਮ��� ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../calendar/libedata-cal/e-data-cal.c:859
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:959
 #, c-format
-#| msgid "Could not create cache file"
-msgid "Could not complete calendar query"
-msgstr "��ਲੰਡਰ �ਿ�ਰ� ਪ�ਰ� ਨਹ�� ��ਤ� �ਾ ਸ��"
+#| msgid "Could not complete calendar query"
+msgid "Could not complete calendar query: %s"
+msgstr "%s: ��ਲੰਡਰ �ਿ�ਰ� ਪ�ਰ� ਨਹ�� ��ਤ� �ਾ ਸ��"
 
-#: ../calendar/libedata-cal/e-data-cal.c:877
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:979
 #, c-format
-#| msgid "Could not retrieve weather data"
-msgid "Could not retrieve calendar time zone"
-msgstr "��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਲਿ� ਨਹ�� �ਾ ਸ�ਿ�"
+#| msgid "Could not retrieve calendar time zone"
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "%s: ��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਲਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../calendar/libedata-cal/e-data-cal.c:895
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:999
 #, c-format
-#| msgid "Could not cancel operation"
-msgid "Could not add calendar time zone"
-msgstr "��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਸ਼ਾਮਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
+#| msgid "Could not add calendar time zone"
+msgid "Could not add calendar time zone: %s"
+msgstr "%s: ��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਸ਼ਾਮਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../calendar/libedata-cal/e-data-cal.c:912
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1018
 #, c-format
-msgid "Could not set default calendar time zone"
-msgstr "ਡਿਫਾਲ� ��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਸ�ੱ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
+#| msgid "Could not set default calendar time zone"
+msgid "Could not set default calendar time zone: %s"
+msgstr "%s: ਡਿਫਾਲ� ��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਸ�ੱ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../calendar/libedata-cal/e-data-cal.c:933
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1041
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar changes"
-msgstr "��ਲੰਡਰ ਬਦਲਾ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
+#| msgid "Cannot retrieve calendar changes"
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "%s: ��ਲੰਡਰ ਬਦਲਾ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../calendar/libedata-cal/e-data-cal.c:983
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1072
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar free/busy list"
-msgstr "��ਲੰਡਰ ਵਿਹਲ�/ਰ��ਿ� ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
+#| msgid "Cannot retrieve calendar free/busy list"
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "%s: ��ਲੰਡਰ ਵਿਹਲ�/ਰ��ਿ� ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#: ../calendar/libedata-cal/e-data-cal-factory.c:353
 #, c-format
-#| msgid "Invalid server URI"
 msgid "Invalid URI"
 msgstr "�ਲਤ URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../calendar/libedata-cal/e-data-cal-factory.c:371
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "'%2$s' ਵਿੱ��� '%1$s' ਲ� ਬ����ਡ ਫ���ਰ� ਨਹ�� ਹ�"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#: ../calendar/libedata-cal/e-data-cal-factory.c:421
 #, 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:75
+#, c-format
 msgid "Signing is not supported by this cipher"
-msgstr "�ਸ ��ਪਤ-ਲ��ਣ ਦਸਤ�ਤਾ� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
+msgstr "�ਸ ਸ�ਫ਼ਰ ਦਸਤ�ਤਾ� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:110
 msgid "Signing message"
 msgstr "ਸ�ਨ�ਹਾ ਸਾ�ਨ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:131
+#, c-format
 msgid "Verifying is not supported by this cipher"
-msgstr "�ਹ ��ਪਤ-ਲ��ਣ �ਾ�� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
+msgstr "�ਹ ਸ�ਫ਼ਰ �ਾ�� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:164
 msgid "Verifying message"
 msgstr "ਸ�ਨ�ਹ� ਦ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:188
+#, c-format
 msgid "Encryption is not supported by this cipher"
-msgstr "�ਹ ��ਪਤ-ਲ��ਣ ���ਰਿਪਸ਼ਮ ਲ� ਸਹਾ� ਨਹ�� ਹ�"
+msgstr "�ਹ ਸ�ਫ਼ਰ ���ਰਿਪਸ਼ਨ ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:223
 msgid "Encrypting message"
 msgstr "ਸ�ਨ�ਹਾ �ੰ��ਰਿਪਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:246
+#, c-format
 msgid "Decryption is not supported by this cipher"
-msgstr "�ਹ ��ਪਤ-ਲ��ਣ ਡਿਸ��ਰਿਪਸ਼ਨ ਲ� ਸਹਾ� ਨਹ�� ਹ�"
+msgstr "�ਹ ਸ�ਫ਼ਰ ਡਿਸ��ਰਿਪਸ਼ਨ ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/camel-cipher-context.c:254
+#: ../camel/camel-cipher-context.c:276
 msgid "Decrypting message"
 msgstr "ਸ�ਨ�ਹਾ ਡਿ��ਰਿਪਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:297
+#, c-format
 msgid "You may not import keys with this cipher"
-msgstr "ਤ�ਸ�� �ਸ ��ਪਤ-ਲ��ਣ ਤ�� �� �ਯਾਤ ਨਹ�� �ਰ ਸ�ਦ� ਹ�"
+msgstr "ਤ�ਸ�� �ਸ ਸ�ਫ਼ਰ ਤ�� �� �ੰਪ�ਰ� ਨਹ�� �ਰ ਸ�ਦ� ਹ�"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:341
+#, c-format
 msgid "You may not export keys with this cipher"
-msgstr "ਤ�ਸ�� ��ਪਤ-ਲ��ਣ ਲ� �� ਨਿਰਯਾਤ ਨਹ�� �ਰ ਸ�ਦ�"
+msgstr "ਤ�ਸ�� ਸ�ਫ਼ਰ ਲ� �� ��ਸਪ�ਰ� ਨਹ�� �ਰ ਸ�ਦ�"
 
-#: ../camel/camel-data-cache.c:135
+#: ../camel/camel-data-cache.c:181
+#, c-format
 msgid "Unable to create cache path"
-msgstr "����� ਮਾਰ� ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ"
+msgstr "��ਸ਼ ਮਾਰ� ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:494
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
-msgstr "����� �ੰਦਰਾ� ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
+msgstr "��ਸ਼ �ੰਦਰਾ� ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
+
+#: ../camel/camel-data-wrapper.c:89
+#, c-format
+#| msgid "No such message available."
+msgid "No stream available"
+msgstr "��� ਸ�ਰ�ਮ �ਪਲੱਬਧ ਨਹ�� ਹ�।"
 
-#: ../camel/camel-db.c:416
+#: ../camel/camel-db.c:464
+#, c-format
 msgid "Insufficient memory"
 msgstr "ਲ���ਦ� ਮ�ਮ�ਰ� ਨਹ��"
 
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
 msgstr ""
-"ਲਾੱ� �ੰਦਰਾ� ਲ� ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s\n"
-"�ਸ ਸਰਵਰ ਤ� ਹ�ਰ �ਾਰਵਾ� ਤ�ਹਾਡ� ਨ�ੱ�ਵਰ�� ਤ� ਮ�� ���ਨ ਤ� ਮ��\n"
+"ਲਾ� �ੰਦਰਾ� ਲ� ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s\n"
+"�ਸ ਸਰਵਰ ਤ� ਹ�ਰ �ਾਰਵਾ� ਤ�ਹਾਡ� ਨ�ੱ�ਵਰ� ਤ� ਮ�� ���ਨ ਤ� ਮ��\n"
 "ਦ�ਹਰਾ� ਨਾ �ਾ ਸ�ਣ��।"
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/camel-disco-diary.c:258
+#: ../camel/providers/imap/camel-imap-journal.c:298
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1449,123 +1651,143 @@ msgstr ""
 "%s\n"
 "�ਸ ਫ�ਲਡਰ ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਮ��-ਸਮ�ਾਲ� ਨਹ�� ��ਤ��� �ਾ ਸ�ਣ����।"
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:299
 msgid "Resynchronizing with server"
 msgstr "ਸਰਵਰ ਨਾਲ ਮ��-ਸਮ�ਾਲ�"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
-msgid "Copy folder content locally for offline operation"
-msgstr "ਬੰਦ �ਾਰਵਾ� ਦ�ਰਾਨ ਫ�ਲਡਰ ਭਾ� ਨ�ਲ �ਰ�"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
 msgid "Downloading new messages for offline mode"
 msgstr "�ਫਲਾ�ਨ ਮ�ਡ ਲ� ਨਵ�� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:379
 #, c-format
 msgid "Preparing folder '%s' for offline"
-msgstr "ਫ�ਲਡਰ '%s' ਨ�ੰ �ਫਲਾ�ਨ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
-
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:216
-#: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imap/camel-imap-store.c:1843
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imap/camel-imap-store.c:3068
-#: ../camel/providers/imapx/camel-imapx-store.c:167
-#: ../camel/providers/imapx/camel-imapx-store.c:620
-#: ../camel/providers/imapx/camel-imapx-store.c:650
+msgstr "ਫ�ਲਡਰ '%s' ਨ�ੰ �ਫਲਾ�ਨ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+msgid "Copy folder content locally for offline operation"
+msgstr "ਬੰਦ �ਾਰਵਾ� ਦ�ਰਾਨ ਫ�ਲਡਰ ਭਾ� ਨ�ਲ �ਰ�"
+
+#: ../camel/camel-disco-store.c:395
+#: ../camel/providers/groupwise/camel-groupwise-store.c:230
+#: ../camel/providers/imap/camel-imap-store.c:876
+#: ../camel/providers/imap/camel-imap-store.c:1720
+#: ../camel/providers/imap/camel-imap-store.c:2178
+#: ../camel/providers/imap/camel-imap-store.c:3022
+#: ../camel/providers/imapx/camel-imapx-store.c:185
+#: ../camel/providers/imapx/camel-imapx-store.c:709
+#: ../camel/providers/imapx/camel-imapx-store.c:772
+#: ../camel/providers/imapx/camel-imapx-store.c:831
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "�ਸ �ਾਰਵਾ� ਨ�ੰ ਸੰਪ�ਰਨ �ਰਨ ਲ� ਤ�ਹਾਨ�ੰ �ਨ-ਲਾ�ਨ ਰਹਿਣਾ �ਾਹ�ਦਾ ਹ�"
 
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr "��� ਵ�ਰਵਾ �ਪਲੱਬਧ ਨਹ��"
+#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
+#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
+#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
+#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
+#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
+#: ../camel/camel-tcp-stream-raw.c:245
+#: ../camel/providers/imapx/camel-imapx-server.c:4639
+#: ../camel/providers/imapx/camel-imapx-server.c:4656
+#: ../camel/providers/nntp/camel-nntp-summary.c:396
+#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:625
+#: ../camel/providers/pop3/camel-pop3-folder.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:466
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+#| msgid "Canceled"
+msgid "Cancelled"
+msgstr "ਰੱਦ ��ਤਾ"
+
+#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:791
+#, c-format
+msgid "Canceled"
+msgstr "ਰੱਦ ��ਤਾ"
 
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "��ਲ� �ਿਰਿ� `%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:853
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s ਤ�� �ਲਤ ਸ�ਨ�ਹਾ ਲ�� ਪ�ਰਾਪਤ ਹ�� ਹ�: %s"
 
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
 msgid "Syncing folders"
 msgstr "ਫ�ਲਡਰ ਸਮ�ਾਲ�"
 
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ਫਿਲ�ਰ ਨ�ੰ ਪਾਰਸ �ਰਨ ਵਿੱ� �ਲਤ�: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ਫਿਲ�ਰ �ਲਾ�ਣ ਵਿੱ� �ਲਤ�: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1240
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "ਸਪ�ਲ ਫ�ਲਡਰ ��ਲਣ ਵਿੱ� �ਲਤ�"
 
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1251
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "�ਾਰ� ਸਪ�ਲ ਫ�ਲਡਰ ��ਲਣ ਤ�� �ਸਮਰੱਥ"
 
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�(%d%%)"
 
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
-msgstr "ਸ�ਨ�ਹਾ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
-
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
 #, c-format
 msgid "Failed on message %d"
 msgstr "ਸ�ਨ�ਹਾ %d ਤ� �ਸਫਲ"
 
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
 msgid "Syncing folder"
 msgstr "ਫ�ਲਡਰ ਸਮ�ਾਲ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
 msgid "Complete"
 msgstr "ਮ��ੰਮਲ"
 
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%2d ਵਿੱ��� %1d ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2d ਵਿੱ��� %1d ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
 msgstr "(system-flag) ਲ� �ਲਤ �ਰ��ਮਿੰ�"
 
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
 msgstr "�ਲਤ �ਰ��ਮਿੰ�(user-tag)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ਫਿਲ�ਰ ��� �ਲਾ�ਣ ਦ�ਰਾਨ �ਲਤ�: %s: %s"
 
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:455
-#: ../camel/camel-folder-search.c:610
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1574,8 +1796,8 @@ msgstr ""
 "��� ਸਮ��ਰਨ ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ ਦਾ ਸ�ਦਾ ਹ�: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:465
-#: ../camel/camel-folder-search.c:620
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1584,73 +1806,77 @@ msgstr ""
 "��� ਸਮ��ਰਨ ਨ�ੰ �ਲਾ�ਣ ਵਿੱ� �ਸਫਲ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:812 ../camel/camel-folder-search.c:854
+#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ਲ� �ੱ� �ੱ�ਲਾ ਬ�ਲ ਨਤ��ਾ �ਾਹ�ਦਾ ਹ�"
 
-#: ../camel/camel-folder-search.c:907
+#: ../camel/camel-folder-search.c:938
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) %s ਵਿੱ� ਮਨ�਼�ਰ ਨਹ�� ਹ�"
 
-#: ../camel/camel-folder-search.c:913 ../camel/camel-folder-search.c:920
+#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ਲ� �ੱ� ਮ�ਲ ਸਤਰ �ਾਹ�ਦ� ਹ�"
 
-#: ../camel/camel-folder-search.c:947
+#: ../camel/camel-folder-search.c:978
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ਲ� �ੱ� ਲ�� ਨਤ��� ਦ� ਲ�� ਹ�"
 
-#: ../camel/camel-folder-search.c:956
+#: ../camel/camel-folder-search.c:987
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ਲ� ਫ�ਲਡਰ ਸ�ੱ� ਦ� ਲ�� ਹ�"
 
-#: ../camel/camel-folder.c:690
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ�: %s ਲ�"
-
-#: ../camel/camel-folder.c:1401
+#: ../camel/camel-folder.c:125
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: ਸਮ��ਰਨ ਨਾਲ ���: %s ਲ�"
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "'%s' ਵਿੱ� ਨਵ�� ਸਪਮ ਸ�ਨ�ਹਾ ਸਿੱ�ਿ� �ਾ ਰਿਹਾ ਹ�"
+msgstr[1] "'%s' ਵਿੱ� ਨਵ�� ਸਪਮ ਸ�ਨ�ਹ� ਸਿੱ�� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-folder.c:1442
+#: ../camel/camel-folder.c:147
 #, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: ਸਮ��ਰਨ �ਿਣਤ�: %s ਲ�"
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "'%s' ਵਿੱ� ਨਵਾ� ਹਮ ਸ�ਨ�ਹਾ ਸਿੱ�ਿ� �ਾ ਰਿਹਾ ਹ�"
+msgstr[1] "'%s' ਵਿੱ� ਨਵ�� ਹਮ ਸ�ਨ�ਹ� ਸਿੱ�� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-folder.c:1483
+#: ../camel/camel-folder.c:171
 #, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: UID ਨਾਲ ���: %s ਲ�"
+#| msgid "Filtering new message(s)"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "'%s' ਵਿੱ� ਨਵਾ� ਸ�ਨ�ਹਾ ਫਿਲ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+msgstr[1] "'%s' ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹ� ਫਿਲ�ਰ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-folder.c:1596
-#: ../camel/providers/local/camel-maildir-folder.c:387
+#: ../camel/camel-folder.c:688
+#: ../camel/providers/local/camel-maildir-folder.c:366
 msgid "Moving messages"
 msgstr "ਸ�ਨ�ਹ� ਭ��� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:690
 msgid "Copying messages"
-msgstr "ਸ�ਨ�ਹਿ�� ਦ� ਨ�ਲ ��ਤ� �ਾ ਰਹ� ਹ�"
+msgstr "ਸ�ਨ�ਹ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-folder.c:1945
-msgid "Learning junk"
-msgstr "�ੰ� ਸਿੱ� ਰਿਹਾ ਹ�"
-
-#: ../camel/camel-folder.c:1963
-msgid "Learning non-junk"
-msgstr "ਨਾ-ਰੱਦ� ਸਿੱ�ਿ� �ਾ ਰਿਹਾ ਹ�"
+#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:1330
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "gpg ਨ�ੰ �ਲਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/camel-folder.c:1983
-msgid "Filtering new message(s)"
-msgstr "ਨਵ�� ਸ�ਨ�ਹ� �ਾਣ� �ਾ ਰਹ� ਹਨ"
+#: ../camel/camel-gpg-context.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:114
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Unknown"
+msgstr "�ਣ�ਾਣ"
 
-#: ../camel/camel-gpg-context.c:760
+#: ../camel/camel-gpg-context.c:770
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1661,15 +1887,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:787
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid ਸੰ��ਤ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ।"
 
-#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
+#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg passphrase ਸੰ��ਤ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ।"
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:848
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1678,7 +1906,7 @@ msgstr ""
 "ਤ�ਹਾਨ�ੰ ਤ�ਹਾਡ� ਸਮਾਰ�-�ਾਰਡ ਲ� �ੱ� PIN �ਣ-ਲਾ� �ਰਨ\n"
 "ਲ� ਲ���ਦਾ ਹ�: \"%s\""
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:852
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1687,281 +1915,265 @@ msgstr ""
 "ਤ�ਹਾਨ�ੰ ਯ��਼ਰ ਲ� ਪਾਸ-ਪ�ਰਸੰ� ਲ���ਦਾ ਹ�, �� �ਿ\n"
 "��ਲ ਸ��: \"%s\""
 
-#: ../camel/camel-gpg-context.c:842
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG ਤ�� '%s' ਤ�� ਨਾ-ਲ���ਦਾ �ਵਾਬ ਪ�ਰਾਪਤ ਹ���"
 
-#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "ਰੱਦ ��ਤਾ ਹ�।"
-
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:905
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "��ਪਤ �� ਨ�ੰ ��ਲਣ ਵਿੱ� �ਸਫਲ: ੩ �ਲਤ ਪਾਸ-ਪ�ਰ� ਦਿੱਤ� ਹਨ।"
+msgstr "��ਪਤ �� ਨ�ੰ ��ਲ�ਹਣ ਵਿੱ� �ਸਫਲ: ੩ �ਲਤ ਪਾਸ-ਪ�ਰ� ਦਿੱਤ� ਹਨ।"
 
-#: ../camel/camel-gpg-context.c:889
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG ਤ�� ਨਾ-ਲ���ਦਾ �ਵਾਬ ਪ�ਰਾਪਤ ਹ���: %s"
 
-#: ../camel/camel-gpg-context.c:988
+#: ../camel/camel-gpg-context.c:1048
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "���ਰਿਪ� ਲ� �ਸਫਲ:��� �ਾ�� ਪ�ਰਾਪਤ �ਰਨ ਨਿਰਧਾਰਿਤ ਨਹ�� ਹ�।"
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
-#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "gpg ਨ�ੰ �ਲਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
+#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+#| msgid "Could not generate signing data: %s"
+msgid "Could not generate signing data: "
+msgstr "ਦਸਤ�ਤ� ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: "
 
-#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "ਦਸਤ�ਤ� ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
-
-#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1646 ../camel/camel-gpg-context.c:1728
-#: ../camel/camel-gpg-context.c:1743 ../camel/camel-gpg-context.c:1859
-#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1969
-#: ../camel/camel-gpg-context.c:2014
+#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
+#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
+#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
 msgid "Failed to execute gpg."
 msgstr "gpg ਨ�ੰ �ਲਾ�ਣ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
-#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
-#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
-#: ../camel/camel-smime-context.c:947
+#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
+#: ../camel/camel-smime-context.c:966
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ਸ�ਨ�ਹਾ ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�� ਹਨ: �ਲਤ ਸ�ਨ�ਹਾ ਫਾਰਮਿ�"
 
-#: ../camel/camel-gpg-context.c:1600
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "ਸ�ਨ�ਹਾ ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�� ਹਨ: �ਰ�� ਫਾ�ਲ ਨਹ�� ਬਣਾ� �ਾ ਸ�� ਹ�: %s"
+#: ../camel/camel-gpg-context.c:1695
+#| msgid "Cannot verify message signature: Incorrect message format"
+msgid "Cannot verify message signature: "
+msgstr "ਸ�ਨ�ਹਾ ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�� ਹਨ: "
 
-#: ../camel/camel-gpg-context.c:1711
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "�ੰ��ਰਿਪ�ਡ ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s"
+#: ../camel/camel-gpg-context.c:1814
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not generate encrypting data: "
+msgstr "�ੰ��ਰਿਪ�ਡ ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: "
 
-#: ../camel/camel-gpg-context.c:1761
+#: ../camel/camel-gpg-context.c:1866
 msgid "This is a digitally encrypted message part"
 msgstr "�ਹ ਸ�ਨ�ਹ� ਦਾ ਡਿ���ਲ ���ਰਿਪ�ਡ ਭਾ� ਹ�"
 
-#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
-#: ../camel/camel-gpg-context.c:1841
+#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1954
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ਸ�ਨ�ਹਾ ਡ�-�ਰਿਪ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: �ਲਤ ਸ�ਨ�ਹਾ ਫਾਰਮਿ�"
 
-#: ../camel/camel-gpg-context.c:1831
+#: ../camel/camel-gpg-context.c:1942
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME ਭਾ� ਡਿ��ਰਿਪ� �ਰਨ ਤ�� �ਸਫਲ: ਪ�ਰ����ਾਲ �ਲਤ�"
 
-#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
 msgid "Encrypted content"
 msgstr "���ਰਿਪ�ਡ ਭਾ�"
 
-#: ../camel/camel-gpg-context.c:1930
-msgid "Unable to parse message content"
-msgstr "ਸ�ਨ�ਹਾ ਭਾ� ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ"
-
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:1999
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
-msgid "Unknown"
-msgstr "�ਣ�ਾਣ"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "ਲਾ�ਿੰ� ਸਹਾ�� ਪਾ�ਪ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "ਲਾ�ਿੰ� ਸਹਾ�� ਨ�ੰ ਭਾ� ਵਿੱ� ਵੰਡਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s"
 
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "ਲਾੱ� '%s' ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: ਲਾੱ�-ਸਹਾ�� ਨਾਲ ਪ�ਰ����ਾਲ �ਲਤ�"
 
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "ਲਾੱ� '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s ਲ� ਫਾ�ਲ ਤ� ਲਾੱ� ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "%s ਤ� ਫਾ�ਲ ਲਾੱ� ਪ�ਰਾਪਤ �ਰਨ ਦ�ਰਾਨ ਸਮਾ�-�ੰਤਰਾਲ ਸਮਾਪਤ। �ਿਰਪਾ �ਰ�� ਮ��-��ਸ਼ਿਸ �ਰ�।"
+#| msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr "%s ਤ� ਫਾ�ਲ ਲਾ� ਪ�ਰਾਪਤ �ਰਨ ਦ�ਰਾਨ ਸਮਾ�-�ੰਤਰਾਲ ਸਮਾਪਤ। ਬਾ�ਦ '� ��ਸ਼ਿਸ਼ �ਰ�।"
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2) ਦ� ਵਰਤ�� �ਰ�� ਲਾੱ� ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ: %s"
+msgstr "fcntl(2) ਦ� ਵਰਤ�� �ਰ�� ਲਾ� ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2) ਦ� ਵਰਤ�� �ਰ�� ਲਾੱ� ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�: %s"
+msgstr "flock(2) ਦ� ਵਰਤ�� �ਰ�� ਲਾ� ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�: %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
-msgstr "ਪੱਤਰ ਫਾ�ਲ %s ਨ�ੰ �ਾ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
+msgstr "ਮ�ਲ ਫਾ�ਲ %s ਨ�ੰ �ਾ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
 #: ../camel/camel-movemail.c:119
 #, c-format
 msgid "Could not open mail file %s: %s"
-msgstr "ਪੱਤਰ ਫਾ�ਲ %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"
+msgstr "�ਰ�� ਮ�ਲ ਫਾ�ਲ %s ਨ�ੰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "�ਰ�� ਫਾ�ਲ %s ਵਿੱ� ਪੱਤਰ ਸੰਭਾਲਣ ਵਿੱ� �ਸਫਲ: %s"
+msgstr "�ਰ�� ਫਾ�ਲ %s ਵਿੱ� ਮ�ਲ ਸੰਭਾਲਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "ਪਾ�ਪ ਬਣਾ�� �ਾ ਸ�ਿ� ਹ�: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "ਵੰਡਿ� ਨਹ� �ਾ ਸ�ਿ� ਹ�: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail �ਾਰ� �ਸਫਲ: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(�ਣਪ�ਾਤ� �ਲਤ�)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "�ਲਤ� ਪੱਤਰ ਫਾ�ਲ ਨ�ੰ ਪ�ਨ ਵਿੱ�: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "�ਰ�� ਪੱਤਰ ਫਾ�ਲ ਤ� ਲਿ�ਣ ਵਿੱ� �ਲਤ�: %s"
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "�ਰ�� ਪੱਤਰ ਫਾ�ਲ ਨ�ੰ ਨ�ਲ �ਰਨ ਵਿੱ� �ਲਤ�: %s"
 
-#: ../camel/camel-multipart-signed.c:592
-msgid "parse error"
-msgstr "ਪਾਰਸ �ਲਤ�"
+#: ../camel/camel-multipart-signed.c:285
+#, c-format
+#| msgid "No description available"
+msgid "No content available"
+msgstr "��� ਸਮੱ�ਰ� �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:678
-#: ../camel/camel-net-utils.c:817
-#: ../camel/providers/pop3/camel-pop3-store.c:478
-#: ../camel/providers/pop3/camel-pop3-store.c:578
-msgid "Canceled"
-msgstr "ਰੱਦ ��ਤਾ"
+#: ../camel/camel-multipart-signed.c:293
+#, c-format
+#| msgid "No description available"
+msgid "No signature available"
+msgstr "��� ਦਸਤ�ਤ �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/camel-net-utils.c:523
-msgid "cannot create thread"
-msgstr "ਥਰਿੱਡ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
+#: ../camel/camel-multipart-signed.c:612
+#, c-format
+msgid "parse error"
+msgstr "ਪਾਰਸ �ਲਤ�"
 
-#: ../camel/camel-net-utils.c:682
+#: ../camel/camel-net-utils.c:693
 #, c-format
 msgid "Resolving: %s"
 msgstr "ਹੱਲ ��ਤਾ �ਾ ਰਿਹਾ ਹ�: %s"
 
-#: ../camel/camel-net-utils.c:704
+#: ../camel/camel-net-utils.c:715
 msgid "Host lookup failed"
 msgstr "ਹ�ਸ� ��� �ਸਫਲ"
 
-#: ../camel/camel-net-utils.c:706
+#: ../camel/camel-net-utils.c:719
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "ਹ�ਸ� ��� �ਸਫਲ: %s: %s"
 
-#: ../camel/camel-net-utils.c:821
+#: ../camel/camel-net-utils.c:842
 msgid "Resolving address"
 msgstr "�ਡਰ�ੱਸ ���ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-net-utils.c:841
+#: ../camel/camel-net-utils.c:862
 msgid "Name lookup failed"
 msgstr "ਨਾ� ��� �ਸਫਲ"
 
-#: ../camel/camel-net-utils.c:844
+#: ../camel/camel-net-utils.c:867
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "ਨਾ� ��� �ਸਫਲ: %s"
 
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:169
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ਫ�ਲਡਰ `%s' ਵਿੱ� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਡਿਸ� ਤ� ਲਿ�ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਲ� �ਫਲਾ�ਨ �ਰਨਲ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "ਫਰ�� ਫ�ਲਡਰ �ਮ�ਲ �ਪਲੱਬਧ �ਰਤਾ"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "ਹ�ਰ ਫ�ਲਡਰ ਸਮ�ਹ ਦ� ਮ�ਲ ਸਵਾਲ ਦ� ਤ�ਰ ਤ� ਪ�ਨ ਲ�"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s ਨ�ੰ ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: �ਸ ਸਿਸ�ਮ ਤ� ਮ�ਡ��ਲ ਲ�ਡਿੰ� ਸਹਾ� ਨਹ�� ਹ�।"
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s ਨ�ੰ ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ਨ�ੰ ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਸ ਮ�ਡ��ਲ ਵਿੱ� ��� ਸ਼�ਰ��ਤ� ��ਡ ਨਹ�� ਹ�।"
 
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ਪਰ����ਾਲ '%s' ਲ� ��� �ਪਲੱਬਧ �ਰਤਾ ਨਹ�� ਹ�"
 
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "��ੰਮਨਾਮ"
 
-#: ../camel/camel-sasl-anonymous.c:38
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "�ਸ ��ਣ ਨਾਲ ਸਰਵਰ ਨਾਲ �ਣ�ਾਣ ਦ� ਤ�ਰ ਤ� ਲਾੱ��ਨ ��ਤਾ �ਾਵ��ਾ।"
 
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:69
+#, c-format
 msgid "Authentication failed."
 msgstr "ਪ�ਰਮਾਣਿ�ਤਾ �ਸਫਲ।"
 
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:80
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1970,7 +2182,7 @@ msgstr ""
 "�ਲਤ �ਮ�ਲ ਸਿਰਨਾਵ� �ਾ�� �ਾਣ�ਾਰ�:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:94
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1979,7 +2191,7 @@ msgstr ""
 "�ਲਤ �ਪਾਰਦਰਸ਼� �ਾ�� �ਾਣ�ਾਰ�:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:108
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1988,21 +2200,21 @@ msgstr ""
 "�ਲਤ �ਾ�� �ਾਣ�ਾਰ�:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:47
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ਸ�ਰੱ�ਿ�ਤ CRAM-MD5 ਪਾਸਵਰਡ ਨਾਲ ���ਦਾ ਹ�, ���ਰ ਸਰਵਰ ਸਹਾ� ਹ��� ਤਾ�।"
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2010,67 +2222,73 @@ msgstr ""
 "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ਸ�ਰੱ�ਿ�ਤ DIGEST-MD5 ਪਾਸਵਰਡ ਨਾਲ ���ਦਾ ਹ�, ���ਰ ਸਰਵਰ ਸਹਾ� ਹ��� "
 "ਤਾ�।"
 
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:818
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ਸਰਵਰ ��ਣ�ਤ� ਬਹ�ਤ ਲੰਮ� ਹ� (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:829
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "ਸਰਵਰ �ਾ�� �ਲਤ ਹ�\n"
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:837
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ਸਰਵਰ ��ਣ�ਤ� ਵਿੱ� \"ਸ�ਰੱ�ਿ� ਦਾ ��ਣ\" ���ਨ �ਲਤ ਹ�"
 
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:869
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ਸਰਵਰ �ਵਾਬ ਵਿੱ� ਪਰਮਾਣਿਤ ਡਾ�ਾ ਨਹ�� ਹ�"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:890
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ਸਰਵਰ �ਵਾਬ ਵਿੱ� ਨਾ-ਸੰਪ�ਰਨ ਪ�ਰਮਾਣਿਤ ਡਾ�ਾ ਹ�"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:903
+#, c-format
 msgid "Server response does not match"
 msgstr "ਸਰਵਰ �ਵਾਬ ਮ�ਲ ਨਹ�� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-sasl-gssapi.c:72
+#: ../camel/camel-sasl-gssapi.c:80
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:74
+#: ../camel/camel-sasl-gssapi.c:82
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ��ਬ�ਰਸ ੫ ਪ�ਰਮਾਣ�ਿਤਾ ਵਰਤ �� ਸਰਵਰ ਨਾਲ �����ਾ।"
 
-#: ../camel/camel-sasl-gssapi.c:168
+#: ../camel/camel-sasl-gssapi.c:119
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "ਨਿਰਧਾਰਿਤ ਢੰ� ਪ�ਰਮਾਣ-ਪੱਤਰ ਦ��ਰਾ ਸਹਾ�� ਨਹ�� ਹ� �ਾ� �ਹ ਸਥਾਪਨ ਦ��ਰਾ ਪ�ਾਣਿ� ਨਹ�� �ਿ�।"
 
-#: ../camel/camel-sasl-gssapi.c:173
+#: ../camel/camel-sasl-gssapi.c:124
 msgid "The provided target_name parameter was ill-formed."
 msgstr "�ਪਲੱਬਧ ਨਿਯਤ ਨਾ� ਪ�ਰਾਮ��ਰ �ਲਤ ਢਾ��� ਵਿੱ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:127
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "�ਪਲੱਬਧ ਨਿਯਤ ਨਾ� ਪ�ਰਾਮ��ਰ �ਲਤ ਹ� �ਾ� ਨਾ ਸਹਾ�� �ਿਸਮ ਦਾ ਨਾ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:131
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr "input_token input_chan_bindings ਪ�ਰਾਮ��ਰ ਦ��ਰਾ ਨਿਰਧਾਰਿਤ ਤ�� ਵੱ�ਰਾ ��ਨਲ ਵਰਤ ਰਿਹਾ ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:136
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token ਵਿੱ� �ਲਤ ਦਸਤ�ਤ ਹਨ �ਾ� ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�ਦ� ਹਨ।"
 
-#: ../camel/camel-sasl-gssapi.c:189
+#: ../camel/camel-sasl-gssapi.c:140
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2078,49 +2296,52 @@ msgstr ""
 "�ਪਲੱਬਧ ਪ�ਰਮਾਣ-ਪੱਤਰ ਪ�ਰਸੰ� ਸ਼�ਰ��ਤ ਲ� ਠ�� ਨਹ�� ਹਨ, �ਾ� ਪ�ਰਮਾਣ-ਪੱਤਰ ਸੰਭਾਲ �ਰਤਾ �ਿਸ� �ਾ�� "
 "ਹਵਾਲ� ਲ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:145
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "�ਪਲੱਬਧ �ਰਵਾ�� ਪ�ਰਸੰ� ਸਹ�� ਪ�ਰਸੰ� ਦਾ ਹਵਾਲਾ ਨਹ�� ਦ� ਰਿਹਾ ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:197
+#: ../camel/camel-sasl-gssapi.c:148
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token ਤ� ��ਸਾਰਤਾ �ਾ�� �ਸਫਲ ਰਹ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:200
+#: ../camel/camel-sasl-gssapi.c:151
 msgid "The consistency checks performed on the credential failed."
 msgstr "ਪ�ਰਮਾਣ-ਪੱਤਰ ਦ� ਪ�ਰਮਾਣ�ਿਤਾ �ਾ�� �ਸਫਲ ਰਹ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:203
+#: ../camel/camel-sasl-gssapi.c:154
 msgid "The referenced credentials have expired."
 msgstr "ਹਵਾਲਾ ਪ�ਰਮਾਣ-ਪੱਤਰ ਦ� ਮਿ�ਦ ਸਮਾਪਤ ਹ� ��ੱ�� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
-#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../camel/camel-sasl-gssapi.c:160 ../camel/camel-sasl-gssapi.c:296
+#: ../camel/camel-sasl-gssapi.c:340 ../camel/camel-sasl-gssapi.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:1171
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "ਸਰਵਰ ਤ�� �ਲਤ �ਵਾਬ ਮਿਲਿ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:383
+#: ../camel/camel-sasl-gssapi.c:369
+#, c-format
 msgid "Unsupported security layer."
 msgstr "ਨਾ ਸਹਾ�� ਸ�ਰੱ�ਿ� ਪਰਤ।"
 
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
 msgid "Login"
 msgstr "ਲਾ��ਨ"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
 msgid "This option will connect to the server using a simple password."
 msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਨਾਲ ������।"
 
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:94
+#, c-format
 msgid "Unknown authentication state."
 msgstr "�ਣਪ�ਾਤ� ਪ�ਰਮਾਣ�ਿਤਾ ਸਥਿਤ�।"
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:41
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:43
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2128,51 +2349,53 @@ msgstr ""
 "�ਹ ��ਣ Windows �ਧਰਿਤ ਸਰਵਰ ਨਾਲ NTLM / Secure Password Authentication ਵਰਤ �� "
 "������।"
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "SMTP ਤ�� ਪਹਿਲਾ� POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "�ਹ ��ਣ POP ��ਨ��ਸ਼ਨ ਪ�ਰਮਾਣ�ਿਤਾ ਨ�ੰ SMTP ਤ�� ਪਹਿਲਾ� �ਾ�����"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source URI"
 msgstr "POP ਸਰ�ਤ URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
+#: ../camel/camel-sasl-popb4smtp.c:89
+#, c-format
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "�ੱ� ਨਾ-�ਾਣ� �ਰਾ�ਸਪ�ਰ� ਰਾਹ� POP SMTP ਤ�� ਪਹਿਲਾ�"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:97
+#, c-format
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "�ੱ� ਨਾ-ਪ�ਪ �ਰਾ�ਸਪ�ਰ� ਰਾਹ� POP SMTP ਤ�� ਪਹਿਲਾ�"
 
-#: ../camel/camel-search-private.c:147
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ਨਿਯਮਿਤ ਸਮ��ਰਨ �ੰਪਾ�ਲ�ਸ਼ਨ �ਸਫਲ: %s: %s"
 
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:88
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' ਨ�ੰ ਯ��਼ਰ ਭਾ� ਲ���ਦਾ ਹ�"
 
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:92
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' ਨ�ੰ ਹ�ਸ� ਭਾ� ਲ���ਦਾ ਹ�"
 
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:96
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' ਨ�ੰ ਰਸਤਾ ਭਾ� ਲ���ਦਾ ਹ�"
 
-#: ../camel/camel-session.c:305
+#: ../camel/camel-session.c:261
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2181,254 +2404,308 @@ msgstr ""
 "ਡਾ�ਰ���ਰ� %s ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ:\n"
 "%s"
 
-#: ../camel/camel-session.c:484
+#: ../camel/camel-session.c:758
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ਹ�ਸ� %3$s ਲ� %2$s ਵਾਸਤ� %1$s ਪਾਸਵਰਡ ਦਿ� ��।"
 
-#: ../camel/camel-session.c:832
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "��ਮਲ ਸ਼�ਸ਼ਨ ਸ�ਨ�ਹਾ �ੱ�� ਭ��ਣ ਲ� ਸਹਾ�� ਨਹ�� ਹ�"
-
-#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' ਲ� ਸਰ��ਫਿ��� ਲੱਭਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:453
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
 msgstr "CMS ਸ�ਨ�ਹਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
 msgstr "CMS ਦਸਤ�ਤ� ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ਦਸਤ�ਤ� ਡਾ�ਾ ਨੱਥ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
 msgstr "CMS ਡਾ�ਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
 msgstr "CMS ਦਸਤ�ਤ� �ਾਣ�ਾਰ� ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:483
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
 msgstr "ਸਰ��ਫਿ��� ਲ�� ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ਦਸਤ�ਤ� ਸਮਾ� ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ਲ� ���ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਮ���ਦ ਨਹ��"
 
-#: ../camel/camel-smime-context.c:530
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ��ਣ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:535
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ਵਿਸ਼�ਸਤਾ ਨ�ੰ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../camel/camel-smime-context.c:540
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
 msgstr "�ੰ��ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਸ਼ਾਮਿਲ ਨਹ�� ਹ� ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:546
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
 msgstr "CMS ਦਸਤ�ਤ� �ਾਣ�ਾਰ� ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
-msgid "Cannot create encoder context"
-msgstr "���ਡਰ ਪ�ਰਸੰ� ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�"
-
-#: ../camel/camel-smime-context.c:622
-msgid "Failed to add data to CMS encoder"
-msgstr "CMS ���ਡਰ ਵਿੱ� ਡਾ�ਾ ਸ਼ਾਮਿਲ �ਰਨ ਤ�� �ਸਮਰੱਥ"
-
-#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
-msgid "Failed to encode data"
-msgstr "ਡਾ�ਾ ���ਡਿ� �ਰਨ ਵਿੱ� �ਸਫਲ"
-
-#: ../camel/camel-smime-context.c:700
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "ਨਾ-�ਾ��ਿ�"
 
-#: ../camel/camel-smime-context.c:702
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "ਵਧ�� ਦਸਤ�ਤ"
 
-#: ../camel/camel-smime-context.c:704
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "�ਲਤ ਦਸਤ�ਤ"
 
-#: ../camel/camel-smime-context.c:706
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "ਤਬਦ�ਲ� ਦ�ਰਾਨ ਪ�ਰਸੰ� ਵਿ�� �ਿ� �ਾ� ਸ���ਤ ��ਤਾ "
 
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "ਦਸਤ�ਤ� ਸਰ��ਫਿ��� ਨਹ�� ਲੱਭਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:710
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "ਦਸਤ�ਤ� ਸਰ��ਫਿ��� ਭਰ�ਸ�ਯ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-smime-context.c:712
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "�ਣ�ਾਣਾ ਦਸਤ�ਤ� �ਲ��ਰਿਥਮ"
 
-#: ../camel/camel-smime-context.c:714
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "ਦਸਤ�ਤ� �ਲ��ਰਿੱਥਮ ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-smime-context.c:716
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "ਨਿ�ਾਰਾ ਦਸਤ�ਤ"
 
-#: ../camel/camel-smime-context.c:718
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "ਪ�ਰ�ਸ��ਸਿੰ� �ਲਤ�"
 
-#: ../camel/camel-smime-context.c:772
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "ਦਸਤ�ਤ ਵਿੱ� ਡਾ�ਾ ਦਸਤ�ਤ� ਨਹ��"
 
-#: ../camel/camel-smime-context.c:777
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "ਸੰ��ਪ ਲਪ��� ਡਾ�� ਤ�� ਬਿਨਾ� ਹ�"
 
-#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "ਸੰ��ਪ ਨ�ੰ ਮਿਣਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "ਸ�ਨ�ਹਾ ਸੰ��ਪ ਨ�ੰ ਨਿਰਧਾਰਿਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "ਸਰ��ਫਿ��� �ਯਾਤ �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:836
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ਸ�ਨ�ਹਾ ਹ� ਸਰ��ਫਿ��� ਹ�, ਸਰ��ਫਿ��� �ਾ��� ਨਹ�� ਹਨ"
 
-#: ../camel/camel-smime-context.c:839
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "ਸਰ��ਫਿ��� ਸਿਰ� ਸ�ਨ�ਹਾ, ਸਰ��ਫਿ��� �ਯਾਤ �ਤ� �ਾ�� ਹ� ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "ਦਸਤ�ਤ� ਸੰ��ਪ ਨਹ�� ਲੱਭਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:859
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ਦਸਤ�ਤ�: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
+#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+msgid "Cannot create encoder context"
+msgstr "���ਡਰ ਪ�ਰਸੰ� ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�"
+
+#: ../camel/camel-smime-context.c:838
+msgid "Failed to add data to CMS encoder"
+msgstr "CMS ���ਡਰ ਵਿੱ� ਡਾ�ਾ ਸ਼ਾਮਿਲ �ਰਨ ਤ�� �ਸਮਰੱਥ"
+
+#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+msgid "Failed to encode data"
+msgstr "ਡਾ�ਾ ���ਡਿ� �ਰਨ ਵਿੱ� �ਸਫਲ"
+
+#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
 msgid "Decoder failed"
 msgstr "ਡ���ਡਰ �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1049
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "�ਮ ਬਲ� ���ਰਿਪਸ਼ਨ �ਲ��ਰਿਥਮ ਨ�ੰ ਲੱਭਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:1027
+#: ../camel/camel-smime-context.c:1057
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "���ਰਿਪਸ਼ਨ ਬਲ� �� ਲ� �ਾਰ� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:1038
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot create CMS Message"
 msgstr "CMS ਸ�ਨ�ਹਾ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:1044
+#: ../camel/camel-smime-context.c:1074
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS ਲਿਫਾਫਾ ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS ਲਿਫਾਫਾ ਡਾ�ਾ ਨੱਥ� ਨਹ�� ਹ� ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot attach CMS data object"
 msgstr "CMS ਡਾ�ਾ ��ਾ� ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS ਸ�ਨ�ਹ� �ਾਣ�ਾਰ� ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:1070
+#: ../camel/camel-smime-context.c:1100
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS ਸ�ਨ�ਹ� �ਾਣ�ਾਰ� ਸ਼ਾਮਲ ਨਹ�� ��ਤ� �ਾ ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1125
 msgid "Failed to add data to encoder"
 msgstr "ਡਾ�ਾ ਨ�ੰ ���ਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:1191
+#: ../camel/camel-smime-context.c:1227
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: ��� ���ਰਿਪ�ਡ ਪ�ਰਸੰ� ਨਹ�� ਲੱਭਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:1219
-msgid "import keys: unimplemented"
-msgstr "�ਯਾਤ ��: ਨਾ-ਸਥਾਪਿਤ"
-
-#: ../camel/camel-smime-context.c:1227
-msgid "export keys: unimplemented"
-msgstr "ਨਿਰਯਾਤ ��: ਨਾ-ਸਥਾਪਿਤ"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ਫ�ਲਡਰ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਸ ਸੰਭਾਲ ਤ� �ਲਤ �ਾਰਵਾ�"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:444
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ਫ�ਲਡਰ '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: ਫ�ਲਡਰ ਮ���ਦ ਹ�"
 
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਸ ਸੰਭਾਲ ਤ� �ਲਤ �ਾਰਵਾ�"
-
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:543
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ %s: ਮ���ਦ ਹ�"
 
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:224
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ਫ�ਲਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: �ਲਤ �ਾਰਵਾ�"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ਫ�ਲਡਰ ਦਾ ਨਾ� ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: %s: �ਲਤ �ਾਰਵਾ�"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-store.c:1128 ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ਰੱਦ�"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:1131 ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "�ੰ�"
 
-#: ../camel/camel-tcp-stream-ssl.c:870
+#: ../camel/camel-tcp-stream-raw.c:804
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "ਪਰਾ�ਸ� ਹ�ਸ� SOCKS5 ਲ� ਸਹਾ�� ਨਹ��"
+
+#: ../camel/camel-tcp-stream-raw.c:810
+#, c-format
+#| msgid "No support for authentication type %s"
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "ਢ�ੱ�ਵ� ਪਰਮਾਣ�ਿਤਾ �ਿਸਮ ਨਹ�� ਲੱਭ� �ਾ ਸ��: code 0x%x"
+
+#: ../camel/camel-tcp-stream-raw.c:822
+msgid "General SOCKS server failure"
+msgstr "�ਮ SOCKS ਸਰਵਰ ਫ�ਲ�ਹ ਹ�"
+
+#: ../camel/camel-tcp-stream-raw.c:823
+msgid "SOCKS server's rules do not allow connection"
+msgstr "SOCKS ਸਰਵਰ ਦ� ਨਿਯਮ ��ਨ��ਸ਼ਨ ਮਨ�਼�ਰ ਨਹ�� �ਰਦ�"
+
+#: ../camel/camel-tcp-stream-raw.c:824
+msgid "Network is unreachable from SOCKS server"
+msgstr "ਨ�ੱ�ਵਰ� SOCKS ਸਰਵਰ ਤ�� ਪਹ�ੰ�ਯ�� ਨਹ�� ਹ�"
+
+#: ../camel/camel-tcp-stream-raw.c:825
+msgid "Host is unreachable from SOCKS server"
+msgstr "ਹ�ਸ� SOCKS ਸਰਵਰ ਤ�� ਪਹ�ੰ�ਯ�� ਨਹ�� ਹ�"
+
+#: ../camel/camel-tcp-stream-raw.c:826
+#| msgid "Connection canceled"
+msgid "Connection refused"
+msgstr "��ਨ��ਸ਼ਨ ਤ�� �ਨ�ਾਰ ��ਤਾ।"
+
+#: ../camel/camel-tcp-stream-raw.c:827
+msgid "Time-to-live expired"
+msgstr "�ਾ�ਮ-��-ਲਿਵ �ਤਮ"
+
+#: ../camel/camel-tcp-stream-raw.c:828
+#| msgid "STLS not supported by server"
+msgid "Command not supported by SOCKS server"
+msgstr "SOCKS ਸਰਵਰ ਵਲ�� �ਮਾ�ਡ ਸਹਾ�� ਨਹ��"
+
+#: ../camel/camel-tcp-stream-raw.c:829
+#| msgid "STLS not supported by server"
+msgid "Address type not supported by SOCKS server"
+msgstr "SOCKS ਸਰਵਰ ਵਲ�� �ਡਰ�ੱਸ �ਿਸਮ ਸਹਾ�� ਨਹ��"
+
+#: ../camel/camel-tcp-stream-raw.c:830
+#| msgid "Unknown error: %s"
+msgid "Unknown error from SOCKS server"
+msgstr "SOCKS ਸਰਵਰ ਤ�� �ਣ�ਾਣ �ਲਤ�"
+
+#: ../camel/camel-tcp-stream-raw.c:860
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "SOCKS ਸਰਵਰ ਤ�� �ਣ�ਾਣ �ਡਰ�ਸ �ਿਸਮ ਮਿਲ�"
+
+#: ../camel/camel-tcp-stream-raw.c:877
+#, c-format
+#| msgid "Invalid response from server"
+msgid "Incomplete reply from SOCKS server"
+msgstr "SOCKS ਸਰਵਰ ਤ�� �ਧ�ਰਾ �ਵਾਬ"
+
+#: ../camel/camel-tcp-stream-raw.c:892
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "ਹ�ਸ�-ਨਾ� ਬਹ�ਤ ਲੰਮਾ ਹ� (ਵੱਧ�-ਵੱਧ ੨੫੫ �ੱ�ਰ)"
+
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:924 ../camel/camel-tcp-stream-raw.c:934
+#, c-format
+#| msgid "Invalid response from server"
+msgid "Invalid reply from proxy server"
+msgstr "ਪਰਾ�ਸ� ਸਰਵਰ ਤ�� �ਲਤ �ਵਾਬ"
+
+#: ../camel/camel-tcp-stream-ssl.c:457
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2441,16 +2718,16 @@ msgstr ""
 "ਫਿੰ�ਰ ਪ�ਰਿੰ�:       %s\n"
 "ਦਸਤ�ਤ:         %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:463
 msgid "GOOD"
 msgstr "ਵਧ��"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:463
 msgid "BAD"
 msgstr "����"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:467
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2465,7 +2742,7 @@ msgstr ""
 "\n"
 "�� ਤ�ਸ�� ਸਵ��ਾਰ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../camel/camel-tcp-stream-ssl.c:924
+#: ../camel/camel-tcp-stream-ssl.c:511
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2474,7 +2751,7 @@ msgstr ""
 "ਸਰ��ਫਿ��� ਸਮੱਸਿ�: %s\n"
 "�ਾਰ� �ਰਤਾ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:976
+#: ../camel/camel-tcp-stream-ssl.c:563
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2483,7 +2760,7 @@ msgstr ""
 "�ਲਤ ਸਰ��ਫਿ��� ਡ�ਮ�ਨ: %s\n"
 "�ਾਰ� �ਰਤਾ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:994
+#: ../camel/camel-tcp-stream-ssl.c:581
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2492,7 +2769,7 @@ msgstr ""
 "ਸਰ��ਫਿ��� ਦ� ਮਿ�ਦ ਪ�ੱ��: %s\n"
 "�ਾਰ� �ਰਤਾ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1011
+#: ../camel/camel-tcp-stream-ssl.c:598
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2501,49 +2778,51 @@ msgstr ""
 "ਸਰ��ਫਿ���: %s\n"
 "Issuer: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:314
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "URL '%s' ਨ�ੰ ਪਾਰਸ ਨਹ� ��ਤਾ �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-vee-folder.c:577
+#: ../camel/camel-vee-folder.c:1044
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "'%s' ਨ�ੰ ��ਰਮਬੱਧ �ਰਨ ਵਿੱ� �ਲਤ�: %s"
+#| msgid "Error storing '%s': %s"
+msgid "Error storing '%s': "
+msgstr "'%s' ਸ��ਰ �ਰਨ ਦ�ਰਾਨ �ਲਤ�: "
 
-#: ../camel/camel-vee-folder.c:654
+#: ../camel/camel-vee-folder.c:1117
 #, c-format
 msgid "No such message %s in %s"
-msgstr "%2$s ਵਿੱ� %1$s ਤਰਾ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
+msgstr "%2$s ਵਿੱ� %1$s ਤਰ�ਹਾ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
 
-#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
+#: ../camel/camel-vee-folder.c:1133 ../camel/camel-vee-folder.c:1148
+#, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ਫਰ�� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨਹਿ�� ਨ�ੰ �ਾਪ� �ਾ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:417
 msgid "Unmatched"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../camel/camel-vee-store.c:400
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: �ਸਤਰਾ� ਦਾ ��� ਫ�ਲਡਰ ਨਹ�� ਹ�"
-
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:223
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ਫ�ਲਡਰ ਦਾ ਨਾ� ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: �ਸ ਤਰਾ� ��� ਫ�ਲਡਰ ਨਹ�� ਹ�"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vee-store.c:289
+#, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: �ਸਤਰਾ� ਦਾ ��� ਫ�ਲਡਰ ਨਹ�� ਹ�"
+
+#: ../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:137
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2552,241 +2831,229 @@ msgstr ""
 "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s\n"
 "  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:293
-#: ../camel/providers/local/camel-maildir-folder.c:401
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:226
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
+#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:380
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/local/camel-mh-folder.c:215
 msgid "No such message"
 msgstr "�ੰ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ��"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:173
-#: ../camel/providers/nntp/camel-nntp-folder.c:248
-#: ../camel/providers/nntp/camel-nntp-folder.c:408
-#: ../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:156
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../camel/providers/nntp/camel-nntp-folder.c:164
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
+#: ../camel/providers/nntp/camel-nntp-folder.c:244
+#: ../camel/providers/nntp/camel-nntp-folder.c:337
+#: ../camel/providers/pop3/camel-pop3-folder.c:714
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "ਸ�ਨ�ਹਾ %s ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get message %s: "
+msgstr "%s ਸ�ਨ�ਹਾ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ: "
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2506
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2645
+#, c-format
 msgid "This message is not available in offline mode."
 msgstr "�ਹ ਸ�ਨ�ਹਾ �ਫਲਾ�ਨ ਵਿੱ� �ਪਲੱਬਧ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2009
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2060
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:203
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2109
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2163
+#, c-format
 msgid "Could not get message"
 msgstr "����� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:982
-#: ../camel/providers/imap/camel-imap-folder.c:295
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1038
+#: ../camel/providers/imap/camel-imap-folder.c:376
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ਲ� ਸੰ��ਪ ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1055
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1112
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "ਹ�ਾ� �� ਸ�ਨ�ਹ� %s ਲ� ��� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1330
-msgid "Trash Folder Full. Please Empty."
-msgstr "ਰੱਦ� ਫ�ਲਡਰ ਭਰ �ਿ� ਹ�। �ਾਲ� �ਰ� ��।"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1564
-#: ../camel/providers/groupwise/camel-groupwise-store.c:626
-#: ../camel/providers/groupwise/camel-groupwise-store.c:756
-#: ../camel/providers/imap/camel-imap-folder.c:3429
-#: ../camel/providers/imap/camel-imap-folder.c:3505
-#: ../camel/providers/imapx/camel-imapx-server.c:2968
-#: ../camel/providers/imapx/camel-imapx-server.c:3054
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1637
+#: ../camel/providers/groupwise/camel-groupwise-store.c:654
+#: ../camel/providers/groupwise/camel-groupwise-store.c:779
+#: ../camel/providers/imap/camel-imap-folder.c:3814
+#: ../camel/providers/imap/camel-imap-folder.c:3892
+#: ../camel/providers/imapx/camel-imapx-server.c:3704
+#: ../camel/providers/imapx/camel-imapx-server.c:3828
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s ਵਿੱ� ਨਵ�� ਸ�ਨਹਿ�� ਲ� ਸੰ��ਪ �ਾਣ�ਾਰ� ਲ� �ਾ ਰਹ� ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2403
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2475
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2525
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਲ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦਾ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2391
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2511
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ਸ�ਨ�ਹਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "ਫ�ਲਡਰ ਬ�ਸਾ %s ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "�ਫਲਾ�ਨ ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: ����� �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "�ਫਲਾ�ਨ ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+#| msgid "Cannot append message in offline mode: %s"
+msgid "Cannot append message in offline mode: "
+msgstr "�ਫਲਾ�ਨ ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: "
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
 msgstr "ਨਵ�� ਮ�ਲ ਲ� ��ੱ� ��ਤ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/hula/camel-hula-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
 msgid "C_heck for new messages in all folders"
 msgstr "ਸਭ ਫ�ਲਡਰਾ� ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� �ਾ��(_h)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
-#: ../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:73
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "��ਣ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "�ਹ ਸਰਵਰ ਦ� �ਨ-ਬਾ�ਸ ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹਿ�� �ੱਤ� ਫਿਲ�ਰ ਲਾ�� �ਰ�(_A)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ੰ� ਸਮੱ�ਰ� ਲ� �ਾ���(_u)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "��ਣ-ਬ�ਸਾ ਫ�ਲਡਰ ਵਿੱ� �ੰ� ਸ�ਨ�ਹਿ�� ਲ� ��ੱ� �ਰ�(_B)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "��ਾ��� ਲ��ਲ� ���ਮ��ਿ� ਹ� ਸਿ�ਰਾਨਾ��਼ �ਰ�(_z)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "SOAP ਸ��ਿੰ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "ਪ�ਸ� �ਫਿਸ ��ੰ� SOA_P ਪ�ਰ�:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
 msgstr "Novell GroupWise ਸਰਵਰ ਵਰਤਣ ਲ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
-#: ../camel/providers/hula/camel-hula-provider.c:93
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:105
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
 msgstr "ਪਾਸਵਰਡ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
 msgid "This option will connect to the GroupWise server using a plaintext password."
 msgstr "�ਸ ��ਣ ਨਾਲ GroupWise ਸਰਵਰ ਨਾਲ �ੱ� ਸਧਾਰਨ ਪਾਠ ਪਾਸਵਰਡ ਰਾਹ�� ���ਿ� �ਾਵ��ਾ।"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
 msgid "Host or user not available in url"
 msgstr "url ਵਿੱ� ਹ�ਸ� �ਾ� ਯ��਼ਰ �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:197
-#: ../camel/providers/imap/camel-imap-store.c:1356
-#: ../camel/providers/imapx/camel-imapx-server.c:2302
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1188
+#: ../camel/providers/imapx/camel-imapx-server.c:2958
+#, c-format
 msgid "You did not enter a password."
 msgstr "ਤ�ਸ�� ਪਾਸਵਰਡ ਨਹ�� ਭਰਿ� ਹ�।"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:312
+#: ../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:533
-#: ../camel/providers/imap/camel-imap-store.c:1879
-#: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imapx/camel-imapx-store.c:331
+#: ../camel/providers/groupwise/camel-groupwise-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:1757
+#: ../camel/providers/imap/camel-imap-store.c:1952
+#: ../camel/providers/imapx/camel-imapx-store.c:410
 #, c-format
 msgid "No such folder %s"
 msgstr "ਫ�ਲਡਰ %s ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1201
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� GroupWise ਫ�ਲਡਰ ਬਣਾ�ਣ� ਸੰਭਵ ਨਹ�� ਹਨ।"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1215
-#: ../camel/providers/imap/camel-imap-store.c:1954
-#: ../camel/providers/imap/camel-imap-store.c:2334
-#: ../camel/providers/imapx/camel-imapx-store.c:687
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#, c-format
+#| msgid "Cannot delete folder '%s': Special folder"
+msgid "Cannot create a special system folder"
+msgstr "�ਾਸ ਸਿਸ�ਮ ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
+#: ../camel/providers/imap/camel-imap-store.c:1835
+#: ../camel/providers/imap/camel-imap-store.c:2257
+#: ../camel/providers/imapx/camel-imapx-store.c:873
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "ਮ�ੱਢਲ� ਫ�ਲਡਰ ਵਿੱ� ਸਬ-ਫ�ਲਡਰ ਸਵ��ਾਰ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1294
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "GroupWise ਫ�ਲਡਰ '%s' ਦਾ ਨਾ�-ਤਬਦ�ਲ '%s' ਲ� ��ਤਾ �ਾ ਸ�ਦਾ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1349
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise ਸਰਵਰ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1351
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "�ਰ�ੱਪਵਾ��਼ ਸ�ਵਾ %s ਲ� %s �ੱਤ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "%s ਨਾਲ �ਰ�ੱਪਵਾ�� ਪੱਤਰ"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
 msgid "Sending Message"
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#, c-format
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "ਫ�ਲਡਰ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਸ ਸੰਭਾਲ ਤ� �ਲਤ �ਾਰਵਾ�"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#, 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 "
@@ -2795,100 +3062,36 @@ msgstr ""
 "ਤ�ਸ�� �ਹ ��ਾ��� ਦ� ਸੰਭਾਲਣ ਸਮੱਰਥਾ ਤ�� ਵੱਧ �� ਹ�। ਤ�ਹਾਡਾ ਸ�ਨ�ਹਾ ਤ�ਹਾਡ� ���-ਬ�ਸ� '� ਪਿ� ਹ�। �ਪਣ� "
 "��� ਪੱਤਰ ਹ�ਾ ��/��ਾ�ਵ ਬਣਾ �� ਭ���/ਲਵ� ਬ�ਨ ਦੱਬ �� ਮ�� ਭ���।\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
 #, c-format
 msgid "Could not send message: %s"
 msgstr "ਸ�ਨ�ਹਾ ਨਹ�� ਭ��ਿ� �ਾ ਸ�ਦਾ : %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Checking for New Mail"
-msgstr "ਨਵ�� ਮ�ਲ ਲ� ��ੱ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
-
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "Connection to Server"
-msgstr "ਸਰਵਰ ਨਾਲ ��ਨ��� �ਰ�"
-
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "_Use custom command to connect to server"
-msgstr "ਸਰਵਰ ਨਾਲ ���ਨ ਲ� ਪਸੰਦ�ਦਾ �ਮਾ�ਡ ਵਰਤ��(_U)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Command:"
-msgstr "�ਮਾ�ਡ:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "ਫ�ਲਡਰ"
-
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
-msgid "_Show only subscribed folders"
-msgstr "ਮ��ਬਰ� ਫ�ਲਡਰ ਹ� ਵ���(_S)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
-#: ../camel/providers/imapx/camel-imapx-provider.c:69
-msgid "O_verride server-supplied folder namespace"
-msgstr "ਸਰਵਰ-ਰਾਹ�� �ਪਲੱਬਧ ਫ�ਲਡਰ ਨਾ�-ਥਾ� �ੱਪਰ(_v)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "ਨ�ਮ-ਸਪ�ਸ"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "ਹ�ਲਾ(Hula)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "Hula ਸਰਵਰ ਵਰਤਣ ਲ�"
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "�ਹ ��ਣ Hula ਸਰਵਰ ਨਾਲ ਪਲ�ਨ-���ਸ� ਪਾਸਵਰਡ ਨਾਲ ਸ਼ਾਮਿਲ �ਰਨ ਲ� ਸਹਾ�� ਹ�।"
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:190
+#: ../camel/providers/imap/camel-imap-command.c:288
+#, c-format
 msgid "No output stream"
 msgstr "��� ���ਪ�ੱ� ਸ�ਰ�ਮ"
 
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:296
+#, c-format
 msgid "No input stream"
 msgstr "�ੰਪ�ੱ� ਸ�ਰ�ਮ ਨਹ��"
 
-#: ../camel/providers/imap/camel-imap-command.c:229
-#: ../camel/providers/imap/camel-imap-command.c:278
-#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3105
+#: ../camel/providers/imap/camel-imap-command.c:245
+#, c-format
 msgid "Operation cancelled"
 msgstr "�ਾਰਵਾ� �ਸਫਲ"
 
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3110
+#: ../camel/providers/imap/camel-imap-command.c:353
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ਸਰਵਰ �ਸਧਾਰਨ ਤ�ਰ ਤ� ਵੱ� ਹ� �ਿ�: %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:352
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2897,262 +3100,283 @@ msgstr ""
 "IMAP ਸਰਵਰ %s %s ਵਲ�� ��ਤਾਵਨ�:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:444
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ਸਰਵਰ ਵਲ�� �ਸਧਾਰਨ �ਵਾਬ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP �ਮਾ�ਡ �ਸਫਲ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:532
+#, c-format
 msgid "Server response ended too soon."
 msgstr "ਸਰਵਰ ਦਾ �ਵਾਬ ਬ�� ��ਤ� ਸਮਾਪਤ ਹ� �ਿ� ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:740
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ਸਰਵਰ ਦ� �ਵਾਬ ਵਿੱ� %s �ਾਣ�ਾਰ� ਨਹ�� ਸ�"
 
-#: ../camel/providers/imap/camel-imap-command.c:748
+#: ../camel/providers/imap/camel-imap-command.c:778
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ਸਰਵਰ ਤ�� �ਸਧਾਰਨ ਸਭ ਠ�� ਹ�� �ਵਾਬ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:90
+#: ../camel/providers/imap/camel-imap-folder.c:281
 msgid "Always check for new mail in this folder"
 msgstr "�ਸ ਫ�ਲਡਰ ਵਿੱ� ਹਮ�ਸ਼ਾ ਨਵ�� �ਿੱਠ� ਵ���"
 
-#: ../camel/providers/imap/camel-imap-folder.c:276
+#: ../camel/providers/imap/camel-imap-folder.c:353
 #, 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:918
-#: ../camel/providers/imapx/camel-imapx-server.c:2997
+#: ../camel/providers/imap/camel-imap-folder.c:960
+#: ../camel/providers/imapx/camel-imapx-server.c:3743
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s ਵਿੱ� ਤਬਦ�ਲ ਸ�ਨ�ਹਿ�� ਦ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1986
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "APPEND �ਮਾ�ਡ ਦ� ਬਾ�ਦ ��ਾਨ� �ਵਾਬ ਹਾਲਤ '%s'"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2001
-msgid "No response on continuation after APPEND command"
-msgstr "APPEND �ਮਾ�ਡ ਦ� ਬਾ�ਦ ��� �ਵਾਬ ਨਹ��"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2046
-msgid "Unknown error occurred during APPEND command!"
-msgstr "APPEND �ਮਾ�ਡ ਦ� ਦ�ਰਾਨ �ਣ�ਾਣ �ਲਤ� �� ਹ�!"
+#: ../camel/providers/imap/camel-imap-folder.c:3231
+#| msgid "Unable to retrieve message: %s"
+msgid "Unable to retrieve message: "
+msgstr "ਸ�ਨ�ਹਾ ਲ�ਣ ਲ� �ਸਮਰੱਥ: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "ਸ�ਨ�ਹਾ ਲ�ਣ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2912
-#: ../camel/providers/imapx/camel-imapx-server.c:3943
+#: ../camel/providers/imap/camel-imap-folder.c:3266
+#: ../camel/providers/imapx/camel-imapx-server.c:4918
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ਸ�ਨ�ਹਾ ID %s ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2913
-#: ../camel/providers/imapx/camel-imapx-server.c:3944
+#: ../camel/providers/imap/camel-imap-folder.c:3267
+#: ../camel/providers/imapx/camel-imapx-server.c:4919
 msgid "No such message available."
 msgstr "�ੰ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2974
-#: ../camel/providers/imap/camel-imap-folder.c:3819
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/imap/camel-imap-folder.c:3341
+#: ../camel/providers/imap/camel-imap-folder.c:4211
+#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#, c-format
 msgid "This message is not currently available"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਮ��� ਤ� �ਪਲੱਬਧ ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:4021
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ਸਰਵਰ ਤ�� �ਧ�ਰਾ �ਵਾਬ: ਸ�ਨ�ਹਾ %d ਲ� ��� �ਾਣ�ਾਰ� �ਪਲੱਬਧ ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3640
+#: ../camel/providers/imap/camel-imap-folder.c:4031
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "�ਧ�ਰਾ ਸਰਵਰ �ਵਾਬ: ਸ�ਨ�ਹ� %d ਲ� ��� UID �ਪਲੱਬਧ ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3857
+#: ../camel/providers/imap/camel-imap-folder.c:4251
+#, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH �ਵਾਬ ਵਿੱ� ਸ�ਨ�ਹਾ ਭਾ� ਨਹ�� ਮਿਲਿ�।"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "��ਸ ਡਾ�ਰ���ਰ� ਨ�ੰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+#| msgid "Could not open cache directory: %s"
+msgid "Could not open cache directory: "
+msgstr "��ਸ਼ ਡਾ�ਰ���ਰ� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:330
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#: ../camel/providers/imap/camel-imap-message-cache.c:450
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "ਸ�ਨ�ਹਾ %s ��ਸ ਲ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
+#: ../camel/providers/imap/camel-imap-message-cache.c:388
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "��ਸ %s ਲ� �ਸਫਲ: %s"
+#| msgid "Failed to cache message %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "ਸ�ਨ�ਹਾ %s ��ਸ਼ �ਰਨ ਲ� ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
+#: ../camel/providers/imap/camel-imap-message-cache.c:525
+#, 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:41
+msgid "Checking for New Mail"
+msgstr "ਨਵ�� ਮ�ਲ ਲ� ��ੱ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ਮ��ਬਰ ਬਣਾ� ਫ�ਲਡਰਾ� ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹ� ��ੱ� �ਰ�(_e)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-#: ../camel/providers/imapx/camel-imapx-provider.c:71
-msgid "Namespace:"
-msgstr "ਨ�ਮ-ਸਪ�ਸ:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
+msgid "Connection to Server"
+msgstr "ਸਰਵਰ ਨਾਲ ��ਨ��� �ਰ�"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
+msgid "_Use custom command to connect to server"
+msgstr "ਸਰਵਰ ਨਾਲ ���ਨ ਲ� ਪਸੰਦ�ਦਾ �ਮਾ�ਡ ਵਰਤ��(_U)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:52
+#| msgid "Command:"
+msgid "Co_mmand:"
+msgstr "�ਮਾ�ਡ(_m):"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../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:65
+msgid "_Show only subscribed folders"
+msgstr "ਮ��ਬਰ� ਫ�ਲਡਰ ਹ� ਵ���(_S)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
+msgid "O_verride server-supplied folder namespace"
+msgstr "ਸਰਵਰ-ਰਾਹ�� �ਪਲੱਬਧ ਫ�ਲਡਰ ਨਾ�-ਥਾ� �ੱਪਰ(_v)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#| msgid "Namespace:"
+msgid "Names_pace:"
+msgstr "ਨ�ਮ-ਸਪ�ਸ(_p):"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "�ਸ ਸਰਵਰ �ੱਤ� �ਨ-ਬਾ�ਸ(INBOX) ਵਿੱ� ਨਵ�� ਸ�ਨਹਿ�� �ੱਤ� ਫਿਲ�ਰ ਲ�ਾ�(_A)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
 msgid "Check new messages for Jun_k contents"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ੰ� ਸਮੱ�ਰ� ਲ� ��ੱ� �ਰ�(_K)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
-#: ../camel/providers/imapx/camel-imapx-provider.c:82
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:81
 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/imapx/camel-imapx-provider.c:92
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:91
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP ਸਰਵਰਾ� �ੱਤ� ਮ�ਲ ਪ�ਨ �ਤ� ਸੰਭਾਲਣ ਲ�"
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapx/camel-imapx-provider.c:108
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:107
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "�ਹ ��ਣ IMAP ਸਰਵਰ ਨਾਲ ਪਲ�ਨ-���ਸ� ਪਾਸਵਰਡ ਨਾਲ ਸ਼ਾਮਿਲ �ਰਨ ਲ� ਸਹਾ�� ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imap4/camel-imap4-store.c:210
-#: ../camel/providers/imapx/camel-imapx-store.c:201
+#: ../camel/providers/imap/camel-imap-store.c:310
+#: ../camel/providers/imapx/camel-imapx-store.c:220
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP ਸਰਵਰ %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:212
-#: ../camel/providers/imapx/camel-imapx-store.c:203
+#: ../camel/providers/imap/camel-imap-store.c:312
+#: ../camel/providers/imapx/camel-imapx-store.c:222
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP ਸਰਵਿਸ %2$s �ੱਤ� %1$s ਲ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:566
-#: ../camel/providers/imap/camel-imap-store.c:581
-#: ../camel/providers/imap4/camel-imap4-store.c:247
-#: ../camel/providers/imap4/camel-imap4-store.c:262
-#: ../camel/providers/nntp/camel-nntp-store.c:182
-#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:192
-#: ../camel/providers/pop3/camel-pop3-store.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
+#: ../camel/providers/imap/camel-imap-store.c:447
+#: ../camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/pop3/camel-pop3-store.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "%s ਨਾਲ ��� ਨਹ�� ਸ�ਦਾ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:567
-#: ../camel/providers/imap4/camel-imap4-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../camel/providers/imap/camel-imap-store.c:448
+#: ../camel/providers/nntp/camel-nntp-store.c:235
+#: ../camel/providers/pop3/camel-pop3-store.c:133
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
 msgid "SSL unavailable"
 msgstr "SSL �ਪਲੱਬਧ ਨਹ� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:578
-#: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:2164
-msgid "Connection cancelled"
-msgstr "��ਨ��ਸ਼ਨ ਰੱਦ ��ਤਾ"
+#: ../camel/providers/imap/camel-imap-store.c:466
+#: ../camel/providers/nntp/camel-nntp-store.c:252
+#, c-format
+#| msgid "Could not connect to %s: %s"
+msgid "Could not connect to %s: "
+msgstr "%s ਨਾਲ ��ਨ��� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: "
 
-#: ../camel/providers/imap/camel-imap-store.c:689
-#: ../camel/providers/imap/camel-imap-store.c:708
-#: ../camel/providers/imap/camel-imap-store.c:714
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imap4/camel-imap4-store.c:310
-#: ../camel/providers/imap4/camel-imap4-store.c:325
-#: ../camel/providers/imap4/camel-imap4-store.c:334
-#: ../camel/providers/imapx/camel-imapx-server.c:2209
-#: ../camel/providers/imapx/camel-imapx-server.c:2231
+#: ../camel/providers/imap/camel-imap-store.c:572
+#: ../camel/providers/imap/camel-imap-store.c:592
+#: ../camel/providers/imap/camel-imap-store.c:599
+#: ../camel/providers/imap/camel-imap-store.c:626
+#: ../camel/providers/imapx/camel-imapx-server.c:2811
+#: ../camel/providers/imapx/camel-imapx-server.c:2847
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "IMAP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imapx/camel-imapx-server.c:2210
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:573
+#: ../camel/providers/imapx/camel-imapx-server.c:2812
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "ਪ�ਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:2232
+#: ../camel/providers/imap/camel-imap-store.c:593
+#: ../camel/providers/imapx/camel-imapx-server.c:2848
 msgid "SSL negotiations failed"
 msgstr "SSL �ੱਲਬਾਤ �ਸਫਲ"
 
-#: ../camel/providers/imap/camel-imap-store.c:715
-#: ../camel/providers/imap4/camel-imap4-store.c:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/imap/camel-imap-store.c:600
+#: ../camel/providers/smtp/camel-smtp-transport.c:339
 msgid "SSL is not available in this build"
 msgstr "�ਸ ਨਿਰਮਾਣ ਵਿੱ� SSL �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/imap/camel-imap-store.c:863
+#: ../camel/providers/imap/camel-imap-store.c:748
+#: ../camel/providers/imapx/camel-imapx-server.c:2648
+#, c-format
+msgid "Connection cancelled"
+msgstr "��ਨ��ਸ਼ਨ ਰੱਦ ��ਤਾ"
+
+#: ../camel/providers/imap/camel-imap-store.c:753
+#: ../camel/providers/imapx/camel-imapx-server.c:2653
 #, 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:1051
-#: ../camel/providers/imap/camel-imap-store.c:2430
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/imapx/camel-imapx-store.c:383
-#: ../camel/providers/imapx/camel-imapx-store.c:856
-#: ../camel/providers/local/camel-maildir-folder.c:81
-#: ../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:461
+#: ../camel/providers/imap/camel-imap-store.c:926
+#: ../camel/providers/imap/camel-imap-store.c:2350
+#: ../camel/providers/imapx/camel-imapx-store.c:457
+#: ../camel/providers/imapx/camel-imapx-store.c:1054
+#: ../camel/providers/local/camel-maildir-folder.c:90
+#: ../camel/providers/local/camel-maildir-store.c:225
+#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/providers/local/camel-maildir-store.c:562
+#: ../camel/providers/local/camel-maildir-store.c:575
+#: ../camel/providers/local/camel-spool-store.c:508
 msgid "Inbox"
 msgstr "��ਣ-ਬ�ਸਾ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:1129
+#: ../camel/providers/imapx/camel-imapx-server.c:2914
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ਸਰਵਰ %s ਲ���ਦ� ਪ�ਰਮਾਣਿਤ �ਿਸਮ %s ਲ� ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:1141
+#: ../camel/providers/imapx/camel-imapx-server.c:2926
+#: ../camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� %s ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:1387
-#: ../camel/providers/imapx/camel-imapx-server.c:2328
+#: ../camel/providers/imap/camel-imap-store.c:1220
+#: ../camel/providers/imapx/camel-imapx-server.c:2996
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3163,437 +3387,201 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1891
-#: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imap4/camel-imap4-store.c:954
-#: ../camel/providers/imapx/camel-imapx-store.c:672
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2193
+#: ../camel/providers/imapx/camel-imapx-store.c:852
 #, 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:2008
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:202
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:1887
+#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-mbox-store.c:193
+#: ../camel/providers/local/camel-mh-store.c:255
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ਫ�ਲਡਰ '%s' ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�: ਫ�ਲਡਰ ਮ���ਦ ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-store.c:2283
-#: ../camel/providers/imapx/camel-imapx-store.c:680
+#: ../camel/providers/imap/camel-imap-store.c:2206
+#: ../camel/providers/imapx/camel-imapx-store.c:863
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "�ਣ�ਾਣਾ ਮ�ੱਢਲਾ ਫ�ਲਡਰ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3107
+#: ../camel/providers/imap/camel-imap-store.c:3062
+#, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ਸਰਵਰ ��ਾਨ� ਡਿਸ-��ਨ��� ਹ� �ਿ�"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "IMAP ਸਰਵਰ %s ਨ�ੰ �ਮਾ�ਡ ਭ��ਣ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "IMAP4 ਸਰਵਰ %s ਤ�� �ਣ�ਾਹਿ� �ਵਾਬ: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "IMAP ਸਰਵਰ %s ਤ�� �ਣ�ਾਣਾ ਸਵਾ�ਤ� ਸ�ਨ�ਹਾ"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "ਫ�ਲਡਰ '%s' ��ਣਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਲਤ mailbox ਨਾ�"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "ਫ�ਲਡਰ '%s' ��ਣਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�:�ਲਤ �ਮਾ�ਡ"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "IMAP ਸਰਵਰ %s ਨ�ੰ �ਮਾ�ਡ ਭ��ਣ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "ਸਰਵਿਸ �ਪਲੱਬਧ ਨਹ� ਹ�"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 ਸਰਵਰ %s �ਸਧਾਰਨ ਬੰਦ ਹ� �ਿ� ਹ�: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr "��� ਫਿਲ�ਰਾ� �ਤ� vFolder ਨਿਯਮਾ� ਹ�ਰ ਮ�ਲਿੰ�-ਲਿਸ� ��� ਲ� �ਾਹ�ਦ� ਹਨ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "ਮਿ�ਦ ਪ�ੱ�� ��ਸ਼ ਵਾਲ� ਸ�ਨ�ਹ�, �� �ਿ X ਸ�ਿੰ�ਾ� '� ਨਹ�� ਪ��ਹ� �� ਹਨ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "X ਸ�ਿੰ�ਾ� ਤ�� ਪ�ਰਾਣ� ਮਿ�ਦ ਪ�ੱ�� ��ਸ਼ ਸ�ਨ�ਹ�"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "'%s' ਫ�ਲਡਰ ਤ� ਪਹ�ੰ� ਨਹ�� ਹ�: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "ਫ�ਲਡਰ '%s' ਨਾਲ ਨਿਸ਼ਾਨ ਸਮ�ਾਲ� ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹਨ: �ਣ�ਾਣ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "ਫ�ਲਡਰ '%s' ਨਾਲ ਸਮ�ਾਲ� ਨਿਸ਼ਾਨ ਨਹ�� ��ਤ� �ਾ ਸ��: �ਲਤ �ਮਾ�ਡ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "ਫ�ਲਡਰ '%s' ਨ�ੰ ਸਾਫ ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਣ�ਾਣ �ਲਤ�"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "ਫ�ਲਡਰ '%s' ਨ�ੰ ਸਾਫ ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਲਤ �ਮਾ�ਡ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "ਫ�ਲਡਰ '%2$s' ਸ�ਨ�ਹਾ %1$s ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਸਤਰਾ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "ਫ�ਲਡਰ '%2$s' ਸ�ਨ�ਹਾ %1$s ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਲਤ �ਮਾ�ਡ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "ਫ�ਲਡਰ '%s' ਲ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦਾ: ਫ�ਲਡਰ ਸਿਰਫ਼ ਪ��ਹਨ ਲ� ਹ�"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "ਫ�ਲਡਰ '%s' ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਣ�ਾਣ� �ਲਤ�"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "ਫ�ਲਡਰ '%s' ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਲਤ �ਮਾ�ਡ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ '%s' ਤ�� '%s' ਵਿੱ� ਭ��� ਨਹ�� �ਾ ਸ�ਦ� ਹਨ: �ਣ�ਾਣ �ਲਤ�"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ '%s' ਤ�� '%s' ਵਿੱ� �ਾਪ� ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹਨ: �ਣ�ਾਣ �ਲਤ�"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ '%s' ਤ�� '%s' ਵਿੱ� ਭ��� ਨਹ�� �ਾ ਸ�ਦ� ਹਨ: �ਲਤ �ਮਾ�ਡ"
+#: ../camel/providers/imap/camel-imap-store.c:3065
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected: "
+msgstr "ਸਰਵਰ �ਸਧਾਰਨ ਤ�ਰ ਤ� ਡਿਸ-��ਨ��� ਹ� �ਿ�: "
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
+#: ../camel/providers/imapx/camel-imapx-folder.c:75
 #, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ '%s' ਤ�� '%s' ਵਿੱ� ਨ�ਲ ਨਹ�� �ਾ ਸ�ਦ� ਹਨ: �ਲਤ �ਮਾ�ਡ"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "�ੰ� ਸਮੱ�ਰ� ਲ� ਨਵ�� ਸ�ਨ�ਹ� ��ੱ� �ਰ�(_J)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "��ਣਬ�ਸ� ਫ�ਲਡਰ ਵਿੱ� �ੰ� ਸ�ਨ�ਹਿ�� ਲ� ਪ�ਤਾਲ �ਰ�(_g)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "MAPv4rev1 ਸਰਵਰਾ� ਤ� ਪੱਤਰ ਪ�ਨ �ਤ� ਸੰਭਾਲਣ ਲ� ਹ�।"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "�ਸ ��ਣ ਨਾਲ ਤ�ਸ�� IMAPv4rev1 ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਨਾਲ ��� ਸ�ਦ� ਹ�।"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/nntp/camel-nntp-store.c:194
-#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:203
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "��ਨ��ਸ਼ਨ ਰੱਦ ��ਤਾ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "IMAP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਮ�ਡ ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ: ਸਰਵਰ STARTTLS ਲ� ਸਹਾ�� ਨਹ�� ਹ�।"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:276
-msgid "TLS negotiations failed"
-msgstr "TLS �ੱਲਬਾਤ ਫ�ਲ�ਹ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "IMAP ਸਰਵਰ %s ਤ� ਪ�ਰਮਾਣ�ਿਤ ਢੰ� %s ਨਾਲ ਪ�ਰਮਾਣਿਤ ਨਹ�� ਹ� �ਾ ਸ�ਦਾ ਹ�।"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "IMAP ਸਰਵਰ %s ਤ� %s ਵਰਤ �� ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ� �ਸਫਲ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:964
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� IMAP ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "IMAP ਸਰਵਰ %2$s ਤ� ਫ�ਲਡਰ '%1$s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: �ਣ�ਾਣ �ਲਤ�"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "IMAP ਸਰਵਰ %2$s �ੱਤ� '%1$s' ਵਾਸਤ� LIST �ਾਣ�ਾਰ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�: %3$s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "�ਲਤ �ਮਾ�ਡ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "ਫ�ਲਡਰ '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਲਤ mailbox ਨਾ�"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "ਫ�ਲਡਰ '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਲਤ �ਮਾ�ਡ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "ਫ�ਲਡਰ '%s' ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: �ਾਸ ਫ�ਲਡਰ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� IMAP ਫ�ਲਡਰਾ� ਨ�ੰ ਹ�ਾ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "ਫ�ਲਡਰ '%s' ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: �ਲਤ mailbox ਨਾ�"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "ਫ�ਲਡਰ '%s' ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: �ਲਤ �ਮਾ�ਡ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "ਫ�ਲਡਰ '%s' ਦਾ� ਨਾ�-ਤਬਦ�ਲ '%s' ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਾਸ ਫ�ਲਡਰ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� IMAP ਫ�ਲਡਰ ਦਾ ਨਾ�-ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+msgid "Could not create folder summary for %s"
+msgstr "%s ਲ� ਫ�ਲਡਰ ਸੰ��ਪ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
+#: ../camel/providers/imapx/camel-imapx-folder.c:83
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "ਫ�ਲਡਰ '%s' ਦਾ ਨਾ�-ਤਬਦ�ਲ '%s' ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਲਤ mailbox ਨਾ�"
+#| msgid "Could not create cache for %s"
+msgid "Could not create cache for %s: "
+msgstr "%s ਲ� ��ਸ਼ ਨਹ�� ਬਣਾ� �ਾ ਸ��: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "ਫ�ਲਡਰ '%s' ਦਾ� ਨਾ�-ਤਬਦ�ਲ '%s' ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਲਤ �ਮਾ�ਡ"
+#: ../camel/providers/imapx/camel-imapx-provider.c:43
+#| msgid "Use I_dle if the server supports it"
+msgid "Use _Quick Resync if the server supports it"
+msgstr "ਤ�ਰੰਤ ਸਿੰ�, �� ਸਰਵਰ �ਸ ਲ� ਸਹਾ�� ਹ�(_Q)"
 
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1572
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "IMAP ਸਰਵਰ %3$s ਤ� ਪ��ਰਨ '%2$s' ਲ� %1$s �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ ਨਹ�� ��ਤ� �ਾ ਸ�ਦ�: %4$s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
+msgid "Use I_dle if the server supports it"
+msgstr "ਵ�ਹਲਾ ਵਰਤ��, �� ਸਰਵਰ �ਸ ਲ� ਸਹਾ�� ਹ�(_d)"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� IMAP ਫ�ਲਡਰ ਨ�ੰ ਸਵ��ਾਰ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+#: ../camel/providers/imapx/camel-imapx-provider.c:57
+msgid "Command:"
+msgstr "�ਮਾ�ਡ:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "ਫ�ਲਡਰ '%s' ਨ�ੰ ਸਵ��ਾਰ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਲਤ mailbox ਨਾ�"
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
+msgid "Numbe_r of cached connections to use"
+msgstr "ਵਰਤਣ ਲ� ��ਸ਼ ��ਤ� �� ��ਨ��ਸ਼ਨ ਦ� �ਿਣਤ�(_r)"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "ਫ�ਲਡਰ '%s' ਲ� ਮ��ਬਰ ਨਹ�� ਬਣਿ� �ਾ ਸ�ਦਾ ਹ�: �ਲਤ �ਮਾ�ਡ"
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
+msgid "Namespace:"
+msgstr "ਨ�ਮ-ਸਪ�ਸ:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� IMAP ਫ�ਲਡਰ ਨ�ੰ �ਸਵ��ਾਰ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "ਫ�ਲਡਰ '%s' ਦ� ਮ��ਬਰ� ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: �ਲਤ mailbox ਨਾ�"
+#: ../camel/providers/imapx/camel-imapx-server.c:1365
+#| msgid "Error writing mail temp file: %s"
+msgid "Error writing to cache stream: "
+msgstr "��ਸ ਸ�ਰ�ਮ ਲਿ�ਣ ਲ� �ਲਤ�: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
+#: ../camel/providers/imapx/camel-imapx-server.c:2008
 #, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "ਫ�ਲਡਰ '%s' ਤ�� ਮ��ਬਰ� ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: �ਲਤ �ਮਾ�ਡ"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "ਤਬਦ�ਲ ਸ�ਨ�ਹਿ�� ਦ� �ਾ�� �ਾਰ� ਹ�"
+#| msgid "Cannot authenticate user"
+msgid "Not authenticated"
+msgstr "ਪਰਮਾਣਿਤ ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
+#: ../camel/providers/imapx/camel-imapx-server.c:2739
 #, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP ਸਰਵਰ %s �ਰਾਬ ਹਾਲਤ '� ਹ�।"
+#| msgid "Could not connect to %s (port %s): %s"
+msgid "Could not connect to %s (port %s): "
+msgstr "%s (ਪ�ਰ� %s) ਨਾਲ ��ਨ��� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: "
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� �ੰਵ�ਲਪ ਲ� �ਾ ਰਹ� ਹਨ"
+#: ../camel/providers/imapx/camel-imapx-server.c:3168
+#| msgid "Posting failed: %s"
+msgid "Closing tmp stream failed: "
+msgstr "�ਰ�਼� ਸ�ਰ�ਮ ਬੰਦ �ਰਨ ਲ� ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
+#: ../camel/providers/imapx/camel-imapx-server.c:5042
 #, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "IMAP ਸਰਵਰ %s ਤ�� �ਵਾਬ ਵਿੱ� �ਲਤ ���ਨ : "
+#| msgid "Cannot create message: %s"
+msgid "Cannot create spool file: %s"
+msgstr "ਸਪ�ਲ ਫਾ�ਲ ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�: %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "��� ਡਾ�ਾ ਨਹ�"
+#: ../camel/providers/imapx/camel-imapx-server.c:5057
+#| msgid "Cannot create message: %s"
+msgid "Cannot create spool file: "
+msgstr "ਸਪ�ਲ ਫਾ�ਲ ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
+#: ../camel/providers/imapx/camel-imapx-store.c:426
+#: ../camel/providers/nntp/camel-nntp-store.c:1510
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP ਸਰਵਰ %s �ਸਧਾਰਨ ਵੱ� ਹ� �ਿ� ਹ�: %s"
+msgid "No such folder: %s"
+msgstr "�ਹ ��� ਫ�ਲਡਰ ਨਹ�� ਹ�: %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:86
+#: ../camel/providers/imapx/camel-imapx-stream.c:71
 #, c-format
-#| msgid "Could not load summary for %s"
-msgid "Could not create folder summary for %s"
-msgstr "%s ਲ� ਫ�ਲਡਰ ਸੰ��ਪ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ�"
+msgid "Source stream returned no data"
+msgstr "ਸਰ�ਤ ਸ�ਰ�ਮ ਨ� ��� ਡਾ�ਾ ਨਹ�� ਦਿੱਤਾ"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:94
+#: ../camel/providers/imapx/camel-imapx-stream.c:80
 #, c-format
-#| msgid "Could not create cache file"
-msgid "Could not create cache for %s"
-msgstr "%s ਲ� ���� ਨਹ�� ਬਣਾ� �ਾ ਸ�� ਹ�"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "Use I_dle if the server supports it"
-msgstr "ਵ�ਹਲਾ ਵਰਤ��, �� ਸਰਵਰ �ਸ ਲ� ਸਹਾ�� ਹ�(_d)"
+#| msgid "service unavailable"
+msgid "Source stream unavailable"
+msgstr "ਸਰ�ਤ ਸ�ਰ�ਮ �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:60
-msgid "Numbe_r of cached connections to use"
-msgstr "ਵਰਤਣ ਲ� ��ਸ਼ ��ਤ� �� ��ਨ��ਸ਼ਨ ਦ� �ਿਣਤ�(_r)"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:2167
-#, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "%s ਨਾਲ (ਪ�ਰ� %s) �ੱਤ� ��ਨ��� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: %s"
-
-#: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "�ੰਡ��ਸ ਸ�ਨ�ਹਾ ਭਾ� ਡਾ�ਾ"
-
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
+#: ../camel/providers/local/camel-local-folder.c:199
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
+#: ../camel/providers/local/camel-local-folder.c:209
+#: ../camel/providers/local/camel-local-folder.c:218
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "mailbox: %s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:227
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:272
+msgid "Index message body data"
+msgstr "�ੰਡ��ਸ ਸ�ਨ�ਹਾ ਭਾ� ਡਾ�ਾ"
+
+#: ../camel/providers/local/camel-local-folder.c:686
+#, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"%2$s ਫ�ਲਡਰ '��� %1$s ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ\n"
+"%3$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-format ਪੱਤਰ ਡਾ�ਰ���ਰ�"
 
-#: ../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-like ਪੱਤਰ ਡਾ�ਰ���ਰ� ਵਿੱ� ਸੰਭਾਲਣ ਲ� ਲ��ਲ ਪੱਤਰ"
 
-#: ../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."
 msgstr ""
 "ਸ���ਡਰਡ mbox ਫਾਰਮ�� ਸਪ�ਲ ਤ�� �ਵ�ਲ�ਸ਼ਨ ਰਾਹ�� ਸੰਭਾਲ� ਫ�ਲਡਰ ਵਿੱ� ਲ��ਲ ਪੱਤਰ ਪ�ਰਾਪਤ (ਭ��ਣ) �ਰਨ ਲ�।"
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "��ਣ-ਬ�ਸ� ਵਿੱ� ਨਵ�� ਸ�ਨਹਿ�� ਤ� ਫਿਲ�ਰ ਲ�ਾ�(_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
 msgstr "Maildir-format ਪੱਤਰ ਡਾ�ਰ���ਰ���"
 
-#: ../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
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "ਹਾਲਤ ਹ�ੱਡਰ Elm/Pine/Mutt ਫਾਰਮ�� ਵਿੱ� ਸੰਭਾਲ�(_S)"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
 msgstr "ਸ���ਡਰਡ Unix mbox ਸਪ�ਲ ਫਾ�ਲ"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3601,212 +3589,193 @@ msgstr ""
 "ਬਾਹਰ� ਪ-ਬ�ਸਾ ਸਪ�ਲ ਫਾ�ਲਾ� ਪ�ਨ �ਤ� ਲ��ਲ ਪੱਤਰ ਸੰਭਾਲਣ ਲ�\n"
 "ਤ�ਸ�� Elm, Pine, �ਤ� Mutt ਸ਼�ਲ� ਫ�ਲਡਰ ਲ�� ਵਰਤ ਸ�ਦ� ਹ�।"
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
 msgstr "ਸ���ਡਰਡ Unix mbox ਸਪ�ਲ ਡਾ�ਰ���ਰ�"
 
-#: ../camel/providers/local/camel-local-store.c:163
-#: ../camel/providers/local/camel-local-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:357
-#: ../camel/providers/local/camel-spool-store.c:126
+#: ../camel/providers/local/camel-local-store.c:149
+#: ../camel/providers/local/camel-local-store.c:284
+#: ../camel/providers/local/camel-mbox-store.c:371
+#: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ਪ�ਰਬੰਧ�(root) %s ਸੰਭਾਲ �ੱ� �ਸਲ� ਰਸਤਾ ਨਹ� ਹ�।"
 
-#: ../camel/providers/local/camel-local-store.c:170
+#: ../camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "ਪ�ਰਬੰਧ�(root) %s ਸੰਭਾਲ �ੱ� �ਸਲ� ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�।"
 
+#: ../camel/providers/local/camel-local-store.c:169
 #: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:285
+#: ../camel/providers/local/camel-local-store.c:297
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ਫ�ਲਡਰ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:199
+#: ../camel/providers/local/camel-local-store.c:193
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "��ਣ-ਬ�ਸ� ਵਿੱ� ਲ��ਲ ਸੰਭਾਲ ਬ�ਸਾ ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-local-store.c:245
+#: ../camel/providers/local/camel-local-store.c:250
 #, c-format
 msgid "Local mail file %s"
 msgstr "ਲ��ਲ ਪੱਤਰ ਫਾ�ਲ %s"
 
-#: ../camel/providers/local/camel-local-store.c:340
+#: ../camel/providers/local/camel-local-store.c:358
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ਫ�ਲਡਰ %s ਦਾ ਨਾ�-ਤਬਦ�ਲ %s ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:408
+#: ../camel/providers/local/camel-local-store.c:431
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' ਦਾ ਨਾ� ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-local-store.c:433
-#: ../camel/providers/local/camel-mbox-store.c:298
+#: ../camel/providers/local/camel-local-store.c:461
+#: ../camel/providers/local/camel-mbox-store.c:304
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ਫ�ਲਡਰ �ੰਡ��ਸ ਫਾ�ਲ '%s' ਨ�ੰ ਹ�ਾ�� ਨਹ� �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:322
+#: ../camel/providers/local/camel-local-store.c:489
+#: ../camel/providers/local/camel-mbox-store.c:333
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ਫ�ਲਡਰ ਮ��ਾ ਫਾ�ਲ '%s' ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:537
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਸੰ��ਪ ਵਿੱ� ਸੰਭਾਲਣ ਵਿੱ� �ਸਫਲ: �ਣ�ਾਣਾ �ਾਰਨ"
 
-#: ../camel/providers/local/camel-maildir-folder.c:230
-msgid "Maildir append message canceled"
-msgstr "Maildir ਸ਼ਾਮਿਲ ਸ�ਨ�ਹਾ ਰੱਦ ��ਤਾ"
-
-#: ../camel/providers/local/camel-maildir-folder.c:233
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "maildir ਫ�ਲਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ ਨਹ� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:263
-#: ../camel/providers/local/camel-maildir-folder.c:292
-#: ../camel/providers/local/camel-maildir-folder.c:306
-#: ../camel/providers/local/camel-maildir-folder.c:314
-#: ../camel/providers/local/camel-maildir-folder.c:400
-#: ../camel/providers/local/camel-mbox-folder.c:362
-#: ../camel/providers/local/camel-mbox-folder.c:413
-#: ../camel/providers/local/camel-mbox-folder.c:434
-#: ../camel/providers/local/camel-mbox-folder.c:465
-#: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:225
-#: ../camel/providers/local/camel-mh-folder.c:236
-#: ../camel/providers/local/camel-mh-folder.c:244
+#: ../camel/providers/local/camel-maildir-folder.c:195
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: %s ਫ�ਲਡਰ %s ਤ��\n"
-"  %s"
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "maildir ਫ�ਲਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ ਨਹ� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:315
-msgid "Invalid message contents"
-msgstr "�ਲਤ ਸ�ਨ�ਹਾ ਸਮੱ�ਰ�"
+#: ../camel/providers/local/camel-maildir-folder.c:283
+#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/local/camel-mbox-folder.c:440
+#: ../camel/providers/local/camel-mh-folder.c:227
+#: ../camel/providers/local/camel-mh-folder.c:235
+#, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid "Cannot get message %s from folder %s: "
+msgstr "%2$s ਫ�ਲਡਰ ਤ�� %1$s ਸ�ਨ�ਹਾ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:418
-#| msgid "Cannot copy messages to the Junk folder"
-msgid "Cannot transfer message to destination folder"
-msgstr "ਸ�ਨ�ਹ� ਨ�ੰ �ਿ�ਾਣਾ ਫ�ਲਡਰ ਵਿੱ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+#: ../camel/providers/local/camel-maildir-folder.c:399
+#, c-format
+#| msgid "Cannot transfer message to destination folder"
+msgid "Cannot transfer message to destination folder: %s"
+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:174
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-maildir-store.c:136
+#: ../camel/providers/local/camel-maildir-store.c:167
+#: ../camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:175
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:145
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:151
+#: ../camel/providers/local/camel-mbox-store.c:127
+#: ../camel/providers/local/camel-mh-store.c:215
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤ� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:153
+#: ../camel/providers/local/camel-maildir-store.c:157
+#: ../camel/providers/local/camel-mbox-store.c:137
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ਫ�ਲਡਰ '%s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤ� �ਾ ਸ�ਦਾ ਹ�: ਫ�ਲਡਰ ਮ���ਦ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:184
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "ਫ�ਲਡਰ '%s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ੱ� maildir ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:282
+#: ../camel/providers/local/camel-mh-store.c:287
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:244
 msgid "not a maildir directory"
 msgstr "�ੱ� maildir ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:328
-#: ../camel/providers/local/camel-spool-store.c:342
+#: ../camel/providers/local/camel-maildir-store.c:482
+#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:380
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਦ� �ਾ�� ਨਹ�� ਹ� ਸ�� ਹ�: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:432
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:435
+#: ../camel/providers/local/camel-maildir-summary.c:558
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir ਡਾ�ਰ���ਰ� ਰਸਤਾ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:544
+#: ../camel/providers/local/camel-maildir-summary.c:549
 msgid "Checking folder consistency"
 msgstr "ਫ�ਲਡਰ ��ਸਾਰਤਾ ਦ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/local/camel-maildir-summary.c:637
+#: ../camel/providers/local/camel-maildir-summary.c:641
 msgid "Checking for new messages"
 msgstr "ਨਵ�� ਸ�ਨਹਿ�� ਲ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/local/camel-maildir-summary.c:724
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:842
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:732
+#: ../camel/providers/local/camel-mbox-summary.c:465
+#: ../camel/providers/local/camel-mbox-summary.c:679
+#: ../camel/providers/local/camel-mbox-summary.c:809
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
 msgstr "ਫ�ਲਡਰ ��ਰਮਬੱਧ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:124
+#: ../camel/providers/local/camel-spool-folder.c:125
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s ਤ� ਫ�ਲਡਰ ਲਾੱ� ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:231
+#: ../camel/providers/local/camel-mbox-folder.c:194
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "mailbox ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s\n"
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot open mailbox: %s: "
+msgstr "mailbox ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr "ਪੱਤਰ ਸ਼ਾਮਿਲ ਰੱਦ ��ਤਾ"
-
-#: ../camel/providers/local/camel-mbox-folder.c:300
+#: ../camel/providers/local/camel-mbox-folder.c:260
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "ਪੱਤਰਬ�ਸਾ ਫਾ�ਲ ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: %s"
+#| msgid "Cannot append message to mbox file: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "mbox ਫਾ�ਲ ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:433
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨਾ-ਪ�ਰਾਪਤਯ�� ਨਿ�ਾਰਾਪਨ ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:245
-msgid "Message construction failed."
-msgstr "ਸ�ਨ�ਹਾ ਰ�ਨਾ �ਸਫਲ।"
-
-#: ../camel/providers/local/camel-mbox-store.c:164
-#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:149
+#: ../camel/providers/local/camel-mbox-store.c:379
+#, c-format
 msgid "Cannot create a folder by this name."
 msgstr "�ਸ ਨਾ� ਨਾਲ ਫ�ਲਡਰ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ਫ�ਲਡਰ '%s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: �ੱ� ਨਿਯਮਿਤ ਫਾ�ਲ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:226
-#: ../camel/providers/local/camel-mbox-store.c:237
+#: ../camel/providers/local/camel-mbox-store.c:218
+#: ../camel/providers/local/camel-mbox-store.c:231
 #: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
@@ -3816,164 +3785,164 @@ msgstr ""
 "ਫ�ਲਡਰ '%s' ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:245
+#: ../camel/providers/local/camel-mbox-store.c:241
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' �� ਨਿਯਮਿਤ ਫਾ�ਲ ਨਹ� ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:250
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ਫ�ਲਡਰ `'%s' �ਾਲ� ਨਹ�� ਹ�। ਹ�ਾ�� ਨਹ�� �ਿ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:286
+#: ../camel/providers/local/camel-mbox-store.c:276
+#: ../camel/providers/local/camel-mbox-store.c:290
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ਫ�ਲਡਰ ਸੰ��ਪ ਫਾ�ਲ '%s' ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:376
+#: ../camel/providers/local/camel-mbox-store.c:395
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ਡਾ�ਰ���ਰ� '%s' ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s।"
 
-#: ../camel/providers/local/camel-mbox-store.c:390
+#: ../camel/providers/local/camel-mbox-store.c:411
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ਫ�ਲਡਰ ਬਣਾ�� ਨਹ� �ਾ ਸ�ਿ� ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:413
 msgid "Folder already exists"
 msgstr "ਫ�ਲਡਰ ਮ���ਦ ਹ�"
 
-#: ../camel/providers/local/camel-mbox-store.c:483
+#: ../camel/providers/local/camel-mbox-store.c:507
+#, c-format
 msgid "The new folder name is illegal."
 msgstr "ਨਵਾ� ਫ�ਲਡਰ ਨਾ� �ਲਤ ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:496
+#: ../camel/providers/local/camel-mbox-store.c:522
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' ਦਾ ਨਾ� ਬਦਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:577
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' ਦਾ ਨਾ� %s ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:532
+#: ../camel/providers/local/camel-mbox-summary.c:473
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ਫ�ਲਡਰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:582
+#: ../camel/providers/local/camel-mbox-summary.c:533
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "%ld ਦ� ਨ��� %s ਫ�ਲਡਰ ਵਿੱ� ਪੱਤਰ ਪ�ਰਾਪਤ ਪਾਰਸ �ਲਤ� ਹ�"
+#| msgid "Fatal mail parser error near position %ld in folder %s"
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "%2$s ਫ�ਲਡਰ '� %1$s ਸਥਿਤ� ਨ��� ਮ�ਲ ਪਾਰਸ �ਰਨ ਦ�ਰਾਨ �ਾਤ� �ਲਤ�"
 
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ਫ�ਲਡਰ ਦ� �ਾ�� ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:686
+#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ਫਾ�ਲ ��ਲ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:700
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�ਰ�� mailbox ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:957
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-mbox-summary.c:933
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ਸਰ�ਤ ਫ�ਲਡਰ %s ਨ�ੰ ਬੰਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../camel/providers/local/camel-mbox-summary.c:726
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "�ਰ�� ਫ�ਲਡਰ ਬੰਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:776
+#: ../camel/providers/local/camel-mbox-summary.c:743
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ਫ�ਲਡਰ ਦਾ ਨਾ� ਬਦਲਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:829
+#: ../camel/providers/local/camel-mbox-summary.c:1071
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ਫ�ਲਡਰ ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:897
-#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1114
-#: ../camel/providers/local/camel-mbox-summary.c:1122
+#: ../camel/providers/local/camel-mbox-summary.c:870
+#: ../camel/providers/local/camel-mbox-summary.c:879
+#: ../camel/providers/local/camel-mbox-summary.c:1104
+#: ../camel/providers/local/camel-mbox-summary.c:1113
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ਸੰ��ਪ ਤ� ਫ�ਲਡਰ ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹਨ, ਸਮ�ਾਲ� �ਰਨ ਮ�ਰ�� ਵ�"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1047
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1030
+#: ../camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "�ਣ�ਾਣ� �ਲਤ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1190
-#: ../camel/providers/local/camel-mbox-summary.c:1216
+#: ../camel/providers/local/camel-mbox-summary.c:1183
+#: ../camel/providers/local/camel-mbox-summary.c:1213
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "�ਰ�� mailbox �ੱਤ� ਲਿ�ਣਾ �ਸਫਲ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1202
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "�ਰ�� mailbox �ੱਤ� ਲਿ�ਣ ਲ� ਫ�ਲ�ਹ: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:180
-msgid "MH append message canceled"
-msgstr "MH ਸ਼ਾਮਿਲ ਸ�ਨ�ਹਾ ਰੱਦ ��ਤਾ"
-
-#: ../camel/providers/local/camel-mh-folder.c:183
+#: ../camel/providers/local/camel-mh-folder.c:165
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "mh ਫ�ਲਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਤ�� �ਸਫਲ: %s: %s"
+#| msgid "Cannot append message to mh folder: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "mh ਫ�ਲਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਤ�� �ਸਫਲ: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:234
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "'%s' ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:248
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ਫ�ਲਡਰ '%s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ੱ� ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�।"
 
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../camel/providers/local/camel-mh-summary.c:228
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ਡਾ�ਰ���ਰ� ਰਸਤਾ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "ਸਪ�ਲ '%s' ਨ�ੰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:144
+#: ../camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "ਸਪ�ਲ '%s' �ੱ� ਨਿਯਮਿਤ ਫਾ�ਲ �ਾ� ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:163
+#: ../camel/providers/local/camel-spool-store.c:158
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ਫ�ਲਡਰ '%s/%s' ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:170
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3982,12 +3951,12 @@ msgstr ""
 "ਫ�ਲਡਰ '%s' ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:177
+#: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ਫ�ਲਡਰ '%s' ਮ���ਦ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/local/camel-spool-store.c:182
+#: ../camel/providers/local/camel-spool-store.c:183
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3996,48 +3965,51 @@ msgstr ""
 "ਫ�ਲਡਰ '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:190
+#: ../camel/providers/local/camel-spool-store.c:193
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' �ੱ� mailbox ਫਾ�ਲ ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:213
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "ਸ��ਰ��਼ �ੱ� ��ਣ-ਬ�ਸ� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ਸਪ�ਲ ਪੱਤਰ ਫਾ�ਲ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ਸਪ�ਲ ਫ�ਲਡਰ ਲ�� %s"
 
-#: ../camel/providers/local/camel-spool-store.c:227
+#: ../camel/providers/local/camel-spool-store.c:238
+#, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ਸਪ� ਫ�ਲਡਰਾ� ਦਾ ਨਾ�-ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:235
+#: ../camel/providers/local/camel-spool-store.c:251
+#, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "ਸਪ�ਲ ਫ�ਲਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:166
+#: ../camel/providers/local/camel-spool-summary.c:178
 #: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "�ਰ�� ਫ�ਲਡਰ %s ਨ�ੰ ਸਮ�ਾਲ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:208
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "ਸਪ�ਲ ਫ�ਲਡਰ %s ਨ�ੰ ਸਮ�ਾਲ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:240
+#: ../camel/providers/local/camel-spool-summary.c:259
+#: ../camel/providers/local/camel-spool-summary.c:272
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4046,67 +4018,84 @@ msgstr ""
 "ਸਪ�ਲ ਫ�ਲਡਰ %s ਨ�ੰ ਸਮ�ਾਲ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s\n"
 "ਫ�ਲਡਰ ਨਿ�ਾਰਾ ਹ� ਸ�ਦਾ ਹ�, ਨ�ਲ '%s' ਵਿੱ� ਸੰਭਾਲ� �� ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:135
-#: ../camel/providers/nntp/camel-nntp-folder.c:192
-#: ../camel/providers/nntp/camel-nntp-folder.c:224
+#: ../camel/providers/nntp/camel-nntp-folder.c:197
+#: ../camel/providers/nntp/camel-nntp-folder.c:271
+#: ../camel/providers/nntp/camel-nntp-folder.c:312
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "�ੰਦਰ�ਨ� �ਲਤ�: UID �ਲਤ ਫਾਰਮ�� ਵਿੱ� ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:365
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/pop3/camel-pop3-folder.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "ਸ�ਨ�ਹਾ %s ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:465
+#: ../camel/providers/nntp/camel-nntp-folder.c:471
+#: ../camel/providers/nntp/camel-nntp-folder.c:518
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ਭ��ਣ �ਾਰਵਾ� �ਸਫਲ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:430
+#: ../camel/providers/nntp/camel-nntp-folder.c:513
+#| msgid "Posting failed: %s"
+msgid "Posting failed: "
+msgstr "ਪ�ਸ� �ਰਨ ਲ� ਫ�ਲ�ਹ: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ਤ�ਸ�� �ਫਲਾ�ਨ �ੰਮ �ਰਦ� ਸਮ�� NNTP ਸ�ਨ�ਹ� ਭ�� ਨਹ�� ਸ�ਦ� !"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ਤ�ਸ�� NNTP ਫ�ਲਡਰ ਤ�� ਸ�ਨ�ਹ� ਨ�ਲ ਨਹ�� �ਰ ਸ�ਦ� ਹ�!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "ਫ�ਲਡਰ ���� ਰ�ਪ ਵਿੱ� ਵ��� (�ਿਵ�� �ਿ comp.os.linux ਦ� ਬ�ਾ� c.o.linux)(_S)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "ਮ��ਬਰ ਬਣਨ ਡਾ�ਲ� ਵਿੱ�, �ਨ�ਸਾਰ� ਫ�ਲਡਰ ਹ� ਵਰਤ��(_d)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "USENET �ਬਰਾ�"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "�ਹ �ਬਰ-ਸਮ�ਹ USENET ਤ�� ਪ�ਨ �ਤ� ਭ��ਣ ਲ� ਸਹਾ� ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "�ਸ ��ਣ ਨਾਲ NNTP ਸਰਵਰ ਤ� ਪਲ�ਨ-���ਸ� ਪਾਸਵਰਡ ਪ�ਰਮਾਣ�ਿਤਾ ਲ� ਵਰਤਿ� �ਾਵ��ਾ।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:265
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "%s ਤ�� ਸਵਾ�ਤ� ਸ�ਨ�ਹਾ ਪ�ਨ ਤ�� �ਸਫਲ: %s"
+#| msgid "Could not read greeting from %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "%s ਤ�� ਸਵਾ�ਤ� ਸ�ਨ�ਹਾ ਪ��ਹਨ ਨਹ�� �ਾ ਸ�ਿ�: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:278
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ਸਰਵਰ %s ਨ� �ਲਤ� ��ਡ %d ਭ��ਿ� ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:434
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET �ਬਰਾ� %s ਰਾਹ�"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:927
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4117,7 +4106,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1024
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4127,7 +4117,8 @@ msgstr ""
 "\n"
 "�ਸ ਤਰਾ� ਦਾ ��� �ਬਰ-ਸਮ�ਹ ਨਹ�� ਹ�। ਸਾ�ਦ ��ਣ� ��ਾ� ਮ�ੱਢਲਾ ਫ�ਲਡਰ ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1064
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4137,126 +4128,122 @@ msgstr ""
 "\n"
 "�ਸ ਤਰਾ� ਦਾ ��� �ਬਰ-ਸਮ�ਹ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1094
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "ਤ�ਸ�� �ਬਰ ਸੰਭਾਲ ਵਿੱ� ਫ�ਲਡਰ ਨਹ�� ਬਣਾ ਸ�ਦ� ਹ�: ਸਵ��ਾਰ ਹ� �ਰ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1106
+#, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "�ਬਰ ਸੰਭਾਲ ਵਿੱ� ਫ�ਲਡਰ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:986
+#: ../camel/providers/nntp/camel-nntp-store.c:1119
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "ਤ�ਸ�� �ਬਰ ਸੰਭਾਲ ਵਿੱ� ਫ�ਲਡਰ ਨਹ�� ਹ�ਾ ਸ�ਦ� ਹ�: �ਸਵ��ਾਰ ਹ� �ਰ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
 msgid "Authentication requested but no username provided"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�, ਪਰ ��� ਯ��਼ਰ ਦਿੱਤਾ ਨਹ�� �ਿ�"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1269
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "ਸਰਵਰ ਨਾਲ ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP �ਮਾ�ਡ �ਸਫਲ: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1395
+#| msgid "NNTP Command failed: %s"
+msgid "NNTP Command failed: "
+msgstr "NNTP �ਮਾ�ਡ �ਸਫਲ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#, c-format
 msgid "Not connected."
 msgstr "��ਨ��� ਨਹ�� ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-msgid "No such folder: %s"
-msgstr "�ਹ ��� ਫ�ਲਡਰ ਨਹ�� ਹ�: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:238
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: ਨਵ�� ਸ�ਨ�ਹਿ�� ਦ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover ਤ� �ਸਧਾਰਨ ਸਰਵਰ �ਵਾਬ ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:356
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head ਤ� �ਸਧਾਰਨ ਸਰਵਰ �ਵਾਬ ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "ਰੱਦ ਵਰਤ��"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
 #, c-format
 msgid "Operation failed: %s"
 msgstr "�ਾਰਵਾ� �ਸਫਲ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
 msgid "Retrieving POP summary"
 msgstr "POP ਸੰ��ਪ �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:274
 #, 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:324
 msgid "Expunging old messages"
 msgstr "ਹ�ਾ� ਸ�ਨ�ਹ� ਸ�ੰ��� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:332
 msgid "Expunging deleted messages"
 msgstr "ਹ�ਾ� ਸ�ਨ�ਹ� ਫ�ਲ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
+#: ../camel/providers/pop3/camel-pop3-folder.c:566
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
 #, c-format
 msgid "No message with UID %s"
 msgstr "UID %s ਨਾਲ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
+#: ../camel/providers/pop3/camel-pop3-folder.c:603
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP ਸ�ਨ�ਹ� %d ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:707
 msgid "Unknown reason"
 msgstr "�ਣ�ਾਣ �ਾਰਨ"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
 msgstr "ਸ�ਨ�ਹਾ ਸ��ਰ��਼"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "ਸਰਵਰ ਤ� ਸ�ਨ�ਹ� �ੱਡ�(_L)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "%s ਦਿਨਾ� ਬਾ�ਦ ਹ�ਾ�(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Disable _support for all POP3 extensions"
 msgstr "ਸਭ POP3 ��ਸ਼��ਸ਼ਨ ਲ� ਸਹਿਯ�� �ਯ��(_s)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "��ਨ��� ਲ� POP ਸਰਵਰ ਤ�� ਸ�ਨ�ਹ� ਪ�ਰਾਪਤ �ਰਨ ਲ�।"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
+#: ../camel/providers/pop3/camel-pop3-provider.c:72
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4264,7 +4251,7 @@ msgstr ""
 "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ POP ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ-ਪਾਠ ਪਾਸਵਰਡ ਨਾਲ �����ਾ,�ਹ ਹ� ��ਣ ਹ�, �� �ਿ ��ਸਰ POP "
 "ਸਰਵਰਾ� ਤ� �ਪਲੱਬਧ ਹ�ੰਦ� ਹ�।"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 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 "
@@ -4273,40 +4260,43 @@ msgstr ""
 "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ POP ਸਰਵਰ ਨਾਲ APOP ਪਰ����ਾਲ ਰਾਹ� ���ਰਿਪ�ਡ ਪਾਸਵਰਡ ਨਾਲ �����ਾ, �ਹ ਹ� ��ਣ "
 "ਹ�, �� �ਿ ��ਸਰ ਸਰਵਰ ਸਭ ਯ��਼ਰਵਾ� ਨ�ੰ ਦ�ਣ ਦਾ ਵਾ�ਦਾ ਤਾ� �ਰਦ� ਹਨ, ਪਰ ਸੱ� �ੱ� ਹ� ਹ�ੰਦਾ ਹ�।"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:229
+#. 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:168
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP ਸਰਵਰ %s ਤ�� ਸ�ਨ�ਹਾ ਪ�ਨ ਵਿੱ� ਫ�ਲ�ਹ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:246
-#: ../camel/providers/pop3/camel-pop3-store.c:275
-#: ../camel/providers/pop3/camel-pop3-store.c:281
+#: ../camel/providers/pop3/camel-pop3-store.c:186
+#: ../camel/providers/pop3/camel-pop3-store.c:217
+#: ../camel/providers/pop3/camel-pop3-store.c:224
 #, 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:247
+#: ../camel/providers/pop3/camel-pop3-store.c:187
 msgid "STLS not supported by server"
 msgstr "ਸਰਵਰ ਵਲ�� STLS ਸਹਾ�� ਨਹ��"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:263
+#: ../camel/providers/pop3/camel-pop3-store.c:205
 #, 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:282
+#: ../camel/providers/pop3/camel-pop3-store.c:218
+msgid "TLS negotiations failed"
+msgstr "TLS �ੱਲਬਾਤ ਫ�ਲ�ਹ"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:225
 msgid "TLS is not available in this build"
 msgstr "�ਸ ਨਿਰਮਾਣ ਵਿੱ� TLS �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:388
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:429
-#: ../camel/providers/pop3/camel-pop3-store.c:567
+#: ../camel/providers/pop3/camel-pop3-store.c:300
+#: ../camel/providers/pop3/camel-pop3-store.c:452
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4314,23 +4304,23 @@ msgid ""
 msgstr "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ: ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� ਲ� ਸਹਾ�� ਨਹ��।"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:448
+#: ../camel/providers/pop3/camel-pop3-store.c:323
 #, c-format
-#| msgid "SASL '%s' Login failed for POP server %s: %s"
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "POP ਸਰਵਰ %2$s%3$s �ੱਤ� SASL '%1$s' ਲਾ��ਨ �ਸਫਲ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:462
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP ਸਰਵਰ %s �ੱਤ� ਲਾ��ਨ �ਰਨ ਤ�� �ਸਫਲ: SASL ਪਰ����ਾਲ �ਲਤ�"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:481
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "POP ਸਰਵਰ %s ਤ� ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ: %s"
+#| msgid "Failed to authenticate on POP server %s: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "POP ਸਰਵਰ %s ਤ� ਪ�ਰਮਾਣ�ਿਤਾ ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:540
+#: ../camel/providers/pop3/camel-pop3-store.c:421
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4339,7 +4329,7 @@ msgstr ""
 "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਲ� �ਸਮੱਰਥ ਹ�।\t�ਲਤ APOP ID ਮਿਲਿ� ਹ�। Impersonation ਹਮਲ� ਦਾ "
 "ਸ਼ੱ� ਹ�। �ਪਣ� ਪਰਸ਼ਾਸ਼� ਨਾਲ ਸੰਪਰ� �ਰ�।"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:581
+#: ../camel/providers/pop3/camel-pop3-store.c:471
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4349,11 +4339,8 @@ msgstr ""
 "ਪਾਸਵਰਡ ਭ��ਣ ਵਿੱ� �ਸਫਲ: %s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:591
+#: ../camel/providers/pop3/camel-pop3-store.c:484
 #, 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"
@@ -4362,11 +4349,8 @@ msgstr ""
 "ਯ��਼ਰ ਨਾ�%s ਭ��ਣ ਦ�ਰਾਨ �ਲਤ�"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:601
+#: ../camel/providers/pop3/camel-pop3-store.c:497
 #, 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"
@@ -4374,188 +4358,216 @@ msgstr ""
 "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਮਰੱਥ ਹ�।\n"
 "ਪਾਸਵਰਡ%s ਭ��ਣ ਦ�ਰਾਨ �ਲਤ�"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:707
+#: ../camel/providers/pop3/camel-pop3-store.c:653
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:666
+#, c-format
+#| msgid "IMAP server %s"
+msgid "POP3 server %s"
+msgstr "POP3 ਸਰਵਰ %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:670
+#, c-format
+#| msgid "IMAP service for %s on %s"
+msgid "POP3 server for %s on %s"
+msgstr "POP3 ਸਰਵਿਸ %2$s �ੱਤ� %1$s ਲ�"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:685
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s' ਫ�ਲਡਰ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:709
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "POP3 ਸ��ਰ � ��� ਫ�ਲਡਰ ਲ�� ਨਹ�� ਹ�"
+
+#: ../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:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "ਪ�ਰਾਪਤ ਸ��� ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "sendmail ਨਾਲ ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: ਪੱਤਰ ਭ��ਿ� ਨਹ�� �ਿ� ਹ�।"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail ਨ�ੰ ਵੰਡਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: ਪੱਤਰ ਨਹ�� ਭ��ਿ� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+#| msgid "Could not send message: %s"
+msgid "Could not send message: "
+msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਿ�: "
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail ਸੰ��ਤ %s ਨਾਲ ਬੰਦ ਹ� �� ਹ�: ਪੱਤਰ ਨਹ�� ਭ��ਿ� �ਿ� ਹ�।"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਿ�: ਪੱਤਰ ਨਹ�� ਭ��ਿ� �ਿ�"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail ਸਥਿਤ� %d ਨਾਲ ਬੰਦ: ਪੱਤਰ ਨਹ�� ਭ��ਿ� �ਿ�।"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail ਪਰ��ਰਾਮ ਰਾਹ�� ਪੱਤਰ ਭ���"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "ਰਿਮ�� mailhub ਨ�ੰ SMTP ਵਰਤ �� ਪੱਤਰ ਭ��ਣ ਲ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:116
 msgid "Syntax error, command unrecognized"
 msgstr "ਸੰ���ਸ �ਲਤ�, �ਮਾ�ਡ ਪ�ਾਣ� ਨਹ�� �ਾ ਸ��"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:118
 msgid "Syntax error in parameters or arguments"
 msgstr "ਪ�ਰਾਮ��ਰ �ਾ� �ਰ��ਮਿੰ� ਵਿੱ� ਸੰ���ਸ �ਲਤ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:120
 msgid "Command not implemented"
 msgstr "�ਮਾ�ਡ ਲਾ�� ਨਹ�� ��ਤ� �ਾ ਸ�� ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:122
 msgid "Command parameter not implemented"
 msgstr "�ਮਾ�ਡ ਪ�ਰਾਮ��ਰ ਲਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:124
 msgid "System status, or system help reply"
 msgstr "ਸਿਸ�ਮ ਸਥਿਤ� �ਾ� ਸਿਸ�ਮ ਮੱਦਦ �ਵਾਬ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:126
 msgid "Help message"
 msgstr "ਮੱਦਦ ਸ�ਨ�ਹਾ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:128
 msgid "Service ready"
 msgstr "ਸਰਵਿਸ ਤਿ�ਰ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:130
 msgid "Service closing transmission channel"
 msgstr "ਸਰਵਿਸ ਬੰਦ �ਰਨ ਲ� ਸੰ�ਾਰ ��ਨਲ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:132
 msgid "Service not available, closing transmission channel"
 msgstr "ਸਰਵਿਸ �ਪਲੱਬਧ ਨਹ�� ਹ�, ਸੰ�ਾਰ ��ਨਲ ਬੰਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:134
 msgid "Requested mail action okay, completed"
 msgstr "ਲ���ਦਾ ਪੱਤਰ �ਾਰਵਾ� ਠ�� ਹ�, ਸਮਾਪਤ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:136
 msgid "User not local; will forward to <forward-path>"
 msgstr "ਯ��਼ਰ ਲ��ਲ ਨਹ�� ਹ�; �ੱ�� <forward-path> ਭ��ਿ� �ਾਵ��ਾ।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:138
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ਲ���ਦ� ਪੱਤਰ �ਾਰਵਾ� ��ਤ� ਨਹ�� �ਾ ਸ�ਦ�: mailbox �ਪਲੱਬਧ ਨਹ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:140
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ਲ���ਦ� �ਾਰਵਾ� ��ਤ� ਨਹ�� �ਾ ਸ�ਦ�: mailbox �ਪਲੱਬਧ ਨਹ��।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:142
 msgid "Requested action aborted: error in processing"
 msgstr "ਲ���ਦ� �ਾਰਵਾ� �ੱਡ� �� ��, �ਾਰਵਾ� ਵਿੱ� �ਲਤ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:144
 msgid "User not local; please try <forward-path>"
 msgstr "ਯ��਼ਰ ਲ��ਲ ਨਹ�� ਹ�; �ਿਰਪਾ �ਰ�� <forward-path> ਵਰਤ��"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:146
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ਲ���ਦ� �ਾਰਵਾ� ��ਤ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: ਲ���ਦ� ਸਿਸ�ਮ ਥਾ� �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:148
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "ਲ���ਦ� ਪੱਤਰ �ਾਰਵਾ� �ਧ�ਰ�: �ਪਲੱਬਧ ਲ�� ਸ�ਮਾ ਤ�� ਵਧ�ਰ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "ਲ���ਦ� �ਾਰਵਾ� ਸੰਭਵ ਨਹ��: mailbox ਨਾ� ਸੰਭਵ ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ਮ�ਲ �ੰਪ�ੱ� ਸ਼�ਰ�; <CRLF>.<CRLF> ਨਾਲ ਸਮਾਪਤ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
 msgid "Transaction failed"
 msgstr "�ਰਾ�ਸ਼��ਸ਼ਨ ਫ�ਲ�ਹ ਹ��"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "A password transition is needed"
 msgstr "�ੱ� ਪਾਸਵਰਡ ਤਬਦ�ਲ� ਲ���ਦ� ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
 msgid "Authentication mechanism is too weak"
 msgstr "ਪ�ਰਮਾਣਿ�ਤਾ ਢੰ� ਬਹ�ਤ �ਮ��ਰ ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� ਲ� ���ਰਿਪਸ਼ਨ ਲ���ਦ� ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
 msgid "Temporary authentication failure"
 msgstr "�ਰ�� ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-msgid "Welcome response error"
-msgstr "�� ���� ਨ�ੰ �ਵਾਬ �ਲਤ�"
+#: ../camel/providers/smtp/camel-smtp-transport.c:252
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+#| msgid "Welcome response error"
+msgid "Welcome response error: "
+msgstr "�� ���� ਨ�ੰ �ਵਾਬ �ਲਤ�: "
 
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
 #: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "SMTP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਨਾਲ ��� ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS �ਮਾ�ਡ �ਸਫਲ: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-msgid "STARTTLS command failed"
-msgstr "STARTTLS �ਮਾ�ਡ �ਸਫਲ"
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:314
+#: ../camel/providers/smtp/camel-smtp-transport.c:320
+#| msgid "STARTTLS command failed: %s"
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS �ਮਾ�ਡ �ਸਫਲ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:450
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP ਸਰਵਰ %s ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ �ਿਸਮ %s ਲ� ਸਹਾ�� ਨਹ�� ਹ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:567
+#: ../camel/providers/smtp/camel-smtp-transport.c:526
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4566,202 +4578,190 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
+#: ../camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ਸਰਵਰ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP ਪੱਤਰ ਪਹ�ੰ� %s ਰਾਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:686
+#, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: ਸ�ਵਾ ���� ਨਹ�� ਹ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:693
+#, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: ਭ��ਣ ਵਾਲ� ਦਾ �ਡਰ�ੱਸ �ਾ�� ਨਹ�� ਹ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Sending message"
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:713
+#, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: ��� ਪ�ਰਾਪਤ �ਰਤਾ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: �ੱ� �ਾ� ਵਧ�ਰ� ਪ�ਰਾਪਤ-�ਰਤਾ �ਲਤ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:961
 msgid "SMTP Greeting"
 msgstr "SMTP ਸ਼�ੱਭ-ਸ�ਨ�ਹਾ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO �ਮਾ�ਡ �ਸਫਲ: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "HELO �ਮਾ�ਡ �ਸਫਲ"
+#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:1000
+#: ../camel/providers/smtp/camel-smtp-transport.c:1007
+#| msgid "HELO command failed: %s"
+msgid "HELO command failed: "
+msgstr "HELO �ਮਾ�ਡ �ਸਫਲ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
 msgid "SMTP Authentication"
 msgstr "SMTP ਪ�ਰਮਾਣ�ਿਤਾ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1081
+#, c-format
 msgid "Error creating SASL authentication object."
 msgstr "�ਲਤ�, SASL ਪ�ਰਮਾਣ�ਿਤਾ ��ਾ� ਬਣਾ�ਣ ਵਿੱ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH �ਮਾ�ਡ �ਸਫਲ: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-msgid "AUTH command failed"
-msgstr "AUTH �ਮਾ�ਡ �ਸਫਲ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr "ਸਰਵਰ ਤ�� �ਲਤ ਪ�ਰਮਾਣਿ�ਤਾ �ਵਾਬ।\n"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1097
+#: ../camel/providers/smtp/camel-smtp-transport.c:1107
+#: ../camel/providers/smtp/camel-smtp-transport.c:1115
+#| msgid "AUTH command failed: %s"
+msgid "AUTH command failed: "
+msgstr "AUTH �ਮਾ�ਡ �ਸਫਲ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1212
+#: ../camel/providers/smtp/camel-smtp-transport.c:1224
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#| msgid "MAIL FROM command failed"
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM �ਮਾ�ਡ �ਸਫਲ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1254
+#| msgid "RSET command failed: %s"
+msgid "RCPT TO command failed: "
+msgstr "RCPT TO �ਮਾ�ਡ ਫ�ਲ�ਹ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1268
+#: ../camel/providers/smtp/camel-smtp-transport.c:1276
+#, c-format
+#| msgid "RCPT TO <%s> failed"
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> ਫ�ਲ�ਹ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1314
+#: ../camel/providers/smtp/camel-smtp-transport.c:1323
+#: ../camel/providers/smtp/camel-smtp-transport.c:1333
+#: ../camel/providers/smtp/camel-smtp-transport.c:1390
+#: ../camel/providers/smtp/camel-smtp-transport.c:1406
+#: ../camel/providers/smtp/camel-smtp-transport.c:1417
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
+#| msgid "DATA command failed"
+msgid "DATA command failed: "
+msgstr "DATA �ਮਾ�ਡ ਫ�ਲ�ਹ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1446
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1465
+#| msgid "RSET command failed: %s"
+msgid "RSET command failed: "
+msgstr "RSET �ਮਾ�ਡ ਫ�ਲ�ਹ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1487
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1506
+#| msgid "QUIT command failed: %s"
+msgid "QUIT command failed: "
+msgstr "QUIT �ਮਾ�ਡ ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM �ਮਾ�ਡ �ਸਫਲ: %s: ਪੱਤਰ ਭ��ਿ� ਨਹ�� �ਿ�"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM �ਮਾ�ਡ �ਸਫਲ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO �ਮਾ�ਡ �ਸਫਲ: %s:ਪੱਤਰ ਭ��ਿ� ਨਹ�� �ਿ�"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> �ਸਫਲ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "DATA �ਮਾ�ਡ �ਸਫਲ: %s: ਪੱਤਰ ਭ��ਿ� ਨਹ�� �ਿ�"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-msgid "DATA command failed"
-msgstr "DATA �ਮਾ�ਡ �ਸਫਲ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET �ਮਾ�ਡ �ਸਫਲ: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "RSET �ਮਾ�ਡ �ਸਫਲ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT �ਮਾ�ਡ �ਸਫਲ: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "QUIT �ਮਾ�ਡ �ਸਫਲ"
-
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:46
 msgid "Business"
 msgstr "ਵਪਾਰ"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:47
 msgid "Competition"
 msgstr "ਮ��ਾਬਲਾ"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:48
 msgid "Favorites"
 msgstr "ਪਸੰਦ�ਦਾ"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:49
 msgid "Gifts"
 msgstr "ਤ�ਹਫ�"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:50
 msgid "Goals/Objectives"
 msgstr "ਨਿਸ਼ਾਨ�/����"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:51
 msgid "Holiday"
 msgstr "��ੱ��"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:52
 msgid "Holiday Cards"
 msgstr "��ੱ���� �ਾਰਡ"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
 msgid "Hot Contacts"
 msgstr "ਤ�� ਸੰਪਰ�"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:55
 msgid "Ideas"
 msgstr "ਢੰ�"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:56
 msgid "International"
 msgstr "�ੰਤਰਰਾਸ਼�ਰ�"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:57
 msgid "Key Customer"
 msgstr "�ਾਸ �ਾਹ�"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:58
 msgid "Miscellaneous"
 msgstr "ਫ���ਲ"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:59
 msgid "Personal"
 msgstr "ਨਿੱ��"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:60
 msgid "Phone Calls"
 msgstr "ਫ�ਨ �ਾਲ"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:62
 msgid "Status"
 msgstr "ਹਾਲਤ"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:63
 msgid "Strategies"
 msgstr "ਨ�ਤ�"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:64
 msgid "Suppliers"
 msgstr "ਸਪਲਾ�ਰ"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:65
 msgid "Time & Expenses"
 msgstr "ਸਮਾ� �ਤ� �ਰ��"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:66
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:67
 msgid "Waiting"
 msgstr "�ਡ�� �ਾਰ�"
 
@@ -4893,11 +4893,11 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP ਸਰਵਰ ਨ�ੰ ��ਿ�ਤ ਦ� ਤ�ਰ 'ਤ� ਵਰਤ��"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
 msgid "Failed to authenticate.\n"
 msgstr "ਡਾ�ਾ ���ਡਿ� �ਰਨ ਵਿੱ� �ਸਫਲ ਹ�।\n"
 
@@ -4909,18 +4909,18 @@ msgstr "���ਾ�ਰ� ���ਾਨ"
 msgid "_No Image"
 msgstr "��� �ਿੱਤਰ ਨਹ��(_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:372
+#: ../libedataserverui/e-categories-dialog.c:368
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "ਸੰਰ�ਨਾ ਵਿੱ� ਪਹਿਲਾ� ਹ� '%s' ���ਾ�ਰ� ਹ�। �ਿਰਪਾ �ਰ�� ਵੱ�ਰਾ ਨਾ� ਵਰਤ��।"
 
-#: ../libedataserverui/e-categories-dialog.c:680
+#: ../libedataserverui/e-categories-dialog.c:676
 msgid "Icon"
 msgstr "���ਾਨ"
 
-#: ../libedataserverui/e-categories-dialog.c:685
+#: ../libedataserverui/e-categories-dialog.c:681
 msgid "Category"
 msgstr "���ਾ�ਰ�"
 
@@ -4937,9 +4937,8 @@ msgid "Category _Name"
 msgstr "���ਾ�ਰ� ਨਾ�(_N)"
 
 #: ../libedataserverui/e-categories-dialog.ui.h:4
-#| msgid "Item(s) belong to these _categories:"
-msgid "Item(s) _belong to these categories:"
-msgstr "�ਹਨਾ� ���ਾ�ਰ��� ਨਾਲ ਸਬੰਧਤ ���ਮਾ�(_b):"
+msgid "Currently _used categories:"
+msgstr "�ਸ ਸਮ�� ਵਰਤ��� ���ਾ�ਰ���(_u):"
 
 #: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
@@ -4958,27 +4957,19 @@ msgstr "���ਾ�ਰ�"
 msgid "Create category \"%s\""
 msgstr "���ਾ�ਰ� \"%s\" ਬਣਾ�"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "ਰੰ� �ਾਣ�ਾਰ�"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "ਰ��ਡਰ �ਰਨ ਲ� ਰੰ�"
-
-#: ../libedataserverui/e-name-selector-dialog.c:292
+#: ../libedataserverui/e-name-selector-dialog.c:319
 msgid "Select Contacts from Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ��� ਸੰਪਰ� ��ਣ�"
 
-#: ../libedataserverui/e-name-selector-dialog.c:587
+#: ../libedataserverui/e-name-selector-dialog.c:658
 msgid "_Add"
 msgstr "ਸ਼ਾਮਲ(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:612
+#: ../libedataserverui/e-name-selector-dialog.c:662
 msgid "_Remove"
 msgstr "ਹ�ਾ�(_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:789
+#: ../libedataserverui/e-name-selector-dialog.c:858
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "��� ਵ� ���ਾ�ਰ�"
@@ -5020,56 +5011,56 @@ msgid "_Search:"
 msgstr "���(_S):"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2511
+#: ../libedataserverui/e-name-selector-entry.c:2586
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s ਲਾ�ਨ '� ਫ�ਲਾ�(_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2526
+#: ../libedataserverui/e-name-selector-entry.c:2601
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s �ਾਪ� �ਰ�(_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2536
+#: ../libedataserverui/e-name-selector-entry.c:2611
 #, c-format
 msgid "C_ut %s"
 msgstr "%s �ੱ��(_U)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2553
+#: ../libedataserverui/e-name-selector-entry.c:2628
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ਸ�ਧ(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:479
+#: ../libedataserverui/e-name-selector-list.c:517
 #, c-format
 msgid "_Delete %s"
 msgstr "%s ਹ�ਾ�(_D)"
 
-#: ../libedataserverui/e-passwords.c:240
+#: ../libedataserverui/e-passwords.c:257
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr "��ਰਿੰ� �� �ਣ-ਵਰਤ��ਯ�� ਹ�: ��� ਹ�ਸ� �ਾ� ਯ��਼ਰ ਨਹ��"
 
-#: ../libedataserverui/e-passwords.c:1099
+#: ../libedataserverui/e-passwords.c:1116
 msgid "You have the Caps Lock key on."
 msgstr "ਤ�ਸ�� ��ਪਸ ਲਾ� ਨ�ੰ �ਾਲ� ��ਤਾ ਹ�।"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1238
 msgid "_Remember this passphrase"
 msgstr "�ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1239
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "�ਸ ਸ਼�ਸ਼ਨ ਲ� �ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1227
+#: ../libedataserverui/e-passwords.c:1244
 msgid "_Remember this password"
 msgstr "�ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1228
+#: ../libedataserverui/e-passwords.c:1245
 msgid "_Remember this password for the remainder of this session"
 msgstr "�ਸ ਸ਼�ਸਨ ਲ� �ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
@@ -5098,6 +5089,326 @@ msgstr "ਸਰਵਰ ਤ�� ��� �ਵਾਬ ਨਹ��"
 msgid "Bad parameter"
 msgstr "�ਲਤ ਪ�ਰਾਮ��ਰ"
 
+#~| msgid "Could not cancel operation"
+#~ msgid "Cannot complete operation"
+#~ msgstr "�ਪਰ�ਸ਼ਨ ਪ�ਰਾ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
+
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "����� ਥਰਿੱਡ ਨ�ੰ ਵਿ�ਸਤ ਨਹ�� �ਾ ਸ�ਿ�"
+
+#~ msgid "Offline mode unavailable"
+#~ msgstr "�ਫਲਾ�ਨ ਮ�ਡ �ਪਲੱਬਧ ਨਹ��"
+
+#~ msgid "Cannot open message"
+#~ msgstr "ਸ�ਨ�ਹਾ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ�: %s ਲ�"
+
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: ਸਮ��ਰਨ ਨਾਲ ���: %s ਲ�"
+
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: ਸਮ��ਰਨ �ਿਣਤ�: %s ਲ�"
+
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: UID ਨਾਲ ���: %s ਲ�"
+
+#~ msgid "Learning junk"
+#~ msgstr "�ੰ� ਸਿੱ� ਰਿਹਾ ਹ�"
+
+#~ msgid "Learning non-junk"
+#~ msgstr "ਨਾ-ਰੱਦ� ਸਿੱ�ਿ� �ਾ ਰਿਹਾ ਹ�"
+
+#~ msgid "Canceled."
+#~ msgstr "ਰੱਦ ��ਤਾ ਹ�।"
+
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr "ਸ�ਨ�ਹਾ ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�� ਹਨ: �ਰ�� ਫਾ�ਲ ਨਹ�� ਬਣਾ� �ਾ ਸ�� ਹ�: %s"
+
+#~ msgid "Unable to parse message content"
+#~ msgstr "ਸ�ਨ�ਹਾ ਭਾ� ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ"
+
+#~ msgid "cannot create thread"
+#~ msgstr "ਥਰਿੱਡ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr "��ਮਲ ਸ਼�ਸ਼ਨ ਸ�ਨ�ਹਾ �ੱ�� ਭ��ਣ ਲ� ਸਹਾ�� ਨਹ�� ਹ�"
+
+#~ msgid "import keys: unimplemented"
+#~ msgstr "�ਯਾਤ ��: ਨਾ-ਸਥਾਪਿਤ"
+
+#~ msgid "export keys: unimplemented"
+#~ msgstr "ਨਿਰਯਾਤ ��: ਨਾ-ਸਥਾਪਿਤ"
+
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਸ ਸੰਭਾਲ ਤ� �ਲਤ �ਾਰਵਾ�"
+
+#~ msgid "User canceled"
+#~ msgstr "ਯ��਼ਰ ਨ� ਰੱਦ ��ਤਾ"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "ਰੱਦ� ਫ�ਲਡਰ ਭਰ �ਿ� ਹ�। �ਾਲ� �ਰ� ��।"
+
+#~ msgid "Hula"
+#~ msgstr "ਹ�ਲਾ(Hula)"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "Hula ਸਰਵਰ ਵਰਤਣ ਲ�"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr "�ਹ ��ਣ Hula ਸਰਵਰ ਨਾਲ ਪਲ�ਨ-���ਸ� ਪਾਸਵਰਡ ਨਾਲ ਸ਼ਾਮਿਲ �ਰਨ ਲ� ਸਹਾ�� ਹ�।"
+
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr "APPEND �ਮਾ�ਡ ਦ� ਬਾ�ਦ ��ਾਨ� �ਵਾਬ ਹਾਲਤ '%s'"
+
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "APPEND �ਮਾ�ਡ ਦ� ਬਾ�ਦ ��� �ਵਾਬ ਨਹ��"
+
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "APPEND �ਮਾ�ਡ ਦ� ਦ�ਰਾਨ �ਣ�ਾਣ �ਲਤ� �� ਹ�!"
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "IMAP ਸਰਵਰ %s ਨ�ੰ �ਮਾ�ਡ ਭ��ਣ ਵਿੱ� �ਸਫਲ: %s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "IMAP4 ਸਰਵਰ %s ਤ�� �ਣ�ਾਹਿ� �ਵਾਬ: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "IMAP ਸਰਵਰ %s ਤ�� �ਣ�ਾਣਾ ਸਵਾ�ਤ� ਸ�ਨ�ਹਾ"
+
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "ਫ�ਲਡਰ '%s' ��ਣਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਲਤ mailbox ਨਾ�"
+
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "ਫ�ਲਡਰ '%s' ��ਣਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�:�ਲਤ �ਮਾ�ਡ"
+
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "IMAP ਸਰਵਰ %s ਨ�ੰ �ਮਾ�ਡ ਭ��ਣ ਵਿੱ� �ਸਫਲ: %s"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP4 ਸਰਵਰ %s �ਸਧਾਰਨ ਬੰਦ ਹ� �ਿ� ਹ�: %s"
+
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr "��� ਫਿਲ�ਰਾ� �ਤ� vFolder ਨਿਯਮਾ� ਹ�ਰ ਮ�ਲਿੰ�-ਲਿਸ� ��� ਲ� �ਾਹ�ਦ� ਹਨ"
+
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "ਮਿ�ਦ ਪ�ੱ�� ��ਸ਼ ਵਾਲ� ਸ�ਨ�ਹ�, �� �ਿ X ਸ�ਿੰ�ਾ� '� ਨਹ�� ਪ��ਹ� �� ਹਨ"
+
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "X ਸ�ਿੰ�ਾ� ਤ�� ਪ�ਰਾਣ� ਮਿ�ਦ ਪ�ੱ�� ��ਸ਼ ਸ�ਨ�ਹ�"
+
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "'%s' ਫ�ਲਡਰ ਤ� ਪਹ�ੰ� ਨਹ�� ਹ�: %s"
+
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਨਾਲ ਨਿਸ਼ਾਨ ਸਮ�ਾਲ� ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹਨ: �ਣ�ਾਣ"
+
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਨਾਲ ਸਮ�ਾਲ� ਨਿਸ਼ਾਨ ਨਹ�� ��ਤ� �ਾ ਸ��: �ਲਤ �ਮਾ�ਡ"
+
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਨ�ੰ ਸਾਫ ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਣ�ਾਣ �ਲਤ�"
+
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਨ�ੰ ਸਾਫ ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਲਤ �ਮਾ�ਡ"
+
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr ""
+#~ "ਫ�ਲਡਰ '%2$s' ਸ�ਨ�ਹਾ %1$s ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਸਤਰਾ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
+
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr "ਫ�ਲਡਰ '%2$s' ਸ�ਨ�ਹਾ %1$s ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਲਤ �ਮਾ�ਡ"
+
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਲ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦਾ: ਫ�ਲਡਰ ਸਿਰਫ਼ ਪ��ਹਨ ਲ� ਹ�"
+
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਣ�ਾਣ� �ਲਤ�"
+
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਲਤ �ਮਾ�ਡ"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ '%s' ਤ�� '%s' ਵਿੱ� ਭ��� ਨਹ�� �ਾ ਸ�ਦ� ਹਨ: �ਣ�ਾਣ �ਲਤ�"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ '%s' ਤ�� '%s' ਵਿੱ� �ਾਪ� ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹਨ: �ਣ�ਾਣ �ਲਤ�"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ '%s' ਤ�� '%s' ਵਿੱ� ਭ��� ਨਹ�� �ਾ ਸ�ਦ� ਹਨ: �ਲਤ �ਮਾ�ਡ"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ '%s' ਤ�� '%s' ਵਿੱ� ਨ�ਲ ਨਹ�� �ਾ ਸ�ਦ� ਹਨ: �ਲਤ �ਮਾ�ਡ"
+
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "�ੰ� ਸਮੱ�ਰ� ਲ� ਨਵ�� ਸ�ਨ�ਹ� ��ੱ� �ਰ�(_J)"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "��ਣਬ�ਸ� ਫ�ਲਡਰ ਵਿੱ� �ੰ� ਸ�ਨ�ਹਿ�� ਲ� ਪ�ਤਾਲ �ਰ�(_g)"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAP4rev1"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "MAPv4rev1 ਸਰਵਰਾ� ਤ� ਪੱਤਰ ਪ�ਨ �ਤ� ਸੰਭਾਲਣ ਲ� ਹ�।"
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr "�ਸ ��ਣ ਨਾਲ ਤ�ਸ�� IMAPv4rev1 ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਨਾਲ ��� ਸ�ਦ� ਹ�।"
+
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "IMAP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਮ�ਡ ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ: ਸਰਵਰ STARTTLS ਲ� ਸਹਾ�� ਨਹ�� ਹ�।"
+
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr "IMAP ਸਰਵਰ %s ਤ� ਪ�ਰਮਾਣ�ਿਤ ਢੰ� %s ਨਾਲ ਪ�ਰਮਾਣਿਤ ਨਹ�� ਹ� �ਾ ਸ�ਦਾ ਹ�।"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "IMAP ਸਰਵਰ %s ਤ� %s ਵਰਤ �� ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ� �ਸਫਲ"
+
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� IMAP ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr "IMAP ਸਰਵਰ %2$s ਤ� ਫ�ਲਡਰ '%1$s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: �ਣ�ਾਣ �ਲਤ�"
+
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr "IMAP ਸਰਵਰ %2$s �ੱਤ� '%1$s' ਵਾਸਤ� LIST �ਾਣ�ਾਰ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�: %3$s"
+
+#~ msgid "Bad command"
+#~ msgstr "�ਲਤ �ਮਾ�ਡ"
+
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਲਤ mailbox ਨਾ�"
+
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਲਤ �ਮਾ�ਡ"
+
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� IMAP ਫ�ਲਡਰਾ� ਨ�ੰ ਹ�ਾ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: �ਲਤ mailbox ਨਾ�"
+
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: �ਲਤ �ਮਾ�ਡ"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਦਾ� ਨਾ�-ਤਬਦ�ਲ '%s' ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਾਸ ਫ�ਲਡਰ"
+
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� IMAP ਫ�ਲਡਰ ਦਾ ਨਾ�-ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਦਾ ਨਾ�-ਤਬਦ�ਲ '%s' ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਲਤ mailbox ਨਾ�"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਦਾ� ਨਾ�-ਤਬਦ�ਲ '%s' ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਲਤ �ਮਾ�ਡ"
+
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr ""
+#~ "IMAP ਸਰਵਰ %3$s ਤ� ਪ��ਰਨ '%2$s' ਲ� %1$s �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ ਨਹ�� ��ਤ� �ਾ ਸ�ਦ�: %4$s"
+
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� IMAP ਫ�ਲਡਰ ਨ�ੰ ਸਵ��ਾਰ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਨ�ੰ ਸਵ��ਾਰ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਲਤ mailbox ਨਾ�"
+
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਲ� ਮ��ਬਰ ਨਹ�� ਬਣਿ� �ਾ ਸ�ਦਾ ਹ�: �ਲਤ �ਮਾ�ਡ"
+
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� IMAP ਫ�ਲਡਰ ਨ�ੰ �ਸਵ��ਾਰ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਦ� ਮ��ਬਰ� ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: �ਲਤ mailbox ਨਾ�"
+
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr "ਫ�ਲਡਰ '%s' ਤ�� ਮ��ਬਰ� ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: �ਲਤ �ਮਾ�ਡ"
+
+#~ msgid "Scanning for changed messages"
+#~ msgstr "ਤਬਦ�ਲ ਸ�ਨ�ਹਿ�� ਦ� �ਾ�� �ਾਰ� ਹ�"
+
+#~ msgid "IMAP server %s is in an inconsistent state."
+#~ msgstr "IMAP ਸਰਵਰ %s �ਰਾਬ ਹਾਲਤ '� ਹ�।"
+
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� �ੰਵ�ਲਪ ਲ� �ਾ ਰਹ� ਹਨ"
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "IMAP ਸਰਵਰ %s ਤ�� �ਵਾਬ ਵਿੱ� �ਲਤ ���ਨ : "
+
+#~ msgid "No data"
+#~ msgstr "��� ਡਾ�ਾ ਨਹ�"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP ਸਰਵਰ %s �ਸਧਾਰਨ ਵੱ� ਹ� �ਿ� ਹ�: %s"
+
+#~ msgid "Maildir append message canceled"
+#~ msgstr "Maildir ਸ਼ਾਮਿਲ ਸ�ਨ�ਹਾ ਰੱਦ ��ਤਾ"
+
+#~ msgid "Invalid message contents"
+#~ msgstr "�ਲਤ ਸ�ਨ�ਹਾ ਸਮੱ�ਰ�"
+
+#~ msgid "Mail append canceled"
+#~ msgstr "ਪੱਤਰ ਸ਼ਾਮਿਲ ਰੱਦ ��ਤਾ"
+
+#~ msgid "Message construction failed."
+#~ msgstr "ਸ�ਨ�ਹਾ ਰ�ਨਾ �ਸਫਲ।"
+
+#~ msgid "MH append message canceled"
+#~ msgstr "MH ਸ਼ਾਮਿਲ ਸ�ਨ�ਹਾ ਰੱਦ ��ਤਾ"
+
+#~ msgid "Use cancel"
+#~ msgstr "ਰੱਦ ਵਰਤ��"
+
+#~ msgid "STARTTLS command failed"
+#~ msgstr "STARTTLS �ਮਾ�ਡ �ਸਫਲ"
+
+#~ msgid "HELO command failed"
+#~ msgstr "HELO �ਮਾ�ਡ �ਸਫਲ"
+
+#~ msgid "AUTH command failed"
+#~ msgstr "AUTH �ਮਾ�ਡ �ਸਫਲ"
+
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "ਸਰਵਰ ਤ�� �ਲਤ ਪ�ਰਮਾਣਿ�ਤਾ �ਵਾਬ।\n"
+
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "MAIL FROM �ਮਾ�ਡ �ਸਫਲ: %s: ਪੱਤਰ ਭ��ਿ� ਨਹ�� �ਿ�"
+
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "RCPT TO �ਮਾ�ਡ �ਸਫਲ: %s:ਪੱਤਰ ਭ��ਿ� ਨਹ�� �ਿ�"
+
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "DATA �ਮਾ�ਡ �ਸਫਲ: %s: ਪੱਤਰ ਭ��ਿ� ਨਹ�� �ਿ�"
+
+#~ msgid "RSET command failed"
+#~ msgstr "RSET �ਮਾ�ਡ �ਸਫਲ"
+
+#~ msgid "QUIT command failed"
+#~ msgstr "QUIT �ਮਾ�ਡ �ਸਫਲ"
+
+#~| msgid "Item(s) belong to these _categories:"
+#~ msgid "Item(s) _belong to these categories:"
+#~ msgstr "�ਹਨਾ� ���ਾ�ਰ��� ਨਾਲ ਸਬੰਧਤ ���ਮਾ�(_b):"
+
+#~ msgid "Color Info"
+#~ msgstr "ਰੰ� �ਾਣ�ਾਰ�"
+
+#~ msgid "The color to render"
+#~ msgstr "ਰ��ਡਰ �ਰਨ ਲ� ਰੰ�"
+
 #~ msgid "\"%s\" on book before \"%s\""
 #~ msgstr "\"%s\" ਬ�ੱ� ਤ� ਪਹਿਲਾ� \"%s\""
 
@@ -5110,9 +5421,6 @@ msgstr "�ਲਤ ਪ�ਰਾਮ��ਰ"
 #~ msgid "%s: there is no current operation"
 #~ msgstr "%s: ਮ���ਦਾ ��� �ਾਰਵਾ� ਨਹ�� ਹ�"
 
-#~ msgid "%s: could not cancel"
-#~ msgstr "%s: ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
-
 #~ msgid "\"%s\" on book after \"%s\""
 #~ msgstr "\"%s\" ਬ�ੱ� ਦ� ਬਾ�ਦ \"%s\""
 
@@ -5312,9 +5620,6 @@ msgstr "�ਲਤ ਪ�ਰਾਮ��ਰ"
 #~ msgid "The specified folder type is not valid"
 #~ msgstr "ਦਿੱਤ� ਫ�ਲਡਰ �ਿਸਮ �ਾ��਼ ਨਹ�� ਹ�"
 
-#~ msgid "I/O error"
-#~ msgstr "I/O �ਲਤ�"
-
 #~ msgid "Not enough space to create the folder"
 #~ msgstr "ਫ�ਲਡਰ ਬਣਾ�ਣ ਲ� ਲ���ਦ� �ਾਲ� ਥਾ� ਨਹ��"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]