[evolution-data-server] Updating Translation for Punjabi



commit c67cfe44079b57cca4c6a9183b2312ad2f81744d
Author: A S Alam <aalam users sf net>
Date:   Sun Sep 13 09:25:21 2009 +0530

    Updating Translation for Punjabi

 po/pa.po | 2069 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 1037 insertions(+), 1032 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index 95f9eeb..f2f5a7a 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -11,73 +11,73 @@ msgstr ""
 "Project-Id-Version: evolution-data-server.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
 "cgi?product=evolution-data-server&component=general\n"
-"POT-Creation-Date: 2009-02-25 12:08+0000\n"
-"PO-Revision-Date: 2009-03-14 15:32+0000\n"
+"POT-Creation-Date: 2009-08-11 14:04+0000\n"
+"PO-Revision-Date: 2009-09-13 09:22+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
-"Language-Team: Punjabi/Panjabi <punjab-l10n list sf net>\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 0.3\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/groupwise/e-book-backend-groupwise.c:2391
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2329
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
 #: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2260
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2282
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2327
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "��� �ਾਰ� ਹ�..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2695
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "ਸੰਪਰ� (%d) ਡਾ�ਨਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2844
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "ਸੰਪਰ� ����� (%d) �ੱਪਡ�� ��ਤ� �ਾ ਰਹ� ਹ�... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
 msgid "Using Distinguished Name (DN)"
 msgstr "ਵੱ�ਰਾ ਨਾ� ਵਰਤ�� (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
 msgid "Using Email Address"
 msgstr "�ਮ�ਲ �ਡਰ�ੱਸ ਵਰਤ ��"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ���ਿ� �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਸ਼ਾਮਿਲ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਹ�ਾ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
 msgid "Receiving LDAP search results..."
 msgstr "LDAP ਤ�� ��� ਨਤ��� ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
 msgid "Error performing search"
 msgstr "��� �ਲਾ�ਣ ਵਿੱ� �ਲਤ�"
 
@@ -85,93 +85,93 @@ msgstr "��� �ਲਾ�ਣ ਵਿੱ� �ਲਤ�"
 #. * function names, e.g.
 #. * "e_book_add_contact" on book before
 #. * "e_book_open
-#: ../addressbook/libebook/e-book.c:288 ../addressbook/libebook/e-book.c:292
-#: ../addressbook/libebook/e-book.c:496 ../addressbook/libebook/e-book.c:500
-#: ../addressbook/libebook/e-book.c:639 ../addressbook/libebook/e-book.c:643
-#: ../addressbook/libebook/e-book.c:730 ../addressbook/libebook/e-book.c:734
-#: ../addressbook/libebook/e-book.c:1028 ../addressbook/libebook/e-book.c:1033
-#: ../addressbook/libebook/e-book.c:1211 ../addressbook/libebook/e-book.c:1215
-#: ../addressbook/libebook/e-book.c:1370 ../addressbook/libebook/e-book.c:1374
-#: ../addressbook/libebook/e-book.c:1575 ../addressbook/libebook/e-book.c:1579
-#: ../addressbook/libebook/e-book.c:1818 ../addressbook/libebook/e-book.c:1822
-#: ../addressbook/libebook/e-book.c:2055 ../addressbook/libebook/e-book.c:2059
-#: ../addressbook/libebook/e-book.c:2263 ../addressbook/libebook/e-book.c:2267
-#: ../addressbook/libebook/e-book.c:3454
+#: ../addressbook/libebook/e-book.c:287 ../addressbook/libebook/e-book.c:291
+#: ../addressbook/libebook/e-book.c:495 ../addressbook/libebook/e-book.c:499
+#: ../addressbook/libebook/e-book.c:637 ../addressbook/libebook/e-book.c:641
+#: ../addressbook/libebook/e-book.c:727 ../addressbook/libebook/e-book.c:731
+#: ../addressbook/libebook/e-book.c:1024 ../addressbook/libebook/e-book.c:1029
+#: ../addressbook/libebook/e-book.c:1206 ../addressbook/libebook/e-book.c:1210
+#: ../addressbook/libebook/e-book.c:1365 ../addressbook/libebook/e-book.c:1369
+#: ../addressbook/libebook/e-book.c:1570 ../addressbook/libebook/e-book.c:1574
+#: ../addressbook/libebook/e-book.c:1813 ../addressbook/libebook/e-book.c:1817
+#: ../addressbook/libebook/e-book.c:2050 ../addressbook/libebook/e-book.c:2054
+#: ../addressbook/libebook/e-book.c:2257 ../addressbook/libebook/e-book.c:2261
+#: ../addressbook/libebook/e-book.c:3445
 #, c-format
 msgid "\"%s\" on book before \"%s\""
 msgstr "\"%s\" ਬ�ੱ� ਤ� ਪਹਿਲਾ� \"%s\""
 
-#: ../addressbook/libebook/e-book.c:301 ../addressbook/libebook/e-book.c:509
-#: ../addressbook/libebook/e-book.c:652 ../addressbook/libebook/e-book.c:743
-#: ../addressbook/libebook/e-book.c:1043 ../addressbook/libebook/e-book.c:1225
-#: ../addressbook/libebook/e-book.c:1384 ../addressbook/libebook/e-book.c:1588
-#: ../addressbook/libebook/e-book.c:1831 ../addressbook/libebook/e-book.c:2069
-#: ../addressbook/libebook/e-book.c:2276 ../addressbook/libebook/e-book.c:2685
-#: ../addressbook/libebook/e-book.c:2883
+#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:508
+#: ../addressbook/libebook/e-book.c:650 ../addressbook/libebook/e-book.c:740
+#: ../addressbook/libebook/e-book.c:1039 ../addressbook/libebook/e-book.c:1220
+#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1583
+#: ../addressbook/libebook/e-book.c:1826 ../addressbook/libebook/e-book.c:2064
+#: ../addressbook/libebook/e-book.c:2270 ../addressbook/libebook/e-book.c:2679
+#: ../addressbook/libebook/e-book.c:2877
 #, c-format
 msgid "book busy"
 msgstr "ਬ�ੱ� ਰ�ੱ��"
 
-#: ../addressbook/libebook/e-book.c:332 ../addressbook/libebook/e-book.c:336
-#: ../addressbook/libebook/e-book.c:540 ../addressbook/libebook/e-book.c:544
-#: ../addressbook/libebook/e-book.c:679 ../addressbook/libebook/e-book.c:683
-#: ../addressbook/libebook/e-book.c:770 ../addressbook/libebook/e-book.c:774
-#: ../addressbook/libebook/e-book.c:1070 ../addressbook/libebook/e-book.c:1073
-#: ../addressbook/libebook/e-book.c:1255 ../addressbook/libebook/e-book.c:1258
-#: ../addressbook/libebook/e-book.c:1411 ../addressbook/libebook/e-book.c:1415
-#: ../addressbook/libebook/e-book.c:1624 ../addressbook/libebook/e-book.c:1628
-#: ../addressbook/libebook/e-book.c:1878 ../addressbook/libebook/e-book.c:1882
-#: ../addressbook/libebook/e-book.c:2099 ../addressbook/libebook/e-book.c:2103
-#: ../addressbook/libebook/e-book.c:2302 ../addressbook/libebook/e-book.c:2306
-#: ../addressbook/libebook/e-book.c:2537 ../addressbook/libebook/e-book.c:2711
-#: ../addressbook/libebook/e-book.c:2715 ../addressbook/libebook/e-book.c:2909
-#: ../addressbook/libebook/e-book.c:2913 ../addressbook/libebook/e-book.c:3463
+#: ../addressbook/libebook/e-book.c:331 ../addressbook/libebook/e-book.c:335
+#: ../addressbook/libebook/e-book.c:539 ../addressbook/libebook/e-book.c:543
+#: ../addressbook/libebook/e-book.c:677 ../addressbook/libebook/e-book.c:681
+#: ../addressbook/libebook/e-book.c:767 ../addressbook/libebook/e-book.c:771
+#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069
+#: ../addressbook/libebook/e-book.c:1250 ../addressbook/libebook/e-book.c:1253
+#: ../addressbook/libebook/e-book.c:1406 ../addressbook/libebook/e-book.c:1410
+#: ../addressbook/libebook/e-book.c:1619 ../addressbook/libebook/e-book.c:1623
+#: ../addressbook/libebook/e-book.c:1873 ../addressbook/libebook/e-book.c:1877
+#: ../addressbook/libebook/e-book.c:2094 ../addressbook/libebook/e-book.c:2098
+#: ../addressbook/libebook/e-book.c:2296 ../addressbook/libebook/e-book.c:2300
+#: ../addressbook/libebook/e-book.c:2531 ../addressbook/libebook/e-book.c:2705
+#: ../addressbook/libebook/e-book.c:2709 ../addressbook/libebook/e-book.c:2903
+#: ../addressbook/libebook/e-book.c:2907 ../addressbook/libebook/e-book.c:3454
 #, c-format
 msgid "CORBA exception making \"%s\" call"
 msgstr "CORBA �ਪਵਾਦ \"%s\" �ਾਲ"
 
-#: ../addressbook/libebook/e-book.c:2526
+#: ../addressbook/libebook/e-book.c:2520
 #, c-format
 msgid "%s: there is no current operation"
 msgstr "%s: ਮ���ਦਾ ��� �ਾਰਵਾ� ਨਹ�� ਹ�"
 
-#: ../addressbook/libebook/e-book.c:2555 ../addressbook/libebook/e-book.c:2600
-#: ../addressbook/libebook/e-book.c:2639
+#: ../addressbook/libebook/e-book.c:2549 ../addressbook/libebook/e-book.c:2594
+#: ../addressbook/libebook/e-book.c:2633
 #, c-format
 msgid "%s: could not cancel"
 msgstr "%s: ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
 
-#: ../addressbook/libebook/e-book.c:2671 ../addressbook/libebook/e-book.c:2675
+#: ../addressbook/libebook/e-book.c:2665 ../addressbook/libebook/e-book.c:2669
 #, c-format
 msgid "\"%s\" on book after \"%s\""
 msgstr "\"%s\" ਬ�ੱ� ਦ� ਬਾ�ਦ \"%s\""
 
-#: ../addressbook/libebook/e-book.c:2739
+#: ../addressbook/libebook/e-book.c:2733
 #, c-format
 msgid "%s: canceled"
 msgstr "%s: ਰੱਦ ��ਤਾ"
 
-#: ../addressbook/libebook/e-book.c:3318
+#: ../addressbook/libebook/e-book.c:3310
 #, c-format
 msgid "%s: Invalid source."
 msgstr "%s: �ਲਤ ਸਰ�ਤ ��ਡ"
 
-#: ../addressbook/libebook/e-book.c:3326 ../addressbook/libebook/e-book.c:3392
+#: ../addressbook/libebook/e-book.c:3318 ../addressbook/libebook/e-book.c:3383
 #, c-format
 msgid "%s: no factories available for URI `%s'"
 msgstr "%s: URI `%s' ਲ� ��� ਫ���ਰ� �ਪਲੱਬਧ ਨਹ�� ਹ�"
 
-#: ../addressbook/libebook/e-book.c:3338
+#: ../addressbook/libebook/e-book.c:3329
 #, c-format
 msgid "%s: Could not create EBookListener"
 msgstr "%s: ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�"
 
-#: ../addressbook/libebook/e-book.c:3605
+#: ../addressbook/libebook/e-book.c:3595
 #, c-format
 msgid "%s: there was no self contact UID stored in gconf"
 msgstr "%s: gconf ਵਿੱ� ��� ��ਦ-ਸੰਪਰ� UID ਸੰਭਾਲਿ� ਨਹ�� ਹ�।"
 
-#: ../addressbook/libebook/e-book.c:3738
+#: ../addressbook/libebook/e-book.c:3727
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s: ��-�ਾਨਫ ਵਿੱ� UID `%s' ਲ� ��� ਸਰ�ਤ ਨਹ�� ਹ�।"
@@ -362,7 +362,7 @@ msgstr "ਵ�ਬਲਾ� URL"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../libedataserverui/e-categories-dialog.c:609
 msgid "Categories"
 msgstr "���ਾ�ਰ�"
 
@@ -628,7 +628,7 @@ msgstr "�ਨਮ ਦਿਨ"
 
 #: ../addressbook/libebook/e-contact.c:260
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "ਵਰ�-�ੰਢ"
 
@@ -675,42 +675,34 @@ msgid "Telephone"
 msgstr "��ਲ�ਫ�ਨ"
 
 #: ../addressbook/libebook/e-contact.c:278
-#| msgid "MSN Home Screen Name 1"
 msgid "Skype Home Name 1"
 msgstr "Skype Home Name ੧"
 
 #: ../addressbook/libebook/e-contact.c:279
-#| msgid "MSN Home Screen Name 2"
 msgid "Skype Home Name 2"
 msgstr "Skype Home Name ੨"
 
 #: ../addressbook/libebook/e-contact.c:280
-#| msgid "MSN Home Screen Name 3"
 msgid "Skype Home Name 3"
 msgstr "Skype Home Name à©©"
 
 #: ../addressbook/libebook/e-contact.c:281
-#| msgid "MSN Work Screen Name 1"
 msgid "Skype Work Name 1"
 msgstr "Skype Work Name ੧"
 
 #: ../addressbook/libebook/e-contact.c:282
-#| msgid "MSN Work Screen Name 2"
 msgid "Skype Work Name 2"
 msgstr "Skype Work Name ੨"
 
 #: ../addressbook/libebook/e-contact.c:283
-#| msgid "MSN Work Screen Name 3"
 msgid "Skype Work Name 3"
 msgstr "Skype Work Name à©©"
 
 #: ../addressbook/libebook/e-contact.c:284
-#| msgid "AIM Screen Name List"
 msgid "Skype Name List"
 msgstr "Skype Name ਲਿਸ�"
 
 #: ../addressbook/libebook/e-contact.c:286
-#| msgid "Home Address"
 msgid "SIP address"
 msgstr "SIP �ਡਰ�ੱਸ"
 
@@ -720,7 +712,7 @@ msgid "Unnamed List"
 msgstr "ਬਿਨਾ� ਨਾ� ਸ���"
 
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
+#: ../libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "�ਨਮਦਿਨ"
 
@@ -734,278 +726,274 @@ msgstr "�ਨਮਦਿਨ: %s"
 msgid "Anniversary: %s"
 msgstr "ਵਰ��ੰਢ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
+#: ../calendar/backends/file/e-cal-backend-file.c:234
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "��ਲੰਡਰ ਡਾ�� ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: ਨਿ�ਾਰਾ URI"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
+#: ../calendar/backends/file/e-cal-backend-file.c:241
+#: ../calendar/backends/file/e-cal-backend-file.c:247
 msgid "Cannot save calendar data"
 msgstr "��ਲੰਡਰ ਡਾ�� ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
 msgid "Could not create thread for getting deltas"
 msgstr "����� ਥਰਿੱਡ ਨ�ੰ ਵਿ�ਸਤ ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
-#: ../calendar/backends/google/e-cal-backend-google.c:1192
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:561
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
+#: ../calendar/backends/google/e-cal-backend-google.c:1189
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
+#: ../calendar/backends/http/e-cal-backend-http.c:659
+#: ../calendar/backends/weather/e-cal-backend-weather.c:486
 msgid "Could not create cache file"
 msgstr "����� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
 msgid "Could not create thread for populating cache"
 msgstr "����� ਥਰਿੱਡ ਨ�ੰ ਵਿ�ਸਤ ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1917
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
 msgid "Reply Requested: by "
 msgstr "�ਵਾਬ ਦ� ਬ�ਨਤ�: ਵਲ��"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1922
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
 msgid "Reply Requested: When convenient"
 msgstr "�ਵਾਬ ਲ� ਬ�ਨਤ�: �ਦ�� ਠ�� ਲੱ��"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
 #, c-format
 msgid "Loading %s items"
 msgstr "��ਾ��� %s ਲ�ਡ ��ਤ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
 msgid "Calendar"
 msgstr "��ਲੰਡਰ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
 msgid "Invalid server URI"
 msgstr "�ਲਤ ਸਰਵਰ URI"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5098
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
+#: ../calendar/libecal/e-cal.c:5117
 #: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1147
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1179
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1217
-#: ../camel/providers/groupwise/camel-groupwise-store.c:588
-#: ../camel/providers/groupwise/camel-groupwise-store.c:753
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
+#: ../camel/providers/groupwise/camel-groupwise-store.c:598
+#: ../camel/providers/groupwise/camel-groupwise-store.c:773
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
 msgid "Authentication failed"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:268
+#: ../calendar/backends/http/e-cal-backend-http.c:316
 msgid "Redirected to Invalid URI"
 msgstr "�ਲਤ URI ਲ� ਭ��ਿ� "
 
-#: ../calendar/backends/http/e-cal-backend-http.c:289
+#: ../calendar/backends/http/e-cal-backend-http.c:339
 msgid "Bad file format."
 msgstr "�ਲਤ ਫਾ�ਲ ਫਾਰਮਿ�"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
+#: ../calendar/backends/http/e-cal-backend-http.c:346
 msgid "Not a calendar."
 msgstr "��� ��ਲੰਡਰ ਨਹ��"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../calendar/backends/weather/e-cal-backend-weather.c:150
 msgid "Could not retrieve weather data"
 msgstr "����� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:247
 msgid "Weather: Fog"
 msgstr "ਮ�ਸਮ: ਧ�ੰਦ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:248
 msgid "Weather: Cloudy"
 msgstr "ਮ�ਸਮ: ਬੱਦਲਵਾ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-#| msgid "Weather: Cloudy"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:249
 msgid "Weather: Cloudy Night"
 msgstr "ਮ�ਸਮ: ਬੱਦਲਵਾ� ਵਾਲ� ਰਾਤ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-#| msgid "Weather: Thunderstorms"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:250
 msgid "Weather: Overcast"
 msgstr "ਮ�ਸਮ: �ਵਰ�ਾਸ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-#| msgid "Weather: Snow"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
 msgid "Weather: Showers"
 msgstr "ਮ�ਸਮ: ਫ�ਹਾਰ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Snow"
 msgstr "ਮ�ਸਮ: ਬਰ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
 msgid "Weather: Sunny"
 msgstr "ਮ�ਸਮ: �ਿ�ਿ� ਦਿਨ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-#| msgid "Weather: Rain"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Clear Night"
 msgstr "ਮ�ਸਮ: ਸਾਫ਼ ਰਾਤ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Thunderstorms"
 msgstr "ਮ�ਸਮ: ਬਰ��ਲਾ ਤ�ਫਾਨ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+#: ../calendar/backends/weather/e-cal-backend-weather.c:400
 msgid "Forecast"
 msgstr "�ਨ�ਮਾਨ"
 
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../calendar/libecal/e-cal-component.c:1320
 msgid "Untitled appointment"
 msgstr "ਬਿਨਾ� ਨਾ� ਰ���ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3945
 msgid "1st"
 msgstr "੧ਹਿਲਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3946
 msgid "2nd"
 msgstr "੨�ਾ"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3947
 msgid "3rd"
 msgstr "੩�ਾ"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3948
 msgid "4th"
 msgstr "੪ਥਾ"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3949
 msgid "5th"
 msgstr "੫ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3950
 msgid "6th"
 msgstr "੬ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3951
 msgid "7th"
 msgstr "੭ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3952
 msgid "8th"
 msgstr "੮ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3953
 msgid "9th"
 msgstr "੯ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3954
 msgid "10th"
 msgstr "੧੦ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3955
 msgid "11th"
 msgstr "੧੧ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3956
 msgid "12th"
 msgstr "੧੨ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3957
 msgid "13th"
 msgstr "੧੩ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3958
 msgid "14th"
 msgstr "੧੪ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:3959
 msgid "15th"
 msgstr "੧੫ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:3960
 msgid "16th"
 msgstr "੧੬ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:3961
 msgid "17th"
 msgstr "੧੭ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:3962
 msgid "18th"
 msgstr "੧੮ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:3963
 msgid "19th"
 msgstr "੧੯ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:3964
 msgid "20th"
 msgstr "੨੦ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:3965
 msgid "21st"
 msgstr "੨੧ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:3966
 msgid "22nd"
 msgstr "੨੨ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:3967
 msgid "23rd"
 msgstr "੨੩ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:3968
 msgid "24th"
 msgstr "੨੪ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:3969
 msgid "25th"
 msgstr "੨੫ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:3970
 msgid "26th"
 msgstr "੨੬ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:3971
 msgid "27th"
 msgstr "੨੭ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:3972
 msgid "28th"
 msgstr "੨੮ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:3973
 msgid "29th"
 msgstr "੨੯ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:3974
 msgid "30th"
 msgstr "੩੦ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:3975
 msgid "31st"
 msgstr "੩੧ਵਾ�"
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
 msgid "High"
 msgstr "�ੱ�"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
 msgid "Low"
 msgstr "ਨਿ�ਨਤਮ"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:710
 msgid "Undefined"
 msgstr "ਨਾ-ਪ�ਰਭਾਸ਼ਿਤ"
 
-#: ../calendar/libecal/e-cal.c:1677 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਦਿ� (ਯ��਼ਰ %s)"
@@ -1014,112 +1002,112 @@ 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:1691
+#: ../calendar/libecal/e-cal.c:1707
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਯ��਼ਰ %s ਲ� ਪਰਾ�ਸ� ਯ�� �ਰਨ ਲ� ਦਿ�"
 
-#: ../calendar/libecal/e-cal.c:5070
+#: ../calendar/libecal/e-cal.c:5089
 msgid "Invalid argument"
 msgstr "�ਲਤ �ਰ��ਮਿੰ�"
 
-#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libecal/e-cal.c:5091
 msgid "Backend is busy"
 msgstr "ਪਿੱ�ਲਾ ਤਾ� ਰ��ਿ� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5074
+#: ../calendar/libecal/e-cal.c:5093
 #: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "Repository is offline"
 msgstr "Repository �ਫਲਾ�ਨ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5076
+#: ../calendar/libecal/e-cal.c:5095
 #: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "No such calendar"
 msgstr "�ੱਦਾ� ਦਾ ��� ��ਲੰਡਰ ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5078
+#: ../calendar/libecal/e-cal.c:5097
 #: ../calendar/libedata-cal/e-cal-backend-util.c:111
 #: ../servers/groupwise/e-gw-connection.c:233
 msgid "Object not found"
 msgstr "��ਾ� ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5080
+#: ../calendar/libecal/e-cal.c:5099
 #: ../calendar/libedata-cal/e-cal-backend-util.c:113
 #: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid object"
 msgstr "�ਲਤ ��ਾ�"
 
-#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libecal/e-cal.c:5101
 msgid "URI not loaded"
 msgstr "URI ਲ�ਡ ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libecal/e-cal.c:5103
 msgid "URI already loaded"
 msgstr "URI ਪਹਿਲਾ� ਹ� ਲ�ਡ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5086
+#: ../calendar/libecal/e-cal.c:5105
 #: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:571
+#: ../servers/exchange/storage/e-storage.c:573
 msgid "Permission denied"
 msgstr "�ਧਿ�ਾਰ ਪਾਬੰਦ� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5088
+#: ../calendar/libecal/e-cal.c:5107
 #: ../calendar/libedata-cal/e-cal-backend-util.c:131
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Unknown User"
 msgstr "�ਣ�ਾਣ ਯ��਼ਰ"
 
-#: ../calendar/libecal/e-cal.c:5090
+#: ../calendar/libecal/e-cal.c:5109
 #: ../calendar/libedata-cal/e-cal-backend-util.c:115
 msgid "Object ID already exists"
 msgstr "��ਾ� ID ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5092
+#: ../calendar/libecal/e-cal.c:5111
 msgid "Protocol not supported"
 msgstr "ਪਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5094
+#: ../calendar/libecal/e-cal.c:5113
 msgid "Operation has been canceled"
 msgstr "�ਾਰਵਾ� ਰੱਦ ��ਤ� �� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5096
+#: ../calendar/libecal/e-cal.c:5115
 #: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Could not cancel operation"
 msgstr "�ਾਰਵਾ� ਨ�ੰ ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5100
+#: ../calendar/libecal/e-cal.c:5119
 #: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication required"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5102
+#: ../calendar/libecal/e-cal.c:5121
 msgid "A CORBA exception has occurred"
 msgstr "�ੱ� CORBA �ਪਵਾਦ ��� ਹ�|"
 
-#: ../calendar/libecal/e-cal.c:5104
+#: ../calendar/libecal/e-cal.c:5123
 #: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
+#: ../camel/providers/imap/camel-imap-command.c:432
 #: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:554
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../servers/exchange/storage/e-storage.c:585
+#: ../camel/providers/imap4/camel-imap4-engine.c:1547
+#: ../camel/providers/imap4/camel-imap4-engine.c:1585
+#: ../camel/providers/imap4/camel-imap4-engine.c:1629
+#: ../camel/providers/imap4/camel-imap4-engine.c:1684
+#: ../camel/providers/imap4/camel-imap4-store.c:311
+#: ../camel/providers/imap4/camel-imap4-store.c:818
+#: ../camel/providers/imap4/camel-imap4-store.c:1574
+#: ../camel/providers/pop3/camel-pop3-store.c:552
+#: ../camel/providers/pop3/camel-pop3-store.c:559
+#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../servers/exchange/storage/e-storage.c:587
 #: ../servers/groupwise/e-gw-connection.c:241
 msgid "Unknown error"
 msgstr "�ਣਪ�ਾਤ� �ਲਤ�"
 
-#: ../calendar/libecal/e-cal.c:5106
+#: ../calendar/libecal/e-cal.c:5125
 #: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:553
+#: ../servers/exchange/storage/e-storage.c:555
 msgid "No error"
 msgstr "��� �ਲਤ� ਨਹ��"
 
@@ -1237,7 +1225,6 @@ msgid "TLS not available"
 msgstr "TLS �ਪਲੱਬਧ ਨਹ��"
 
 #: ../calendar/libedata-cal/e-cal-backend-util.c:133
-#| msgid "Offline unavailable"
 msgid "Offline mode unavailable"
 msgstr "�ਫਲਾ�ਨ ਮ�ਡ �ਪਲੱਬਧ ਨਹ��"
 
@@ -1305,16 +1292,16 @@ msgstr "ਤ�ਸ�� ��ਪਤ-ਲ��ਣ ਲ� �� ਨਿਰਯਾ
 msgid "Unable to create cache path"
 msgstr "����� ਮਾਰ� ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:402
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "����� �ੰਦਰਾ� ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/camel-db.c:469
+#: ../camel/camel-db.c:412
 msgid "Insufficient memory"
 msgstr "ਲ���ਦ� ਮ�ਮ�ਰ� ਨਹ��"
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:197
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1325,8 +1312,8 @@ msgstr ""
 "�ਸ ਸਰਵਰ ਤ� ਹ�ਰ �ਾਰਵਾ� ਤ�ਹਾਡ� ਨ�ੱ�ਵਰ�� ਤ� ਮ�� ���ਨ ਤ� ਮ��\n"
 "ਦ�ਹਰਾ� ਨਾ �ਾ ਸ�ਣ��।"
 
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:320
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1337,114 +1324,114 @@ msgstr ""
 "%s\n"
 "�ਸ ਫ�ਲਡਰ ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਮ��-ਸਮ�ਾਲ� ਨਹ�� ��ਤ��� �ਾ ਸ�ਣ����।"
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:296
 msgid "Resynchronizing with server"
 msgstr "ਸਰਵਰ ਨਾਲ ਮ��-ਸਮ�ਾਲ�"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52
+#: ../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:111
+#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
 msgid "Downloading new messages for offline mode"
 msgstr "�ਫਲਾ�ਨ ਮ�ਡ ਲ� ਨਵ�� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ਫ�ਲਡਰ '%s' ਨ�ੰ �ਫਲਾ�ਨ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
+#: ../camel/camel-disco-store.c:400
+#: ../camel/providers/groupwise/camel-groupwise-store.c:223
 #: ../camel/providers/imap/camel-imap-store.c:1003
 #: ../camel/providers/imap/camel-imap-store.c:1813
 #: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+#: ../camel/providers/imap/camel-imap-store.c:3014
 msgid "You must be working online to complete this operation"
 msgstr "�ਸ �ਾਰਵਾ� ਨ�ੰ ਸੰਪ�ਰਨ �ਰਨ ਲ� ਤ�ਹਾਨ�ੰ �ਨ-ਲਾ�ਨ ਰਹਿਣਾ �ਾਹ�ਦਾ ਹ�"
 
-#: ../camel/camel-exception.c:262
+#: ../camel/camel-exception.c:260
 msgid "No description available"
 msgstr "��� ਵ�ਰਵਾ �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/camel-filter-driver.c:795 ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "��ਲ� �ਿਰਿ� `%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:836
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s ਤ�� �ਲਤ ਸ�ਨ�ਹਾ ਲ�� ਪ�ਰਾਪਤ ਹ�� ਹ�: %s"
 
-#: ../camel/camel-filter-driver.c:1026 ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
 msgid "Syncing folders"
 msgstr "ਫ�ਲਡਰ ਸਮ�ਾਲ�"
 
-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ਫਿਲ�ਰ ਨ�ੰ ਪਾਰਸ �ਰਨ ਵਿੱ� �ਲਤ�: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133 ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ਫਿਲ�ਰ �ਲਾ�ਣ ਵਿੱ� �ਲਤ�: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1216
 msgid "Unable to open spool folder"
 msgstr "ਸਪ�ਲ ਫ�ਲਡਰ ��ਲਣ ਵਿੱ� �ਲਤ�"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1225
 msgid "Unable to process spool folder"
 msgstr "�ਾਰ� ਸਪ�ਲ ਫ�ਲਡਰ ��ਲਣ ਤ�� �ਸਮਰੱਥ"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1241
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�(%d%%)"
 
-#: ../camel/camel-filter-driver.c:1250
+#: ../camel/camel-filter-driver.c:1245
 msgid "Cannot open message"
 msgstr "ਸ�ਨ�ਹਾ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
 #, c-format
 msgid "Failed on message %d"
 msgstr "ਸ�ਨ�ਹਾ %d ਤ� �ਸਫਲ"
 
-#: ../camel/camel-filter-driver.c:1283 ../camel/camel-filter-driver.c:1374
+#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
 msgid "Syncing folder"
 msgstr "ਫ�ਲਡਰ ਸਮ�ਾਲ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
 msgid "Complete"
 msgstr "ਮ��ੰਮਲ"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1338
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%2d ਵਿੱ��� %1d ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1353
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2d ਵਿੱ��� %1d ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
 msgstr "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:399
 msgid "Invalid arguments to (system-flag)"
 msgstr "(system-flag) ਲ� �ਲਤ �ਰ��ਮਿੰ�"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:414
 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:737 ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ਫਿਲ�ਰ ��� �ਲਾ�ਣ ਦ�ਰਾਨ �ਲਤ�: %s: %s"
@@ -1469,72 +1456,72 @@ msgstr ""
 "��� ਸਮ��ਰਨ ਨ�ੰ �ਲਾ�ਣ ਵਿੱ� �ਸਫਲ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ਲ� �ੱ� �ੱ�ਲਾ ਬ�ਲ ਨਤ��ਾ �ਾਹ�ਦਾ ਹ�"
 
-#: ../camel/camel-folder-search.c:906
+#: ../camel/camel-folder-search.c:905
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) %s ਵਿੱ� ਮਨ�਼�ਰ ਨਹ�� ਹ�"
 
-#: ../camel/camel-folder-search.c:912 ../camel/camel-folder-search.c:919
+#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ਲ� �ੱ� ਮ�ਲ ਸਤਰ �ਾਹ�ਦ� ਹ�"
 
-#: ../camel/camel-folder-search.c:946
+#: ../camel/camel-folder-search.c:945
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ਲ� �ੱ� ਲ�� ਨਤ��� ਦ� ਲ�� ਹ�"
 
-#: ../camel/camel-folder-search.c:955
+#: ../camel/camel-folder-search.c:954
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ਲ� ਫ�ਲਡਰ ਸ�ੱ� ਦ� ਲ�� ਹ�"
 
-#: ../camel/camel-folder.c:696
+#: ../camel/camel-folder.c:683
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ�: %s ਲ�"
 
-#: ../camel/camel-folder.c:1398
+#: ../camel/camel-folder.c:1388
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: ਸਮ��ਰਨ ਨਾਲ ���: %s ਲ�"
 
-#: ../camel/camel-folder.c:1440, c-format
-#| msgid "Unsupported operation: search by expression: for %s"
+#: ../camel/camel-folder.c:1429
+#, c-format
 msgid "Unsupported operation: count by expression: for %s"
 msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: ਸਮ��ਰਨ �ਿਣਤ�: %s ਲ�"
 
-#: ../camel/camel-folder.c:1480
+#: ../camel/camel-folder.c:1468
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: UID ਨਾਲ ���: %s ਲ�"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:1581
 msgid "Moving messages"
 msgstr "ਸ�ਨ�ਹ� ਭ��� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:1581
 msgid "Copying messages"
 msgstr "ਸ�ਨ�ਹਿ�� ਦ� ਨ�ਲ ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../camel/camel-folder.c:1942
+#: ../camel/camel-folder.c:1922
 msgid "Learning junk"
 msgstr "�ੰ� ਸਿੱ� ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-folder.c:1959
+#: ../camel/camel-folder.c:1939
 msgid "Learning non-junk"
 msgstr "ਨਾ-ਰੱਦ� ਸਿੱ�ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-folder.c:1978
+#: ../camel/camel-folder.c:1958
 msgid "Filtering new message(s)"
 msgstr "ਨਵ�� ਸ�ਨ�ਹ� �ਾਣ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:751
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1545,15 +1532,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:766
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid ਸੰ��ਤ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ।"
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg passphrase ਸੰ��ਤ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ।"
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:824
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1562,7 +1549,7 @@ msgstr ""
 "ਤ�ਹਾਨ�ੰ ਤ�ਹਾਡ� ਸਮਾਰ�-�ਾਰਡ ਲ� �ੱ� PIN �ਣ-ਲਾ� �ਰਨ\n"
 "ਲ� ਲ���ਦਾ ਹ�: \"%s\""
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:828
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1571,95 +1558,96 @@ msgstr ""
 "ਤ�ਹਾਨ�ੰ ਯ��਼ਰ ਲ� ਪਾਸ-ਪ�ਰਸੰ� ਲ���ਦਾ ਹ�, �� �ਿ\n"
 "��ਲ ਸ��: \"%s\""
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:833
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG ਤ�� '%s' ਤ�� ਨਾ-ਲ���ਦਾ �ਵਾਬ ਪ�ਰਾਪਤ ਹ���"
 
-#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1304
+#: ../camel/camel-gpg-context.c:858 ../camel/camel-gpg-context.c:1067
+#: ../camel/providers/nntp/camel-nntp-store.c:1313
 msgid "Canceled."
 msgstr "ਰੱਦ ��ਤਾ ਹ�।"
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:872
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "��ਪਤ �� ਨ�ੰ ��ਲਣ ਵਿੱ� �ਸਫਲ: ੩ �ਲਤ ਪਾਸ-ਪ�ਰ� ਦਿੱਤ� ਹਨ।"
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:880
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG ਤ�� ਨਾ-ਲ���ਦਾ �ਵਾਬ ਪ�ਰਾਪਤ ਹ���: %s"
 
-#: ../camel/camel-gpg-context.c:947
+#: ../camel/camel-gpg-context.c:943
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "���ਰਿਪ� ਲ� �ਸਫਲ:��� �ਾ�� ਪ�ਰਾਪਤ �ਰਨ ਨਿਰਧਾਰਿਤ ਨਹ�� ਹ�।"
 
 #. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1209 ../camel/camel-gpg-context.c:1337
-#: ../camel/camel-gpg-context.c:1850 ../camel/camel-gpg-context.c:1895
+#: ../camel/camel-gpg-context.c:1205 ../camel/camel-gpg-context.c:1330
+#: ../camel/camel-gpg-context.c:1852 ../camel/camel-gpg-context.c:1897
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg ਨ�ੰ �ਲਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/camel-gpg-context.c:1305 ../camel/camel-smime-context.c:598
+#: ../camel/camel-gpg-context.c:1298 ../camel/camel-smime-context.c:602
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "ਦਸਤ�ਤ� ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1554
-#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-gpg-context.c:1771 ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1866 ../camel/camel-gpg-context.c:1911
+#: ../camel/camel-gpg-context.c:1345 ../camel/camel-gpg-context.c:1546
+#: ../camel/camel-gpg-context.c:1562 ../camel/camel-gpg-context.c:1642
+#: ../camel/camel-gpg-context.c:1657 ../camel/camel-gpg-context.c:1773
+#: ../camel/camel-gpg-context.c:1788 ../camel/camel-gpg-context.c:1868
+#: ../camel/camel-gpg-context.c:1913
 msgid "Failed to execute gpg."
 msgstr "gpg ਨ�ੰ �ਲਾ�ਣ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-gpg-context.c:1371
+#: ../camel/camel-gpg-context.c:1364
 msgid "This is a digitally signed message part"
 msgstr "�ਹ ਸ�ਨ�ਹ� ਦਾ ਡਿ���ਲ ਦਸਤ�ਤ� ਭਾ� ਹ�"
 
-#: ../camel/camel-gpg-context.c:1458 ../camel/camel-gpg-context.c:1464
-#: ../camel/camel-gpg-context.c:1470 ../camel/camel-gpg-context.c:1485
-#: ../camel/camel-smime-context.c:901 ../camel/camel-smime-context.c:912
-#: ../camel/camel-smime-context.c:919
+#: ../camel/camel-gpg-context.c:1450 ../camel/camel-gpg-context.c:1456
+#: ../camel/camel-gpg-context.c:1462 ../camel/camel-gpg-context.c:1477
+#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
+#: ../camel/camel-smime-context.c:928
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ਸ�ਨ�ਹਾ ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�� ਹਨ: �ਲਤ ਸ�ਨ�ਹਾ ਫਾਰਮਿ�"
 
-#: ../camel/camel-gpg-context.c:1524
+#: ../camel/camel-gpg-context.c:1516
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "ਸ�ਨ�ਹਾ ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�� ਹਨ: �ਰ�� ਫਾ�ਲ ਨਹ�� ਬਣਾ� �ਾ ਸ�� ਹ�: %s"
 
-#: ../camel/camel-gpg-context.c:1623
+#: ../camel/camel-gpg-context.c:1625
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "�ੰ��ਰਿਪ�ਡ ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s"
 
-#: ../camel/camel-gpg-context.c:1673
+#: ../camel/camel-gpg-context.c:1675
 msgid "This is a digitally encrypted message part"
 msgstr "�ਹ ਸ�ਨ�ਹ� ਦਾ ਡਿ���ਲ ���ਰਿਪ�ਡ ਭਾ� ਹ�"
 
-#: ../camel/camel-gpg-context.c:1726 ../camel/camel-gpg-context.c:1734
-#: ../camel/camel-gpg-context.c:1753
+#: ../camel/camel-gpg-context.c:1728 ../camel/camel-gpg-context.c:1736
+#: ../camel/camel-gpg-context.c:1755
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ਸ�ਨ�ਹਾ ਡ�-�ਰਿਪ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: �ਲਤ ਸ�ਨ�ਹਾ ਫਾਰਮਿ�"
 
-#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1745
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME ਭਾ� ਡਿ��ਰਿਪ� �ਰਨ ਤ�� �ਸਫਲ: ਪ�ਰ����ਾਲ �ਲਤ�"
 
-#: ../camel/camel-gpg-context.c:1808 ../camel/camel-smime-context.c:1176
+#: ../camel/camel-gpg-context.c:1810 ../camel/camel-smime-context.c:1186
 msgid "Encrypted content"
 msgstr "���ਰਿਪ�ਡ ਭਾ�"
 
-#: ../camel/camel-gpg-context.c:1827
+#: ../camel/camel-gpg-context.c:1829
 msgid "Unable to parse message content"
 msgstr "ਸ�ਨ�ਹਾ ਭਾ� ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ"
 
-#: ../camel/camel-gpg-context.c:1851 ../camel/camel-gpg-context.c:1896
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
+#: ../camel/camel-gpg-context.c:1853 ../camel/camel-gpg-context.c:1898
+#: ../camel/camel-tcp-stream-openssl.c:627
+#: ../camel/providers/imap4/camel-imap4-utils.c:614
+#: ../camel/providers/smtp/camel-smtp-transport.c:165
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Unknown"
 msgstr "�ਣ�ਾਣ"
 
@@ -1673,12 +1661,12 @@ msgstr "ਲਾ�ਿੰ� ਸਹਾ�� ਪਾ�ਪ ਨਹ�� ਬਣਾ
 msgid "Cannot fork locking helper: %s"
 msgstr "ਲਾ�ਿੰ� ਸਹਾ�� ਨ�ੰ ਭਾ� ਵਿੱ� ਵੰਡਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s"
 
-#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "ਲਾੱ� '%s' ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: ਲਾੱ�-ਸਹਾ�� ਨਾਲ ਪ�ਰ����ਾਲ �ਲਤ�"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:216
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "ਲਾੱ� '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�"
@@ -1757,54 +1745,54 @@ msgstr "�ਰ�� ਪੱਤਰ ਫਾ�ਲ ਤ� ਲਿ�ਣ ਵਿੱ�
 msgid "Error copying mail temp file: %s"
 msgstr "�ਰ�� ਪੱਤਰ ਫਾ�ਲ ਨ�ੰ ਨ�ਲ �ਰਨ ਵਿੱ� �ਲਤ�: %s"
 
-#: ../camel/camel-multipart-signed.c:593
+#: ../camel/camel-multipart-signed.c:592
 msgid "parse error"
 msgstr "ਪਾਰਸ �ਲਤ�"
 
-#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:548
+#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
+#: ../camel/camel-net-utils.c:806
+#: ../camel/providers/pop3/camel-pop3-store.c:446
+#: ../camel/providers/pop3/camel-pop3-store.c:546
 msgid "Canceled"
 msgstr "ਰੱਦ ��ਤਾ"
 
-#: ../camel/camel-net-utils.c:524
+#: ../camel/camel-net-utils.c:522
 msgid "cannot create thread"
 msgstr "ਥਰਿੱਡ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:678
 #, c-format
 msgid "Resolving: %s"
 msgstr "ਹੱਲ ��ਤਾ �ਾ ਰਿਹਾ ਹ�: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:700
 msgid "Host lookup failed"
 msgstr "ਹ�ਸ� ��� �ਸਫਲ"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:702
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "ਹ�ਸ� ��� �ਸਫਲ: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:810
 msgid "Resolving address"
 msgstr "�ਡਰ�ੱਸ ���ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:830
 msgid "Name lookup failed"
 msgstr "ਨਾ� ��� �ਸਫਲ"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:833
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "ਨਾ� ��� �ਸਫਲ: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:249
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ਫ�ਲਡਰ `%s' ਵਿੱ� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਡਿਸ� ਤ� ਲਿ�ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਲ� �ਫਲਾ�ਨ �ਰਨਲ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
@@ -1832,24 +1820,24 @@ msgstr "%s ਨ�ੰ ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ਨ�ੰ ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਸ ਮ�ਡ��ਲ ਵਿੱ� ��� ਸ਼�ਰ��ਤ� ��ਡ ਨਹ�� ਹ�।"
 
-#: ../camel/camel-provider.c:373 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ਪਰ����ਾਲ '%s' ਲ� ��� �ਪਲੱਬਧ �ਰਤਾ ਨਹ�� ਹ�"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:36
 msgid "Anonymous"
 msgstr "��ੰਮਨਾਮ"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:38
 msgid "This option will connect to the server using an anonymous login."
 msgstr "�ਸ ��ਣ ਨਾਲ ਸਰਵਰ ਨਾਲ �ਣ�ਾਣ ਦ� ਤ�ਰ ਤ� ਲਾੱ��ਨ ��ਤਾ �ਾਵ��ਾ।"
 
-#: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
 msgid "Authentication failed."
 msgstr "ਪ�ਰਮਾਣਿ�ਤਾ �ਸਫਲ।"
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:130
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1858,7 +1846,7 @@ msgstr ""
 "�ਲਤ �ਮ�ਲ ਸਿਰਨਾਵ� �ਾ�� �ਾਣ�ਾਰ�:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:142
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1867,7 +1855,7 @@ msgstr ""
 "�ਲਤ �ਪਾਰਦਰਸ਼� �ਾ�� �ਾਣ�ਾਰ�:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:154
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1884,7 +1872,8 @@ msgstr "CRAM-MD5"
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ਸ�ਰੱ�ਿ�ਤ CRAM-MD5 ਪਾਸਵਰਡ ਨਾਲ ���ਦਾ ਹ�, ���ਰ ਸਰਵਰ ਸਹਾ� ਹ��� ਤਾ�।"
+msgstr ""
+"�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ਸ�ਰੱ�ਿ�ਤ CRAM-MD5 ਪਾਸਵਰਡ ਨਾਲ ���ਦਾ ਹ�, ���ਰ ਸਰਵਰ ਸਹਾ� ਹ��� ਤਾ�।"
 
 #: ../camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
@@ -1898,67 +1887,67 @@ msgstr ""
 "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ਸ�ਰੱ�ਿ�ਤ DIGEST-MD5 ਪਾਸਵਰਡ ਨਾਲ ���ਦਾ ਹ�, ���ਰ ਸਰਵਰ ਸਹਾ� ਹ��� "
 "ਤਾ�।"
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:844
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ਸਰਵਰ ��ਣ�ਤ� ਬਹ�ਤ ਲੰਮ� ਹ� (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:853
 msgid "Server challenge invalid\n"
 msgstr "ਸਰਵਰ �ਾ�� �ਲਤ ਹ�\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:859
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ਸਰਵਰ ��ਣ�ਤ� ਵਿੱ� \"ਸ�ਰੱ�ਿ� ਦਾ ��ਣ\" ���ਨ �ਲਤ ਹ�"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:889
 msgid "Server response did not contain authorization data"
 msgstr "ਸਰਵਰ �ਵਾਬ ਵਿੱ� ਪਰਮਾਣਿਤ ਡਾ�ਾ ਨਹ�� ਹ�"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:907
 msgid "Server response contained incomplete authorization data"
 msgstr "ਸਰਵਰ �ਵਾਬ ਵਿੱ� ਨਾ-ਸੰਪ�ਰਨ ਪ�ਰਮਾਣਿਤ ਡਾ�ਾ ਹ�"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:917
 msgid "Server response does not match"
 msgstr "ਸਰਵਰ �ਵਾਬ ਮ�ਲ ਨਹ�� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:63
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:65
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ��ਬ�ਰਸ ੫ ਪ�ਰਮਾਣ�ਿਤਾ ਵਰਤ �� ਸਰਵਰ ਨਾਲ �����ਾ।"
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:159
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "ਨਿਰਧਾਰਿਤ ਢੰ� ਪ�ਰਮਾਣ-ਪੱਤਰ ਦ��ਰਾ ਸਹਾ�� ਨਹ�� ਹ� �ਾ� �ਹ ਸਥਾਪਨ ਦ��ਰਾ ਪ�ਾਣਿ� ਨਹ�� �ਿ�।"
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The provided target_name parameter was ill-formed."
 msgstr "�ਪਲੱਬਧ ਨਿਯਤ ਨਾ� ਪ�ਰਾਮ��ਰ �ਲਤ ਢਾ��� ਵਿੱ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:172
+#: ../camel/camel-sasl-gssapi.c:167
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "�ਪਲੱਬਧ ਨਿਯਤ ਨਾ� ਪ�ਰਾਮ��ਰ �ਲਤ ਹ� �ਾ� ਨਾ ਸਹਾ�� �ਿਸਮ ਦਾ ਨਾ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:171
 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:181
+#: ../camel/camel-sasl-gssapi.c:176
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token ਵਿੱ� �ਲਤ ਦਸਤ�ਤ ਹਨ �ਾ� ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�ਦ� ਹਨ।"
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:180
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -1966,30 +1955,30 @@ msgstr ""
 "�ਪਲੱਬਧ ਪ�ਰਮਾਣ-ਪੱਤਰ ਪ�ਰਸੰ� ਸ਼�ਰ��ਤ ਲ� ਠ�� ਨਹ�� ਹਨ, �ਾ� ਪ�ਰਮਾਣ-ਪੱਤਰ ਸੰਭਾਲ �ਰਤਾ �ਿਸ� �ਾ�� "
 "ਹਵਾਲ� ਲ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:185
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "�ਪਲੱਬਧ �ਰਵਾ�� ਪ�ਰਸੰ� ਸਹ�� ਪ�ਰਸੰ� ਦਾ ਹਵਾਲਾ ਨਹ�� ਦ� ਰਿਹਾ ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:188
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token ਤ� ��ਸਾਰਤਾ �ਾ�� �ਸਫਲ ਰਹ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:191
 msgid "The consistency checks performed on the credential failed."
 msgstr "ਪ�ਰਮਾਣ-ਪੱਤਰ ਦ� ਪ�ਰਮਾਣ�ਿਤਾ �ਾ�� �ਸਫਲ ਰਹ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:194
 msgid "The referenced credentials have expired."
 msgstr "ਹਵਾਲਾ ਪ�ਰਮਾਣ-ਪੱਤਰ ਦ� ਮਿ�ਦ ਸਮਾਪਤ ਹ� ��ੱ�� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1273
+#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
+#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
+#: ../camel/camel-sasl-kerberos4.c:230
+#: ../camel/providers/imap/camel-imap-store.c:1274
 msgid "Bad authentication response from server."
 msgstr "ਸਰਵਰ ਤ�� �ਲਤ �ਵਾਬ ਮਿਲਿ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:309
 msgid "Unsupported security layer."
 msgstr "ਨਾ ਸਹਾ�� ਸ�ਰੱ�ਿ� ਪਰਤ।"
 
@@ -2001,7 +1990,7 @@ msgstr "Kerberos 4"
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ��ਰਬਰ�ਸ ੪ ਪ�ਰਮਾਣਿਤ ਨਾਲ �����ਾ।"
 
-#: ../camel/camel-sasl-kerberos4.c:174
+#: ../camel/camel-sasl-kerberos4.c:173
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -2018,7 +2007,7 @@ msgstr "ਲਾ��ਨ"
 msgid "This option will connect to the server using a simple password."
 msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਨਾਲ ������।"
 
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:134
 msgid "Unknown authentication state."
 msgstr "�ਣਪ�ਾਤ� ਪ�ਰਮਾਣ�ਿਤਾ ਸਥਿਤ�।"
 
@@ -2063,22 +2052,22 @@ msgstr "�ੱ� ਨਾ-ਪ�ਪ �ਰਾ�ਸਪ�ਰ� ਰਾਹ� POP
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ਨਿਯਮਿਤ ਸਮ��ਰਨ �ੰਪਾ�ਲ�ਸ਼ਨ �ਸਫਲ: %s: %s"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:265
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' ਨ�ੰ ਯ��਼ਰ ਭਾ� ਲ���ਦਾ ਹ�"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:269
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' ਨ�ੰ ਹ�ਸ� ਭਾ� ਲ���ਦਾ ਹ�"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:273
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' ਨ�ੰ ਰਸਤਾ ਭਾ� ਲ���ਦਾ ਹ�"
 
-#: ../camel/camel-session.c:308
+#: ../camel/camel-session.c:307
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2087,214 +2076,214 @@ msgstr ""
 "ਡਾ�ਰ���ਰ� %s ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ:\n"
 "%s"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:479
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ਹ�ਸ� %3$s ਲ� %2$s ਵਾਸਤ� %1$s ਪਾਸਵਰਡ ਦਿ� ��।"
 
-#: ../camel/camel-session.c:822
+#: ../camel/camel-session.c:817
 msgid "Camel session doesn't support forwarding of a message."
 msgstr "��ਮਲ ਸ਼�ਸ਼ਨ ਸ�ਨ�ਹਾ �ੱ�� ਭ��ਣ ਲ� ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-smime-context.c:440 ../camel/camel-smime-context.c:984
+#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' ਲ� ਸਰ��ਫਿ��� ਲੱਭਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:446
+#: ../camel/camel-smime-context.c:450
 msgid "Cannot create CMS message"
 msgstr "CMS ਸ�ਨ�ਹਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:455
 msgid "Cannot create CMS signed data"
 msgstr "CMS ਦਸਤ�ਤ� ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:457
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ਦਸਤ�ਤ� ਡਾ�ਾ ਨੱਥ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot attach CMS data"
 msgstr "CMS ਡਾ�ਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../camel/camel-smime-context.c:470
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot create CMS Signer information"
 msgstr "CMS ਦਸਤ�ਤ� �ਾਣ�ਾਰ� ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:476
+#: ../camel/camel-smime-context.c:480
 msgid "Cannot find certificate chain"
 msgstr "ਸਰ��ਫਿ��� ਲ�� ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:482
+#: ../camel/camel-smime-context.c:486
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ਦਸਤ�ਤ� ਸਮਾ� ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:504 ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ਲ� ���ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਮ���ਦ ਨਹ��"
 
-#: ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:527
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ��ਣ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:528
+#: ../camel/camel-smime-context.c:532
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ਵਿਸ਼�ਸਤਾ ਨ�ੰ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../camel/camel-smime-context.c:533
+#: ../camel/camel-smime-context.c:537
 msgid "Cannot add encryption certificate"
 msgstr "�ੰ��ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਸ਼ਾਮਿਲ ਨਹ�� ਹ� ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:539
+#: ../camel/camel-smime-context.c:543
 msgid "Cannot add CMS Signer information"
 msgstr "CMS ਦਸਤ�ਤ� �ਾਣ�ਾਰ� ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
 msgid "Cannot create encoder context"
 msgstr "���ਡਰ ਪ�ਰਸੰ� ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:615
+#: ../camel/camel-smime-context.c:619
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS ���ਡਰ ਵਿੱ� ਡਾ�ਾ ਸ਼ਾਮਿਲ �ਰਨ ਤ�� �ਸਮਰੱਥ"
 
-#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:1073
+#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
 msgid "Failed to encode data"
 msgstr "ਡਾ�ਾ ���ਡਿ� �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:693
+#: ../camel/camel-smime-context.c:697
 msgid "Unverified"
 msgstr "ਨਾ-�ਾ��ਿ�"
 
-#: ../camel/camel-smime-context.c:695
+#: ../camel/camel-smime-context.c:699
 msgid "Good signature"
 msgstr "ਵਧ�� ਦਸਤ�ਤ"
 
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:701
 msgid "Bad signature"
 msgstr "�ਲਤ ਦਸਤ�ਤ"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:703
 msgid "Content tampered with or altered in transit"
 msgstr "ਤਬਦ�ਲ� ਦ�ਰਾਨ ਪ�ਰਸੰ� ਵਿ�� �ਿ� �ਾ� ਸ���ਤ ��ਤਾ "
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:705
 msgid "Signing certificate not found"
 msgstr "ਦਸਤ�ਤ� ਸਰ��ਫਿ��� ਨਹ�� ਲੱਭਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:707
 msgid "Signing certificate not trusted"
 msgstr "ਦਸਤ�ਤ� ਸਰ��ਫਿ��� ਭਰ�ਸ�ਯ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:709
 msgid "Signature algorithm unknown"
 msgstr "�ਣ�ਾਣਾ ਦਸਤ�ਤ� �ਲ��ਰਿਥਮ"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:711
 msgid "Signature algorithm unsupported"
 msgstr "ਦਸਤ�ਤ� �ਲ��ਰਿੱਥਮ ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:713
 msgid "Malformed signature"
 msgstr "ਨਿ�ਾਰਾ ਦਸਤ�ਤ"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:715
 msgid "Processing error"
 msgstr "ਪ�ਰ�ਸ��ਸਿੰ� �ਲਤ�"
 
-#: ../camel/camel-smime-context.c:748
+#: ../camel/camel-smime-context.c:753
 msgid "No signed data in signature"
 msgstr "ਦਸਤ�ਤ ਵਿੱ� ਡਾ�ਾ ਦਸਤ�ਤ� ਨਹ��"
 
-#: ../camel/camel-smime-context.c:755
+#: ../camel/camel-smime-context.c:758
 msgid "Digests missing from enveloped data"
 msgstr "ਸੰ��ਪ ਲਪ��� ਡਾ�� ਤ�� ਬਿਨਾ� ਹ�"
 
-#: ../camel/camel-smime-context.c:768 ../camel/camel-smime-context.c:778
+#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
 msgid "Cannot calculate digests"
 msgstr "ਸੰ��ਪ ਨ�ੰ ਮਿਣਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:783
+#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
 msgid "Cannot set message digests"
 msgstr "ਸ�ਨ�ਹਾ ਸੰ��ਪ ਨ�ੰ ਨਿਰਧਾਰਿਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:793 ../camel/camel-smime-context.c:798
+#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
 msgid "Certificate import failed"
 msgstr "ਸਰ��ਫਿ��� �ਯਾਤ �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:808
+#: ../camel/camel-smime-context.c:817
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ਸ�ਨ�ਹਾ ਹ� ਸਰ��ਫਿ��� ਹ�, ਸਰ��ਫਿ��� �ਾ��� ਨਹ�� ਹਨ"
 
-#: ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:820
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "ਸਰ��ਫਿ��� ਸਿਰ� ਸ�ਨ�ਹਾ, ਸਰ��ਫਿ��� �ਯਾਤ �ਤ� �ਾ�� ਹ� ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:815
+#: ../camel/camel-smime-context.c:824
 msgid "Cannot find signature digests"
 msgstr "ਦਸਤ�ਤ� ਸੰ��ਪ ਨਹ�� ਲੱਭਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:831
+#: ../camel/camel-smime-context.c:840
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ਦਸਤ�ਤ�: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:932 ../camel/camel-smime-context.c:1156
+#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
 msgid "Decoder failed"
 msgstr "ਡ���ਡਰ �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:991
+#: ../camel/camel-smime-context.c:1000
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "�ਮ ਬਲ� ���ਰਿਪਸ਼ਨ �ਲ��ਰਿਥਮ ਨ�ੰ ਲੱਭਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:999
+#: ../camel/camel-smime-context.c:1008
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "���ਰਿਪਸ਼ਨ ਬਲ� �� ਲ� �ਾਰ� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:1010
+#: ../camel/camel-smime-context.c:1019
 msgid "Cannot create CMS Message"
 msgstr "CMS ਸ�ਨ�ਹਾ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:1016
+#: ../camel/camel-smime-context.c:1025
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS ਲਿਫਾਫਾ ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:1022
+#: ../camel/camel-smime-context.c:1031
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS ਲਿਫਾਫਾ ਡਾ�ਾ ਨੱਥ� ਨਹ�� ਹ� ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:1028
+#: ../camel/camel-smime-context.c:1037
 msgid "Cannot attach CMS data object"
 msgstr "CMS ਡਾ�ਾ ��ਾ� ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1046
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS ਸ�ਨ�ਹ� �ਾਣ�ਾਰ� ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:1042
+#: ../camel/camel-smime-context.c:1051
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS ਸ�ਨ�ਹ� �ਾਣ�ਾਰ� ਸ਼ਾਮਲ ਨਹ�� ��ਤ� �ਾ ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:1067
+#: ../camel/camel-smime-context.c:1076
 msgid "Failed to add data to encoder"
 msgstr "ਡਾ�ਾ ਨ�ੰ ���ਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:1163
+#: ../camel/camel-smime-context.c:1172
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: ��� ���ਰਿਪ�ਡ ਪ�ਰਸੰ� ਨਹ�� ਲੱਭਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:1190
+#: ../camel/camel-smime-context.c:1200
 msgid "import keys: unimplemented"
 msgstr "�ਯਾਤ ��: ਨਾ-ਸਥਾਪਿਤ"
 
-#: ../camel/camel-smime-context.c:1198
+#: ../camel/camel-smime-context.c:1208
 msgid "export keys: unimplemented"
 msgstr "ਨਿਰਯਾਤ ��: ਨਾ-ਸਥਾਪਿਤ"
 
 #: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "ਫ�ਲਡਰ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਸ ਸੰਭਾਲ ਤ� �ਲਤ �ਾਰਵਾ�"
 
@@ -2312,146 +2301,148 @@ msgstr "ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�:
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ %s: ਮ���ਦ ਹ�"
 
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:384
+#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
 #: ../camel/providers/local/camel-maildir-store.c:219
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ਫ�ਲਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: �ਲਤ �ਾਰਵਾ�"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:421
+#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
 #: ../camel/providers/local/camel-maildir-store.c:291
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ਫ�ਲਡਰ ਦਾ ਨਾ� ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: %s: �ਲਤ �ਾਰਵਾ�"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:899 ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
+#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
 msgid "Trash"
 msgstr "ਰੱਦ�"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
 msgid "Junk"
 msgstr "�ੰ�"
 
-#: ../camel/camel-tcp-stream-openssl.c:572
+#: ../camel/camel-tcp-stream-openssl.c:564
 msgid "Unable to get issuer's certificate"
 msgstr "�ਾਰ��ਰਤਾ ਦਾ ਸਰ��ਫਿ��� ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-tcp-stream-openssl.c:574
+#: ../camel/camel-tcp-stream-openssl.c:566
 msgid "Unable to get Certificate Revocation List"
 msgstr "ਸਰ��ਫਿ��� ਥਾ� ਸ��� ਪ�ਰਾਪਤ ਨਹ�� ��ਤ� �ਾ ਸ�� ਹ�"
 
-#: ../camel/camel-tcp-stream-openssl.c:576
+#: ../camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to decrypt certificate signature"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ ਡਿ��ਰਿਪ� �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-tcp-stream-openssl.c:578
+#: ../camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "ਸਰ��ਫਿ��� ਥਾ� ਸ��� ਦਸਤ�ਤ ਡਿ��ਰਿਪ� �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-tcp-stream-openssl.c:580
+#: ../camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decode issuer's public key"
 msgstr "�ਾਰ��ਰਤਾ ਦ� ਪਬਲਿ� ��ੰ�� ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-tcp-stream-openssl.c:582
+#: ../camel/camel-tcp-stream-openssl.c:574
 msgid "Certificate signature failure"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ �ਸਫਲ"
 
-#: ../camel/camel-tcp-stream-openssl.c:584
+#: ../camel/camel-tcp-stream-openssl.c:576
 msgid "Certificate Revocation List signature failure"
 msgstr "ਸਰ��ਫਿ��� ਥਾ� ਸ��� ਦਸਤ�ਤ �ਸਫਲ"
 
-#: ../camel/camel-tcp-stream-openssl.c:586
+#: ../camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate not yet valid"
 msgstr "ਸਰ��ਫਿ��� �ਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-tcp-stream-openssl.c:588
+#: ../camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate has expired"
 msgstr "ਸਰ��ਫਿ��� ਦ� ਮਿ�ਦ ਪ�ੱ� ��ੱ�� ਹ�"
 
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL �ਾ�� ਨਹ�� ਹ�"
+#: ../camel/camel-tcp-stream-openssl.c:582
+#| msgid "Certificate Revocation List signature failure"
+msgid "Certificate Revocation List (CRL) not yet valid"
+msgstr "ਸਰ��ਫਿ��� ਮਨਸ�� ਲਿਸ� (CRL) ਹਾਲ� ਢ�ੱ�ਵ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "CRL ਦ� ਮਿ�ਦ ਪ�ੱ� �� ਹ�"
+#: ../camel/camel-tcp-stream-openssl.c:584
+#| msgid "Certificate Revocation List signature failure"
+msgid "Certificate Revocation List (CRL) has expired"
+msgstr "ਸਰ��ਫਿ��� ਮਨਸ�� ਲਿਸ� (CRL) ਦ� ਮਿ�ਦ ਪ�ੱ��"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "CRL ਵਿੱ� �ਲਤ�"
+#: ../camel/camel-tcp-stream-openssl.c:589
+#| msgid "Unable to get Certificate Revocation List"
+msgid "Error in Certificate Revocation List (CRL)"
+msgstr "ਸਰ��ਫਿ��� ਮਨਸ�� ਲਿਸ� (CRL) ਵਿੱ� �ਲਤ�"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
+#: ../camel/camel-tcp-stream-openssl.c:591
 msgid "Out of memory"
 msgstr "ਮ�ਮ�ਰ� ਤ�� ਬਾਹਰ"
 
-#: ../camel/camel-tcp-stream-openssl.c:601
+#: ../camel/camel-tcp-stream-openssl.c:593
 msgid "Zero-depth self-signed certificate"
 msgstr "Zero-depth ਸਵ�-ਦਸਤ�ਤ� ਸਰ��ਫਿ���"
 
-#: ../camel/camel-tcp-stream-openssl.c:603
+#: ../camel/camel-tcp-stream-openssl.c:595
 msgid "Self-signed certificate in chain"
 msgstr "ਲ�� ਵਿੱ� ਸਵ�-ਦਸਤ�ਤ� ਸਰ��ਫਿ��� ਹ�"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
+#: ../camel/camel-tcp-stream-openssl.c:597
 msgid "Unable to get issuer's certificate locally"
 msgstr "�ਾਰ��ਰਤਾ ਦਾ ਸਰ��ਫਿ��� ਲ��ਲ ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫ਼ਲ"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
+#: ../camel/camel-tcp-stream-openssl.c:599
 msgid "Unable to verify leaf signature"
 msgstr "ਸਿਰਾ ਦਸਤ�ਤ �ਾ�� �ਰਨ ਤ�� �ਸਫਲ"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
+#: ../camel/camel-tcp-stream-openssl.c:601
 msgid "Certificate chain too long"
 msgstr "ਸਰ��ਫਿ��� ਲ�� ਬ�� ਲੰਮ� ਹ�"
 
-#: ../camel/camel-tcp-stream-openssl.c:611
+#: ../camel/camel-tcp-stream-openssl.c:603
 msgid "Certificate Revoked"
 msgstr "ਸਰ��ਫਿ��� ਮ�� ਸ਼ਾਮਿਲ"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
+#: ../camel/camel-tcp-stream-openssl.c:605
 msgid "Invalid Certificate Authority (CA)"
-msgstr "�ਲਤ Certificate Authority (CA)"
+msgstr "�ਲਤ ਸਰ��ਫਿ��� �ਥਾਰ�� (CA)"
 
-#: ../camel/camel-tcp-stream-openssl.c:615
+#: ../camel/camel-tcp-stream-openssl.c:607
 msgid "Path length exceeded"
 msgstr "ਰਸਤਾ ਲੰਬਾ� ਵੱਧ �� ਹ�"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
+#: ../camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid purpose"
 msgstr "�ਲਤ �ਦ�ਸ਼"
 
-#: ../camel/camel-tcp-stream-openssl.c:619
+#: ../camel/camel-tcp-stream-openssl.c:611
 msgid "Certificate untrusted"
 msgstr "ਸਰ��ਫਿ��� ਨਾ-ਭਰ�ਸ�ਯ��"
 
-#: ../camel/camel-tcp-stream-openssl.c:621
+#: ../camel/camel-tcp-stream-openssl.c:613
 msgid "Certificate rejected"
 msgstr "ਸਰ��ਫਿ��� �ਸਵ��ਾਰ"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
+#: ../camel/camel-tcp-stream-openssl.c:616
 msgid "Subject/Issuer mismatch"
 msgstr "ਵਿਸ਼ਾ/�ਾਰ� �ਰਤਾ ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
+#: ../camel/camel-tcp-stream-openssl.c:618
 msgid "AKID/SKID mismatch"
 msgstr "AKID/SKID ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-tcp-stream-openssl.c:628
+#: ../camel/camel-tcp-stream-openssl.c:620
 msgid "AKID/Issuer serial mismatch"
 msgstr "AKID/�ਾਰ� �ਰਤਾ ਸ�ਰ��ਲ ਮ�ਲ ਨਹ�� �ਾਦ�"
 
-#: ../camel/camel-tcp-stream-openssl.c:630
+#: ../camel/camel-tcp-stream-openssl.c:622
 msgid "Key usage does not support certificate signing"
 msgstr "ਵਰਤ� ��ੰ�� ਸਰ��ਫਿ��� ਦਸਤ�ਤਾ� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/camel-tcp-stream-openssl.c:633
+#: ../camel/camel-tcp-stream-openssl.c:625
 msgid "Error in application verification"
-msgstr "�ਾਰ� �ਾ�� ਵਿੱ� �ਲਤ� ਹ�"
+msgstr "�ਪਲ���ਸ਼ਨ �ਾ�� ਵਿੱ� �ਲਤ� ਹ�"
 
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2464,15 +2455,15 @@ msgstr ""
 "ਫਿੰ�ਰ ਪ�ਰਿੰ�:       %s\n"
 "ਦਸਤ�ਤ:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
 msgid "GOOD"
 msgstr "ਵਧ��"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
 msgid "BAD"
 msgstr "����"
 
-#: ../camel/camel-tcp-stream-openssl.c:708
+#: ../camel/camel-tcp-stream-openssl.c:700
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -2492,7 +2483,7 @@ msgstr ""
 "�� ਤ�ਸ�� �ਿਸ� ਵ� ਤਰਾ� ਸਵ��ਾਰ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
+#: ../camel/camel-tcp-stream-ssl.c:883
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2507,7 +2498,7 @@ msgstr ""
 "\n"
 "�� ਤ�ਸ�� ਸਵ��ਾਰ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:927
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2516,7 +2507,7 @@ msgstr ""
 "ਸਰ��ਫਿ��� ਸਮੱਸਿ�: %s\n"
 "�ਾਰ� �ਰਤਾ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:979
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2525,7 +2516,7 @@ msgstr ""
 "�ਲਤ ਸਰ��ਫਿ��� ਡ�ਮ�ਨ: %s\n"
 "�ਾਰ� �ਰਤਾ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:997
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2534,7 +2525,7 @@ msgstr ""
 "ਸਰ��ਫਿ��� ਦ� ਮਿ�ਦ ਪ�ੱ��: %s\n"
 "�ਾਰ� �ਰਤਾ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:1014
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2548,42 +2539,42 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "URL '%s' ਨ�ੰ ਪਾਰਸ ਨਹ� ��ਤਾ �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:580
 #, c-format
 msgid "Error storing '%s': %s"
 msgstr "'%s' ਨ�ੰ ��ਰਮਬੱਧ �ਰਨ ਵਿੱ� �ਲਤ�: %s"
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:657
 #, c-format
 msgid "No such message %s in %s"
-msgstr "%2s ਵਿੱ� %1s ਤਰਾ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
+msgstr "%2$s ਵਿੱ� %1$s ਤਰਾ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
 
-#: ../camel/camel-vee-folder.c:820 ../camel/camel-vee-folder.c:826
+#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
 msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "ਫਰ�� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨਹਿ�� ਨ�ੰ ਨ�ਲ �ਾ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+msgstr "ਫਰ�� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨਹਿ�� ਨ�ੰ �ਾਪ� �ਾ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
+#: ../camel/camel-vee-store.c:353
 msgid "Unmatched"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:400
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: �ਸਤਰਾ� ਦਾ ��� ਫ�ਲਡਰ ਨਹ�� ਹ�"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:422
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ਫ�ਲਡਰ ਦਾ ਨਾ� ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: �ਸ ਤਰਾ� ��� ਫ�ਲਡਰ ਨਹ�� ਹ�"
 
 #: ../camel/camel-vtrash-folder.c:55
 msgid "Cannot copy messages to the Trash folder"
-msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਰੱਦ� ਵਿੱ� ਨ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
+msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਰੱਦ� ਵਿੱ� �ਾਪ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
 #: ../camel/camel-vtrash-folder.c:57
 msgid "Cannot copy messages to the Junk folder"
-msgstr "ਸ�ਨ�ਹ� ਨ�ੰ �ਬਾ� ਫ�ਲਡਰ ਵਿੱ� ਨ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
+msgstr "ਸ�ਨ�ਹ� ਨ�ੰ �ੰ� ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:136
 #, c-format
@@ -2595,19 +2586,19 @@ msgstr ""
 "  %s"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:248
-#: ../camel/providers/local/camel-maildir-folder.c:275
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mh-folder.c:214
+#: ../camel/providers/local/camel-maildir-folder.c:255
+#: ../camel/providers/local/camel-maildir-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:363
+#: ../camel/providers/local/camel-mbox-folder.c:414
+#: ../camel/providers/local/camel-mh-folder.c:216
 msgid "No such message"
-msgstr "�ਸਤਰਾ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ��"
+msgstr "�ੰ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ��"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:821
+#: ../camel/providers/imap4/camel-imap4-folder.c:814
 #: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:411
+#: ../camel/providers/nntp/camel-nntp-folder.c:250
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
 #: ../camel/providers/pop3/camel-pop3-folder.c:268
 #: ../camel/providers/pop3/camel-pop3-folder.c:578
 #: ../camel/providers/pop3/camel-pop3-folder.c:639
@@ -2616,11 +2607,11 @@ msgid "User canceled"
 msgstr "ਯ��਼ਰ ਨ� ਰੱਦ ��ਤਾ"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
+#: ../camel/providers/imap4/camel-imap4-folder.c:819
 #: ../camel/providers/nntp/camel-nntp-folder.c:166
 #: ../camel/providers/nntp/camel-nntp-folder.c:168
 #: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:253
+#: ../camel/providers/nntp/camel-nntp-folder.c:252
 #: ../camel/providers/pop3/camel-pop3-folder.c:388
 #: ../camel/providers/pop3/camel-pop3-folder.c:581
 #: ../camel/providers/pop3/camel-pop3-folder.c:642
@@ -2632,285 +2623,290 @@ msgstr "ਸ�ਨ�ਹਾ %s ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:172
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2303
-#: ../camel/providers/imap4/camel-imap4-folder.c:844
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
+#: ../camel/providers/imap4/camel-imap4-folder.c:837
 msgid "This message is not available in offline mode."
 msgstr "�ਹ ਸ�ਨ�ਹਾ �ਫਲਾ�ਨ ਵਿੱ� �ਪਲੱਬਧ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:192
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:199
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1818
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1869
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
 msgid "Could not get message"
 msgstr "����� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:883
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
+#: ../camel/providers/imap/camel-imap-folder.c:296
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ਲ� ਸੰ��ਪ ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1143
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012, c-format
+#| msgid "Checking for new messages"
+msgid "Checking for deleted messages %s"
+msgstr "ਹ�ਾ� �� ਸ�ਨ�ਹ� %s ਲ� ��� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
 msgid "Trash Folder Full. Please Empty."
 msgstr "ਰੱਦ� ਫ�ਲਡਰ ਭਰ �ਿ� ਹ�। �ਾਲ� �ਰ� ��।"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1352
-#: ../camel/providers/groupwise/camel-groupwise-store.c:617
-#: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:3362
-#: ../camel/providers/imap/camel-imap-folder.c:3438
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
+#: ../camel/providers/groupwise/camel-groupwise-store.c:633
+#: ../camel/providers/groupwise/camel-groupwise-store.c:763
+#: ../camel/providers/imap/camel-imap-folder.c:3421
+#: ../camel/providers/imap/camel-imap-folder.c:3497
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s ਵਿੱ� ਨਵ�� ਸ�ਨਹਿ�� ਲ� ਸੰ��ਪ �ਾਣ�ਾਰ� ਲ� �ਾ ਰਹ� ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2200
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਲ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦਾ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2188
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ਸ�ਨ�ਹਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "ਫ�ਲਡਰ ਬ�ਸਾ %s ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
+#: ../camel/providers/imap4/camel-imap4-journal.c:311
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "�ਫਲਾ�ਨ ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: ����� �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
+#: ../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-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:38
 msgid "Checking for new mail"
 msgstr "ਨਵ�� ਮ�ਲ ਲ� ��ੱ� ��ਤ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
+#: ../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:41
+#: ../camel/providers/imap4/camel-imap4-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "ਸਭ ਫ�ਲਡਰਾ� ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� �ਾ��(_h)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
 #: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
+#: ../camel/providers/imap4/camel-imap4-provider.c:51
 #: ../camel/providers/local/camel-local-provider.c:46
 #: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:106
 msgid "Options"
 msgstr "��ਣ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "�ਹ ਸਰਵਰ ਦ� �ਨ-ਬਾ�ਸ ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹਿ�� �ੱਤ� ਫਿਲ�ਰ ਲਾ�� �ਰ�(_A)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
 msgid "Check new messages for J_unk contents"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ੰ� ਸਮੱ�ਰ� ਲ� �ਾ���(_u)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
 #: ../camel/providers/imap/camel-imap-provider.c:74
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "��ਣ-ਬ�ਸਾ ਫ�ਲਡਰ ਵਿੱ� �ੰ� ਸ�ਨ�ਹਿ�� ਲ� ��ੱ� �ਰ�(_B)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
 msgid "Automatically synchroni_ze account locally"
 msgstr "��ਾ��� ਲ��ਲ� ���ਮ��ਿ� ਹ� ਸਿ�ਰਾਨਾ��਼ �ਰ�(_z)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
 msgid "SOAP Settings"
 msgstr "SOAP ਸ��ਿੰ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
-#| msgid "Post Office Agent SOAP Port:"
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
 msgid "Post Office Agent SOAP _Port:"
-msgstr "Post Office Agent SOAP _Port:"
+msgstr "ਪ�ਸ� �ਫਿਸ ��ੰ� SOA_P ਪ�ਰ�:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
 msgid "For accessing Novell GroupWise servers"
 msgstr "Novell GroupWise ਸਰਵਰ ਵਰਤਣ ਲ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
+#: ../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:84
+#: ../camel/providers/imap4/camel-imap4-provider.c:83
 #: ../camel/providers/imapp/camel-imapp-provider.c:67
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid "Password"
 msgstr "ਪਾਸਵਰਡ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
 msgid "This option will connect to the GroupWise server using a plaintext password."
 msgstr "�ਸ ��ਣ ਨਾਲ GroupWise ਸਰਵਰ ਨਾਲ �ੱ� ਸਧਾਰਨ ਪਾਠ ਪਾਸਵਰਡ ਰਾਹ�� ���ਿ� �ਾਵ��ਾ।"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:102
 msgid "Host or user not available in url"
 msgstr "url ਵਿੱ� ਹ�ਸ� �ਾ� ਯ��਼ਰ �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
+#: ../camel/providers/groupwise/camel-groupwise-store.c:204
+#: ../camel/providers/imap/camel-imap-store.c:1358
 msgid "You did not enter a password."
 msgstr "ਤ�ਸ�� ਪਾਸਵਰਡ ਨਹ�� ਭਰਿ� ਹ�।"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
+#: ../camel/providers/groupwise/camel-groupwise-store.c:319
 msgid "Some features may not work correctly with your current server version"
 msgstr "ਤ�ਹਾਡ� ਸਰਵਰ ਦ� ਮ���ਦਾ ਵਰ�ਨ ਨਾਲ ��� ��ਣ ਠ�� ਤਰਾ� �ੰਮ ਨਹ�� �ਰ ਸ�ਦ� ਹਨ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:524
+#: ../camel/providers/groupwise/camel-groupwise-store.c:540
 #: ../camel/providers/imap/camel-imap-store.c:1849
 #: ../camel/providers/imap/camel-imap-store.c:2047
 #, c-format
 msgid "No such folder %s"
 msgstr "ਫ�ਲਡਰ %s ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� GroupWise ਫ�ਲਡਰ ਬਣਾ�ਣ� ਸੰਭਵ ਨਹ�� ਹਨ।"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
 #: ../camel/providers/imap/camel-imap-store.c:1924
 #: ../camel/providers/imap/camel-imap-store.c:2304
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "ਮ�ੱਢਲ� ਫ�ਲਡਰ ਵਿੱ� ਸਬ-ਫ�ਲਡਰ ਸਵ��ਾਰ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359, c-format
-#| msgid "Cannot rename Groupwise folder '%s' to '%s'"
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
+#, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "GroupWise ਫ�ਲਡਰ '%s' ਦਾ ਨਾ�-ਤਬਦ�ਲ '%s' ਲ� ��ਤਾ �ਾ ਸ�ਦਾ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise ਸਰਵਰ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "�ਰ�ੱਪਵਾ��਼ ਸ�ਵਾ %s ਲ� %s �ੱਤ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "%s ਨਾਲ �ਰ�ੱਪਵਾ�� ਪੱਤਰ"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
 msgid "Sending Message"
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
 "of your mail.\n"
 msgstr ""
-"ਤ�ਸ�� �ਹ �ਾਤ� ਦ� ਸੰਭਾਲਣ ਸਮੱਰਥਾ ਤ�� ਵੱਧ �� ਹ�। ਤ�ਹਾਡਾ ਸ�ਨ�ਹਾ ਤ�ਹਾਡ� ���-ਬ�ਸ� '� ਪਿ� ਹ�। �ਪਣ� "
+"ਤ�ਸ�� �ਹ ��ਾ��� ਦ� ਸੰਭਾਲਣ ਸਮੱਰਥਾ ਤ�� ਵੱਧ �� ਹ�। ਤ�ਹਾਡਾ ਸ�ਨ�ਹਾ ਤ�ਹਾਡ� ���-ਬ�ਸ� '� ਪਿ� ਹ�। "
+"�ਪਣ� "
 "��� ਪੱਤਰ ਹ�ਾ ��/��ਾ�ਵ ਬਣਾ �� ਭ���/ਲਵ� ਬ�ਨ ਦੱਬ �� ਮ�� ਭ���।\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
 #, c-format
 msgid "Could not send message: %s"
 msgstr "ਸ�ਨ�ਹਾ ਨਹ�� ਭ��ਿ� �ਾ ਸ�ਦਾ : %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:49
+#: ../camel/providers/hula/camel-hula-provider.c:48
 #: ../camel/providers/imap/camel-imap-provider.c:44
 msgid "Checking for New Mail"
 msgstr "ਨਵ�� ਮ�ਲ ਲ� ��ੱ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/providers/hula/camel-hula-provider.c:54
+#: ../camel/providers/hula/camel-hula-provider.c:53
 #: ../camel/providers/imap/camel-imap-provider.c:52
 msgid "Connection to Server"
 msgstr "ਸਰਵਰ ਨਾਲ ��ਨ��� �ਰ�"
 
-#: ../camel/providers/hula/camel-hula-provider.c:56
+#: ../camel/providers/hula/camel-hula-provider.c:55
 #: ../camel/providers/imap/camel-imap-provider.c:54
 msgid "_Use custom command to connect to server"
 msgstr "ਸਰਵਰ ਨਾਲ ���ਨ ਲ� ਪਸੰਦ�ਦਾ �ਮਾ�ਡ ਵਰਤ��(_U)"
 
-#: ../camel/providers/hula/camel-hula-provider.c:58
+#: ../camel/providers/hula/camel-hula-provider.c:57
 #: ../camel/providers/imap/camel-imap-provider.c:56
 msgid "Command:"
 msgstr "�ਮਾ�ਡ:"
 
-#: ../camel/providers/hula/camel-hula-provider.c:61
+#: ../camel/providers/hula/camel-hula-provider.c:60
 #: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
+#: ../camel/providers/imap4/camel-imap4-provider.c:43
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "ਫ�ਲਡਰ"
 
-#: ../camel/providers/hula/camel-hula-provider.c:63
+#: ../camel/providers/hula/camel-hula-provider.c:62
 #: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
+#: ../camel/providers/imap4/camel-imap4-provider.c:45
 msgid "_Show only subscribed folders"
-msgstr "ਮ��ਬਰ� ਫ�ਲਡਰ ਹ� ਵ��ਾ�(_S)"
+msgstr "ਮ��ਬਰ� ਫ�ਲਡਰ ਹ� ਵ���(_S)"
 
-#: ../camel/providers/hula/camel-hula-provider.c:65
+#: ../camel/providers/hula/camel-hula-provider.c:64
 #: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
+#: ../camel/providers/imap4/camel-imap4-provider.c:47
 msgid "O_verride server-supplied folder namespace"
 msgstr "ਸਰਵਰ-ਰਾਹ�� �ਪਲੱਬਧ ਫ�ਲਡਰ ਨਾ�-ਥਾ� �ੱਪਰ(_v)"
 
-#: ../camel/providers/hula/camel-hula-provider.c:67
+#: ../camel/providers/hula/camel-hula-provider.c:66
 msgid "Namespace"
 msgstr "ਨ�ਮ-ਸਪ�ਸ"
 
-#: ../camel/providers/hula/camel-hula-provider.c:78
+#: ../camel/providers/hula/camel-hula-provider.c:76
 msgid "Hula"
 msgstr "ਹ�ਲਾ(Hula)"
 
-#: ../camel/providers/hula/camel-hula-provider.c:80
+#: ../camel/providers/hula/camel-hula-provider.c:78
 msgid "For accessing Hula servers"
 msgstr "Hula ਸਰਵਰ ਵਰਤਣ ਲ�"
 
-#: ../camel/providers/hula/camel-hula-provider.c:97
+#: ../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:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:181
+#: ../camel/providers/imap/camel-imap-command.c:265
 msgid "No output stream"
 msgstr "��� ���ਪ�ੱ� ਸ�ਰ�ਮ"
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../camel/providers/imap/camel-imap-command.c:186
+#: ../camel/providers/imap/camel-imap-command.c:270
 msgid "No input stream"
 msgstr "�ੰਪ�ੱ� ਸ�ਰ�ਮ ਨਹ��"
 
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
+#: ../camel/providers/imap/camel-imap-command.c:229
+#: ../camel/providers/imap/camel-imap-command.c:278
+#: ../camel/providers/imap/camel-imap-command.c:492
+#: ../camel/providers/imap/camel-imap-store.c:3051
 msgid "Operation cancelled"
 msgstr "�ਾਰਵਾ� �ਸਫਲ"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:331
+#: ../camel/providers/imap/camel-imap-store.c:3056
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ਸਰਵਰ �ਸਧਾਰਨ ਤ�ਰ ਤ� ਵੱ� ਹ� �ਿ�: %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:354
+#: ../camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2919,122 +2915,122 @@ msgstr ""
 "IMAP ਸਰਵਰ %s %s ਵਲ�� ��ਤਾਵਨ�:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:421
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ਸਰਵਰ ਵਲ�� �ਸਧਾਰਨ �ਵਾਬ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:431
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP �ਮਾ�ਡ �ਸਫਲ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:506
 msgid "Server response ended too soon."
 msgstr "ਸਰਵਰ ਦਾ �ਵਾਬ ਬ�� ��ਤ� ਸਮਾਪਤ ਹ� �ਿ� ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:712
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ਸਰਵਰ ਦ� �ਵਾਬ ਵਿੱ� %s �ਾਣ�ਾਰ� ਨਹ�� ਸ�"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:748
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ਸਰਵਰ ਤ�� �ਸਧਾਰਨ ਸਭ ਠ�� ਹ�� �ਵਾਬ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
+#: ../camel/providers/imap/camel-imap-folder.c:91
 msgid "Always check for new mail in this folder"
 msgstr "�ਸ ਫ�ਲਡਰ ਵਿੱ� ਹਮ�ਸ਼ਾ ਨਵ�� �ਿੱਠ� ਵ���"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:277
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ਡਾ�ਰ���ਰ� %s ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s"
 
 #. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:891
+#: ../camel/providers/imap/camel-imap-folder.c:919
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s ਵਿੱ� ਤਬਦ�ਲ ਸ�ਨ�ਹਿ�� ਦ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1950
+#: ../camel/providers/imap/camel-imap-folder.c:1987
 #, c-format
 msgid "Unexpected response status '%s' after APPEND command"
 msgstr "APPEND �ਮਾ�ਡ ਦ� ਬਾ�ਦ ��ਾਨ� �ਵਾਬ ਹਾਲਤ '%s'"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1965
+#: ../camel/providers/imap/camel-imap-folder.c:2002
 msgid "No response on continuation after APPEND command"
 msgstr "APPEND �ਮਾ�ਡ ਦ� ਬਾ�ਦ ��� �ਵਾਬ ਨਹ��"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2010
+#: ../camel/providers/imap/camel-imap-folder.c:2047
 msgid "Unknown error occurred during APPEND command!"
 msgstr "APPEND �ਮਾ�ਡ ਦ� ਦ�ਰਾਨ �ਣ�ਾਣ �ਲਤ� �� ਹ�!"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2842
+#: ../camel/providers/imap/camel-imap-folder.c:2878
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "ਸ�ਨ�ਹਾ ਲ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:2913
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ਸ�ਨ�ਹਾ ID %s ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:2914
 msgid "No such message available."
 msgstr "�ੰ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2932
-#: ../camel/providers/imap/camel-imap-folder.c:3753
-#: ../camel/providers/nntp/camel-nntp-folder.c:239
+#: ../camel/providers/imap/camel-imap-folder.c:2975
+#: ../camel/providers/imap/camel-imap-folder.c:3808
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਮ��� ਤ� �ਪਲੱਬਧ ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3567
+#: ../camel/providers/imap/camel-imap-folder.c:3624
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ਸਰਵਰ ਤ�� �ਧ�ਰਾ �ਵਾਬ: ਸ�ਨ�ਹਾ %d ਲ� ��� �ਾਣ�ਾਰ� �ਪਲੱਬਧ ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3575
+#: ../camel/providers/imap/camel-imap-folder.c:3632
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "�ਧ�ਰਾ ਸਰਵਰ �ਵਾਬ: ਸ�ਨ�ਹ� %d ਲ� ��� UID �ਪਲੱਬਧ ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../camel/providers/imap/camel-imap-folder.c:3846
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH �ਵਾਬ ਵਿੱ� ਸ�ਨ�ਹਾ ਭਾ� ਨਹ�� ਮਿਲਿ�।"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
+#: ../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"
+msgstr "��ਸ ਡਾ�ਰ���ਰ� ਨ�ੰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:333
-#: ../camel/providers/imap/camel-imap-message-cache.c:390
-#: ../camel/providers/imap/camel-imap-message-cache.c:421
-#: ../camel/providers/imap/camel-imap-message-cache.c:453
+#: ../camel/providers/imap/camel-imap-message-cache.c: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
 #, c-format
 msgid "Failed to cache message %s: %s"
-msgstr "ਸ�ਨ�ਹਾ %s ���� ਲ�ਣ ਵਿੱ� �ਸਫਲ: %s"
+msgstr "ਸ�ਨ�ਹਾ %s ��ਸ ਲ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:530
 #, c-format
 msgid "Failed to cache %s: %s"
-msgstr "���� %s ਲ� �ਸਫਲ: %s"
+msgstr "��ਸ %s ਲ� �ਸਫਲ: %s"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ਮ��ਬਰ ਬਣਾ� ਫ�ਲਡਰਾ� ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹ� ��ੱ� �ਰ�(_e)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
+#: ../camel/providers/imap4/camel-imap4-provider.c:49
 msgid "Namespace:"
 msgstr "ਨ�ਮ-ਸਪ�ਸ:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:53
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "�ਸ ਸਰਵਰ �ੱਤ� �ਨ-ਬਾ�ਸ(INBOX) ਵਿੱ� ਨਵ�� ਸ�ਨਹਿ�� �ੱਤ� ਫਿਲ�ਰ ਲ�ਾ�(_A)"
 
@@ -3043,7 +3039,7 @@ msgid "Check new messages for Jun_k contents"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ੰ� ਸਮੱ�ਰ� ਲ� ��ੱ� �ਰ�(_K)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imap4/camel-imap4-provider.c:59
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ਰਿਮ�� ਮ�ਲ ਲ��ਲ� ���ਮ��ਿ� ਹ� ਸਿ�ਰਾਨਾ��਼ �ਰ�(_z)"
 
@@ -3061,36 +3057,36 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "�ਹ ��ਣ IMAP ਸਰਵਰ ਨਾਲ ਪਲ�ਨ-���ਸ� ਪਾਸਵਰਡ ਨਾਲ ਸ਼ਾਮਿਲ �ਰਨ ਲ� ਸਹਾ�� ਹ�।"
 
 #: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
+#: ../camel/providers/imap4/camel-imap4-store.c:210
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP ਸਰਵਰ %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
+#: ../camel/providers/imap4/camel-imap4-store.c:212
 #, c-format
 msgid "IMAP service for %s on %s"
-msgstr "IMAP ਸ�ਵਾ %2s ਤ� %1s ਲ�"
+msgstr "IMAP ਸਰਵਿਸ %2$s �ੱਤ� %1$s ਲ�"
 
 #: ../camel/providers/imap/camel-imap-store.c:568
 #: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
+#: ../camel/providers/imap4/camel-imap4-store.c:247
+#: ../camel/providers/imap4/camel-imap4-store.c:262
+#: ../camel/providers/nntp/camel-nntp-store.c:182
+#: ../camel/providers/nntp/camel-nntp-store.c:197
+#: ../camel/providers/pop3/camel-pop3-store.c:170
+#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "%s ਨਾਲ ��� ਨਹ�� ਸ�ਦਾ: %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap4/camel-imap4-store.c:248
+#: ../camel/providers/nntp/camel-nntp-store.c:183
+#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:260
 msgid "SSL unavailable"
 msgstr "SSL �ਪਲੱਬਧ ਨਹ� ਹ�"
 
@@ -3103,15 +3099,15 @@ msgstr "��ਨ��ਸ਼ਨ ਰੱਦ ��ਤਾ"
 #: ../camel/providers/imap/camel-imap-store.c:710
 #: ../camel/providers/imap/camel-imap-store.c:716
 #: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../camel/providers/imap4/camel-imap4-store.c:310
+#: ../camel/providers/imap4/camel-imap4-store.c:325
+#: ../camel/providers/imap4/camel-imap4-store.c:334
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "IMAP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ: %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "ਪ�ਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
 
@@ -3120,8 +3116,8 @@ msgid "SSL negotiations failed"
 msgstr "SSL �ੱਲਬਾਤ �ਸਫਲ"
 
 #: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../camel/providers/imap4/camel-imap4-store.c:335
+#: ../camel/providers/smtp/camel-smtp-transport.c:371
 msgid "SSL is not available in this build"
 msgstr "�ਸ ਨਿਰਮਾਣ ਵਿੱ� SSL �ਪਲੱਬਧ ਨਹ��"
 
@@ -3133,43 +3129,30 @@ msgstr "�ਮਾ�ਡ \"%s\" ਨਾਲ ���ਿ� ਨਹ�� �ਾ ਸ
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
 #: ../camel/providers/imap/camel-imap-store.c:1053
 #: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:78
+#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
+#: ../camel/providers/imap4/camel-imap4-store.c:1403
+#: ../camel/providers/local/camel-maildir-folder.c:80
 #: ../camel/providers/local/camel-maildir-store.c:219
 #: ../camel/providers/local/camel-maildir-store.c:291
 #: ../camel/providers/local/camel-maildir-store.c:517
 #: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
+#: ../camel/providers/local/camel-spool-store.c:463
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
 msgid "Inbox"
 msgstr "��ਣ-ਬ�ਸਾ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1055
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "ਡਰਾਫ�"
-
-#: ../camel/providers/imap/camel-imap-store.c:1057
-msgid "Sent"
-msgstr "ਭ���"
-
-#: ../camel/providers/imap/camel-imap-store.c:1059
-msgid "Templates"
-msgstr "��ਪਲ��"
-
-#: ../camel/providers/imap/camel-imap-store.c:1304
+#: ../camel/providers/imap/camel-imap-store.c:1305
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ਸਰਵਰ %s ਲ���ਦ� ਪ�ਰਮਾਣਿਤ �ਿਸਮ %s ਲ� ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:1315
+#: ../camel/providers/smtp/camel-smtp-transport.c:506
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� %s ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:1389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3182,7 +3165,7 @@ msgstr ""
 
 #: ../camel/providers/imap/camel-imap-store.c:1861
 #: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
+#: ../camel/providers/imap4/camel-imap4-store.c:954
 #, c-format
 msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "ਫ�ਲਡਰ ਨਾ� \"%s\" �ਾ�� ਨਹ�� ਹ�, �ਿ��ਿ �ਸ ਵਿੱ� \"%c\" �ੱ�ਰ ਸ਼ਾਮਿਲ ਹ�।"
@@ -3200,318 +3183,323 @@ msgstr "ਫ�ਲਡਰ '%s' ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ 
 msgid "Unknown parent folder: %s"
 msgstr "�ਣ�ਾਣਾ ਮ�ੱਢਲਾ ਫ�ਲਡਰ: %s"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
+#: ../camel/providers/imap/camel-imap-store.c:3053
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected"
+msgstr "ਸਰਵਰ ��ਾਨ� ਡਿਸ-��ਨ��� ਹ� �ਿ�"
+
+#: ../camel/providers/imap4/camel-imap4-command.c:572
+#: ../camel/providers/imap4/camel-imap4-command.c:579
 #, c-format
 msgid "Failed sending command to IMAP server %s: %s"
 msgstr "IMAP ਸਰਵਰ %s ਨ�ੰ �ਮਾ�ਡ ਭ��ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:686
+#: ../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:221
+#: ../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:450
+#: ../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:456
+#: ../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:1433
+#: ../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:1435
+#: ../camel/providers/imap4/camel-imap4-engine.c:1416
 msgid "service unavailable"
 msgstr "ਸਰਵਿਸ �ਪਲੱਬਧ ਨਹ� ਹ�"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
+#: ../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:89
+#: ../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:90
+#: ../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:91
+#: ../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:432
+#: ../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:491
+#: ../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:497
+#: ../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:637
+#: ../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:642
+#: ../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:898
+#: ../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:903
+#: ../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:947
+#: ../camel/providers/imap4/camel-imap4-folder.c:940
 #, c-format
 msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "ਫ�ਲਡਰ '%s' ਲ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦਾ: ਫ�ਲਡਰ ਸਿਰਫ਼ ਪ�ਨ ਲ� ਹ�"
+msgstr "ਫ�ਲਡਰ '%s' ਲ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦਾ: ਫ�ਲਡਰ ਸਿਰਫ਼ ਪ��ਹਨ ਲ� ਹ�"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
+#: ../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:1070
+#: ../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:1190
+#: ../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:1194
+#: ../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' ਵਿੱ� ਨ�ਲ ਨਹ�� �ਾ ਸ�ਦ� ਹਨ: �ਣ�ਾਣ �ਲਤ�"
+msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ '%s' ਤ�� '%s' ਵਿੱ� �ਾਪ� ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹਨ: �ਣ�ਾਣ �ਲਤ�"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1202
+#: ../camel/providers/imap4/camel-imap4-folder.c:1194
 #, c-format
 msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
 msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ '%s' ਤ�� '%s' ਵਿੱ� ਭ��� ਨਹ�� �ਾ ਸ�ਦ� ਹਨ: �ਲਤ �ਮਾ�ਡ"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1206
+#: ../camel/providers/imap4/camel-imap4-folder.c:1198
 #, c-format
 msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
 msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ '%s' ਤ�� '%s' ਵਿੱ� ਨ�ਲ ਨਹ�� �ਾ ਸ�ਦ� ਹਨ: �ਲਤ �ਮਾ�ਡ"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
+#: ../camel/providers/imap4/camel-imap4-provider.c:55
 msgid "Check new messages for _Junk contents"
 msgstr "�ੰ� ਸਮੱ�ਰ� ਲ� ਨਵ�� ਸ�ਨ�ਹ� ��ੱ� �ਰ�(_J)"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
+#: ../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:67
+#: ../camel/providers/imap4/camel-imap4-provider.c:66
 msgid "IMAP4rev1"
 msgstr "IMAP4rev1"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
+#: ../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:86
+#: ../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:263
+#: ../camel/providers/imap4/camel-imap4-store.c:259
 #: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
+#: ../camel/providers/nntp/camel-nntp-store.c:194
+#: ../camel/providers/nntp/camel-nntp-store.c:213
+#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:271
 msgid "Connection canceled"
 msgstr "��ਨ��ਸ਼ਨ ਰੱਦ ��ਤਾ"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:300
+#: ../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:330
-#: ../camel/providers/pop3/camel-pop3-store.c:251
+#: ../camel/providers/imap4/camel-imap4-store.c:326
+#: ../camel/providers/pop3/camel-pop3-store.c:249
 msgid "TLS negotiations failed"
 msgstr "TLS �ੱਲਬਾਤ ਫ�ਲ�ਹ"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:415
+#: ../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:538
+#: ../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:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
+#: ../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:740
+#: ../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:821
+#: ../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:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
+#: ../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:902
+#: ../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:907
+#: ../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:1013
+#: ../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:1020
+#: ../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:1079
+#: ../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:1084
+#: ../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:1104
+#: ../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:1111
+#: ../camel/providers/imap4/camel-imap4-store.c:1106
 msgid "Cannot rename IMAP folders in offline mode."
 msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� IMAP ਫ�ਲਡਰ ਦਾ ਨਾ�-ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../camel/providers/imap4/camel-imap4-store.c:1137
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
 msgstr "ਫ�ਲਡਰ '%s' ਦਾ ਨਾ�-ਤਬਦ�ਲ '%s' ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਲਤ mailbox ਨਾ�"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
+#: ../camel/providers/imap4/camel-imap4-store.c:1142
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Bad command"
 msgstr "ਫ�ਲਡਰ '%s' ਦਾ� ਨਾ�-ਤਬਦ�ਲ '%s' ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਲਤ �ਮਾ�ਡ"
 
 #. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
 #. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
+#: ../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/imap4/camel-imap4-store.c:1638
+#: ../camel/providers/imap4/camel-imap4-store.c:1633
 msgid "Cannot subscribe to IMAP folders in offline mode."
 msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� IMAP ਫ�ਲਡਰ ਨ�ੰ ਸਵ��ਾਰ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
+#: ../camel/providers/imap4/camel-imap4-store.c:1678
 #, c-format
 msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
 msgstr "ਫ�ਲਡਰ '%s' ਨ�ੰ ਸਵ��ਾਰ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਲਤ mailbox ਨਾ�"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1688
+#: ../camel/providers/imap4/camel-imap4-store.c:1683
 #, c-format
 msgid "Cannot subscribe to folder '%s': Bad command"
 msgstr "ਫ�ਲਡਰ '%s' ਲ� ਮ��ਬਰ ਨਹ�� ਬਣਿ� �ਾ ਸ�ਦਾ ਹ�: �ਲਤ �ਮਾ�ਡ"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
+#: ../camel/providers/imap4/camel-imap4-store.c:1705
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
 msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� IMAP ਫ�ਲਡਰ ਨ�ੰ �ਸਵ��ਾਰ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
+#: ../camel/providers/imap4/camel-imap4-store.c:1750
 #, c-format
 msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
 msgstr "ਫ�ਲਡਰ '%s' ਦ� ਮ��ਬਰ� ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: �ਲਤ mailbox ਨਾ�"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
+#: ../camel/providers/imap4/camel-imap4-store.c:1755
 #, c-format
 msgid "Cannot unsubscribe from folder '%s': Bad command"
 msgstr "ਫ�ਲਡਰ '%s' ਤ�� ਮ��ਬਰ� ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: �ਲਤ �ਮਾ�ਡ"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
+#: ../camel/providers/imap4/camel-imap4-summary.c:1590
 msgid "Scanning for changed messages"
 msgstr "ਤਬਦ�ਲ ਸ�ਨ�ਹਿ�� ਦ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
+#: ../camel/providers/imap4/camel-imap4-summary.c:1611
 #, c-format
 msgid "IMAP server %s is in an inconsistent state."
 msgstr "IMAP ਸਰਵਰ %s �ਰਾਬ ਹਾਲਤ '� ਹ�।"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
+#: ../camel/providers/imap4/camel-imap4-summary.c:1638
 msgid "Fetching envelopes of new messages"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� �ੰਵ�ਲਪ ਲ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
+#: ../camel/providers/imap4/camel-imap4-utils.c:429
 #, c-format
 msgid "Unexpected token in response from IMAP server %s: "
 msgstr "IMAP ਸਰਵਰ %s ਤ�� �ਵਾਬ ਵਿੱ� �ਲਤ ���ਨ : "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
+#: ../camel/providers/imap4/camel-imap4-utils.c:452
 msgid "No data"
 msgstr "��� ਡਾ�ਾ ਨਹ�"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imap4/camel-imap4-utils.c:613
 #, c-format
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "IMAP ਸਰਵਰ %s �ਸਧਾਰਨ ਵੱ� ਹ� �ਿ� ਹ�: %s"
 
 #: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 msgid "Message storage"
-msgstr "ਸ�ਨ�ਹਾ ਸੰਭਾਲ"
+msgstr "ਸ�ਨ�ਹਾ ਸ��ਰ��਼"
 
 #: ../camel/providers/imapp/camel-imapp-provider.c:49
 msgid "IMAP+"
@@ -3532,32 +3520,32 @@ msgstr ""
 #: ../camel/providers/imapp/camel-imapp-store.c:252
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
-msgstr "%s ਨਾਲ (ਪ�ਰ� %s) ਤ� ��� ਨਹ�� ਸ�ਿ�: %s"
+msgstr "%s ਨਾਲ (ਪ�ਰ� %s) �ੱਤ� ��ਨ��� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:349
+#: ../camel/providers/imapp/camel-imapp-store.c:348
 #, c-format
 msgid "Could not connect to POP server on %s"
-msgstr "POP ਸਰਵਰ ਨਾਲ %s ਤ� ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+msgstr "POP ਸਰਵਰ ਨਾਲ %s �ੱਤ� ��ਨ��� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../camel/providers/local/camel-local-folder.c:176
+#: ../camel/providers/local/camel-local-folder.c:178
 msgid "Index message body data"
-msgstr "ਤਤ�ਰਾ ਸ�ਨ�ਹਾ ਭਾ� ਡਾ�ਾ"
+msgstr "�ੰਡ��ਸ ਸ�ਨ�ਹਾ ਭਾ� ਡਾ�ਾ"
 
 #. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
+#: ../camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:396
 #: ../camel/providers/local/camel-local-folder.c:399
-#, c-format
-msgid "mailbox:%s (%s)"
-msgstr "mailbox:%s (%s)"
+#: ../camel/providers/local/camel-local-folder.c:402, c-format
+#| msgid "mailbox:%s (%s)"
+msgid "mailbox: %s (%s)"
+msgstr "mailbox: %s (%s)"
 
 #. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:403
+#: ../camel/providers/local/camel-local-folder.c:406
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -3582,7 +3570,8 @@ msgstr "ਲ��ਲ ਪ�ਰਾਪਤ�"
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
-msgstr "ਸ���ਡਰਡ mbox ਫਾਰਮ�� ਸਪ�ਲ ਤ�� �ਵ�ਲ�ਸ਼ਨ ਰਾਹ�� ਸੰਭਾਲ� ਫ�ਲਡਰ ਵਿੱ� ਲ��ਲ ਪੱਤਰ ਪ�ਰਾਪਤ (ਭ��ਣ) �ਰਨ ਲ�।"
+msgstr ""
+"ਸ���ਡਰਡ mbox ਫਾਰਮ�� ਸਪ�ਲ ਤ�� �ਵ�ਲ�ਸ਼ਨ ਰਾਹ�� ਸੰਭਾਲ� ਫ�ਲਡਰ ਵਿੱ� ਲ��ਲ ਪੱਤਰ ਪ�ਰਾਪਤ (ਭ��ਣ) �ਰਨ ਲ�।"
 
 #: ../camel/providers/local/camel-local-provider.c:88
 #: ../camel/providers/local/camel-local-provider.c:107
@@ -3599,7 +3588,7 @@ msgstr "maildir ਡਾ�ਰ���ਰ��� ਵਿੱ� ਸੰਭਾਲ
 
 #: ../camel/providers/local/camel-local-provider.c:108
 msgid "_Store status headers in Elm/Pine/Mutt format"
-msgstr "ਹਾਲਤ ਸਿਰਲ�� Elm/Pine/Mutt ਫਾਰਮ�� ਵਿੱ� ਸੰਭਾਲ�(_S)"
+msgstr "ਹਾਲਤ ਹ�ੱਡਰ Elm/Pine/Mutt ਫਾਰਮ�� ਵਿੱ� ਸੰਭਾਲ�(_S)"
 
 #: ../camel/providers/local/camel-local-provider.c:115
 msgid "Standard Unix mbox spool file"
@@ -3621,7 +3610,7 @@ msgstr "ਸ���ਡਰਡ Unix mbox ਸਪ�ਲ ਡਾ�ਰ���ਰ�
 #: ../camel/providers/local/camel-local-store.c:165
 #: ../camel/providers/local/camel-local-store.c:276
 #: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-spool-store.c:128
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ਪ�ਰਬੰਧ�(root) %s ਸੰਭਾਲ �ੱ� �ਸਲ� ਰਸਤਾ ਨਹ� ਹ�।"
@@ -3673,27 +3662,27 @@ msgstr "ਫ�ਲਡਰ ਮ��ਾ ਫਾ�ਲ '%s' ਨ�ੰ ਹ�ਾ��
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਸੰ��ਪ ਵਿੱ� ਸੰਭਾਲਣ ਵਿੱ� �ਸਫਲ: �ਣ�ਾਣਾ �ਾਰਨ"
 
-#: ../camel/providers/local/camel-maildir-folder.c:222
+#: ../camel/providers/local/camel-maildir-folder.c:229
 msgid "Maildir append message canceled"
 msgstr "Maildir ਸ਼ਾਮਿਲ ਸ�ਨ�ਹਾ ਰੱਦ ��ਤਾ"
 
-#: ../camel/providers/local/camel-maildir-folder.c:225
+#: ../camel/providers/local/camel-maildir-folder.c:232
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "maildir ਫ�ਲਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ ਨਹ� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:247
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-mbox-folder.c:346
-#: ../camel/providers/local/camel-mbox-folder.c:398
-#: ../camel/providers/local/camel-mbox-folder.c:419
-#: ../camel/providers/local/camel-mbox-folder.c:450
-#: ../camel/providers/local/camel-mbox-folder.c:458
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:224
-#: ../camel/providers/local/camel-mh-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:254
+#: ../camel/providers/local/camel-maildir-folder.c:280
+#: ../camel/providers/local/camel-maildir-folder.c:294
+#: ../camel/providers/local/camel-maildir-folder.c:303
+#: ../camel/providers/local/camel-mbox-folder.c:362
+#: ../camel/providers/local/camel-mbox-folder.c:413
+#: ../camel/providers/local/camel-mbox-folder.c:434
+#: ../camel/providers/local/camel-mbox-folder.c:465
+#: ../camel/providers/local/camel-mbox-folder.c:473
+#: ../camel/providers/local/camel-mh-folder.c:215
+#: ../camel/providers/local/camel-mh-folder.c:226
+#: ../camel/providers/local/camel-mh-folder.c:235
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3702,9 +3691,9 @@ msgstr ""
 "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: %s ਫ�ਲਡਰ %s ਤ��\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
+#: ../camel/providers/local/camel-maildir-folder.c:304
 msgid "Invalid message contents"
-msgstr "�ਲਤ ਫ�ਲਡਰ ਭਾ�"
+msgstr "�ਲਤ ਸ�ਨ�ਹਾ ਸਮੱ�ਰ�"
 
 #: ../camel/providers/local/camel-maildir-store.c:148
 #: ../camel/providers/local/camel-maildir-store.c:173
@@ -3745,60 +3734,60 @@ msgid "not a maildir directory"
 msgstr "�ੱ� maildir ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�"
 
 #: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../camel/providers/local/camel-spool-store.c:330
+#: ../camel/providers/local/camel-spool-store.c:344
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਦ� �ਾ�� ਨਹ�� ਹ� ਸ�� ਹ�: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:437
+#: ../camel/providers/local/camel-maildir-summary.c:556
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir ਡਾ�ਰ���ਰ� ਰਸਤਾ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:549
 msgid "Checking folder consistency"
 msgstr "ਫ�ਲਡਰ ��ਸਾਰਤਾ ਦ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:658
 msgid "Checking for new messages"
 msgstr "ਨਵ�� ਸ�ਨਹਿ�� ਲ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:529
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-mbox-summary.c:831
+#: ../camel/providers/local/camel-maildir-summary.c:744
+#: ../camel/providers/local/camel-mbox-summary.c:526
+#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:842
 #: ../camel/providers/local/camel-spool-summary.c:150
 msgid "Storing folder"
 msgstr "ਫ�ਲਡਰ ��ਰਮਬੱਧ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/providers/local/camel-mbox-folder.c:159
+#: ../camel/providers/local/camel-mbox-folder.c:167
 #: ../camel/providers/local/camel-spool-folder.c:150
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s ਤ� ਫ�ਲਡਰ ਲਾੱ� ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:220
+#: ../camel/providers/local/camel-mbox-folder.c:231
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "mailbox ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:297
 msgid "Mail append canceled"
 msgstr "ਪੱਤਰ ਸ਼ਾਮਿਲ ਰੱਦ ��ਤਾ"
 
-#: ../camel/providers/local/camel-mbox-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:300
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "ਪੱਤਰਬ�ਸਾ ਫਾ�ਲ ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:451
+#: ../camel/providers/local/camel-mbox-folder.c:466
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨਾ-ਪ�ਰਾਪਤਯ�� ਨਿ�ਾਰਾਪਨ ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
+#: ../camel/providers/local/camel-mbox-folder.c:474
+#: ../camel/providers/local/camel-mh-folder.c:236
 msgid "Message construction failed."
 msgstr "ਸ�ਨ�ਹਾ ਰ�ਨਾ �ਸਫਲ।"
 
@@ -3867,85 +3856,85 @@ msgstr "'%s' ਦਾ ਨਾ� ਬਦਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ 
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' ਦਾ ਨਾ� %s ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:532
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ਫ�ਲਡਰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:585
+#: ../camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "%ld ਦ� ਨ��� %s ਫ�ਲਡਰ ਵਿੱ� ਪੱਤਰ ਪ�ਰਾਪਤ ਪਾਰਸ �ਲਤ� ਹ�"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:659
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ਫ�ਲਡਰ ਦ� �ਾ�� ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
+#: ../camel/providers/local/camel-mbox-summary.c:727
+#: ../camel/providers/local/camel-mbox-summary.c:847
 #: ../camel/providers/local/camel-spool-summary.c:155
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ਫਾ�ਲ ��ਲ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #: ../camel/providers/local/camel-spool-summary.c:168
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�ਰ�� mailbox ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../camel/providers/local/camel-mbox-summary.c:752
+#: ../camel/providers/local/camel-mbox-summary.c:956
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ਸਰ�ਤ ਫ�ਲਡਰ %s ਨ�ੰ ਬੰਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-mbox-summary.c:761
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "�ਰ�� ਫ�ਲਡਰ ਬੰਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:776
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ਫ�ਲਡਰ ਦਾ ਨਾ� ਬਦਲਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:858
+#: ../camel/providers/local/camel-mbox-summary.c:1083
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ਫ�ਲਡਰ ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:894
-#: ../camel/providers/local/camel-mbox-summary.c:1105
+#: ../camel/providers/local/camel-mbox-summary.c:897
+#: ../camel/providers/local/camel-mbox-summary.c:905
 #: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../camel/providers/local/camel-mbox-summary.c:1121
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ਸੰ��ਪ ਤ� ਫ�ਲਡਰ ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹਨ, ਸਮ�ਾਲ� �ਰਨ ਮ�ਰ�� ਵ�"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1038
-#: ../camel/providers/local/camel-spool-summary.c:336
+#: ../camel/providers/local/camel-mbox-summary.c:1046
+#: ../camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "�ਣ�ਾਣ� �ਲਤ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1189
+#: ../camel/providers/local/camel-mbox-summary.c:1215
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "�ਰ�� mailbox �ੱਤ� ਲਿ�ਣਾ �ਸਫਲ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1206
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "�ਰ�� mailbox �ੱਤ� ਲਿ�ਣ ਲ� ਫ�ਲ�ਹ: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-mh-folder.c:181
 msgid "MH append message canceled"
 msgstr "MH ਸ਼ਾਮਿਲ ਸ�ਨ�ਹਾ ਰੱਦ ��ਤਾ"
 
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:184
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "mh ਫ�ਲਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਤ�� �ਸਫਲ: %s: %s"
@@ -3960,27 +3949,27 @@ msgstr "'%s' ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ 
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ਫ�ਲਡਰ '%s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ੱ� ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�।"
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:240
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ਡਾ�ਰ���ਰ� ਰਸਤਾ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:134
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "ਸਪ�ਲ '%s' ਨ�ੰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:146
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "ਸਪ�ਲ '%s' �ੱ� ਨਿਯਮਿਤ ਫਾ�ਲ �ਾ� ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:166
+#: ../camel/providers/local/camel-spool-store.c:165
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ਫ�ਲਡਰ '%s/%s' ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:175
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3989,12 +3978,12 @@ msgstr ""
 "ਫ�ਲਡਰ '%s' ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:179
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ਫ�ਲਡਰ '%s' ਮ���ਦ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:184
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4003,48 +3992,48 @@ msgstr ""
 "ਫ�ਲਡਰ '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:192
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' �ੱ� mailbox ਫਾ�ਲ ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:209
 msgid "Store does not support an INBOX"
-msgstr "ਸੰਭਾਲ �ੱ� ��ਣ-ਬ�ਸ� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
+msgstr "ਸ��ਰ��਼ �ੱ� ��ਣ-ਬ�ਸ� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:221
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ਸਪ�ਲ ਪੱਤਰ ਫਾ�ਲ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:221
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ਸਪ�ਲ ਫ�ਲਡਰ ਲ�� %s"
 
-#: ../camel/providers/local/camel-spool-store.c:230
+#: ../camel/providers/local/camel-spool-store.c:229
 msgid "Spool folders cannot be renamed"
 msgstr "ਸਪ� ਫ�ਲਡਰਾ� ਦਾ ਨਾ�-ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:237
 msgid "Spool folders cannot be deleted"
 msgstr "ਸਪ�ਲ ਫ�ਲਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../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:217
+#: ../camel/providers/local/camel-spool-summary.c:216
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "ਸਪ�ਲ ਫ�ਲਡਰ %s ਨ�ੰ ਸਮ�ਾਲ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:248
-#: ../camel/providers/local/camel-spool-summary.c:265
-#: ../camel/providers/local/camel-spool-summary.c:276
+#: ../camel/providers/local/camel-spool-summary.c:246
+#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4054,25 +4043,25 @@ msgstr ""
 "ਫ�ਲਡਰ ਨਿ�ਾਰਾ ਹ� ਸ�ਦਾ ਹ�, ਨ�ਲ '%s' ਵਿੱ� ਸੰਭਾਲ� �� ਹ�।"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:194
+#: ../camel/providers/nntp/camel-nntp-folder.c:226
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "�ੰਦਰ�ਨ� �ਲਤ�: UID �ਲਤ ਫਾਰਮ�� ਵਿੱ� ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/nntp/camel-nntp-folder.c:415
+#: ../camel/providers/nntp/camel-nntp-folder.c:367
+#: ../camel/providers/nntp/camel-nntp-folder.c:370
+#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../camel/providers/nntp/camel-nntp-folder.c:414
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ਭ��ਣ �ਾਰਵਾ� �ਸਫਲ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:432
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ਤ�ਸ�� �ਫਲਾ�ਨ �ੰਮ �ਰਦ� ਸਮ�� NNTP ਸ�ਨ�ਹ� ਭ�� ਨਹ�� ਸ�ਦ� !"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:443
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ਤ�ਸ�� NNTP ਫ�ਲਡਰ ਤ�� ਸ�ਨ�ਹ� ਨ�ਲ ਨਹ�� �ਰ ਸ�ਦ� ਹ�!"
 
@@ -4096,24 +4085,24 @@ msgstr "�ਹ �ਬਰ-ਸਮ�ਹ USENET ਤ�� ਪ�ਨ �ਤ� ਭ
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
-msgstr "�ਸ ��ਣ ਨਾਲ NNTP ਸਰਵਰ ਤ� ਸਮਤਲ-ਪਾਠ ਪਾਸਵਰਡ ਪ�ਰਮਾਣ�ਿਤਾ ਲ� ਵਰਤਿ� �ਾਵ��ਾ।"
+msgstr "�ਸ ��ਣ ਨਾਲ NNTP ਸਰਵਰ ਤ� ਪਲ�ਨ-���ਸ� ਪਾਸਵਰਡ ਪ�ਰਮਾਣ�ਿਤਾ ਲ� ਵਰਤਿ� �ਾਵ��ਾ।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:216
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "%s ਤ�� ਸਵਾ�ਤ� ਸ�ਨ�ਹਾ ਪ�ਨ ਤ�� �ਸਫਲ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:228
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ਸਰਵਰ %s ਨ� �ਲਤ� ��ਡ %d ਭ��ਿ� ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:410
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET �ਬਰਾ� %s ਰਾਹ�"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:815
+#: ../camel/providers/nntp/camel-nntp-store.c:819
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4124,7 +4113,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:909
+#: ../camel/providers/nntp/camel-nntp-store.c:913
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4134,7 +4123,7 @@ msgstr ""
 "\n"
 "�ਸ ਤਰਾ� ਦਾ ��� �ਬਰ-ਸਮ�ਹ ਨਹ�� ਹ�। ਸਾ�ਦ ��ਣ� ��ਾ� ਮ�ੱਢਲਾ ਫ�ਲਡਰ ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:941
+#: ../camel/providers/nntp/camel-nntp-store.c:945
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4144,62 +4133,62 @@ msgstr ""
 "\n"
 "�ਸ ਤਰਾ� ਦਾ ��� �ਬਰ-ਸਮ�ਹ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:966
+#: ../camel/providers/nntp/camel-nntp-store.c:970
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "ਤ�ਸ�� �ਬਰ ਸੰਭਾਲ ਵਿੱ� ਫ�ਲਡਰ ਨਹ�� ਬਣਾ ਸ�ਦ� ਹ�: ਸਵ��ਾਰ ਹ� �ਰ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:974
+#: ../camel/providers/nntp/camel-nntp-store.c:978
 msgid "You cannot rename a folder in a News store."
 msgstr "�ਬਰ ਸੰਭਾਲ ਵਿੱ� ਫ�ਲਡਰ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:982
+#: ../camel/providers/nntp/camel-nntp-store.c:986
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "ਤ�ਸ�� �ਬਰ ਸੰਭਾਲ ਵਿੱ� ਫ�ਲਡਰ ਨਹ�� ਹ�ਾ ਸ�ਦ� ਹ�: �ਸਵ��ਾਰ ਹ� �ਰ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1171
+#: ../camel/providers/nntp/camel-nntp-store.c:1180
 msgid "Authentication requested but no username provided"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�, ਪਰ ��� ਯ��਼ਰ ਦਿੱਤਾ ਨਹ�� �ਿ�"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1183
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "ਸਰਵਰ ਨਾਲ ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#: ../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:1360
+#: ../camel/providers/nntp/camel-nntp-store.c:1369
 msgid "Not connected."
-msgstr "���ਿ� ਨਹ� ਹ�।"
+msgstr "��ਨ��� ਨਹ�� ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1413
+#: ../camel/providers/nntp/camel-nntp-store.c:1422
 #, c-format
 msgid "No such folder: %s"
-msgstr "�ਸਤਰਾ� ਦਾ ��� ਫ�ਲਡਰ ਨਹ�� ਹ�: %s"
+msgstr "�ਹ ��� ਫ�ਲਡਰ ਨਹ�� ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../camel/providers/nntp/camel-nntp-summary.c:272
+#: ../camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: ਨਵ�� ਸ�ਨ�ਹਿ�� ਦ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:279
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover ਤ� �ਸਧਾਰਨ ਸਰਵਰ �ਵਾਬ ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:384
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head ਤ� �ਸਧਾਰਨ ਸਰਵਰ �ਵਾਬ ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
+#: ../camel/providers/nntp/camel-nntp-summary.c:420
 msgid "Use cancel"
 msgstr "ਰੱਦ ਵਰਤ��"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:422
 #, c-format
 msgid "Operation failed: %s"
 msgstr "�ਾਰਵਾ� �ਸਫਲ: %s"
@@ -4236,30 +4225,30 @@ msgstr "POP ਸ�ਨ�ਹ� %d ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:649
 msgid "Unknown reason"
-msgstr "�ਣਪ�ਾਤਾ �ਾਰਨ"
+msgstr "�ਣ�ਾਣ �ਾਰਨ"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "_Leave messages on server"
 msgstr "ਸਰਵਰ ਤ� ਸ�ਨ�ਹ� �ੱਡ�(_L)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "%s ਦਿਨਾ� ਬਾ�ਦ ਹ�ਾ�(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:49
 msgid "Disable _support for all POP3 extensions"
 msgstr "ਸਭ POP3 ��ਸ਼��ਸ਼ਨ ਲ� ਸਹਿਯ�� �ਯ��(_s)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:57
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:59
 msgid "For connecting to and downloading mail from POP servers."
-msgstr "���ਨ ਲ� POP ਸਰਵਰ ਤ�� ਸ�ਨ�ਹ� ਪ�ਰਾਪਤ �ਰਨ ਲ�।"
+msgstr "��ਨ��� ਲ� POP ਸਰਵਰ ਤ�� ਸ�ਨ�ਹ� ਪ�ਰਾਪਤ �ਰਨ ਲ�।"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/pop3/camel-pop3-provider.c:76
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4267,7 +4256,7 @@ msgstr ""
 "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ POP ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ-ਪਾਠ ਪਾਸਵਰਡ ਨਾਲ �����ਾ,�ਹ ਹ� ��ਣ ਹ�, �� �ਿ ��ਸਰ POP "
 "ਸਰਵਰਾ� ਤ� �ਪਲੱਬਧ ਹ�ੰਦ� ਹ�।"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:86
 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 "
@@ -4276,56 +4265,56 @@ msgstr ""
 "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ POP ਸਰਵਰ ਨਾਲ APOP ਪਰ����ਾਲ ਰਾਹ� ���ਰਿਪ�ਡ ਪਾਸਵਰਡ ਨਾਲ �����ਾ, �ਹ ਹ� ��ਣ "
 "ਹ�, �� �ਿ ��ਸਰ ਸਰਵਰ ਸਭ ਯ��਼ਰਵਾ� ਨ�ੰ ਦ�ਣ ਦਾ ਵਾ�ਦਾ ਤਾ� �ਰਦ� ਹਨ, ਪਰ ਸੱ� �ੱ� ਹ� ਹ�ੰਦਾ ਹ�।"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:207
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "POP ਸਰਵਰ %s ਤ�� ਸ�ਨ�ਹਾ ਪ�ਨ ਵਿੱ� �ਸਫਲ"
+msgstr "POP ਸਰਵਰ %s ਤ�� ਸ�ਨ�ਹਾ ਪ�ਨ ਵਿੱ� ਫ�ਲ�ਹ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:226
-#: ../camel/providers/pop3/camel-pop3-store.c:240
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:224
+#: ../camel/providers/pop3/camel-pop3-store.c:238
+#: ../camel/providers/pop3/camel-pop3-store.c:248
+#: ../camel/providers/pop3/camel-pop3-store.c:254
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "POP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:225
 msgid "STLS not supported by server"
 msgstr "ਸਰਵਰ ਵਲ�� STLS ਸਹਾ�� ਨਹ��"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:257
+#: ../camel/providers/pop3/camel-pop3-store.c:255
 msgid "TLS is not available in this build"
 msgstr "�ਸ ਨਿਰਮਾਣ ਵਿੱ� TLS �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
+#: ../camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:404
-#: ../camel/providers/pop3/camel-pop3-store.c:537
+#: ../camel/providers/pop3/camel-pop3-store.c:402
+#: ../camel/providers/pop3/camel-pop3-store.c:535
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ: ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� ਲ� ਸਹਾ�� ਨਹ��।"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:420
+#: ../camel/providers/pop3/camel-pop3-store.c:418
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s: %s"
 msgstr "POP ਸਰਵਰ %2$s �ੱਤ� SASL '%1$s' ਲਾ��ਨ �ਸਫਲ: %3$s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:432
+#: ../camel/providers/pop3/camel-pop3-store.c:430
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "POP ਸਰਵਰ %s ਤ� ਲਾੱ��ਨ �ਰਨ ਤ�� �ਸਫਲ: SASL ਪਰ����ਾਲ �ਲਤ�"
+msgstr "POP ਸਰਵਰ %s �ੱਤ� ਲਾ��ਨ �ਰਨ ਤ�� �ਸਫਲ: SASL ਪਰ����ਾਲ �ਲਤ�"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:449
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "POP ਸਰਵਰ %s ਤ� ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4334,8 +4323,8 @@ msgstr ""
 "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਲ� �ਸਮੱਰਥ ਹ�।\t�ਲਤ APOP ID ਮਿਲਿ� ਹ�। Impersonation ਹਮਲ� ਦਾ "
 "ਸ਼ੱ� ਹ�। �ਪਣ� ਪਰਸ਼ਾਸ਼� ਨਾਲ ਸੰਪਰ� �ਰ�।"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../camel/providers/pop3/camel-pop3-store.c:549
+#: ../camel/providers/pop3/camel-pop3-store.c:562
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4344,7 +4333,7 @@ msgstr ""
 "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ\n"
 "ਪਾਸਵਰਡ ਭ��ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#: ../camel/providers/pop3/camel-pop3-store.c:556
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4353,7 +4342,7 @@ msgstr ""
 "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ।\n"
 "ਯ��਼ਰ ਨਾ� ਭ��ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#: ../camel/providers/pop3/camel-pop3-store.c:669
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s' ਫ�ਲਡਰ ਨਹ�� ਹ�।"
@@ -4368,173 +4357,173 @@ msgid ""
 "system."
 msgstr "ਲ��ਲ ਸਿਸ�ਮ ਤ� ਪੱਤਰ ਭ��ਣ ਲ� \"sendmail\" ਨ�ੰ ਵਰਤ��।"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "ਪ�ਰਾਪਤ ਸ��� ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "sendmail ਨਾਲ ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: ਪੱਤਰ ਭ��ਿ� ਨਹ�� �ਿ� ਹ�।"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail ਨ�ੰ ਵੰਡਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: ਪੱਤਰ ਨਹ�� ਭ��ਿ� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail ਸੰ��ਤ %s ਨਾਲ ਬੰਦ ਹ� �� ਹ�: ਪੱਤਰ ਨਹ�� ਭ��ਿ� �ਿ� ਹ�।"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਿ�: ਪੱਤਰ ਨਹ�� ਭ��ਿ� �ਿ�"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail ਸਥਿਤ� %d ਨਾਲ ਬੰਦ: ਪੱਤਰ ਨਹ�� ਭ��ਿ� �ਿ�।"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
 msgid "Mail delivery via the sendmail program"
-msgstr "sendmail �ਾਰ� ਰਾਹ� ਪੱਤਰ ਭ���"
+msgstr "sendmail ਪਰ��ਰਾਮ ਰਾਹ�� ਪੱਤਰ ਭ���"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "ਰਿਮ�� mailhub ਨ�ੰ SMTP ਵਰਤ �� ਪੱਤਰ ਭ��ਣ ਲ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error, command unrecognized"
 msgstr "ਸੰ���ਸ �ਲਤ�, �ਮਾ�ਡ ਪ�ਾਣ� ਨਹ�� �ਾ ਸ��"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error in parameters or arguments"
 msgstr "ਪ�ਰਾਮ��ਰ �ਾ� �ਰ��ਮਿੰ� ਵਿੱ� ਸੰ���ਸ �ਲਤ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command not implemented"
 msgstr "�ਮਾ�ਡ ਲਾ�� ਨਹ�� ��ਤ� �ਾ ਸ�� ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command parameter not implemented"
 msgstr "�ਮਾ�ਡ ਪ�ਰਾਮ��ਰ ਲਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:175
 msgid "System status, or system help reply"
-msgstr "ਸਿਸ�ਮ ਸਥਿਤ� �ਾ� ਸਿਸ�ਮ ਸਹਾ�ਤਾ �ਵਾਬ"
+msgstr "ਸਿਸ�ਮ ਸਥਿਤ� �ਾ� ਸਿਸ�ਮ ਮੱਦਦ �ਵਾਬ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Help message"
-msgstr "ਸਹਾ�ਤਾ ਸ�ਨ�ਹਾ"
+msgstr "ਮੱਦਦ ਸ�ਨ�ਹਾ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service ready"
-msgstr "ਸ�ਵਾ ਤਿ�ਰ"
+msgstr "ਸਰਵਿਸ ਤਿ�ਰ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service closing transmission channel"
-msgstr "ਸ�ਵਾ ਬੰਦ �ਰਨ ਲ� ਸੰ�ਾਰ ��ਨਲ"
+msgstr "ਸਰਵਿਸ ਬੰਦ �ਰਨ ਲ� ਸੰ�ਾਰ ��ਨਲ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service not available, closing transmission channel"
-msgstr "ਸ�ਵਾ �ਪਲੱਬਧ ਨਹ�� ਹ�, ਸੰ�ਾਰ ��ਨਲ ਬੰਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+msgstr "ਸਰਵਿਸ �ਪਲੱਬਧ ਨਹ�� ਹ�, ਸੰ�ਾਰ ��ਨਲ ਬੰਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Requested mail action okay, completed"
 msgstr "ਲ���ਦਾ ਪੱਤਰ �ਾਰਵਾ� ਠ�� ਹ�, ਸਮਾਪਤ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:187
 msgid "User not local; will forward to <forward-path>"
 msgstr "ਯ��਼ਰ ਲ��ਲ ਨਹ�� ਹ�; �ੱ�� <forward-path> ਭ��ਿ� �ਾਵ��ਾ।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ਲ���ਦ� ਪੱਤਰ �ਾਰਵਾ� ��ਤ� ਨਹ�� �ਾ ਸ�ਦ�: mailbox �ਪਲੱਬਧ ਨਹ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ਲ���ਦ� �ਾਰਵਾ� ��ਤ� ਨਹ�� �ਾ ਸ�ਦ�: mailbox �ਪਲੱਬਧ ਨਹ��।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action aborted: error in processing"
 msgstr "ਲ���ਦ� �ਾਰਵਾ� �ੱਡ� �� ��, �ਾਰਵਾ� ਵਿੱ� �ਲਤ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
 msgid "User not local; please try <forward-path>"
 msgstr "ਯ��਼ਰ ਲ��ਲ ਨਹ�� ਹ�; �ਿਰਪਾ �ਰ�� <forward-path> ਵਰਤ��"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ਲ���ਦ� �ਾਰਵਾ� ��ਤ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: ਲ���ਦ� ਸਿਸ�ਮ ਥਾ� �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "ਲ���ਦ� ਪੱਤਰ �ਾਰਵਾ� �ਧ�ਰ�: �ਪਲੱਬਧ ਲ�� ਸ�ਮਾ ਤ�� ਵਧ�ਰ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "ਲ���ਦ� �ਾਰਵਾ� ਸੰਭਵ ਨਹ��: mailbox ਨਾ� ਸੰਭਵ ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ਮ�ਲ �ੰਪ�ੱ� ਸ਼�ਰ�; <CRLF>.<CRLF> ਨਾਲ ਸਮਾਪਤ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Transaction failed"
 msgstr "�ਰਾ�ਸ਼��ਸ਼ਨ ਫ�ਲ�ਹ ਹ��"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:209
 msgid "A password transition is needed"
 msgstr "�ੱ� ਪਾਸਵਰਡ ਤਬਦ�ਲ� ਲ���ਦ� ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Authentication mechanism is too weak"
 msgstr "ਪ�ਰਮਾਣਿ�ਤਾ ਢੰ� ਬਹ�ਤ �ਮ��ਰ ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� ਲ� ���ਰਿਪਸ਼ਨ ਲ���ਦ� ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Temporary authentication failure"
 msgstr "�ਰ�� ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
+#: ../camel/providers/smtp/camel-smtp-transport.c:296
 msgid "Welcome response error"
 msgstr "�� ���� ਨ�ੰ �ਵਾਬ �ਲਤ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:364
+#: ../camel/providers/smtp/camel-smtp-transport.c:370
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "SMTP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਨਾਲ ��� ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
+#: ../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:356
+#: ../camel/providers/smtp/camel-smtp-transport.c:355
 msgid "STARTTLS command failed"
 msgstr "STARTTLS �ਮਾ�ਡ �ਸਫਲ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP ਸਰਵਰ %s ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ �ਿਸਮ %s ਲ� ਸਹਾ�� ਨਹ�� ਹ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:567
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4545,93 +4534,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:700
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ਸਰਵਰ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP ਪੱਤਰ ਪਹ�ੰ� %s ਰਾਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Cannot send message: service not connected."
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: ਸ�ਵਾ ���� ਨਹ�� ਹ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
 msgid "Cannot send message: sender address not valid."
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: ਭ��ਣ ਵਾਲ� ਦਾ �ਡਰ�ੱਸ �ਾ�� ਨਹ�� ਹ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Sending message"
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "Cannot send message: no recipients defined."
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: ��� ਪ�ਰਾਪਤ �ਰਤਾ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: �ੱ� �ਾ� ਵਧ�ਰ� ਪ�ਰਾਪਤ-�ਰਤਾ �ਲਤ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:985
 msgid "SMTP Greeting"
 msgstr "SMTP ਸ਼�ੱਭ-ਸ�ਨ�ਹਾ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
+#: ../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:1028
+#: ../camel/providers/smtp/camel-smtp-transport.c:1027
 msgid "HELO command failed"
 msgstr "HELO �ਮਾ�ਡ �ਸਫਲ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
 msgid "SMTP Authentication"
 msgstr "SMTP ਪ�ਰਮਾਣ�ਿਤਾ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../camel/providers/smtp/camel-smtp-transport.c:1099
 msgid "Error creating SASL authentication object."
 msgstr "�ਲਤ�, SASL ਪ�ਰਮਾਣ�ਿਤਾ ��ਾ� ਬਣਾ�ਣ ਵਿੱ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../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:1134
+#: ../camel/providers/smtp/camel-smtp-transport.c:1133
 msgid "AUTH command failed"
 msgstr "AUTH �ਮਾ�ਡ �ਸਫਲ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
+#: ../camel/providers/smtp/camel-smtp-transport.c:1203
 msgid "Bad authentication response from server.\n"
 msgstr "ਸਰਵਰ ਤ�� �ਲਤ ਪ�ਰਮਾਣਿ�ਤਾ �ਵਾਬ।\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../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:1248
+#: ../camel/providers/smtp/camel-smtp-transport.c:1247
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM �ਮਾ�ਡ �ਸਫਲ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../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:1291
+#: ../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:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
+#: ../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: ਪੱਤਰ ਭ��ਿ� ਨਹ�� �ਿ�"
@@ -4639,108 +4628,108 @@ 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:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
+#: ../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:1458
+#: ../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:1474
+#: ../camel/providers/smtp/camel-smtp-transport.c:1473
 msgid "RSET command failed"
 msgstr "RSET �ਮਾ�ਡ �ਸਫਲ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../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:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1510
 msgid "QUIT command failed"
 msgstr "QUIT �ਮਾ�ਡ �ਸਫਲ"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:47
 msgid "Business"
 msgstr "ਵਪਾਰ"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:48
 msgid "Competition"
 msgstr "ਮ��ਾਬਲਾ"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
 msgid "Favorites"
 msgstr "ਪਸੰਦ�ਦਾ"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
 msgid "Gifts"
 msgstr "ਤ�ਹਫ�"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
 msgid "Goals/Objectives"
 msgstr "ਨਿਸ਼ਾਨ�/����"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
 msgid "Holiday"
 msgstr "��ੱ��"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
 msgid "Holiday Cards"
 msgstr "��ੱ���� �ਾਰਡ"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
 msgid "Hot Contacts"
 msgstr "ਤ�� ਸੰਪਰ�"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:56
 msgid "Ideas"
 msgstr "ਢੰ�"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:57
 msgid "International"
 msgstr "�ੰਤਰਰਾਸ਼�ਰ�"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
 msgid "Key Customer"
 msgstr "�ਾਸ �ਾਹ�"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
 msgid "Miscellaneous"
 msgstr "ਫ���ਲ"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
 msgid "Personal"
 msgstr "ਨਿੱ��"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
 msgid "Phone Calls"
 msgstr "ਫ�ਨ �ਾਲ"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
 msgid "Status"
 msgstr "ਹਾਲਤ"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:64
 msgid "Strategies"
 msgstr "ਨ�ਤ�"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:65
 msgid "Suppliers"
 msgstr "ਸਪਲਾ�ਰ"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
 msgid "Time & Expenses"
 msgstr "ਸਮਾ� �ਤ� �ਰ��"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
 msgid "Waiting"
 msgstr "�ਡ�� �ਾਰ�"
 
@@ -4748,7 +4737,7 @@ msgstr "�ਡ�� �ਾਰ�"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1900
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%I:%M:%S %p %a %d/%m/%Y"
 
@@ -4756,7 +4745,7 @@ msgstr "%I:%M:%S %p %a %d/%m/%Y"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%H:%M:%S %a %d/%m/%Y"
 
@@ -4764,7 +4753,7 @@ msgstr "%H:%M:%S %a %d/%m/%Y"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1654 ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1896
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%I:%M %p %a %d/%m/%Y"
 
@@ -4772,78 +4761,78 @@ msgstr "%I:%M %p %a %d/%m/%Y"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1659 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1887
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%H:%M %a %d/%m/%Y"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1664
+#: ../libedataserver/e-time-utils.c:1655
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%I %p %a %d/%m/%Y"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1669
+#: ../libedataserver/e-time-utils.c:1660
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1763
+#: ../libedataserver/e-time-utils.c:1882
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1680
+#: ../libedataserver/e-time-utils.c:1670
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%I:%M:%S %p %d/%m/%Y"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1674
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%H:%M:%S %d/%m/%Y"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1679
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%I:%M %p %d/%m/%Y"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1684
 msgid "%m/%d/%Y %H:%M"
 msgstr "%H:%M %d/%m/%Y"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1699
+#: ../libedataserver/e-time-utils.c:1689
 msgid "%m/%d/%Y %I %p"
 msgstr "%I %p %d/%m/%Y"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1704
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %H"
 msgstr "%H %d/%m/%Y"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1776
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1766
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1834 ../libedataserver/e-time-utils.c:1956
+#: ../libedataserver/e-time-utils.c:1824 ../libedataserver/e-time-utils.c:1944
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1838 ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1828 ../libedataserver/e-time-utils.c:1936
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4851,24 +4840,24 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953
+#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1847 ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1837 ../libedataserver/e-time-utils.c:1933
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1850
+#: ../libedataserver/e-time-utils.c:1840
 msgid "%H%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
+#: ../libedataserver/e-time-utils.c:1844
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -4880,18 +4869,18 @@ msgstr "LDAP ਸਰਵਰ ਨ�ੰ ��ਿ�ਤ ਦ� ਤ�ਰ 'ਤ� ਵ
 msgid "Failed to authenticate.\n"
 msgstr "ਡਾ�ਾ ���ਡਿ� �ਰਨ ਵਿੱ� �ਸਫਲ ਹ�।\n"
 
-#: ../libedataserverui/e-categories-dialog.c:362
+#: ../libedataserverui/e-categories-dialog.c:327
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "ਸੰਰ�ਨਾ ਵਿੱ� ਪਹਿਲਾ� ਹ� '%s' ���ਾ�ਰ� ਹ�। �ਿਰਪਾ �ਰ�� ਵੱ�ਰਾ ਨਾ� ਵਰਤ��।"
 
-#: ../libedataserverui/e-categories-dialog.c:526
+#: ../libedataserverui/e-categories-dialog.c:618
 msgid "Icon"
 msgstr "���ਾਨ"
 
-#: ../libedataserverui/e-categories-dialog.c:531
+#: ../libedataserverui/e-categories-dialog.c:623
 msgid "Category"
 msgstr "���ਾ�ਰ�"
 
@@ -4913,11 +4902,11 @@ msgstr "���ਾ�ਰ� ਨਾ�(_N)"
 
 #: ../libedataserverui/e-categories-dialog.glade.h:5
 msgid "Item(s) belong to these _categories:"
-msgstr "�ਹਨਾ� ���ਾ�ਰ�ਾ� ਨਾਲ ਸਬੰਧਤ ��ਾ���(_c):"
+msgstr "�ਹਨਾ� ���ਾ�ਰ��� ਨਾਲ ਸਬੰਧਤ ���ਮਾ�(_c):"
 
 #: ../libedataserverui/e-categories-dialog.glade.h:6
 msgid "_Available Categories:"
-msgstr "�ਪਲੱਬਧ ���ਾ�ਰ�(_A):"
+msgstr "�ਪਲੱਬਧ ���ਾ�ਰ���(_A):"
 
 #: ../libedataserverui/e-categories-dialog.glade.h:7
 msgid "_Edit"
@@ -4927,8 +4916,8 @@ msgstr "ਸ�ਧ(_E)"
 msgid "categories"
 msgstr "���ਾ�ਰ�"
 
-#: ../libedataserverui/e-category-completion.c:290, c-format
-#| msgid "Category List"
+#: ../libedataserverui/e-category-completion.c:290
+#, c-format
 msgid "Create category \"%s\""
 msgstr "���ਾ�ਰ� \"%s\" ਬਣਾ�"
 
@@ -4940,19 +4929,19 @@ msgstr "ਰੰ� �ਾਣ�ਾਰ�"
 msgid "The color to render"
 msgstr "ਰ��ਡਰ �ਰਨ ਲ� ਰੰ�"
 
-#: ../libedataserverui/e-name-selector-dialog.c:278
+#: ../libedataserverui/e-name-selector-dialog.c:276
 msgid "Select Contacts from Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ��� ਸੰਪਰ� ��ਣ�"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
+#: ../libedataserverui/e-name-selector-dialog.c:563
 msgid "_Add"
 msgstr "ਸ਼ਾਮਲ(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
+#: ../libedataserverui/e-name-selector-dialog.c:588
 msgid "_Remove"
 msgstr "ਹ�ਾ�(_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
+#: ../libedataserverui/e-name-selector-dialog.c:765
 #: ../libedataserverui/e-name-selector-dialog.glade.h:6
 msgid "Any Category"
 msgstr "��� ਵ� ���ਾ�ਰ�"
@@ -4967,7 +4956,7 @@ msgstr "<b>ਸੰਪਰ�(_n)</b>"
 
 #: ../libedataserverui/e-name-selector-dialog.glade.h:3
 msgid "<b>Show Contacts</b>"
-msgstr "<b>ਸੰਬੰਧ ਵ���</b>"
+msgstr "<b>ਸੰਪਰ� ਵ���</b>"
 
 #: ../libedataserverui/e-name-selector-dialog.glade.h:4
 msgid "Address B_ook:"
@@ -4995,30 +4984,30 @@ 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:2456
+#: ../libedataserverui/e-name-selector-entry.c:2455
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s ਲਾ�ਨ '� ਫ�ਲਾ�(_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
+#: ../libedataserverui/e-name-selector-entry.c:2470
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s �ਾਪ� �ਰ�(_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
+#: ../libedataserverui/e-name-selector-entry.c:2480
 #, c-format
 msgid "C_ut %s"
 msgstr "%s �ੱ��(_U)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2497
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ਸ�ਧ(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:472
+#: ../libedataserverui/e-name-selector-list.c:469
 #, c-format
 msgid "_Delete %s"
 msgstr "%s ਹ�ਾ�(_D)"
@@ -5028,23 +5017,23 @@ msgstr "%s ਹ�ਾ�(_D)"
 msgid "Keyring key is unusable: no user or host name"
 msgstr "��ਰਿੰ� �� �ਣ-ਵਰਤ��ਯ�� ਹ�: ��� ਹ�ਸ� �ਾ� ਯ��਼ਰ ਨਹ��"
 
-#: ../libedataserverui/e-passwords.c:1094
+#: ../libedataserverui/e-passwords.c:1093
 msgid "You have the Caps Lock key on."
 msgstr "ਤ�ਸ�� ��ਪਸ ਲਾ� ਨ�ੰ �ਾਲ� ��ਤਾ ਹ�।"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1215
 msgid "_Remember this passphrase"
 msgstr "�ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1217
+#: ../libedataserverui/e-passwords.c:1216
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "�ਸ ਸ਼�ਸ਼ਨ ਲ� �ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1221
 msgid "_Remember this password"
 msgstr "�ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1223
+#: ../libedataserverui/e-passwords.c:1222
 msgid "_Remember this password for the remainder of this session"
 msgstr "�ਸ ਸ਼�ਸਨ ਲ� �ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
@@ -5057,143 +5046,147 @@ msgstr "�ਿ�ਾਣਾ ��ਣ�"
 msgid "_Destination"
 msgstr "�ਿ�ਾਣਾ(_D)"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1698
-#: ../servers/exchange/storage/exchange-account.c:959
+#: ../servers/exchange/lib/e2k-autoconfig.c:1694
+#: ../servers/exchange/storage/exchange-account.c:955
 #, c-format
 msgid "Enter password for %s"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਦਿ�"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
+#: ../servers/exchange/lib/e2k-autoconfig.c:1695
+#: ../servers/exchange/storage/exchange-account.c:960
 msgid "Enter password"
 msgstr "ਪਾਸਵਰਡ ਦਿ�"
 
 #. i18n: These are Outlook's words for the default roles in
 #. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
+#: ../servers/exchange/lib/e2k-security-descriptor.c:844
 msgid "Owner"
 msgstr "ਮਾਲ�"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
+#: ../servers/exchange/lib/e2k-security-descriptor.c:854
 msgid "Publishing Editor"
 msgstr "ਪਰ�ਾਸ਼ਤ ਸੰਪਾਦ�"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
+#: ../servers/exchange/lib/e2k-security-descriptor.c:862
 msgid "Editor"
 msgstr "ਸੰਪਾਦ�"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
+#: ../servers/exchange/lib/e2k-security-descriptor.c:869
 msgid "Publishing Author"
 msgstr "ਪਰ�ਾਸ਼ਤ ਲ���"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
+#: ../servers/exchange/lib/e2k-security-descriptor.c:875
 msgid "Author"
 msgstr "ਲ���"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
+#: ../servers/exchange/lib/e2k-security-descriptor.c:880
 msgid "Non-editing Author"
 msgstr "ਨਾ-ਸੰਪਾਦਿਤ ਲ���"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
+#: ../servers/exchange/lib/e2k-security-descriptor.c:884
 msgid "Reviewer"
 msgstr "ਸਮ��ਿ��"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
+#: ../servers/exchange/lib/e2k-security-descriptor.c:886
 msgid "Contributor"
 msgstr "ਯ��ਦਾਨ"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
+#: ../servers/exchange/lib/e2k-security-descriptor.c:888
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
+#: ../servers/exchange/lib/e2k-security-descriptor.c:903
 msgid "Custom"
 msgstr "ਪਸੰਦ�ਦਾ"
 
-#: ../servers/exchange/storage/e-storage.c:555
+#: ../servers/exchange/storage/e-storage.c:557
 msgid "Generic error"
 msgstr "�ਮ �ਲਤ�"
 
-#: ../servers/exchange/storage/e-storage.c:557
+#: ../servers/exchange/storage/e-storage.c:559
 msgid "A folder with the same name already exists"
 msgstr "ਦਿੱਤ� ਨਾ� ਨਾਲ ਫ�ਲਡਰ ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
 
-#: ../servers/exchange/storage/e-storage.c:559
+#: ../servers/exchange/storage/e-storage.c:561
 msgid "The specified folder type is not valid"
 msgstr "ਦਿੱਤ� ਫ�ਲਡਰ �ਿਸਮ �ਾ��਼ ਨਹ�� ਹ�"
 
-#: ../servers/exchange/storage/e-storage.c:561
+#: ../servers/exchange/storage/e-storage.c:563
 msgid "I/O error"
 msgstr "I/O �ਲਤ�"
 
-#: ../servers/exchange/storage/e-storage.c:563
+#: ../servers/exchange/storage/e-storage.c:565
 msgid "Not enough space to create the folder"
 msgstr "ਫ�ਲਡਰ ਬਣਾ�ਣ ਲ� ਲ���ਦ� �ਾਲ� ਥਾ� ਨਹ��"
 
-#: ../servers/exchange/storage/e-storage.c:565
+#: ../servers/exchange/storage/e-storage.c:567
 msgid "The folder is not empty"
 msgstr "ਫ�ਲਡਰ �ਾਲ� ਨਹ�� ਹ�"
 
-#: ../servers/exchange/storage/e-storage.c:567
+#: ../servers/exchange/storage/e-storage.c:569
 msgid "The specified folder was not found"
 msgstr "ਦਿੱਤਾ ਫ�ਲਡਰ ਮਿਲਿ� ਨਹ�� ਹ�"
 
-#: ../servers/exchange/storage/e-storage.c:569
+#: ../servers/exchange/storage/e-storage.c:571
 msgid "Function not implemented in this storage"
 msgstr "�ਸ ਸ��ਰ��਼ ਵਿੱ� ਫੰ�ਸ਼ਨ ਹਾਲ� ਬਣਿ� ਨਹ�� ਹ�"
 
-#: ../servers/exchange/storage/e-storage.c:573
+#: ../servers/exchange/storage/e-storage.c:575
 msgid "Operation not supported"
 msgstr "�ਾਰਵਾ� ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../servers/exchange/storage/e-storage.c:575
+#: ../servers/exchange/storage/e-storage.c:577
 msgid "The specified type is not supported in this storage"
 msgstr "�ਸ ਸ��ਰ��਼ ਵਿੱ� ਦਿੱਤ� �ਿਸਮ ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../servers/exchange/storage/e-storage.c:577
+#: ../servers/exchange/storage/e-storage.c:579
 msgid "The specified folder cannot be modified or removed"
 msgstr "ਦਿੱਤਾ ਫ�ਲਡਰ ਸ�ਧਿ� �ਾ� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../servers/exchange/storage/e-storage.c:579
+#: ../servers/exchange/storage/e-storage.c:581
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "�ੱ� ਫ�ਲਡਰ ਨ�ੰ �ਸ ਦ� �ਧ�ਨ ਦ� �ਧ�ਨ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../servers/exchange/storage/e-storage.c:581
+#: ../servers/exchange/storage/e-storage.c:583
 msgid "Cannot create a folder with that name"
 msgstr "�ਸ� ਨਾ� ਨਾਲ ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../servers/exchange/storage/e-storage.c:583
+#: ../servers/exchange/storage/e-storage.c:585
 msgid "This operation cannot be performed in off-line mode"
 msgstr "�ਹ �ਾਰਵਾ� �ਫਲਾ�ਨ ਢੰ� ਰਾਹ�� ��ਤ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�"
 
 #. i18n: This is the title of an "other user's folders"
 #. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:642
+#: ../servers/exchange/storage/exchange-account.c:640
 #, c-format
 msgid "%s's Folders"
 msgstr "%s ਦ� ਫ�ਲਡਰ"
 
-#: ../servers/exchange/storage/exchange-account.c:1265
+#: ../servers/exchange/storage/exchange-account.c:1260
 msgid "Personal Folders"
 msgstr "ਨਿੱ�� ਫ�ਲਡਰ"
 
-#: ../servers/exchange/storage/exchange-account.c:1280
+#: ../servers/exchange/storage/exchange-account.c:1275
 msgid "Favorite Public Folders"
 msgstr "ਪਸੰਦ�ਦਾ ਪਬਲਿ� ਫ�ਲਡਰ"
 
 #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
+#: ../servers/exchange/storage/exchange-account.c:1292
 msgid "All Public Folders"
 msgstr "ਸਭ ਪਬਲਿ� ਫ�ਲਡਰ"
 
 #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
+#: ../servers/exchange/storage/exchange-account.c:1306
 msgid "Global Address List"
-msgstr "�ਲ�ਬਲ �ਡਰ�ੱਸ ਸ���"
+msgstr "�ਲ�ਬਲ �ਡਰ�ੱਸ ਲਿਸ�"
 
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
 msgid "Deleted Items"
-msgstr "ਹ�ਾ��� ��ਾ���"
+msgstr "ਹ�ਾ��� ���ਮਾ�"
+
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
+msgid "Drafts"
+msgstr "ਡਰਾਫ�"
 
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
 msgid "Journal"
@@ -5209,7 +5202,7 @@ msgstr "ਬਾਹਰ�-ਬ�ਸਾ"
 
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
 msgid "Sent Items"
-msgstr "ਭ����� ��ਾ���"
+msgstr "ਭ����� ���ਮਾ�"
 
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
 msgid "Tasks"
@@ -5245,13 +5238,25 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਸਰਵਰ �ੰ�ਰਫ�ਸ
 
 #: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
 msgid "Evolution Data Server logging service"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਸਰਵਰ ਲਾ��ਨ ਸ�ਵਾ"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਸਰਵਰ ਲਾ��ਨ ਸਰਵਿਸ"
 
-#. dialog display isn't working out
-#: ../src/server.c:109
-#, c-format
-msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-msgstr "ਬਹ� ਭਾ� �ਲਤ� �� ਹ�, �ਲਤ� ਬ�ਸਾ ਵ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�\n"
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL �ਾ�� ਨਹ�� ਹ�"
+
+#~ msgid "CRL has expired"
+#~ msgstr "CRL ਦ� ਮਿ�ਦ ਪ�ੱ� �� ਹ�"
+
+#~ msgid "Error in CRL"
+#~ msgstr "CRL ਵਿੱ� �ਲਤ�"
+
+#~ msgid "Sent"
+#~ msgstr "ਭ���"
+
+#~ msgid "Templates"
+#~ msgstr "��ਪਲ��"
+
+#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
+#~ msgstr "ਬਹ� ਭਾ� �ਲਤ� �� ਹ�, �ਲਤ� ਬ�ਸਾ ਵ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�\n"
 
 #~ msgid "Fair"
 #~ msgstr "ਸਾ�"



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