[evolution-data-server] update Punjabi Translation



commit 06d80fb26c7062e73a3b3eb759c98255b7ae7c10
Author: A S Alam <aalam users sf net>
Date:   Sun Jan 2 06:26:27 2011 +0530

    update Punjabi Translation

 po/pa.po | 2474 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1304 insertions(+), 1170 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index 6046afa..1163bdf 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -4,21 +4,21 @@
 # Robert Brady <rwb197 zepler org> 2000
 #
 #
-# A S Alam <aalam users sf net>, 2005, 2006, 2007, 2009, 2010.
+# A S Alam <aalam users sf net>, 2005, 2006, 2007, 2009, 2010, 2011.
 # ASB <aalam users sf net>, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
 "cgi?product=evolution-data-server&component=Misc.\n"
-"POT-Creation-Date: 2010-09-01 08:23+0000\n"
-"PO-Revision-Date: 2010-09-03 08:04+0530\n"
+"POT-Creation-Date: 2010-12-10 17:38+0000\n"
+"PO-Revision-Date: 2011-01-02 06:25+0530\n"
 "Last-Translator: A S Alam <aalam users 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 1.0\n"
+"X-Generator: Lokalize 1.1\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:570
@@ -31,75 +31,96 @@ msgstr "ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4482
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "��� �ਾਰ� ਹ�..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "ਸੰਪਰ� (%d) ਡਾ�ਨਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2846
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "ਸੰਪਰ� ����� (%d) �ੱਪਡ�� ��ਤ� �ਾ ਰਹ� ਹ�... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
 msgid "Not connected"
 msgstr "��ਨ��� ਨਹ�� ਹ�"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
 msgid "Using Distinguished Name (DN)"
 msgstr "ਵੱ�ਰਾ ਨਾ� ਵਰਤ�� (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
 msgid "Using Email Address"
 msgstr "�ਮ�ਲ �ਡਰ�ੱਸ ਵਰਤ ��"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ���ਿ� �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
 msgid "Invalid DN syntax"
 msgstr "�ਲਤ DN ਸੰ���ਸ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਸ਼ਾਮਿਲ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਹ�ਾ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
 msgid "Receiving LDAP search results..."
 msgstr "LDAP ਤ�� ��� ਨਤ��� ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
 msgid "Error performing search"
 msgstr "��� �ਲਾ�ਣ ਵਿੱ� �ਲਤ�"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
+#: ../calendar/backends/http/e-cal-backend-http.c:378
+#: ../calendar/libecal/e-cal.c:4180
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "�ਣਪ�ਾਤ� �ਲਤ�"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
 #, c-format
-#| msgid "Create resource '%s' failed with http status: %d"
-msgid "Create resource '%s' failed with HTTP status: %d"
-msgstr "'%s' ਸਰ�ਤ ਬਣਾ�ਣ ਲ� ਫ�ਲ�ਹ, HTTP ਹਾਲਤ ਨਾਲ: %d"
+#| msgid "Create resource '%s' failed with HTTP status: %d"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "'%s' ਸਰ�ਤ ਬਣਾ�ਣ ਲ� ਫ�ਲ�ਹ, HTTP ਹਾਲਤ ਨਾਲ: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:2995
+#: ../addressbook/libebook/e-book.c:3066
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: ��-�ਾਨਫ ਵਿੱ� ਸ��ਰ ��ਤ� UID `%s' ਲ� ��� ਸਰ�ਤ ਨਹ�� ਹ�।"
 
+#: ../addressbook/libebook/e-book.c:3422
+#: ../addressbook/libedata-book/e-data-book.c:183
+msgid "Address book does not exist"
+msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਮ���ਦ ਨਹ�� ਹ�"
+
 #. Dummy row as EContactField starts from 1
 #: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
@@ -286,7 +307,7 @@ msgstr "ਵ�ਬਲਾ� URL"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:667
+#: ../libedataserverui/e-categories-dialog.c:759
 msgid "Categories"
 msgstr "���ਾ�ਰ�"
 
@@ -552,7 +573,6 @@ msgstr "�ਨਮ ਦਿਨ"
 
 #: ../addressbook/libebook/e-contact.c:262
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:44
 msgid "Anniversary"
 msgstr "ਵਰ�-�ੰਢ"
 
@@ -635,238 +655,248 @@ msgstr "SIP �ਡਰ�ੱਸ"
 msgid "Unnamed List"
 msgstr "ਬਿਨਾ� ਨਾ� ਸ���"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:287
+#: ../addressbook/libedata-book/e-data-book-factory.c:298
 #, c-format
 msgid "Empty URI"
 msgstr "�ਾਲ� URI"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:306
-#: ../addressbook/libedata-book/e-data-book-factory.c:344
-#: ../calendar/libedata-cal/e-data-cal-factory.c:331
-#: ../calendar/libedata-cal/e-data-cal-factory.c:343
+#: ../addressbook/libedata-book/e-data-book-factory.c:317
+#: ../addressbook/libedata-book/e-data-book-factory.c:355
+#: ../calendar/libedata-cal/e-data-cal-factory.c:346
+#: ../calendar/libedata-cal/e-data-cal-factory.c:358
 #, c-format
 msgid "Invalid source"
 msgstr "�ਲਤ ਸਰ�ਤ"
 
-#: ../addressbook/libedata-book/e-data-book.c:171
-#: ../calendar/libedata-cal/e-data-cal.c:109
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:110
 msgid "Success"
 msgstr "ਸਫ਼ਲ"
 
-#: ../addressbook/libedata-book/e-data-book.c:172
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:111
 msgid "Repository offline"
 msgstr "Repository �ਫਲਾ�ਨ ਹ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libecal/e-cal.c:4065 ../calendar/libedata-cal/e-data-cal.c:111
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libecal/e-cal.c:4162 ../calendar/libedata-cal/e-data-cal.c:112
 msgid "Permission denied"
 msgstr "�ਧਿ�ਾਰ ਪਾਬੰਦ� ਹ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../addressbook/libedata-book/e-data-book.c:176
 msgid "Contact not found"
 msgstr "ਸੰਪਰ� ਨਹ�� ਲੱਭਿ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../addressbook/libedata-book/e-data-book.c:177
 msgid "Contact ID already exists"
 msgstr "ਸੰਪਰ� ID ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:176
-#: ../calendar/libedata-cal/e-data-cal.c:116
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:117
 msgid "Authentication Failed"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਫ�ਲ�ਹ ਹ��"
 
-#: ../addressbook/libedata-book/e-data-book.c:177
-#: ../calendar/libedata-cal/e-data-cal.c:117
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:118
 msgid "Authentication Required"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:118
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:119
 msgid "Unsupported field"
 msgstr "��ਰ-ਸਹਾ�� ��ਤਰ"
 
-#: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:121
 msgid "Unsupported authentication method"
 msgstr "�਼�ਰ-ਸਹਾ�� ਪਰਮਾਣ�ਿਤਾ ਢੰ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:122
 msgid "TLS not available"
 msgstr "TLS �ਪਲੱਬਧ ਨਹ��"
 
-#: ../addressbook/libedata-book/e-data-book.c:181
-#| msgid "Address Book does not exist"
-msgid "Address book does not exist"
-msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਮ���ਦ ਨਹ�� ਹ�"
-
-#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../addressbook/libedata-book/e-data-book.c:184
 msgid "Book removed"
 msgstr "�ਿਤਾਬ ਹ�ਾ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:183
-#: ../calendar/libedata-cal/e-data-cal.c:124
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:125
 msgid "Not available in offline mode"
 msgstr "�ਫਲਾ�ਨ ਵਿੱ� �ਪਲੱਬਧ ਨਹ�� ਹ�।"
 
-#: ../addressbook/libedata-book/e-data-book.c:184
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:126
 msgid "Search size limit exceeded"
 msgstr "��� ਸਾ��਼ ਲਿਮ� ਵੱਧ ��"
 
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:127
 msgid "Search time limit exceeded"
 msgstr "��� �ਾ�ਮ ਲਿਮ� ਵੱਧ ��"
 
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:128
 msgid "Invalid query"
 msgstr "�ਲਤ �ਿ�ਰ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:129
 msgid "Query refused"
 msgstr "�ਿ�ਰ� ਤ�� �ਨ�ਾਰ ��ਤਾ �ਿ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:188
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:130
 msgid "Could not cancel"
 msgstr "ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:131
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:132
 msgid "Invalid server version"
 msgstr "�ਲਤ ਸਰਵਰ ਵਰ�ਨ"
 
-#: ../addressbook/libedata-book/e-data-book.c:191
+#: ../addressbook/libedata-book/e-data-book.c:193
 msgid "No space"
 msgstr "ਥਾ� ਨਹ�� ਬਾ��"
 
-#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libecal/e-cal.c:4049 ../calendar/libedata-cal/e-data-cal.c:132
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4146 ../calendar/libedata-cal/e-data-cal.c:133
 msgid "Invalid argument"
 msgstr "�ਲਤ �ਰ��ਮਿੰ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:193
-#: ../calendar/libecal/e-cal.c:4087 ../calendar/libedata-cal/e-data-cal.c:133
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libecal/e-cal.c:4185 ../calendar/libedata-cal/e-data-cal.c:135
 msgid "Not supported"
 msgstr "ਸਹਾ�� ਨਹ��"
 
-#: ../addressbook/libedata-book/e-data-book.c:201
-#: ../calendar/libedata-cal/e-data-cal.c:141
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:143
 msgid "Other error"
 msgstr "ਹ�ਰ �ਲਤ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../addressbook/libedata-book/e-data-book.c:325
 #, c-format
 msgid "Cannot open book: %s"
 msgstr "%s: ਬ�ੱ� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:344
+#: ../addressbook/libedata-book/e-data-book.c:347
 #, c-format
 msgid "Cannot remove book: %s"
 msgstr "%s: ਬ�ੱ� ਹ�ਾ� �ਾ ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:361
-#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
 #, c-format
 msgid "Cannot get contact: %s"
 msgstr "%s: ਸੰਪਰ� ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:395
+#: ../addressbook/libedata-book/e-data-book.c:402
 #, c-format
 msgid "Empty query: %s"
 msgstr "%s: �ਿ�ਰ� �ਾਲ� ਹ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:411
+#: ../addressbook/libedata-book/e-data-book.c:418
 #, c-format
 msgid "Cannot get contact list: %s"
 msgstr "%s: ਸੰਪਰ� ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:448
+#: ../addressbook/libedata-book/e-data-book.c:457
 #, c-format
 msgid "Cannot authenticate user: %s"
 msgstr "%s: ਪਰਮਾਣਿਤ ਹ��� ਯ��਼ਰ ਨਹ�� ਹ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:463
-#: ../addressbook/libedata-book/e-data-book.c:482
+#: ../addressbook/libedata-book/e-data-book.c:472
+#: ../addressbook/libedata-book/e-data-book.c:491
 #, c-format
 msgid "Cannot add contact: %s"
 msgstr "%s: ਸੰਪਰ� ਸ਼ਾਮਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:500
-#: ../addressbook/libedata-book/e-data-book.c:519
+#: ../addressbook/libedata-book/e-data-book.c:513
+#: ../addressbook/libedata-book/e-data-book.c:532
 #, c-format
 msgid "Cannot modify contact: %s"
 msgstr "%s: ਸੰਪਰ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:558
+#: ../addressbook/libedata-book/e-data-book.c:571
 #, c-format
 msgid "Cannot remove contacts: %s"
 msgstr "%s: ਸੰਪਰ� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:595
+#: ../addressbook/libedata-book/e-data-book.c:610
 #, c-format
 msgid "Cannot get supported fields: %s"
 msgstr "%s: ਸਹਾ�� ��ਤਰ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:610
+#: ../addressbook/libedata-book/e-data-book.c:625
 #, c-format
 msgid "Cannot get required fields: %s"
 msgstr "%s: ਲ���ਦ� ��ਤਰ ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:625
+#: ../addressbook/libedata-book/e-data-book.c:640
 #, c-format
-#| msgid "Cannot get supported auth methods: %s"
 msgid "Cannot get supported authentication methods: %s"
 msgstr "%s: ਸਹਾ�� ਪਰਮਾਣ�ਿਤਾ ਢੰ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:651
-#: ../addressbook/libedata-book/e-data-book.c:662
+#: ../addressbook/libedata-book/e-data-book.c:666
+#: ../addressbook/libedata-book/e-data-book.c:677
 #, c-format
 msgid "Invalid query: %s"
 msgstr "%s: �ਲਤ �ਿ�ਰ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:698
+#: ../addressbook/libedata-book/e-data-book.c:713
 #, c-format
 msgid "Cannot get changes: %s"
 msgstr "%s: ਬਦਲਾ� ਨਹ�� ਲ� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:737
+#: ../addressbook/libedata-book/e-data-book.c:755
 #, c-format
 msgid "Cancel operation failed: %s"
 msgstr "%s: �ਪਰ�ਸ਼ਨ ਰੱਦ �ਰਨ ਲ� ਫ�ਲ�ਹ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:498
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
 #, c-format
-msgid "Unexpected HTTP status code %d returned"
-msgstr "�ਲਤ HTTP ਹਾਲਤ ��ਡ %d ਮਿਲਿ�"
+msgid "Server is unreachable (%s)"
+msgstr "ਸਰਵਰ ਪਹ�ੰ� ਵਿੱ� ਨਹ�� ਹ� (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4094
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, c-format
+#| msgid "Unexpected HTTP status code %d returned"
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "�ਲਤ HTTP ਹਾਲਤ ��ਡ %d ਮਿਲਿ� (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2090
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2495
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"ਸਰਵਰ ਪਹ�ੰ� '� ਨਹ�� ਹ�, ��ਲੰਡਰ ਨ�ੰ ��ਵਲ ਪ��ਹਨ ਮ�ਡ '� ਹ� ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�।\n"
+"�ਲਤ� ਸ�ਨ�ਹਾ: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4266
 msgid "Calendar doesn't support Free/Busy"
 msgstr "��ਲੰਡਰ ਵਿਹਲ�/ਰ��ਿ� ਲ� ਸਹਾ�� ਨਹ��"
 
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
-#: ../libedataserver/e-categories.c:45
 msgid "Birthday"
 msgstr "�ਨਮਦਿਨ"
 
@@ -880,251 +910,266 @@ msgstr "�ਨਮਦਿਨ: %s"
 msgid "Anniversary: %s"
 msgstr "ਵਰ��ੰਢ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:239
+#: ../calendar/backends/file/e-cal-backend-file.c:251
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "��ਲੰਡਰ ਡਾ�� ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: ਨਿ�ਾਰਾ URI"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:246
-#: ../calendar/backends/file/e-cal-backend-file.c:252
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
 msgid "Cannot save calendar data"
 msgstr "��ਲੰਡਰ ਡਾ�� ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1121
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2107
 msgid "Reply Requested: by "
 msgstr "�ਵਾਬ ਦ� ਬ�ਨਤ�: ਵਲ��"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1126
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2112
 msgid "Reply Requested: When convenient"
 msgstr "�ਵਾਬ ਲ� ਬ�ਨਤ�: �ਦ�� ਠ�� ਲੱ��"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:295
-#, c-format
-msgid "Loading %s items"
-msgstr "��ਾ��� %s ਲ�ਡ ��ਤ��� �ਾ ਰਹ��� ਹਨ"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:330
+#| msgid "Loading %s items"
+msgid "Loading Appointment items"
+msgstr "ਮ�ਲਾ�ਾਤ ���ਮਾ� ਲ�ਡ ��ਤ��� �ਾ ਰਹ��� ਹਨ"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:332
+#| msgid "Loading %s items"
+msgid "Loading Task items"
+msgstr "�ਾਸ� ���ਮਾ� ਲ�ਡ ��ਤ��� �ਾ ਰਹ��� ਹਨ"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:334
+#| msgid "Loading %s items"
+msgid "Loading Note items"
+msgstr "ਨ�� ���ਮਾ� ਲ�ਡ ��ਤ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:926
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:336
+#| msgid "Loading %s items"
+msgid "Loading items"
+msgstr "���ਮਾ� ਲ�ਡ ��ਤ��� �ਾ ਰਹ��� ਹਨ"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:963
 msgid "Calendar"
 msgstr "��ਲੰਡਰ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:989
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1026
 msgid "Invalid server URI"
 msgstr "�ਲਤ ਸਰਵਰ URI"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1082
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1343
-#: ../calendar/backends/http/e-cal-backend-http.c:659
-#: ../calendar/backends/weather/e-cal-backend-weather.c:487
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1387
+#: ../calendar/backends/http/e-cal-backend-http.c:721
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
 msgid "Could not create cache file"
 msgstr "����� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1139
 msgid "Could not create thread for populating cache"
 msgstr "����� ਥਰਿੱਡ ਨ�ੰ ਵਿ�ਸਤ ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:327
+#: ../calendar/backends/http/e-cal-backend-http.c:366
 msgid "Redirected to Invalid URI"
 msgstr "�ਲਤ URI ਲ� ਭ��ਿ� "
 
-#: ../calendar/backends/http/e-cal-backend-http.c:350
+#: ../calendar/backends/http/e-cal-backend-http.c:399
 msgid "Bad file format."
 msgstr "�ਲਤ ਫਾ�ਲ ਫਾਰਮਿ�"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:357
+#: ../calendar/backends/http/e-cal-backend-http.c:406
 msgid "Not a calendar."
 msgstr "��� ��ਲੰਡਰ ਨਹ��"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:154
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
 msgid "Could not retrieve weather data"
 msgstr "����� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Fog"
 msgstr "ਮ�ਸਮ: ਧ�ੰਦ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy Night"
 msgstr "ਮ�ਸਮ: ਬੱਦਲਵਾ� ਵਾਲ� ਰਾਤ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Cloudy"
 msgstr "ਮ�ਸਮ: ਬੱਦਲਵਾ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Overcast"
 msgstr "ਮ�ਸਮ: �ਵਰ�ਾਸ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Showers"
 msgstr "ਮ�ਸਮ: ਫ�ਹਾਰ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Snow"
 msgstr "ਮ�ਸਮ: ਬਰ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Clear Night"
 msgstr "ਮ�ਸਮ: ਸਾਫ਼ ਰਾਤ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:260
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
 msgid "Weather: Sunny"
 msgstr "ਮ�ਸਮ: �ਿ�ਿ� ਦਿਨ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:261
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
 msgid "Weather: Thunderstorms"
 msgstr "ਮ�ਸਮ: ਬਰ��ਲਾ ਤ�ਫਾਨ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:407
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
 msgid "Forecast"
 msgstr "�ਨ�ਮਾਨ"
 
-#: ../calendar/libecal/e-cal-component.c:1286
+#: ../calendar/libecal/e-cal-component.c:1306
 msgid "Untitled appointment"
 msgstr "ਬਿਨਾ� ਨਾ� ਰ���ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "1st"
 msgstr "੧ਹਿਲਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "2nd"
 msgstr "੨�ਾ"
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "3rd"
 msgstr "੩�ਾ"
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "4th"
 msgstr "੪ਥਾ"
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "5th"
 msgstr "੫ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "6th"
 msgstr "੬ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "7th"
 msgstr "੭ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "8th"
 msgstr "੮ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "9th"
 msgstr "੯ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "10th"
 msgstr "੧੦ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "11th"
 msgstr "੧੧ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "12th"
 msgstr "੧੨ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "13th"
 msgstr "੧੩ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "14th"
 msgstr "੧੪ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "15th"
 msgstr "੧੫ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "16th"
 msgstr "੧੬ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "17th"
 msgstr "੧੭ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "18th"
 msgstr "੧੮ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "19th"
 msgstr "੧੯ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "20th"
 msgstr "੨੦ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "21st"
 msgstr "੨੧ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "22nd"
 msgstr "੨੨ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "23rd"
 msgstr "੨੩ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "24th"
 msgstr "੨੪ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "25th"
 msgstr "੨੫ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3976
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "26th"
 msgstr "੨੬ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3977
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "27th"
 msgstr "੨੭ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3978
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "28th"
 msgstr "੨੮ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "29th"
 msgstr "੨੯ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "30th"
 msgstr "੩੦ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "31st"
 msgstr "੩੧ਵਾ�"
 
-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
 msgid "High"
 msgstr "�ੱ�"
 
-#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
-#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
 msgid "Low"
 msgstr "ਨਿ�ਨਤਮ"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:703
 msgid "Undefined"
 msgstr "ਨਾ-ਪ�ਰਭਾਸ਼ਿਤ"
 
-#: ../calendar/libecal/e-cal.c:1227 ../libedataserverui/e-book-auth-util.c:206
+#: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
 #: ../libedataserverui/e-book-auth-util.c:435
 #, c-format
 msgid "Enter password for %s (user %s)"
@@ -1134,92 +1179,82 @@ 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:1241
+#: ../calendar/libecal/e-cal.c:1250
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਯ��਼ਰ %s ਲ� ਪਰਾ�ਸ� ਯ�� �ਰਨ ਲ� ਦਿ�"
 
-#: ../calendar/libecal/e-cal.c:4051
+#: ../calendar/libecal/e-cal.c:4148
 msgid "Backend is busy"
 msgstr "ਪਿੱ�ਲਾ ਤਾ� ਰ��ਿ� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4053
+#: ../calendar/libecal/e-cal.c:4150
 msgid "Repository is offline"
 msgstr "Repository �ਫਲਾ�ਨ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4055
+#: ../calendar/libecal/e-cal.c:4152
 msgid "No such calendar"
 msgstr "�ੱਦਾ� ਦਾ ��� ��ਲੰਡਰ ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4057 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libecal/e-cal.c:4154 ../calendar/libedata-cal/e-data-cal.c:114
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "��ਾ� ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4059 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../calendar/libecal/e-cal.c:4156 ../calendar/libedata-cal/e-data-cal.c:115
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "�ਲਤ ��ਾ�"
 
-#: ../calendar/libecal/e-cal.c:4061
+#: ../calendar/libecal/e-cal.c:4158
 msgid "URI not loaded"
 msgstr "URI ਲ�ਡ ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4063
+#: ../calendar/libecal/e-cal.c:4160
 msgid "URI already loaded"
 msgstr "URI ਪਹਿਲਾ� ਹ� ਲ�ਡ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4067 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4164 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "�ਣ�ਾਣ ਯ��਼ਰ"
 
-#: ../calendar/libecal/e-cal.c:4069 ../calendar/libedata-cal/e-data-cal.c:115
+#: ../calendar/libecal/e-cal.c:4166 ../calendar/libedata-cal/e-data-cal.c:116
 msgid "Object ID already exists"
 msgstr "��ਾ� ID ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4071
+#: ../calendar/libecal/e-cal.c:4168
 msgid "Protocol not supported"
 msgstr "ਪਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4073
+#: ../calendar/libecal/e-cal.c:4170
 msgid "Operation has been canceled"
 msgstr "�ਾਰਵਾ� ਰੱਦ ��ਤ� �� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4075
+#: ../calendar/libecal/e-cal.c:4172
 msgid "Could not cancel operation"
 msgstr "�ਾਰਵਾ� ਨ�ੰ ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4077
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
-#: ../camel/providers/groupwise/camel-groupwise-store.c:618
-#: ../camel/providers/groupwise/camel-groupwise-store.c:793
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#: ../calendar/libecal/e-cal.c:4174
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1311
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1329
+#: ../camel/providers/groupwise/camel-groupwise-store.c:635
+#: ../camel/providers/groupwise/camel-groupwise-store.c:817
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
 #, c-format
 msgid "Authentication failed"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ"
 
-#: ../calendar/libecal/e-cal.c:4079
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../calendar/libecal/e-cal.c:4176
+#: ../camel/providers/smtp/camel-smtp-transport.c:768
 msgid "Authentication required"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:4081
-#| msgid "A DBUS exception has occurred"
+#: ../calendar/libecal/e-cal.c:4178
 msgid "A D-Bus exception has occurred"
 msgstr "D-BUS ��ਰਾ ���"
 
-#: ../calendar/libecal/e-cal.c:4083
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
-#: ../camel/providers/imap/camel-imap-command.c:457
-#: ../camel/providers/imap/camel-imap-store.c:627
-#: ../camel/providers/pop3/camel-pop3-store.c:474
-#: ../servers/groupwise/e-gw-connection.c:243
-msgid "Unknown error"
-msgstr "�ਣਪ�ਾਤ� �ਲਤ�"
-
-#: ../calendar/libecal/e-cal.c:4085
+#: ../calendar/libecal/e-cal.c:4182
 msgid "No error"
 msgstr "��� �ਲਤ� ਨਹ��"
 
@@ -1316,223 +1351,217 @@ msgid ""
 "be a boolean false (#f)"
 msgstr "\"%s\" ਲ� ਸਭ �ਰ��ਮਿੰ� �ਾ� ਤਾ� ਸਤਰ ਹ�ਣ �ਾ� ਸਿਰਫ �ੱ� �ਰ��ਮਿੰ� ਬ�ਲ��ਨ (�ਲਤ) ਹ�ਵ�"
 
-#: ../calendar/libedata-cal/e-data-cal.c:112
+#: ../calendar/libedata-cal/e-data-cal.c:113
 msgid "Invalid range"
 msgstr "�ਲਤ ਰ��਼"
 
-#: ../calendar/libedata-cal/e-data-cal.c:119
+#: ../calendar/libedata-cal/e-data-cal.c:120
 msgid "Unsupported method"
 msgstr "�਼�ਰ-ਸਹਾ�� ਢੰ�"
 
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../calendar/libedata-cal/e-data-cal.c:123
 msgid "Calendar does not exist"
 msgstr "��ਲੰਡਰ ਮ���ਦ ਨਹ��"
 
-#: ../calendar/libedata-cal/e-data-cal.c:123
-#| msgid "Unknown User"
+#: ../calendar/libedata-cal/e-data-cal.c:124
 msgid "Unknown user"
 msgstr "�ਣ�ਾਣ ਯ��਼ਰ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:604
+#: ../calendar/libedata-cal/e-data-cal.c:610
 #, c-format
 msgid "Cannot retrieve calendar address: %s"
 msgstr "��ਲੰਡਰ �ਡਰ�ੱਸ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:624
+#: ../calendar/libedata-cal/e-data-cal.c:635
 #, c-format
 msgid "Cannot retrieve calendar alarm e-mail address: %s"
 msgstr "%s: ��ਲੰਡਰ �ਲਾਰਮ �ਮ�ਲ �ਡਰ�ੱਸ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:644
+#: ../calendar/libedata-cal/e-data-cal.c:660
 #, c-format
-#| msgid "Cannot retrieve calendar's ldap attribute: %s"
 msgid "Cannot retrieve calendar's LDAP attribute: %s"
 msgstr "%s: ��ਲੰਡਰ ਦਾ LDAP ��ਣ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:664
+#: ../calendar/libedata-cal/e-data-cal.c:685
 #, c-format
 msgid "Cannot retrieve calendar scheduling information: %s"
 msgstr "%s: ��ਲੰਡਰ ਸ�ਡ��ਲ �ਾਣ�ਾਰ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:683
+#: ../calendar/libedata-cal/e-data-cal.c:709
 #, c-format
 msgid "Cannot open calendar: %s"
 msgstr "%s: ��ਲੰਡਰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:704
+#: ../calendar/libedata-cal/e-data-cal.c:730
 #, c-format
 msgid "Cannot refresh calendar: %s"
 msgstr "%s: ��ਲੰਡਰ ਤਾ�਼ਾ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:723
+#: ../calendar/libedata-cal/e-data-cal.c:749
 #, c-format
 msgid "Cannot remove calendar: %s"
 msgstr "%s: ��ਲੰਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:744
+#: ../calendar/libedata-cal/e-data-cal.c:770
 #, c-format
 msgid "Cannot create calendar object: %s"
 msgstr "%s: ��ਲੰਡਰ �ਬ���� ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:768
+#: ../calendar/libedata-cal/e-data-cal.c:798
 #, c-format
 msgid "Cannot modify calendar object: %s"
 msgstr "%s: ��ਲੰਡਰ �ਬ���� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:794
+#: ../calendar/libedata-cal/e-data-cal.c:824
 #, c-format
 msgid "Cannot remove calendar object: %s"
 msgstr "%s: ��ਲੰਡਰ �ਬ���� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:815
+#: ../calendar/libedata-cal/e-data-cal.c:845
 #, c-format
 msgid "Cannot receive calendar objects: %s"
 msgstr "%s: ��ਲੰਡਰ �ਬ���� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:834
+#: ../calendar/libedata-cal/e-data-cal.c:864
 #, c-format
 msgid "Cannot discard calendar alarm: %s"
 msgstr "%s: ��ਲੰਡਰ �ਲਾਰਮ �ਣਡਿੱਠਾ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:855
+#: ../calendar/libedata-cal/e-data-cal.c:885
 #, c-format
 msgid "Cannot send calendar objects: %s"
 msgstr "%s: ��ਲੰਡਰ �ਬ���� ਭ��� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:880
+#: ../calendar/libedata-cal/e-data-cal.c:912
 #, c-format
 msgid "Cannot retrieve default calendar object path: %s"
 msgstr "%s: ਡਿਫਾਲ� ��ਲੰਡਰ �ਬ���� ਪਾਥ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:900
+#: ../calendar/libedata-cal/e-data-cal.c:937
 #, c-format
 msgid "Cannot retrieve calendar object path: %s"
 msgstr "%s: ��ਲੰਡਰ �ਬ���� ਪਾਥ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:920
+#: ../calendar/libedata-cal/e-data-cal.c:962
 #, c-format
 msgid "Cannot retrieve calendar object list: %s"
 msgstr "%s: ��ਲੰਡਰ �ਬ���� ਲਿਸ� ਨਹ�� ਲ� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:948
+#: ../calendar/libedata-cal/e-data-cal.c:990
 #, c-format
 msgid "Could not retrieve attachment list: %s"
 msgstr "%s: ����ਮ��� ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:974
+#: ../calendar/libedata-cal/e-data-cal.c:1016
 #, c-format
 msgid "Could not complete calendar query: %s"
 msgstr "%s: ��ਲੰਡਰ �ਿ�ਰ� ਪ�ਰ� ਨਹ�� ��ਤ� �ਾ ਸ��"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:994
+#: ../calendar/libedata-cal/e-data-cal.c:1041
 #, c-format
 msgid "Could not retrieve calendar time zone: %s"
 msgstr "%s: ��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਲਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1014
+#: ../calendar/libedata-cal/e-data-cal.c:1066
 #, c-format
 msgid "Could not add calendar time zone: %s"
 msgstr "%s: ��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਸ਼ਾਮਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1033
+#: ../calendar/libedata-cal/e-data-cal.c:1085
 #, c-format
 msgid "Could not set default calendar time zone: %s"
 msgstr "%s: ਡਿਫਾਲ� ��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਸ�ੱ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1056
+#: ../calendar/libedata-cal/e-data-cal.c:1108
 #, c-format
 msgid "Cannot retrieve calendar changes: %s"
 msgstr "%s: ��ਲੰਡਰ ਬਦਲਾ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1087
+#: ../calendar/libedata-cal/e-data-cal.c:1139
 #, c-format
 msgid "Cannot retrieve calendar free/busy list: %s"
 msgstr "%s: ��ਲੰਡਰ ਵਿਹਲ�/ਰ��ਿ� ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:353
+#: ../calendar/libedata-cal/e-data-cal-factory.c:368
 #, c-format
 msgid "Invalid URI"
 msgstr "�ਲਤ URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:371
+#: ../calendar/libedata-cal/e-data-cal-factory.c:386
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "'%2$s' ਵਿੱ��� '%1$s' ਲ� ਬ����ਡ ਫ���ਰ� ਨਹ�� ਹ�"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:421
+#: ../calendar/libedata-cal/e-data-cal-factory.c:436
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "ਬ����ਡ ਸ਼�ਰ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../camel/camel-cipher-context.c:75
+#: ../camel/camel-cipher-context.c:204
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "�ਸ ਸ�ਫ਼ਰ ਦਸਤ�ਤਾ� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/camel-cipher-context.c:110
-msgid "Signing message"
-msgstr "ਸ�ਨ�ਹਾ ਸਾ�ਨ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
-
-#: ../camel/camel-cipher-context.c:131
+#: ../camel/camel-cipher-context.c:217
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "�ਹ ਸ�ਫ਼ਰ �ਾ�� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/camel-cipher-context.c:164
-msgid "Verifying message"
-msgstr "ਸ�ਨ�ਹ� ਦ� �ਾ�� �ਾਰ� ਹ�"
-
-#: ../camel/camel-cipher-context.c:188
+#: ../camel/camel-cipher-context.c:233
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "�ਹ ਸ�ਫ਼ਰ ���ਰਿਪਸ਼ਨ ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/camel-cipher-context.c:223
-msgid "Encrypting message"
-msgstr "ਸ�ਨ�ਹਾ �ੰ��ਰਿਪਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
-
-#: ../camel/camel-cipher-context.c:246
+#: ../camel/camel-cipher-context.c:247
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "�ਹ ਸ�ਫ਼ਰ ਡਿਸ��ਰਿਪਸ਼ਨ ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/camel-cipher-context.c:276
-msgid "Decrypting message"
-msgstr "ਸ�ਨ�ਹਾ ਡਿ��ਰਿਪਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
-
-#: ../camel/camel-cipher-context.c:297
+#: ../camel/camel-cipher-context.c:260
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ਤ�ਸ�� �ਸ ਸ�ਫ਼ਰ ਤ�� �� �ੰਪ�ਰ� ਨਹ�� �ਰ ਸ�ਦ� ਹ�"
 
-#: ../camel/camel-cipher-context.c:341
+#: ../camel/camel-cipher-context.c:274
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ਤ�ਸ�� ਸ�ਫ਼ਰ ਲ� �� ��ਸਪ�ਰ� ਨਹ�� �ਰ ਸ�ਦ�"
 
+#: ../camel/camel-cipher-context.c:815
+msgid "Signing message"
+msgstr "ਸ�ਨ�ਹਾ ਸਾ�ਨ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#: ../camel/camel-cipher-context.c:1056
+msgid "Encrypting message"
+msgstr "ਸ�ਨ�ਹਾ �ੰ��ਰਿਪਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#: ../camel/camel-cipher-context.c:1183
+msgid "Decrypting message"
+msgstr "ਸ�ਨ�ਹਾ ਡਿ��ਰਿਪਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
 #: ../camel/camel-data-cache.c:181
 #, c-format
 msgid "Unable to create cache path"
@@ -1543,12 +1572,12 @@ msgstr "��ਸ਼ ਮਾਰ� ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "��ਸ਼ �ੰਦਰਾ� ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/camel-data-wrapper.c:89
+#: ../camel/camel-data-wrapper.c:147
 #, c-format
 msgid "No stream available"
 msgstr "��� ਸ�ਰ�ਮ �ਪਲੱਬਧ ਨਹ�� ਹ�।"
 
-#: ../camel/camel-db.c:464
+#: ../camel/camel-db.c:455
 #, c-format
 msgid "Insufficient memory"
 msgstr "ਲ���ਦ� ਮ�ਮ�ਰ� ਨਹ��"
@@ -1564,8 +1593,8 @@ msgstr ""
 "�ਸ ਸਰਵਰ ਤ� ਹ�ਰ �ਾਰਵਾ� ਤ�ਹਾਡ� ਨ�ੱ�ਵਰ� ਤ� ਮ�� ���ਨ ਤ� ਮ��\n"
 "ਦ�ਹਰਾ� ਨਾ �ਾ ਸ�ਣ��।"
 
-#: ../camel/camel-disco-diary.c:258
-#: ../camel/providers/imap/camel-imap-journal.c:298
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:300
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1576,119 +1605,107 @@ msgstr ""
 "%s\n"
 "�ਸ ਫ�ਲਡਰ ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਮ��-ਸਮ�ਾਲ� ਨਹ�� ��ਤ��� �ਾ ਸ�ਣ����।"
 
-#: ../camel/camel-disco-diary.c:299
+#: ../camel/camel-disco-diary.c:304
 msgid "Resynchronizing with server"
 msgstr "ਸਰਵਰ ਨਾਲ ਮ��-ਸਮ�ਾਲ�"
 
-#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
+#: ../camel/camel-disco-folder.c:67 ../camel/camel-offline-folder.c:83
 msgid "Downloading new messages for offline mode"
 msgstr "�ਫਲਾ�ਨ ਮ�ਡ ਲ� ਨਵ�� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-disco-folder.c:379
+#: ../camel/camel-disco-folder.c:389
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ਫ�ਲਡਰ '%s' ਨ�ੰ �ਫਲਾ�ਨ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+#: ../camel/camel-disco-folder.c:455 ../camel/camel-offline-folder.c:316
 msgid "Copy folder content locally for offline operation"
 msgstr "ਬੰਦ �ਾਰਵਾ� ਦ�ਰਾਨ ਫ�ਲਡਰ ਭਾ� ਨ�ਲ �ਰ�"
 
-#: ../camel/camel-disco-store.c:395
-#: ../camel/providers/groupwise/camel-groupwise-store.c:230
-#: ../camel/providers/imap/camel-imap-store.c:876
-#: ../camel/providers/imap/camel-imap-store.c:1720
-#: ../camel/providers/imap/camel-imap-store.c:2178
-#: ../camel/providers/imap/camel-imap-store.c:3022
-#: ../camel/providers/imapx/camel-imapx-store.c:185
-#: ../camel/providers/imapx/camel-imapx-store.c:709
-#: ../camel/providers/imapx/camel-imapx-store.c:772
-#: ../camel/providers/imapx/camel-imapx-store.c:831
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:232
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:277
+#: ../camel/providers/imapx/camel-imapx-store.c:1299
+#: ../camel/providers/imapx/camel-imapx-store.c:1387
+#: ../camel/providers/imapx/camel-imapx-store.c:1422
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "�ਸ �ਾਰਵਾ� ਨ�ੰ ਸੰਪ�ਰਨ �ਰਨ ਲ� ਤ�ਹਾਨ�ੰ �ਨ-ਲਾ�ਨ ਰਹਿਣਾ �ਾਹ�ਦਾ ਹ�"
 
-#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
-#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
-#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
-#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
-#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
-#: ../camel/camel-tcp-stream-raw.c:250
-#: ../camel/providers/imapx/camel-imapx-server.c:4654
-#: ../camel/providers/imapx/camel-imapx-server.c:4671
-#: ../camel/providers/nntp/camel-nntp-summary.c:396
-#: ../camel/providers/pop3/camel-pop3-folder.c:269
-#: ../camel/providers/pop3/camel-pop3-folder.c:625
-#: ../camel/providers/pop3/camel-pop3-folder.c:690
-#: ../camel/providers/pop3/camel-pop3-store.c:466
-#: ../libedataserverui/e-book-auth-util.c:229
-#, c-format
-msgid "Cancelled"
-msgstr "ਰੱਦ ��ਤਾ"
-
-#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
-#: ../camel/camel-file-utils.c:791
+#: ../camel/camel-file-utils.c:719
 #, c-format
 msgid "Canceled"
 msgstr "ਰੱਦ ��ਤਾ"
 
-#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:839 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "��ਲ� �ਿਰਿ� `%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/camel-filter-driver.c:853
+#: ../camel/camel-filter-driver.c:886
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s ਤ�� �ਲਤ ਸ�ਨ�ਹਾ ਲ�� ਪ�ਰਾਪਤ ਹ�� ਹ�: %s"
 
-#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
+#: ../camel/camel-filter-driver.c:1073 ../camel/camel-filter-driver.c:1082
 msgid "Syncing folders"
 msgstr "ਫ�ਲਡਰ ਸਮ�ਾਲ�"
 
-#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
+#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1620
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ਫਿਲ�ਰ ਨ�ੰ ਪਾਰਸ �ਰਨ ਵਿੱ� �ਲਤ�: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
+#: ../camel/camel-filter-driver.c:1181 ../camel/camel-filter-driver.c:1631
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ਫਿਲ�ਰ �ਲਾ�ਣ ਵਿੱ� �ਲਤ�: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1240
+#: ../camel/camel-filter-driver.c:1278
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ਸਪ�ਲ ਫ�ਲਡਰ ��ਲਣ ਵਿੱ� �ਲਤ�"
 
-#: ../camel/camel-filter-driver.c:1251
+#: ../camel/camel-filter-driver.c:1289
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "�ਾਰ� ਸਪ�ਲ ਫ�ਲਡਰ ��ਲਣ ਤ�� �ਸਮਰੱਥ"
 
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1307
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�(%d%%)"
 
-#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
+#: ../camel/camel-filter-driver.c:1314 ../camel/camel-filter-driver.c:1336
 #, c-format
 msgid "Failed on message %d"
 msgstr "ਸ�ਨ�ਹਾ %d ਤ� �ਸਫਲ"
 
-#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
+#: ../camel/camel-filter-driver.c:1351 ../camel/camel-filter-driver.c:1456
 msgid "Syncing folder"
 msgstr "ਫ�ਲਡਰ ਸਮ�ਾਲ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
+#: ../camel/camel-filter-driver.c:1356 ../camel/camel-filter-driver.c:1462
 msgid "Complete"
 msgstr "ਮ��ੰਮਲ"
 
-#: ../camel/camel-filter-driver.c:1377
+#: ../camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%2d ਵਿੱ��� %1d ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1438
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2d ਵਿੱ��� %1d ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ"
@@ -1755,49 +1772,55 @@ msgstr "(%s) ਲ� �ੱ� ਲ�� ਨਤ��� ਦ� ਲ�� ਹ�"
 msgid "(%s) requires the folder set"
 msgstr "(%s) ਲ� ਫ�ਲਡਰ ਸ�ੱ� ਦ� ਲ�� ਹ�"
 
-#: ../camel/camel-folder.c:125
+#: ../camel/camel-folder.c:220
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "'%s' ਵਿੱ� ਨਵ�� ਸਪਮ ਸ�ਨ�ਹਾ ਸਿੱ�ਿ� �ਾ ਰਿਹਾ ਹ�"
 msgstr[1] "'%s' ਵਿੱ� ਨਵ�� ਸਪਮ ਸ�ਨ�ਹ� ਸਿੱ�� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-folder.c:147
+#: ../camel/camel-folder.c:244
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "'%s' ਵਿੱ� ਨਵਾ� ਹਮ ਸ�ਨ�ਹਾ ਸਿੱ�ਿ� �ਾ ਰਿਹਾ ਹ�"
 msgstr[1] "'%s' ਵਿੱ� ਨਵ�� ਹਮ ਸ�ਨ�ਹ� ਸਿੱ�� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-folder.c:171
+#: ../camel/camel-folder.c:270
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "'%s' ਵਿੱ� ਨਵਾ� ਸ�ਨ�ਹਾ ਫਿਲ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 msgstr[1] "'%s' ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹ� ਫਿਲ�ਰ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-folder.c:688
-#: ../camel/providers/local/camel-maildir-folder.c:366
+#: ../camel/camel-folder.c:881
+#: ../camel/providers/local/camel-maildir-folder.c:293
 msgid "Moving messages"
 msgstr "ਸ�ਨ�ਹ� ਭ��� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-folder.c:690
+#: ../camel/camel-folder.c:884
 msgid "Copying messages"
 msgstr "ਸ�ਨ�ਹ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
-#: ../camel/camel-gpg-context.c:1330
+#: ../camel/camel-folder.c:3253
+#, c-format
+#| msgid "Retrieving POP message %d"
+msgid "Retrieving message '%s'"
+msgstr "ਸ�ਨ�ਹਾ '%s' ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#: ../camel/camel-gpg-context.c:646 ../camel/camel-gpg-context.c:651
+#: ../camel/camel-gpg-context.c:1276
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg ਨ�ੰ �ਲਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/camel-gpg-context.c:706
-#: ../camel/providers/smtp/camel-smtp-transport.c:114
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/camel-gpg-context.c:651
+#: ../camel/providers/smtp/camel-smtp-transport.c:716
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
 msgid "Unknown"
 msgstr "�ਣ�ਾਣ"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:715
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1808,17 +1831,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:787
+#: ../camel/camel-gpg-context.c:732
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid ਸੰ��ਤ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ।"
 
-#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:757 ../camel/camel-gpg-context.c:772
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg passphrase ਸੰ��ਤ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ।"
 
-#: ../camel/camel-gpg-context.c:848
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1827,7 +1850,7 @@ msgstr ""
 "ਤ�ਹਾਨ�ੰ ਤ�ਹਾਡ� ਸਮਾਰ�-�ਾਰਡ ਲ� �ੱ� PIN �ਣ-ਲਾ� �ਰਨ\n"
 "ਲ� ਲ���ਦਾ ਹ�: \"%s\""
 
-#: ../camel/camel-gpg-context.c:852
+#: ../camel/camel-gpg-context.c:797
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1836,68 +1859,83 @@ msgstr ""
 "ਤ�ਹਾਨ�ੰ ਯ��਼ਰ ਲ� ਪਾਸ-ਪ�ਰਸੰ� ਲ���ਦਾ ਹ�, �� �ਿ\n"
 "��ਲ ਸ��: \"%s\""
 
-#: ../camel/camel-gpg-context.c:858
+#: ../camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG ਤ�� '%s' ਤ�� ਨਾ-ਲ���ਦਾ �ਵਾਬ ਪ�ਰਾਪਤ ਹ���"
 
-#: ../camel/camel-gpg-context.c:905
+#: ../camel/camel-gpg-context.c:832 ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4908
+#: ../camel/providers/imapx/camel-imapx-server.c:4925
+#: ../camel/providers/imapx/camel-imapx-store.c:199
+#: ../camel/providers/nntp/camel-nntp-summary.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:364
+#: ../camel/providers/pop3/camel-pop3-folder.c:429
+#: ../camel/providers/pop3/camel-pop3-folder.c:504
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "ਰੱਦ ��ਤਾ"
+
+#: ../camel/camel-gpg-context.c:850
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "��ਪਤ �� ਨ�ੰ ��ਲ�ਹਣ ਵਿੱ� �ਸਫਲ: ੩ �ਲਤ ਪਾਸ-ਪ�ਰ� ਦਿੱਤ� ਹਨ।"
 
-#: ../camel/camel-gpg-context.c:917
+#: ../camel/camel-gpg-context.c:862
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG ਤ�� ਨਾ-ਲ���ਦਾ �ਵਾਬ ਪ�ਰਾਪਤ ਹ���: %s"
 
-#: ../camel/camel-gpg-context.c:1048
+#: ../camel/camel-gpg-context.c:993
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "���ਰਿਪ� ਲ� �ਸਫਲ:��� �ਾ�� ਪ�ਰਾਪਤ �ਰਨ ਨਿਰਧਾਰਿਤ ਨਹ�� ਹ�।"
 
-#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+#: ../camel/camel-gpg-context.c:1539 ../camel/camel-smime-context.c:824
 msgid "Could not generate signing data: "
 msgstr "ਦਸਤ�ਤ� ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: "
 
-#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
-#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
-#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
+#: ../camel/camel-gpg-context.c:1586 ../camel/camel-gpg-context.c:1786
+#: ../camel/camel-gpg-context.c:1896 ../camel/camel-gpg-context.c:2042
+#: ../camel/camel-gpg-context.c:2141 ../camel/camel-gpg-context.c:2189
 msgid "Failed to execute gpg."
 msgstr "gpg ਨ�ੰ �ਲਾ�ਣ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
-#: ../camel/camel-smime-context.c:966
+#: ../camel/camel-gpg-context.c:1666 ../camel/camel-gpg-context.c:1674
+#: ../camel/camel-gpg-context.c:1682 ../camel/camel-gpg-context.c:1701
+#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
+#: ../camel/camel-smime-context.c:971
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ਸ�ਨ�ਹਾ ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�� ਹਨ: �ਲਤ ਸ�ਨ�ਹਾ ਫਾਰਮਿ�"
 
-#: ../camel/camel-gpg-context.c:1695
+#: ../camel/camel-gpg-context.c:1741
 msgid "Cannot verify message signature: "
 msgstr "ਸ�ਨ�ਹਾ ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�� ਹਨ: "
 
-#: ../camel/camel-gpg-context.c:1814
+#: ../camel/camel-gpg-context.c:1862
 msgid "Could not generate encrypting data: "
 msgstr "�ੰ��ਰਿਪ�ਡ ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: "
 
-#: ../camel/camel-gpg-context.c:1866
+#: ../camel/camel-gpg-context.c:1915
 msgid "This is a digitally encrypted message part"
 msgstr "�ਹ ਸ�ਨ�ਹ� ਦਾ ਡਿ���ਲ ���ਰਿਪ�ਡ ਭਾ� ਹ�"
 
-#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
-#: ../camel/camel-gpg-context.c:1954
+#: ../camel/camel-gpg-context.c:1973 ../camel/camel-gpg-context.c:1982
+#: ../camel/camel-gpg-context.c:2005
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ਸ�ਨ�ਹਾ ਡ�-�ਰਿਪ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: �ਲਤ ਸ�ਨ�ਹਾ ਫਾਰਮਿ�"
 
-#: ../camel/camel-gpg-context.c:1942
+#: ../camel/camel-gpg-context.c:1993
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME ਭਾ� ਡਿ��ਰਿਪ� �ਰਨ ਤ�� �ਸਫਲ: ਪ�ਰ����ਾਲ �ਲਤ�"
 
-#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
+#: ../camel/camel-gpg-context.c:2082 ../camel/camel-smime-context.c:1255
 msgid "Encrypted content"
 msgstr "���ਰਿਪ�ਡ ਭਾ�"
 
@@ -1995,54 +2033,54 @@ msgstr "�ਰ�� ਪੱਤਰ ਫਾ�ਲ ਤ� ਲਿ�ਣ ਵਿੱ�
 msgid "Error copying mail temp file: %s"
 msgstr "�ਰ�� ਪੱਤਰ ਫਾ�ਲ ਨ�ੰ ਨ�ਲ �ਰਨ ਵਿੱ� �ਲਤ�: %s"
 
-#: ../camel/camel-multipart-signed.c:285
+#: ../camel/camel-multipart-signed.c:286
 #, c-format
 msgid "No content available"
 msgstr "��� ਸਮੱ�ਰ� �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/camel-multipart-signed.c:293
+#: ../camel/camel-multipart-signed.c:294
 #, c-format
 msgid "No signature available"
 msgstr "��� ਦਸਤ�ਤ �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/camel-multipart-signed.c:612
+#: ../camel/camel-multipart-signed.c:620
 #, c-format
 msgid "parse error"
 msgstr "ਪਾਰਸ �ਲਤ�"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
 msgstr "ਹੱਲ ��ਤਾ �ਾ ਰਿਹਾ ਹ�: %s"
 
-#: ../camel/camel-net-utils.c:715
+#: ../camel/camel-net-utils.c:718
 msgid "Host lookup failed"
 msgstr "ਹ�ਸ� ��� �ਸਫਲ"
 
-#: ../camel/camel-net-utils.c:719
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "ਹ�ਸ� ��� �ਸਫਲ: %s: %s"
 
-#: ../camel/camel-net-utils.c:842
+#: ../camel/camel-net-utils.c:845
 msgid "Resolving address"
 msgstr "�ਡਰ�ੱਸ ���ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-net-utils.c:862
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
 msgstr "ਨਾ� ��� �ਸਫਲ"
 
-#: ../camel/camel-net-utils.c:867
+#: ../camel/camel-net-utils.c:872
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "ਨਾ� ��� �ਸਫਲ: %s"
 
-#: ../camel/camel-offline-folder.c:169
+#: ../camel/camel-offline-folder.c:193
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ਫ�ਲਡਰ `%s' ਵਿੱ� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਡਿਸ� ਤ� ਲਿ�ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਲ� �ਫਲਾ�ਨ �ਰਨਲ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
@@ -2070,7 +2108,7 @@ msgstr "%s ਨ�ੰ ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ਨ�ੰ ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਸ ਮ�ਡ��ਲ ਵਿੱ� ��� ਸ਼�ਰ��ਤ� ��ਡ ਨਹ�� ਹ�।"
 
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:206
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ਪਰ����ਾਲ '%s' ਲ� ��� �ਪਲੱਬਧ �ਰਤਾ ਨਹ�� ਹ�"
@@ -2083,12 +2121,12 @@ msgstr "��ੰਮਨਾਮ"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "�ਸ ��ਣ ਨਾਲ ਸਰਵਰ ਨਾਲ �ਣ�ਾਣ ਦ� ਤ�ਰ ਤ� ਲਾੱ��ਨ ��ਤਾ �ਾਵ��ਾ।"
 
-#: ../camel/camel-sasl-anonymous.c:69
+#: ../camel/camel-sasl-anonymous.c:70
 #, c-format
 msgid "Authentication failed."
 msgstr "ਪ�ਰਮਾਣਿ�ਤਾ �ਸਫਲ।"
 
-#: ../camel/camel-sasl-anonymous.c:80
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2097,7 +2135,7 @@ msgstr ""
 "�ਲਤ �ਮ�ਲ ਸਿਰਨਾਵ� �ਾ�� �ਾਣ�ਾਰ�:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:94
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2106,7 +2144,7 @@ msgstr ""
 "�ਲਤ �ਪਾਰਦਰਸ਼� �ਾ�� �ਾਣ�ਾਰ�:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:108
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2125,11 +2163,11 @@ msgid ""
 "the server supports it."
 msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ਸ�ਰੱ�ਿ�ਤ CRAM-MD5 ਪਾਸਵਰਡ ਨਾਲ ���ਦਾ ਹ�, ���ਰ ਸਰਵਰ ਸਹਾ� ਹ��� ਤਾ�।"
 
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../camel/camel-sasl-digest-md5.c:60
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2137,73 +2175,73 @@ msgstr ""
 "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ਸ�ਰੱ�ਿ�ਤ DIGEST-MD5 ਪਾਸਵਰਡ ਨਾਲ ���ਦਾ ਹ�, ���ਰ ਸਰਵਰ ਸਹਾ� ਹ��� "
 "ਤਾ�।"
 
-#: ../camel/camel-sasl-digest-md5.c:818
+#: ../camel/camel-sasl-digest-md5.c:821
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ਸਰਵਰ ��ਣ�ਤ� ਬਹ�ਤ ਲੰਮ� ਹ� (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:829
+#: ../camel/camel-sasl-digest-md5.c:832
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ਸਰਵਰ �ਾ�� �ਲਤ ਹ�\n"
 
-#: ../camel/camel-sasl-digest-md5.c:837
+#: ../camel/camel-sasl-digest-md5.c:840
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ਸਰਵਰ ��ਣ�ਤ� ਵਿੱ� \"ਸ�ਰੱ�ਿ� ਦਾ ��ਣ\" ���ਨ �ਲਤ ਹ�"
 
-#: ../camel/camel-sasl-digest-md5.c:869
+#: ../camel/camel-sasl-digest-md5.c:875
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ਸਰਵਰ �ਵਾਬ ਵਿੱ� ਪਰਮਾਣਿਤ ਡਾ�ਾ ਨਹ�� ਹ�"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:896
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ਸਰਵਰ �ਵਾਬ ਵਿੱ� ਨਾ-ਸੰਪ�ਰਨ ਪ�ਰਮਾਣਿਤ ਡਾ�ਾ ਹ�"
 
-#: ../camel/camel-sasl-digest-md5.c:903
+#: ../camel/camel-sasl-digest-md5.c:909
 #, c-format
 msgid "Server response does not match"
 msgstr "ਸਰਵਰ �ਵਾਬ ਮ�ਲ ਨਹ�� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-sasl-gssapi.c:80
+#: ../camel/camel-sasl-gssapi.c:85
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:82
+#: ../camel/camel-sasl-gssapi.c:87
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ��ਬ�ਰਸ ੫ ਪ�ਰਮਾਣ�ਿਤਾ ਵਰਤ �� ਸਰਵਰ ਨਾਲ �����ਾ।"
 
-#: ../camel/camel-sasl-gssapi.c:119
+#: ../camel/camel-sasl-gssapi.c:128
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "ਨਿਰਧਾਰਿਤ ਢੰ� ਪ�ਰਮਾਣ-ਪੱਤਰ ਦ��ਰਾ ਸਹਾ�� ਨਹ�� ਹ� �ਾ� �ਹ ਸਥਾਪਨ ਦ��ਰਾ ਪ�ਾਣਿ� ਨਹ�� �ਿ�।"
 
-#: ../camel/camel-sasl-gssapi.c:124
+#: ../camel/camel-sasl-gssapi.c:133
 msgid "The provided target_name parameter was ill-formed."
 msgstr "�ਪਲੱਬਧ ਨਿਯਤ ਨਾ� ਪ�ਰਾਮ��ਰ �ਲਤ ਢਾ��� ਵਿੱ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:127
+#: ../camel/camel-sasl-gssapi.c:136
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "�ਪਲੱਬਧ ਨਿਯਤ ਨਾ� ਪ�ਰਾਮ��ਰ �ਲਤ ਹ� �ਾ� ਨਾ ਸਹਾ�� �ਿਸਮ ਦਾ ਨਾ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:131
+#: ../camel/camel-sasl-gssapi.c:140
 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:136
+#: ../camel/camel-sasl-gssapi.c:145
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token ਵਿੱ� �ਲਤ ਦਸਤ�ਤ ਹਨ �ਾ� ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�ਦ� ਹਨ।"
 
-#: ../camel/camel-sasl-gssapi.c:140
+#: ../camel/camel-sasl-gssapi.c:149
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2211,30 +2249,30 @@ msgstr ""
 "�ਪਲੱਬਧ ਪ�ਰਮਾਣ-ਪੱਤਰ ਪ�ਰਸੰ� ਸ਼�ਰ��ਤ ਲ� ਠ�� ਨਹ�� ਹਨ, �ਾ� ਪ�ਰਮਾਣ-ਪੱਤਰ ਸੰਭਾਲ �ਰਤਾ �ਿਸ� �ਾ�� "
 "ਹਵਾਲ� ਲ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:145
+#: ../camel/camel-sasl-gssapi.c:154
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "�ਪਲੱਬਧ �ਰਵਾ�� ਪ�ਰਸੰ� ਸਹ�� ਪ�ਰਸੰ� ਦਾ ਹਵਾਲਾ ਨਹ�� ਦ� ਰਿਹਾ ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:148
+#: ../camel/camel-sasl-gssapi.c:157
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token ਤ� ��ਸਾਰਤਾ �ਾ�� �ਸਫਲ ਰਹ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:151
+#: ../camel/camel-sasl-gssapi.c:160
 msgid "The consistency checks performed on the credential failed."
 msgstr "ਪ�ਰਮਾਣ-ਪੱਤਰ ਦ� ਪ�ਰਮਾਣ�ਿਤਾ �ਾ�� �ਸਫਲ ਰਹ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:154
+#: ../camel/camel-sasl-gssapi.c:163
 msgid "The referenced credentials have expired."
 msgstr "ਹਵਾਲਾ ਪ�ਰਮਾਣ-ਪੱਤਰ ਦ� ਮਿ�ਦ ਸਮਾਪਤ ਹ� ��ੱ�� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:160 ../camel/camel-sasl-gssapi.c:296
-#: ../camel/camel-sasl-gssapi.c:340 ../camel/camel-sasl-gssapi.c:357
-#: ../camel/providers/smtp/camel-smtp-transport.c:1171
+#: ../camel/camel-sasl-gssapi.c:169 ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:353 ../camel/camel-sasl-gssapi.c:370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1249
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ਸਰਵਰ ਤ�� �ਲਤ �ਵਾਬ ਮਿਲਿ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:369
+#: ../camel/camel-sasl-gssapi.c:382
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ਨਾ ਸਹਾ�� ਸ�ਰੱ�ਿ� ਪਰਤ।"
@@ -2247,7 +2285,7 @@ msgstr "ਲਾ��ਨ"
 msgid "This option will connect to the server using a simple password."
 msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਨਾਲ ������।"
 
-#: ../camel/camel-sasl-login.c:94
+#: ../camel/camel-sasl-login.c:95
 #, c-format
 msgid "Unknown authentication state."
 msgstr "�ਣਪ�ਾਤ� ਪ�ਰਮਾਣ�ਿਤਾ ਸਥਿਤ�।"
@@ -2276,19 +2314,17 @@ msgstr "SMTP ਤ�� ਪਹਿਲਾ� POP"
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "�ਹ ��ਣ POP ��ਨ��ਸ਼ਨ ਪ�ਰਮਾਣ�ਿਤਾ ਨ�ੰ SMTP ਤ�� ਪਹਿਲਾ� �ਾ�����"
 
-#: ../camel/camel-sasl-popb4smtp.c:82
+#: ../camel/camel-sasl-popb4smtp.c:83
 msgid "POP Source URI"
 msgstr "POP ਸਰ�ਤ URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:89
+#: ../camel/camel-sasl-popb4smtp.c:90
 #, c-format
-#| msgid "POP Before SMTP auth using an unknown transport"
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "�ੱ� ਨਾ-�ਾਣ� �ਰਾ�ਸਪ�ਰ� ਰਾਹ� POP SMTP ਪਰਮਾਣ�ਿਤਾ ਤ�� ਪਹਿਲਾ�"
 
-#: ../camel/camel-sasl-popb4smtp.c:97
+#: ../camel/camel-sasl-popb4smtp.c:98
 #, c-format
-#| msgid "POP Before SMTP auth using a non-pop source"
 msgid "POP Before SMTP authentication using a non-POP source"
 msgstr "�ੱ� �਼�ਰ-POP ਸਰ�ਤ ਰਾਹ� POP SMTP ਪਰਮਾਣ�ਿਤਾ ਤ�� ਪਹਿਲਾ�"
 
@@ -2297,22 +2333,22 @@ msgstr "�ੱ� �਼�ਰ-POP ਸਰ�ਤ ਰਾਹ� POP SMTP ਪਰਮ
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ਨਿਯਮਿਤ ਸਮ��ਰਨ �ੰਪਾ�ਲ�ਸ਼ਨ �ਸਫਲ: %s: %s"
 
-#: ../camel/camel-service.c:88
+#: ../camel/camel-service.c:89
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' ਨ�ੰ ਯ��਼ਰ ਭਾ� ਲ���ਦਾ ਹ�"
 
-#: ../camel/camel-service.c:92
+#: ../camel/camel-service.c:93
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' ਨ�ੰ ਹ�ਸ� ਭਾ� ਲ���ਦਾ ਹ�"
 
-#: ../camel/camel-service.c:96
+#: ../camel/camel-service.c:97
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' ਨ�ੰ ਰਸਤਾ ਭਾ� ਲ���ਦਾ ਹ�"
 
-#: ../camel/camel-session.c:261
+#: ../camel/camel-session.c:260
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2321,12 +2357,12 @@ msgstr ""
 "ਡਾ�ਰ���ਰ� %s ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ:\n"
 "%s"
 
-#: ../camel/camel-session.c:758
+#: ../camel/camel-session.c:757
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ਹ�ਸ� %3$s ਲ� %2$s ਵਾਸਤ� %1$s ਪਾਸਵਰਡ ਦਿ� ��।"
 
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1048
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' ਲ� ਸਰ��ਫਿ��� ਲੱਭਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�"
@@ -2380,237 +2416,249 @@ msgstr "�ੰ��ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਸ਼ਾਮਿਲ
 msgid "Cannot add CMS Signer information"
 msgstr "CMS ਦਸਤ�ਤ� �ਾਣ�ਾਰ� ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:506
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:507
 msgid "Unverified"
 msgstr "ਨਾ-�ਾ��ਿ�"
 
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:509
 msgid "Good signature"
 msgstr "ਵਧ�� ਦਸਤ�ਤ"
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:511
 msgid "Bad signature"
 msgstr "�ਲਤ ਦਸਤ�ਤ"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:513
 msgid "Content tampered with or altered in transit"
 msgstr "ਤਬਦ�ਲ� ਦ�ਰਾਨ ਪ�ਰਸੰ� ਵਿ�� �ਿ� �ਾ� ਸ���ਤ ��ਤਾ "
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:515
 msgid "Signing certificate not found"
 msgstr "ਦਸਤ�ਤ� ਸਰ��ਫਿ��� ਨਹ�� ਲੱਭਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:517
 msgid "Signing certificate not trusted"
 msgstr "ਦਸਤ�ਤ� ਸਰ��ਫਿ��� ਭਰ�ਸ�ਯ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:519
 msgid "Signature algorithm unknown"
 msgstr "�ਣ�ਾਣਾ ਦਸਤ�ਤ� �ਲ��ਰਿਥਮ"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:521
 msgid "Signature algorithm unsupported"
 msgstr "ਦਸਤ�ਤ� �ਲ��ਰਿੱਥਮ ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:523
 msgid "Malformed signature"
 msgstr "ਨਿ�ਾਰਾ ਦਸਤ�ਤ"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:525
 msgid "Processing error"
 msgstr "ਪ�ਰ�ਸ��ਸਿੰ� �ਲਤ�"
 
-#: ../camel/camel-smime-context.c:566
+#: ../camel/camel-smime-context.c:568
 msgid "No signed data in signature"
 msgstr "ਦਸਤ�ਤ ਵਿੱ� ਡਾ�ਾ ਦਸਤ�ਤ� ਨਹ��"
 
-#: ../camel/camel-smime-context.c:571
+#: ../camel/camel-smime-context.c:573
 msgid "Digests missing from enveloped data"
 msgstr "ਸੰ��ਪ ਲਪ��� ਡਾ�� ਤ�� ਬਿਨਾ� ਹ�"
 
-#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
+#: ../camel/camel-smime-context.c:586 ../camel/camel-smime-context.c:597
 msgid "Cannot calculate digests"
 msgstr "ਸੰ��ਪ ਨ�ੰ ਮਿਣਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:604 ../camel/camel-smime-context.c:608
 msgid "Cannot set message digests"
 msgstr "ਸ�ਨ�ਹਾ ਸੰ��ਪ ਨ�ੰ ਨਿਰਧਾਰਿਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
+#: ../camel/camel-smime-context.c:618 ../camel/camel-smime-context.c:623
 msgid "Certificate import failed"
 msgstr "ਸਰ��ਫਿ��� �ਯਾਤ �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:631
+#: ../camel/camel-smime-context.c:633
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ਸ�ਨ�ਹਾ ਹ� ਸਰ��ਫਿ��� ਹ�, ਸਰ��ਫਿ��� �ਾ��� ਨਹ�� ਹਨ"
 
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:636
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "ਸਰ��ਫਿ��� ਸਿਰ� ਸ�ਨ�ਹਾ, ਸਰ��ਫਿ��� �ਯਾਤ �ਤ� �ਾ�� ਹ� ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:640
 msgid "Cannot find signature digests"
 msgstr "ਦਸਤ�ਤ� ਸੰ��ਪ ਨਹ�� ਲੱਭਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:654
+#: ../camel/camel-smime-context.c:656
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ਦਸਤ�ਤ�: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
 msgid "Cannot create encoder context"
 msgstr "���ਡਰ ਪ�ਰਸੰ� ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:838
+#: ../camel/camel-smime-context.c:841
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS ���ਡਰ ਵਿੱ� ਡਾ�ਾ ਸ਼ਾਮਿਲ �ਰਨ ਤ�� �ਸਮਰੱਥ"
 
-#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
 msgid "Failed to encode data"
 msgstr "ਡਾ�ਾ ���ਡਿ� �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
+#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
 msgid "Decoder failed"
 msgstr "ਡ���ਡਰ �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:1049
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "�ਮ ਬਲ� ���ਰਿਪਸ਼ਨ �ਲ��ਰਿਥਮ ਨ�ੰ ਲੱਭਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:1057
+#: ../camel/camel-smime-context.c:1064
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "���ਰਿਪਸ਼ਨ ਬਲ� �� ਲ� �ਾਰ� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:1068
+#: ../camel/camel-smime-context.c:1075
 msgid "Cannot create CMS Message"
 msgstr "CMS ਸ�ਨ�ਹਾ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:1074
+#: ../camel/camel-smime-context.c:1081
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS ਲਿਫਾਫਾ ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:1080
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS ਲਿਫਾਫਾ ਡਾ�ਾ ਨੱਥ� ਨਹ�� ਹ� ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:1086
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot attach CMS data object"
 msgstr "CMS ਡਾ�ਾ ��ਾ� ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS ਸ�ਨ�ਹ� �ਾਣ�ਾਰ� ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:1100
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS ਸ�ਨ�ਹ� �ਾਣ�ਾਰ� ਸ਼ਾਮਲ ਨਹ�� ��ਤ� �ਾ ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:1125
+#: ../camel/camel-smime-context.c:1132
 msgid "Failed to add data to encoder"
 msgstr "ਡਾ�ਾ ਨ�ੰ ���ਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:1227
+#: ../camel/camel-smime-context.c:1240
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: ��� ���ਰਿਪ�ਡ ਪ�ਰਸੰ� ਨਹ�� ਲੱਭਾ ਹ�"
 
-#: ../camel/camel-store.c:444
+#: ../camel/camel-store.c:2184
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ਫ�ਲਡਰ '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: ਫ�ਲਡਰ ਮ���ਦ ਹ�"
 
-#: ../camel/camel-store.c:543
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:2375 ../camel/camel-vtrash-folder.c:48
+msgid "Trash"
+msgstr "ਰੱਦ�"
+
+#. the name of the Junk folder, used for spam messages
+#: ../camel/camel-store.c:2378 ../camel/camel-vtrash-folder.c:50
+msgid "Junk"
+msgstr "�ੰ�"
+
+#: ../camel/camel-store.c:2811
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ %s: ਮ���ਦ ਹ�"
 
-#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
-#: ../camel/providers/local/camel-maildir-store.c:224
+#: ../camel/camel-store.c:2938 ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ਫ�ਲਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: �ਲਤ �ਾਰਵਾ�"
 
-#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
-#: ../camel/providers/local/camel-maildir-store.c:314
+#: ../camel/camel-store.c:3079 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:662
 #, 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:1128 ../camel/camel-vtrash-folder.c:48
-msgid "Trash"
-msgstr "ਰੱਦ�"
+#: ../camel/camel-tcp-stream-raw.c:747 ../camel/camel-tcp-stream-raw.c:758
+#, c-format
+#| msgid "The proxy host does not support SOCKS5"
+msgid "The proxy host does not support SOCKS4"
+msgstr "ਪਰਾ�ਸ� ਹ�ਸ� SOCKS4 ਲ� ਸਹਾ�� ਨਹ��"
 
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:1131 ../camel/camel-vtrash-folder.c:50
-msgid "Junk"
-msgstr "�ੰ�"
+#: ../camel/camel-tcp-stream-raw.c:769
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr "ਪਰਾ�ਸ� ਹ�ਸ� ਨ� ਸਾਡ� ਮੰ� ਨ�ੰ �ਨ�ਾਰਿ�: ��ਡ %d"
 
-#: ../camel/camel-tcp-stream-raw.c:809
+#: ../camel/camel-tcp-stream-raw.c:865 ../camel/camel-tcp-stream-raw.c:871
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ਪਰਾ�ਸ� ਹ�ਸ� SOCKS5 ਲ� ਸਹਾ�� ਨਹ��"
 
-#: ../camel/camel-tcp-stream-raw.c:815
+#: ../camel/camel-tcp-stream-raw.c:877
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "ਢ�ੱ�ਵ� ਪਰਮਾਣ�ਿਤਾ �ਿਸਮ ਨਹ�� ਲੱਭ� �ਾ ਸ��: code 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:827
+#: ../camel/camel-tcp-stream-raw.c:889
 msgid "General SOCKS server failure"
 msgstr "�ਮ SOCKS ਸਰਵਰ ਫ�ਲ�ਹ ਹ�"
 
-#: ../camel/camel-tcp-stream-raw.c:828
+#: ../camel/camel-tcp-stream-raw.c:890
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS ਸਰਵਰ ਦ� ਨਿਯਮ ��ਨ��ਸ਼ਨ ਮਨ�਼�ਰ ਨਹ�� �ਰਦ�"
 
-#: ../camel/camel-tcp-stream-raw.c:829
+#: ../camel/camel-tcp-stream-raw.c:891
 msgid "Network is unreachable from SOCKS server"
 msgstr "ਨ�ੱ�ਵਰ� SOCKS ਸਰਵਰ ਤ�� ਪਹ�ੰ�ਯ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-tcp-stream-raw.c:830
+#: ../camel/camel-tcp-stream-raw.c:892
 msgid "Host is unreachable from SOCKS server"
 msgstr "ਹ�ਸ� SOCKS ਸਰਵਰ ਤ�� ਪਹ�ੰ�ਯ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-tcp-stream-raw.c:831
+#: ../camel/camel-tcp-stream-raw.c:893
 msgid "Connection refused"
 msgstr "��ਨ��ਸ਼ਨ ਤ�� �ਨ�ਾਰ ��ਤਾ।"
 
-#: ../camel/camel-tcp-stream-raw.c:832
+#: ../camel/camel-tcp-stream-raw.c:894
 msgid "Time-to-live expired"
 msgstr "�ਾ�ਮ-��-ਲਿਵ �ਤਮ"
 
-#: ../camel/camel-tcp-stream-raw.c:833
+#: ../camel/camel-tcp-stream-raw.c:895
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKS ਸਰਵਰ ਵਲ�� �ਮਾ�ਡ ਸਹਾ�� ਨਹ��"
 
-#: ../camel/camel-tcp-stream-raw.c:834
+#: ../camel/camel-tcp-stream-raw.c:896
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS ਸਰਵਰ ਵਲ�� �ਡਰ�ੱਸ �ਿਸਮ ਸਹਾ�� ਨਹ��"
 
-#: ../camel/camel-tcp-stream-raw.c:835
+#: ../camel/camel-tcp-stream-raw.c:897
 msgid "Unknown error from SOCKS server"
 msgstr "SOCKS ਸਰਵਰ ਤ�� �ਣ�ਾਣ �ਲਤ�"
 
-#: ../camel/camel-tcp-stream-raw.c:865
+#: ../camel/camel-tcp-stream-raw.c:930
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "SOCKS ਸਰਵਰ ਤ�� �ਣ�ਾਣ �ਡਰ�ਸ �ਿਸਮ ਮਿਲ�"
 
-#: ../camel/camel-tcp-stream-raw.c:882
+#: ../camel/camel-tcp-stream-raw.c:948
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "SOCKS ਸਰਵਰ ਤ�� �ਧ�ਰਾ �ਵਾਬ"
 
-#: ../camel/camel-tcp-stream-raw.c:897
+#: ../camel/camel-tcp-stream-raw.c:968
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ਹ�ਸ�-ਨਾ� ਬਹ�ਤ ਲੰਮਾ ਹ� (ਵੱਧ�-ਵੱਧ ੨੫੫ �ੱ�ਰ)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:929 ../camel/camel-tcp-stream-raw.c:939
+#: ../camel/camel-tcp-stream-raw.c:1000 ../camel/camel-tcp-stream-raw.c:1010
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "ਪਰਾ�ਸ� ਸਰਵਰ ਤ�� �ਲਤ �ਵਾਬ"
@@ -2693,36 +2741,36 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "URL '%s' ਨ�ੰ ਪਾਰਸ ਨਹ� ��ਤਾ �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-vee-folder.c:1044
+#: ../camel/camel-vee-folder.c:1251 ../camel/camel-vee-folder.c:1414
 #, c-format
-msgid "Error storing '%s': "
-msgstr "'%s' ਸ��ਰ �ਰਨ ਦ�ਰਾਨ �ਲਤ�: "
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "ਫਰ�� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨਹਿ�� ਨ�ੰ �ਾਪ� �ਾ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-vee-folder.c:1117
+#: ../camel/camel-vee-folder.c:1287
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%2$s ਵਿੱ� %1$s ਤਰ�ਹਾ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
 
-#: ../camel/camel-vee-folder.c:1133 ../camel/camel-vee-folder.c:1148
+#: ../camel/camel-vee-folder.c:1355
 #, c-format
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "ਫਰ�� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨਹਿ�� ਨ�ੰ �ਾਪ� �ਾ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+msgid "Error storing '%s': "
+msgstr "'%s' ਸ��ਰ �ਰਨ ਦ�ਰਾਨ �ਲਤ�: "
 
 #: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
-#: ../camel/camel-vee-store.c:417
+#: ../camel/camel-vee-store.c:322
 msgid "Unmatched"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../camel/camel-vee-store.c:223
-#, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "ਫ�ਲਡਰ ਦਾ ਨਾ� ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: �ਸ ਤਰਾ� ��� ਫ�ਲਡਰ ਨਹ�� ਹ�"
-
-#: ../camel/camel-vee-store.c:289
+#: ../camel/camel-vee-store.c:393
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: �ਸਤਰਾ� ਦਾ ��� ਫ�ਲਡਰ ਨਹ�� ਹ�"
 
+#: ../camel/camel-vee-store.c:427
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "ਫ�ਲਡਰ ਦਾ ਨਾ� ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: �ਸ ਤਰਾ� ��� ਫ�ਲਡਰ ਨਹ�� ਹ�"
+
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਰੱਦ� ਵਿੱ� �ਾਪ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
@@ -2731,92 +2779,91 @@ msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਰੱਦ� ਵਿੱ� �ਾਪ� ਨ
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ਸ�ਨ�ਹ� ਨ�ੰ �ੰ� ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
-#: ../camel/providers/local/camel-maildir-folder.c:233
-#: ../camel/providers/local/camel-maildir-folder.c:268
-#: ../camel/providers/local/camel-maildir-folder.c:380
-#: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/local/camel-mh-folder.c:215
-msgid "No such message"
-msgstr "�ੰ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ��"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
-#: ../camel/providers/nntp/camel-nntp-folder.c:244
-#: ../camel/providers/nntp/camel-nntp-folder.c:337
-#: ../camel/providers/pop3/camel-pop3-folder.c:714
-#, c-format
-msgid "Cannot get message %s: "
-msgstr "%s ਸ�ਨ�ਹਾ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ: "
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2645
-#, c-format
-msgid "This message is not available in offline mode."
-msgstr "�ਹ ਸ�ਨ�ਹਾ �ਫਲਾ�ਨ ਵਿੱ� �ਪਲੱਬਧ ਨਹ�� ਹ�।"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:203
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2109
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2163
-#, c-format
-msgid "Could not get message"
-msgstr "����� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1038
-#: ../camel/providers/imap/camel-imap-folder.c:376
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:959
+#: ../camel/providers/imap/camel-imap-folder.c:390
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ਲ� ਸੰ��ਪ ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1112
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1035
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "ਹ�ਾ� �� ਸ�ਨ�ਹ� %s ਲ� ��� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1637
-#: ../camel/providers/groupwise/camel-groupwise-store.c:654
-#: ../camel/providers/groupwise/camel-groupwise-store.c:779
-#: ../camel/providers/imap/camel-imap-folder.c:3814
-#: ../camel/providers/imap/camel-imap-folder.c:3892
-#: ../camel/providers/imapx/camel-imapx-server.c:3719
-#: ../camel/providers/imapx/camel-imapx-server.c:3844
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1520
+#: ../camel/providers/groupwise/camel-groupwise-store.c:672
+#: ../camel/providers/groupwise/camel-groupwise-store.c:803
+#: ../camel/providers/imap/camel-imap-folder.c:3919
+#: ../camel/providers/imap/camel-imap-folder.c:4001
+#: ../camel/providers/imapx/camel-imapx-server.c:3889
+#: ../camel/providers/imapx/camel-imapx-server.c:4020
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s ਵਿੱ� ਨਵ�� ਸ�ਨਹਿ�� ਲ� ਸੰ��ਪ �ਾਣ�ਾਰ� ਲ� �ਾ ਰਹ� ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2475
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2525
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1992
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2046
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2710
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2720
+#, c-format
+msgid "Could not get message"
+msgstr "����� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2430
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2480
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਲ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦਾ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2511
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2466
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ਸ�ਨ�ਹਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2646
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s\n"
+"  %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2646
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:307
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "�ੰ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ��"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2665
+#: ../camel/providers/nntp/camel-nntp-folder.c:251
+#: ../camel/providers/nntp/camel-nntp-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:455
+#, c-format
+msgid "Cannot get message %s: "
+msgstr "%s ਸ�ਨ�ਹਾ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ: "
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2683
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2693
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2897
+#, c-format
+msgid "This message is not available in offline mode."
+msgstr "�ਹ ਸ�ਨ�ਹਾ �ਫਲਾ�ਨ ਵਿੱ� �ਪਲੱਬਧ ਨਹ�� ਹ�।"
+
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "ਫ�ਲਡਰ ਬ�ਸਾ %s ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
 #, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "�ਫਲਾ�ਨ ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: ����� �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
 msgid "Cannot append message in offline mode: "
 msgstr "�ਫਲਾ�ਨ ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: "
 
@@ -2826,13 +2873,13 @@ msgstr "ਨਵ�� ਮ�ਲ ਲ� ��ੱ� ��ਤ� �ਾ ਰਿਹ
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:50
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "C_heck for new messages in all folders"
 msgstr "ਸਭ ਫ�ਲਡਰਾ� ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� �ਾ��(_h)"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:53
 #: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:73
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
 #: ../camel/providers/local/camel-local-provider.c:42
 #: ../camel/providers/local/camel-local-provider.c:82
 #: ../camel/providers/local/camel-local-provider.c:102
@@ -2849,7 +2896,7 @@ msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ੰ� ਸਮੱ�
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:59
 #: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "��ਣ-ਬ�ਸਾ ਫ�ਲਡਰ ਵਿੱ� �ੰ� ਸ�ਨ�ਹਿ�� ਲ� ��ੱ� �ਰ�(_B)"
 
@@ -2875,9 +2922,9 @@ msgstr "Novell GroupWise ਸਰਵਰ ਵਰਤਣ ਲ�"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:98
 #: ../camel/providers/imap/camel-imap-provider.c:97
-#: ../camel/providers/imapx/camel-imapx-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:104
 #: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:70
+#: ../camel/providers/pop3/camel-pop3-provider.c:73
 msgid "Password"
 msgstr "ਪਾਸਵਰਡ"
 
@@ -2890,75 +2937,75 @@ msgstr "�ਸ ��ਣ ਨਾਲ GroupWise ਸਰਵਰ ਨਾਲ �ੱ� 
 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:1188
-#: ../camel/providers/imapx/camel-imapx-server.c:2972
+#: ../camel/providers/groupwise/camel-groupwise-store.c:209
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3100
 #, c-format
 msgid "You did not enter a password."
 msgstr "ਤ�ਸ�� ਪਾਸਵਰਡ ਨਹ�� ਭਰਿ� ਹ�।"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:328
+#: ../camel/providers/groupwise/camel-groupwise-store.c:332
 msgid "Some features may not work correctly with your current server version"
 msgstr "ਤ�ਹਾਡ� ਸਰਵਰ ਦ� ਮ���ਦਾ ਵਰ�ਨ ਨਾਲ ��� ��ਣ ਠ�� ਤਰਾ� �ੰਮ ਨਹ�� �ਰ ਸ�ਦ� ਹਨ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:550
-#: ../camel/providers/imap/camel-imap-store.c:1757
-#: ../camel/providers/imap/camel-imap-store.c:1952
-#: ../camel/providers/imapx/camel-imapx-store.c:410
+#: ../camel/providers/groupwise/camel-groupwise-store.c:563
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:342
 #, c-format
 msgid "No such folder %s"
 msgstr "ਫ�ਲਡਰ %s ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1224
 #, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� GroupWise ਫ�ਲਡਰ ਬਣਾ�ਣ� ਸੰਭਵ ਨਹ�� ਹਨ।"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
 #, c-format
 msgid "Cannot create a special system folder"
 msgstr "�ਾਸ ਸਿਸ�ਮ ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
-#: ../camel/providers/imap/camel-imap-store.c:1835
-#: ../camel/providers/imap/camel-imap-store.c:2257
-#: ../camel/providers/imapx/camel-imapx-store.c:873
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1243
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1341
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "ਮ�ੱਢਲ� ਫ�ਲਡਰ ਵਿੱ� ਸਬ-ਫ�ਲਡਰ ਸਵ��ਾਰ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1328
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1353
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "GroupWise ਫ�ਲਡਰ '%s' ਦਾ ਨਾ�-ਤਬਦ�ਲ '%s' ਲ� ��ਤਾ �ਾ ਸ�ਦਾ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1387
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise ਸਰਵਰ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1389
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "�ਰ�ੱਪਵਾ��਼ ਸ�ਵਾ %s ਲ� %s �ੱਤ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "%s ਨਾਲ �ਰ�ੱਪਵਾ�� ਪੱਤਰ"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
 msgid "Sending Message"
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
 #, c-format
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "ਫ�ਲਡਰ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਸ ਸੰਭਾਲ ਤ� �ਲਤ �ਾਰਵਾ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
 #, c-format
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
@@ -2968,36 +3015,36 @@ msgstr ""
 "ਤ�ਸ�� �ਹ ��ਾ��� ਦ� ਸੰਭਾਲਣ ਸਮੱਰਥਾ ਤ�� ਵੱਧ �� ਹ�। ਤ�ਹਾਡਾ ਸ�ਨ�ਹਾ ਤ�ਹਾਡ� ���-ਬ�ਸ� '� ਪਿ� ਹ�। �ਪਣ� "
 "��� ਪੱਤਰ ਹ�ਾ ��/��ਾ�ਵ ਬਣਾ �� ਭ���/ਲਵ� ਬ�ਨ ਦੱਬ �� ਮ�� ਭ���।\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
 #, c-format
 msgid "Could not send message: %s"
 msgstr "ਸ�ਨ�ਹਾ ਨਹ�� ਭ��ਿ� �ਾ ਸ�ਦਾ : %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:190
-#: ../camel/providers/imap/camel-imap-command.c:288
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
 #, c-format
 msgid "No output stream"
 msgstr "��� ���ਪ�ੱ� ਸ�ਰ�ਮ"
 
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:296
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
 #, c-format
 msgid "No input stream"
 msgstr "�ੰਪ�ੱ� ਸ�ਰ�ਮ ਨਹ��"
 
-#: ../camel/providers/imap/camel-imap-command.c:245
+#: ../camel/providers/imap/camel-imap-command.c:255
 #, c-format
 msgid "Operation cancelled"
 msgstr "�ਾਰਵਾ� �ਸਫਲ"
 
-#: ../camel/providers/imap/camel-imap-command.c:353
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ਸਰਵਰ �ਸਧਾਰਨ ਤ�ਰ ਤ� ਵੱ� ਹ� �ਿ�: %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:373
+#: ../camel/providers/imap/camel-imap-command.c:394
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3006,79 +3053,79 @@ msgstr ""
 "IMAP ਸਰਵਰ %s %s ਵਲ�� ��ਤਾਵਨ�:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:444
+#: ../camel/providers/imap/camel-imap-command.c:468
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ਸਰਵਰ ਵਲ�� �ਸਧਾਰਨ �ਵਾਬ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:456
+#: ../camel/providers/imap/camel-imap-command.c:480
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP �ਮਾ�ਡ �ਸਫਲ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:532
+#: ../camel/providers/imap/camel-imap-command.c:560
 #, c-format
 msgid "Server response ended too soon."
 msgstr "ਸਰਵਰ ਦਾ �ਵਾਬ ਬ�� ��ਤ� ਸਮਾਪਤ ਹ� �ਿ� ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-command.c:740
+#: ../camel/providers/imap/camel-imap-command.c:771
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ਸਰਵਰ ਦ� �ਵਾਬ ਵਿੱ� %s �ਾਣ�ਾਰ� ਨਹ�� ਸ�"
 
-#: ../camel/providers/imap/camel-imap-command.c:778
+#: ../camel/providers/imap/camel-imap-command.c:809
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ਸਰਵਰ ਤ�� �ਸਧਾਰਨ ਸਭ ਠ�� ਹ�� �ਵਾਬ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:281
+#: ../camel/providers/imap/camel-imap-folder.c:291
 msgid "Always check for new mail in this folder"
 msgstr "�ਸ ਫ�ਲਡਰ ਵਿੱ� ਹਮ�ਸ਼ਾ ਨਵ�� �ਿੱਠ� ਵ���"
 
-#: ../camel/providers/imap/camel-imap-folder.c:353
+#: ../camel/providers/imap/camel-imap-folder.c:367
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ਡਾ�ਰ���ਰ� %s ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:960
-#: ../camel/providers/imapx/camel-imapx-server.c:3759
+#: ../camel/providers/imap/camel-imap-folder.c:990
+#: ../camel/providers/imapx/camel-imapx-server.c:3933
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s ਵਿੱ� ਤਬਦ�ਲ ਸ�ਨ�ਹਿ�� ਦ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3231
+#: ../camel/providers/imap/camel-imap-folder.c:3326
 msgid "Unable to retrieve message: "
 msgstr "ਸ�ਨ�ਹਾ ਲ�ਣ ਲ� �ਸਮਰੱਥ: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3266
-#: ../camel/providers/imapx/camel-imapx-server.c:4935
+#: ../camel/providers/imap/camel-imap-folder.c:3361
+#: ../camel/providers/imapx/camel-imapx-server.c:5217
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ਸ�ਨ�ਹਾ ID %s ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3267
-#: ../camel/providers/imapx/camel-imapx-server.c:4936
+#: ../camel/providers/imap/camel-imap-folder.c:3362
+#: ../camel/providers/imapx/camel-imapx-server.c:5218
 msgid "No such message available."
 msgstr "�ੰ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3341
-#: ../camel/providers/imap/camel-imap-folder.c:4211
-#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#: ../camel/providers/imap/camel-imap-folder.c:3437
+#: ../camel/providers/imap/camel-imap-folder.c:4332
+#: ../camel/providers/nntp/camel-nntp-folder.c:407
 #, c-format
 msgid "This message is not currently available"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਮ��� ਤ� �ਪਲੱਬਧ ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4021
+#: ../camel/providers/imap/camel-imap-folder.c:4133
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ਸਰਵਰ ਤ�� �ਧ�ਰਾ �ਵਾਬ: ਸ�ਨ�ਹਾ %d ਲ� ��� �ਾਣ�ਾਰ� �ਪਲੱਬਧ ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4031
+#: ../camel/providers/imap/camel-imap-folder.c:4143
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "�ਧ�ਰਾ ਸਰਵਰ �ਵਾਬ: ਸ�ਨ�ਹ� %d ਲ� ��� UID �ਪਲੱਬਧ ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4251
+#: ../camel/providers/imap/camel-imap-folder.c:4372
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH �ਵਾਬ ਵਿੱ� ਸ�ਨ�ਹਾ ਭਾ� ਨਹ�� ਮਿਲਿ�।"
@@ -3093,33 +3140,33 @@ msgstr "��ਸ਼ ਡਾ�ਰ���ਰ� ��ਲ�ਹ� ਨਹ��
 msgid "Failed to cache message %s: %s"
 msgstr "ਸ�ਨ�ਹਾ %s ��ਸ ਲ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:388
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
 #, c-format
 msgid "Failed to cache message %s: "
 msgstr "ਸ�ਨ�ਹਾ %s ��ਸ਼ �ਰਨ ਲ� ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:525
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
 #, c-format
 msgid "Failed to cache %s: "
 msgstr "��ਸ %s ਲ� �ਸਫਲ: "
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:41
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "Checking for New Mail"
 msgstr "ਨਵ�� ਮ�ਲ ਲ� ��ੱ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ਮ��ਬਰ ਬਣਾ� ਫ�ਲਡਰਾ� ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹ� ��ੱ� �ਰ�(_e)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
 msgid "Connection to Server"
 msgstr "ਸਰਵਰ ਨਾਲ ��ਨ��� �ਰ�"
 
 #: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "_Use custom command to connect to server"
 msgstr "ਸਰਵਰ ਨਾਲ ���ਨ ਲ� ਪਸੰਦ�ਦਾ �ਮਾ�ਡ ਵਰਤ��(_U)"
 
@@ -3128,18 +3175,18 @@ msgid "Co_mmand:"
 msgstr "�ਮਾ�ਡ(_m):"
 
 #: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
 #: ../camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "ਫ�ਲਡਰ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
 msgid "_Show only subscribed folders"
 msgstr "ਮ��ਬਰ� ਫ�ਲਡਰ ਹ� ਵ���(_S)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "O_verride server-supplied folder namespace"
 msgstr "ਸਰਵਰ-ਰਾਹ�� �ਪਲੱਬਧ ਫ�ਲਡਰ ਨਾ�-ਥਾ� �ੱਪਰ(_v)"
 
@@ -3148,17 +3195,17 @@ msgid "Names_pace:"
 msgstr "ਨ�ਮ-ਸਪ�ਸ(_p):"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "�ਸ ਸਰਵਰ �ੱਤ� �ਨ-ਬਾ�ਸ(INBOX) ਵਿੱ� ਨਵ�� ਸ�ਨਹਿ�� �ੱਤ� ਫਿਲ�ਰ ਲ�ਾ�(_A)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:77
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ੰ� ਸਮੱ�ਰ� ਲ� ��ੱ� �ਰ�(_K)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ਰਿਮ�� ਮ�ਲ ਲ��ਲ� ���ਮ��ਿ� ਹ� ਸਿ�ਰਾਨਾ��਼ �ਰ�(_z)"
 
@@ -3167,115 +3214,89 @@ msgid "IMAP"
 msgstr "IMAP"
 
 #: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:91
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP ਸਰਵਰਾ� �ੱਤ� ਮ�ਲ ਪ�ਨ �ਤ� ਸੰਭਾਲਣ ਲ�"
 
 #: ../camel/providers/imap/camel-imap-provider.c:99
-#: ../camel/providers/imapx/camel-imapx-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "�ਹ ��ਣ IMAP ਸਰਵਰ ਨਾਲ ਪਲ�ਨ-���ਸ� ਪਾਸਵਰਡ ਨਾਲ ਸ਼ਾਮਿਲ �ਰਨ ਲ� ਸਹਾ�� ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-store.c:310
-#: ../camel/providers/imapx/camel-imapx-store.c:220
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP ਸਰਵਰ %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:312
-#: ../camel/providers/imapx/camel-imapx-store.c:222
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP ਸਰਵਿਸ %2$s �ੱਤ� %1$s ਲ�"
-
-#: ../camel/providers/imap/camel-imap-store.c:447
-#: ../camel/providers/nntp/camel-nntp-store.c:234
-#: ../camel/providers/pop3/camel-pop3-store.c:132
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/imap/camel-imap-store.c:243
+#: ../camel/providers/nntp/camel-nntp-store.c:313
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "%s ਨਾਲ ��� ਨਹ�� ਸ�ਦਾ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:448
-#: ../camel/providers/nntp/camel-nntp-store.c:235
-#: ../camel/providers/pop3/camel-pop3-store.c:133
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/imap/camel-imap-store.c:244
+#: ../camel/providers/nntp/camel-nntp-store.c:314
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "SSL unavailable"
 msgstr "SSL �ਪਲੱਬਧ ਨਹ� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:466
-#: ../camel/providers/nntp/camel-nntp-store.c:252
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:333
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "%s ਨਾਲ ��ਨ��� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: "
 
-#: ../camel/providers/imap/camel-imap-store.c:572
-#: ../camel/providers/imap/camel-imap-store.c:592
-#: ../camel/providers/imap/camel-imap-store.c:599
-#: ../camel/providers/imap/camel-imap-store.c:626
-#: ../camel/providers/imapx/camel-imapx-server.c:2825
-#: ../camel/providers/imapx/camel-imapx-server.c:2861
+#: ../camel/providers/imap/camel-imap-store.c:370
+#: ../camel/providers/imap/camel-imap-store.c:390
+#: ../camel/providers/imap/camel-imap-store.c:397
+#: ../camel/providers/imap/camel-imap-store.c:424
+#: ../camel/providers/imapx/camel-imapx-server.c:2942
+#: ../camel/providers/imapx/camel-imapx-server.c:2982
 #, 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:573
-#: ../camel/providers/imapx/camel-imapx-server.c:2826
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2943
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "STARTTLS not supported"
 msgstr "ਪ�ਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:593
-#: ../camel/providers/imapx/camel-imapx-server.c:2862
+#: ../camel/providers/imap/camel-imap-store.c:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2983
 msgid "SSL negotiations failed"
 msgstr "SSL �ੱਲਬਾਤ �ਸਫਲ"
 
-#: ../camel/providers/imap/camel-imap-store.c:600
-#: ../camel/providers/smtp/camel-smtp-transport.c:339
+#: ../camel/providers/imap/camel-imap-store.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
 msgid "SSL is not available in this build"
 msgstr "�ਸ ਨਿਰਮਾਣ ਵਿੱ� SSL �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/imap/camel-imap-store.c:748
-#: ../camel/providers/imapx/camel-imapx-server.c:2662
+#: ../camel/providers/imap/camel-imap-store.c:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2770
 #, c-format
 msgid "Connection cancelled"
 msgstr "��ਨ��ਸ਼ਨ ਰੱਦ ��ਤਾ"
 
-#: ../camel/providers/imap/camel-imap-store.c:753
-#: ../camel/providers/imapx/camel-imapx-server.c:2667
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2775
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "�ਮਾ�ਡ \"%s\" ਨਾਲ ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:926
-#: ../camel/providers/imap/camel-imap-store.c:2350
-#: ../camel/providers/imapx/camel-imapx-store.c:457
-#: ../camel/providers/imapx/camel-imapx-store.c:1054
-#: ../camel/providers/local/camel-maildir-folder.c:90
-#: ../camel/providers/local/camel-maildir-store.c:225
-#: ../camel/providers/local/camel-maildir-store.c:315
-#: ../camel/providers/local/camel-maildir-store.c:562
-#: ../camel/providers/local/camel-maildir-store.c:575
-#: ../camel/providers/local/camel-spool-store.c:508
-msgid "Inbox"
-msgstr "��ਣ-ਬ�ਸਾ"
-
-#: ../camel/providers/imap/camel-imap-store.c:1129
-#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3056
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ਸਰਵਰ %s ਲ���ਦ� ਪ�ਰਮਾਣਿਤ �ਿਸਮ %s ਲ� ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:1141
-#: ../camel/providers/imapx/camel-imapx-server.c:2940
-#: ../camel/providers/smtp/camel-smtp-transport.c:462
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3068
+#: ../camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� %s ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:1220
-#: ../camel/providers/imapx/camel-imapx-server.c:3010
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3144
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3286,134 +3307,160 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1771
-#: ../camel/providers/imap/camel-imap-store.c:2193
-#: ../camel/providers/imapx/camel-imapx-store.c:852
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:183
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP ਸਰਵਰ %s"
+
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:185
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP ਸਰਵਿਸ %2$s �ੱਤ� %1$s ਲ�"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:372
+#: ../camel/providers/imapx/camel-imapx-store.c:794
+#: ../camel/providers/local/camel-maildir-folder.c:409
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:609
+#: ../camel/providers/local/camel-maildir-store.c:615
+#: ../camel/providers/local/camel-maildir-store.c:663
+#: ../camel/providers/local/camel-spool-store.c:289
+msgid "Inbox"
+msgstr "��ਣ-ਬ�ਸਾ"
+
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1320
 #, c-format
 msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "ਫ�ਲਡਰ ਨਾ� \"%s\" �ਾ�� ਨਹ�� ਹ�, �ਿ��ਿ �ਸ ਵਿੱ� \"%c\" �ੱ�ਰ ਸ਼ਾਮਿਲ ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-store.c:1887
-#: ../camel/providers/local/camel-maildir-store.c:189
-#: ../camel/providers/local/camel-mbox-store.c:193
-#: ../camel/providers/local/camel-mh-store.c:255
+#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:413
+#: ../camel/providers/local/camel-mh-store.c:504
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ਫ�ਲਡਰ '%s' ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�: ਫ�ਲਡਰ ਮ���ਦ ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-store.c:2206
-#: ../camel/providers/imapx/camel-imapx-store.c:863
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1331
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "�ਣ�ਾਣਾ ਮ�ੱਢਲਾ ਫ�ਲਡਰ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3062
+#: ../camel/providers/imap/camel-imap-store.c:3137
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ਸਰਵਰ ��ਾਨ� ਡਿਸ-��ਨ��� ਹ� �ਿ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:3065
+#: ../camel/providers/imap/camel-imap-store.c:3140
 msgid "Server unexpectedly disconnected: "
 msgstr "ਸਰਵਰ �ਸਧਾਰਨ ਤ�ਰ ਤ� ਡਿਸ-��ਨ��� ਹ� �ਿ�: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:75
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "%s ਲ� ਫ�ਲਡਰ ਸੰ��ਪ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:83
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "%s ਲ� ��ਸ਼ ਨਹ�� ਬਣਾ� �ਾ ਸ��: "
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:43
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Use _Quick Resync if the server supports it"
 msgstr "ਤ�ਰੰਤ ਸਿੰ�, �� ਸਰਵਰ �ਸ ਲ� ਸਹਾ�� ਹ�(_Q)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:45
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Use I_dle if the server supports it"
 msgstr "ਵ�ਹਲਾ ਵਰਤ��, �� ਸਰਵਰ �ਸ ਲ� ਸਹਾ�� ਹ�(_d)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "Command:"
 msgstr "�ਮਾ�ਡ:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
 msgid "Numbe_r of cached connections to use"
 msgstr "ਵਰਤਣ ਲ� ��ਸ਼ ��ਤ� �� ��ਨ��ਸ਼ਨ ਦ� �ਿਣਤ�(_r)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Namespace:"
 msgstr "ਨ�ਮ-ਸਪ�ਸ:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1365
+#: ../camel/providers/imapx/camel-imapx-server.c:1410
 msgid "Error writing to cache stream: "
 msgstr "��ਸ ਸ�ਰ�ਮ ਲਿ�ਣ ਲ� �ਲਤ�: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2019
+#: ../camel/providers/imapx/camel-imapx-server.c:2092
 #, c-format
 msgid "Not authenticated"
 msgstr "ਪਰਮਾਣਿਤ ਨਹ�� ਹ�"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2753
+#: ../camel/providers/imapx/camel-imapx-server.c:2865
 #, c-format
 msgid "Could not connect to %s (port %s): "
 msgstr "%s (ਪ�ਰ� %s) ਨਾਲ ��ਨ��� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3182
+#: ../camel/providers/imapx/camel-imapx-server.c:3329
 msgid "Closing tmp stream failed: "
 msgstr "�ਰ�਼� ਸ�ਰ�ਮ ਬੰਦ �ਰਨ ਲ� ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5059
+#: ../camel/providers/imapx/camel-imapx-server.c:5365
 #, c-format
 msgid "Cannot create spool file: %s"
 msgstr "ਸਪ�ਲ ਫਾ�ਲ ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5074
+#: ../camel/providers/imapx/camel-imapx-server.c:5381
 msgid "Cannot create spool file: "
 msgstr "ਸਪ�ਲ ਫਾ�ਲ ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:426
-#: ../camel/providers/nntp/camel-nntp-store.c:1510
+#: ../camel/providers/imapx/camel-imapx-store.c:1136
+#: ../camel/providers/nntp/camel-nntp-store.c:1610
 #, c-format
 msgid "No such folder: %s"
 msgstr "�ਹ ��� ਫ�ਲਡਰ ਨਹ�� ਹ�: %s"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:71
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
 msgid "Source stream returned no data"
 msgstr "ਸਰ�ਤ ਸ�ਰ�ਮ ਨ� ��� ਡਾ�ਾ ਨਹ�� ਦਿੱਤਾ"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:80
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
 msgid "Source stream unavailable"
 msgstr "ਸਰ�ਤ ਸ�ਰ�ਮ �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/local/camel-local-folder.c:199
+#: ../camel/providers/local/camel-local-folder.c:182
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:209
-#: ../camel/providers/local/camel-local-folder.c:218
+#: ../camel/providers/local/camel-local-folder.c:192
+#: ../camel/providers/local/camel-local-folder.c:201
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "mailbox: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:227
+#: ../camel/providers/local/camel-local-folder.c:210
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:272
+#: ../camel/providers/local/camel-local-folder.c:469
 msgid "Index message body data"
 msgstr "�ੰਡ��ਸ ਸ�ਨ�ਹਾ ਭਾ� ਡਾ�ਾ"
 
-#: ../camel/providers/local/camel-local-folder.c:686
+#: ../camel/providers/local/camel-local-folder.c:685
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3479,183 +3526,219 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "ਸ���ਡਰਡ Unix mbox ਸਪ�ਲ ਡਾ�ਰ���ਰ�"
 
-#: ../camel/providers/local/camel-local-store.c:149
-#: ../camel/providers/local/camel-local-store.c:284
-#: ../camel/providers/local/camel-mbox-store.c:371
-#: ../camel/providers/local/camel-spool-store.c:109
+#: ../camel/providers/local/camel-local-store.c:174
+#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-maildir-store.c:92
+#: ../camel/providers/local/camel-mbox-store.c:532
+#: ../camel/providers/local/camel-spool-store.c:318
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ਪ�ਰਬੰਧ�(root) %s ਸੰਭਾਲ �ੱ� �ਸਲ� ਰਸਤਾ ਨਹ� ਹ�।"
 
-#: ../camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "ਪ�ਰਬੰਧ�(root) %s ਸੰਭਾਲ �ੱ� �ਸਲ� ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�।"
 
-#: ../camel/providers/local/camel-local-store.c:169
-#: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:297
+#: ../camel/providers/local/camel-local-store.c:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ਫ�ਲਡਰ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:193
+#: ../camel/providers/local/camel-local-store.c:220
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "��ਣ-ਬ�ਸ� ਵਿੱ� ਲ��ਲ ਸੰਭਾਲ ਬ�ਸਾ ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-local-store.c:250
+#: ../camel/providers/local/camel-local-store.c:281
 #, c-format
 msgid "Local mail file %s"
 msgstr "ਲ��ਲ ਪੱਤਰ ਫਾ�ਲ %s"
 
-#: ../camel/providers/local/camel-local-store.c:358
+#: ../camel/providers/local/camel-local-store.c:393
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ਫ�ਲਡਰ %s ਦਾ ਨਾ�-ਤਬਦ�ਲ %s ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:431
+#: ../camel/providers/local/camel-local-store.c:467
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' ਦਾ ਨਾ� ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-local-store.c:461
-#: ../camel/providers/local/camel-mbox-store.c:304
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:701
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ਫ�ਲਡਰ �ੰਡ��ਸ ਫਾ�ਲ '%s' ਨ�ੰ ਹ�ਾ�� ਨਹ� �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:489
-#: ../camel/providers/local/camel-mbox-store.c:333
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:730
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ਫ�ਲਡਰ ਮ��ਾ ਫਾ�ਲ '%s' ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:537
+#: ../camel/providers/local/camel-local-summary.c:548
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਸੰ��ਪ ਵਿੱ� ਸੰਭਾਲਣ ਵਿੱ� �ਸਫਲ: �ਣ�ਾਣਾ �ਾਰਨ"
 
-#: ../camel/providers/local/camel-maildir-folder.c:195
+#: ../camel/providers/local/camel-maildir-folder.c:198
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "maildir ਫ�ਲਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ ਨਹ� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:283
-#: ../camel/providers/local/camel-maildir-folder.c:291
-#: ../camel/providers/local/camel-mbox-folder.c:440
-#: ../camel/providers/local/camel-mh-folder.c:227
-#: ../camel/providers/local/camel-mh-folder.c:235
+#: ../camel/providers/local/camel-maildir-folder.c:246
+#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "%2$s ਫ�ਲਡਰ ਤ�� %1$s ਸ�ਨ�ਹਾ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:399
+#: ../camel/providers/local/camel-maildir-folder.c:326
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "ਸ�ਨ�ਹ� ਨ�ੰ �ਿ�ਾਣਾ ਫ�ਲਡਰ ਵਿੱ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:136
-#: ../camel/providers/local/camel-maildir-store.c:167
-#: ../camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:175
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, c-format
+#| msgid "Cannot create folder: %s: folder exists"
+msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgstr "%s: ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: ਫ�ਲਡਰ ਨਾ� ਵਿੱ� ਬਿੰਦ� ਨਹ�� ਹ� ਸ�ਦ�"
+
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:680
+#, c-format
+#| msgid "Folder already exists"
+msgid "Folder %s already exists"
+msgstr "ਫ�ਲਡਰ %s ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
+
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:381
+#: ../camel/providers/local/camel-mbox-store.c:395
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:151
-#: ../camel/providers/local/camel-mbox-store.c:127
-#: ../camel/providers/local/camel-mh-store.c:215
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:347
+#: ../camel/providers/local/camel-mh-store.c:464
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤ� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:157
-#: ../camel/providers/local/camel-mbox-store.c:137
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-mh-store.c:473
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ਫ�ਲਡਰ '%s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤ� �ਾ ਸ�ਦਾ ਹ�: ਫ�ਲਡਰ ਮ���ਦ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/local/camel-maildir-store.c:184
+#: ../camel/providers/local/camel-maildir-store.c:239
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "ਫ�ਲਡਰ '%s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ੱ� maildir ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-maildir-store.c:242
-#: ../camel/providers/local/camel-maildir-store.c:282
-#: ../camel/providers/local/camel-mh-store.c:287
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:584
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
 msgstr "�ੱ� maildir ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-maildir-store.c:482
-#: ../camel/providers/local/camel-spool-store.c:364
-#: ../camel/providers/local/camel-spool-store.c:380
+#: ../camel/providers/local/camel-maildir-store.c:508
+#: ../camel/providers/local/camel-maildir-store.c:819
+#: ../camel/providers/local/camel-spool-store.c:143
+#: ../camel/providers/local/camel-spool-store.c:159
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਦ� �ਾ�� ਨਹ�� ਹ� ਸ�� ਹ�: %s"
 
+#: ../camel/providers/local/camel-maildir-store.c:671
+#, c-format
+#| msgid "Cannot create folder: %s: folder exists"
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "%s: ਫ�ਲਡਰ ਨਾ� ਨਹ�� ਬਦਲਿ� �ਾ ਸ�ਦਾ, ਫ�ਲਡਰ ਨਾ� ਵਿੱ� ਬਿੰਦ� ਨਹ�� ਹ� ਸ�ਦ�"
+
 #: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:565
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir ਡਾ�ਰ���ਰ� ਰਸਤਾ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:556
 msgid "Checking folder consistency"
 msgstr "ਫ�ਲਡਰ ��ਸਾਰਤਾ ਦ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/local/camel-maildir-summary.c:641
+#: ../camel/providers/local/camel-maildir-summary.c:649
 msgid "Checking for new messages"
 msgstr "ਨਵ�� ਸ�ਨਹਿ�� ਲ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/local/camel-maildir-summary.c:732
-#: ../camel/providers/local/camel-mbox-summary.c:465
-#: ../camel/providers/local/camel-mbox-summary.c:679
-#: ../camel/providers/local/camel-mbox-summary.c:809
-#: ../camel/providers/local/camel-spool-summary.c:130
+#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
 msgstr "ਫ�ਲਡਰ ��ਰਮਬੱਧ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/providers/local/camel-mbox-folder.c:124
-#: ../camel/providers/local/camel-spool-folder.c:125
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "%s ਤ� ਫ�ਲਡਰ ਲਾੱ� ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
-
-#: ../camel/providers/local/camel-mbox-folder.c:194
+#: ../camel/providers/local/camel-mbox-folder.c:183
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "mailbox ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:260
+#: ../camel/providers/local/camel-mbox-folder.c:249
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "mbox ਫਾ�ਲ ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:433
+#: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨਾ-ਪ�ਰਾਪਤਯ�� ਨਿ�ਾਰਾਪਨ ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:149
-#: ../camel/providers/local/camel-mbox-store.c:379
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "%s ਤ� ਫ�ਲਡਰ ਲਾੱ� ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:369
+#: ../camel/providers/local/camel-mbox-store.c:540
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "�ਸ ਨਾ� ਨਾਲ ਫ�ਲਡਰ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-mbox-store.c:406
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ਫ�ਲਡਰ '%s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: �ੱ� ਨਿਯਮਿਤ ਫਾ�ਲ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:218
-#: ../camel/providers/local/camel-mbox-store.c:231
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:556
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "ਡਾ�ਰ���ਰ� '%s' ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s।"
+
+#: ../camel/providers/local/camel-mbox-store.c:572
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "ਫ�ਲਡਰ ਬਣਾ�� ਨਹ� �ਾ ਸ�ਿ� ਹ�: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:574
+msgid "Folder already exists"
+msgstr "ਫ�ਲਡਰ ਮ���ਦ ਹ�"
+
+#: ../camel/providers/local/camel-mbox-store.c:615
+#: ../camel/providers/local/camel-mbox-store.c:628
+#: ../camel/providers/local/camel-mbox-store.c:657
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3664,103 +3747,89 @@ msgstr ""
 "ਫ�ਲਡਰ '%s' ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:241
+#: ../camel/providers/local/camel-mbox-store.c:638
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' �� ਨਿਯਮਿਤ ਫਾ�ਲ ਨਹ� ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:250
+#: ../camel/providers/local/camel-mbox-store.c:647
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ਫ�ਲਡਰ `'%s' �ਾਲ� ਨਹ�� ਹ�। ਹ�ਾ�� ਨਹ�� �ਿ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:290
+#: ../camel/providers/local/camel-mbox-store.c:673
+#: ../camel/providers/local/camel-mbox-store.c:687
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ਫ�ਲਡਰ ਸੰ��ਪ ਫਾ�ਲ '%s' ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:395
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "ਡਾ�ਰ���ਰ� '%s' ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s।"
-
-#: ../camel/providers/local/camel-mbox-store.c:411
-#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "ਫ�ਲਡਰ ਬਣਾ�� ਨਹ� �ਾ ਸ�ਿ� ਹ�: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:413
-msgid "Folder already exists"
-msgstr "ਫ�ਲਡਰ ਮ���ਦ ਹ�"
-
-#: ../camel/providers/local/camel-mbox-store.c:507
+#: ../camel/providers/local/camel-mbox-store.c:767
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "ਨਵਾ� ਫ�ਲਡਰ ਨਾ� �ਲਤ ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:522
+#: ../camel/providers/local/camel-mbox-store.c:782
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' ਦਾ ਨਾ� ਬਦਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:605
+#: ../camel/providers/local/camel-mbox-store.c:865
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' ਦਾ ਨਾ� %s ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:473
+#: ../camel/providers/local/camel-mbox-summary.c:476
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ਫ�ਲਡਰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:533
+#: ../camel/providers/local/camel-mbox-summary.c:537
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "%2$s ਫ�ਲਡਰ '� %1$s ਸਥਿਤ� ਨ��� ਮ�ਲ ਪਾਰਸ �ਰਨ ਦ�ਰਾਨ �ਾਤ� �ਲਤ�"
 
-#: ../camel/providers/local/camel-mbox-summary.c:615
+#: ../camel/providers/local/camel-mbox-summary.c:622
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ਫ�ਲਡਰ ਦ� �ਾ�� ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:686
-#: ../camel/providers/local/camel-mbox-summary.c:816
-#: ../camel/providers/local/camel-spool-summary.c:137
+#: ../camel/providers/local/camel-mbox-summary.c:697
+#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ਫਾ�ਲ ��ਲ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:700
-#: ../camel/providers/local/camel-spool-summary.c:152
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�ਰ�� mailbox ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:715
-#: ../camel/providers/local/camel-mbox-summary.c:932
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:949
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ਸਰ�ਤ ਫ�ਲਡਰ %s ਨ�ੰ ਬੰਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:726
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "�ਰ�� ਫ�ਲਡਰ ਬੰਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:756
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ਫ�ਲਡਰ ਦਾ ਨਾ� ਬਦਲਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:829
-#: ../camel/providers/local/camel-mbox-summary.c:1070
+#: ../camel/providers/local/camel-mbox-summary.c:846
+#: ../camel/providers/local/camel-mbox-summary.c:1099
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ਫ�ਲਡਰ ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:869
-#: ../camel/providers/local/camel-mbox-summary.c:1102
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:1131
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3769,65 +3838,75 @@ msgstr ""
 "MBOX ਫਾ�ਲ �਼ਰਾਬ ਹ� �� ਹ�, �ਸ ਨ�ੰ ਠ�� �ਰ� ��। (ਵਲ�� (From) ਲਾ�ਨ ਦ� ਲ�� ਸ�, ਪਰ �ਹ ਮਿਲ� "
 "ਨਹ��।)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:878
-#: ../camel/providers/local/camel-mbox-summary.c:1111
+#: ../camel/providers/local/camel-mbox-summary.c:895
+#: ../camel/providers/local/camel-mbox-summary.c:1140
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ਸੰ��ਪ ਤ� ਫ�ਲਡਰ ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹਨ, ਸਮ�ਾਲ� �ਰਨ ਮ�ਰ�� ਵ�"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1029
-#: ../camel/providers/local/camel-spool-summary.c:337
+#: ../camel/providers/local/camel-mbox-summary.c:1052
+#: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "�ਣ�ਾਣ� �ਲਤ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1211
+#: ../camel/providers/local/camel-mbox-summary.c:1210
+#: ../camel/providers/local/camel-mbox-summary.c:1240
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "�ਰ�� mailbox �ੱਤ� ਲਿ�ਣਾ �ਸਫਲ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1200
+#: ../camel/providers/local/camel-mbox-summary.c:1229
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "�ਰ�� mailbox �ੱਤ� ਲਿ�ਣ ਲ� ਫ�ਲ�ਹ: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:165
+#: ../camel/providers/local/camel-mh-folder.c:115
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "mh ਫ�ਲਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਤ�� �ਸਫਲ: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:234
+#: ../camel/providers/local/camel-mh-store.c:483
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "'%s' ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:248
+#: ../camel/providers/local/camel-mh-store.c:497
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ਫ�ਲਡਰ '%s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ੱ� ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�।"
 
-#: ../camel/providers/local/camel-mh-summary.c:228
+#: ../camel/providers/local/camel-mh-summary.c:230
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ਡਾ�ਰ���ਰ� ਰਸਤਾ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:118
+#: ../camel/providers/local/camel-spool-store.c:327
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "ਸਪ�ਲ '%s' ਨ�ੰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:341
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "ਸਪ�ਲ '%s' �ੱ� ਨਿਯਮਿਤ ਫਾ�ਲ �ਾ� ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:158
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "ਸਪ�ਲ ਪੱਤਰ ਫਾ�ਲ %s"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "ਸਪ�ਲ ਫ�ਲਡਰ ਲ�� %s"
+
+#: ../camel/providers/local/camel-spool-store.c:391
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ਫ�ਲਡਰ '%s/%s' ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:170
+#: ../camel/providers/local/camel-spool-store.c:403
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3836,12 +3915,12 @@ msgstr ""
 "ਫ�ਲਡਰ '%s' ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:409
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ਫ�ਲਡਰ '%s' ਮ���ਦ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/local/camel-spool-store.c:183
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3850,57 +3929,42 @@ msgstr ""
 "ਫ�ਲਡਰ '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:426
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' �ੱ� mailbox ਫਾ�ਲ ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:213
+#: ../camel/providers/local/camel-spool-store.c:462
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "ਸ��ਰ��਼ �ੱ� ��ਣ-ਬ�ਸ� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:226
+#: ../camel/providers/local/camel-spool-store.c:476
 #, c-format
-msgid "Spool mail file %s"
-msgstr "ਸਪ�ਲ ਪੱਤਰ ਫਾ�ਲ %s"
-
-#: ../camel/providers/local/camel-spool-store.c:226
-#, c-format
-msgid "Spool folder tree %s"
-msgstr "ਸਪ�ਲ ਫ�ਲਡਰ ਲ�� %s"
+msgid "Spool folders cannot be deleted"
+msgstr "ਸਪ�ਲ ਫ�ਲਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:491
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ਸਪ� ਫ�ਲਡਰਾ� ਦਾ ਨਾ�-ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:251
+#: ../camel/providers/local/camel-spool-summary.c:169
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:193
 #, c-format
-msgid "Spool folders cannot be deleted"
-msgstr "ਸਪ�ਲ ਫ�ਲਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
-
-#: ../camel/providers/local/camel-spool-summary.c:166
-#: ../camel/providers/local/camel-spool-summary.c:178
-#: ../camel/providers/local/camel-spool-summary.c:190
-#, c-format
-#| msgid "Could not sync temporary folder %s: %s"
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "�ਰ�� ਫ�ਲਡਰ %s ਨ�ੰ ਸ��ਰ�ਨਾ��਼ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:208
+#: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
-#| msgid "Could not sync spool folder %s: %s"
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "ਸਪ�ਲ ਫ�ਲਡਰ %s ਨ�ੰ ਸ��ਰ�ਨਾ��਼ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:240
-#: ../camel/providers/local/camel-spool-summary.c:259
-#: ../camel/providers/local/camel-spool-summary.c:272
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
 #, c-format
-#| msgid ""
-#| "Could not sync spool folder %s: %s\n"
-#| "Folder may be corrupt, copy saved in '%s'"
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
@@ -3908,40 +3972,40 @@ msgstr ""
 "ਸਪ�ਲ ਫ�ਲਡਰ %s ਨ�ੰ ਸ��ਰ�ਨਾ��਼ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s\n"
 "ਫ�ਲਡਰ ਨਿ�ਾਰਾ ਹ� ਸ�ਦਾ ਹ�, ਨ�ਲ '%s' ਵਿੱ� ਸੰਭਾਲ� �� ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:197
-#: ../camel/providers/nntp/camel-nntp-folder.c:271
-#: ../camel/providers/nntp/camel-nntp-folder.c:312
+#: ../camel/providers/nntp/camel-nntp-folder.c:200
+#: ../camel/providers/nntp/camel-nntp-folder.c:279
+#: ../camel/providers/nntp/camel-nntp-folder.c:393
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "�ੰਦਰ�ਨ� �ਲਤ�: UID �ਲਤ ਫਾਰਮ�� ਵਿੱ� ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:234
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
-#: ../camel/providers/pop3/camel-pop3-folder.c:402
-#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../camel/providers/nntp/camel-nntp-folder.c:241
+#: ../camel/providers/nntp/camel-nntp-folder.c:245
+#: ../camel/providers/pop3/camel-pop3-folder.c:369
+#: ../camel/providers/pop3/camel-pop3-folder.c:434
+#: ../camel/providers/pop3/camel-pop3-folder.c:446
 #: ../camel/providers/pop3/camel-pop3-folder.c:695
-#: ../camel/providers/pop3/camel-pop3-folder.c:706
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ਸ�ਨ�ਹਾ %s ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:465
-#: ../camel/providers/nntp/camel-nntp-folder.c:471
-#: ../camel/providers/nntp/camel-nntp-folder.c:518
+#: ../camel/providers/nntp/camel-nntp-folder.c:477
+#: ../camel/providers/nntp/camel-nntp-folder.c:483
+#: ../camel/providers/nntp/camel-nntp-folder.c:530
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ਭ��ਣ �ਾਰਵਾ� �ਸਫਲ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:513
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 msgid "Posting failed: "
 msgstr "ਪ�ਸ� �ਰਨ ਲ� ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#: ../camel/providers/nntp/camel-nntp-folder.c:554
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ਤ�ਸ�� �ਫਲਾ�ਨ �ੰਮ �ਰਦ� ਸਮ�� NNTP ਸ�ਨ�ਹ� ਭ�� ਨਹ�� ਸ�ਦ� !"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#: ../camel/providers/nntp/camel-nntp-folder.c:574
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ਤ�ਸ�� NNTP ਫ�ਲਡਰ ਤ�� ਸ�ਨ�ਹ� ਨ�ਲ ਨਹ�� �ਰ ਸ�ਦ� ਹ�!"
@@ -3968,22 +4032,32 @@ msgid ""
 "password."
 msgstr "�ਸ ��ਣ ਨਾਲ NNTP ਸਰਵਰ ਤ� ਪਲ�ਨ-���ਸ� ਪਾਸਵਰਡ ਪ�ਰਮਾਣ�ਿਤਾ ਲ� ਵਰਤਿ� �ਾਵ��ਾ।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:265
+#: ../camel/providers/nntp/camel-nntp-store.c:77
+#, c-format
+msgid "Authentication requested but no username provided"
+msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�, ਪਰ ��� ਯ��਼ਰ ਦਿੱਤਾ ਨਹ�� �ਿ�"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:89
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "ਸਰਵਰ ਨਾਲ ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ� �ਸਫਲ: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:346
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "%s ਤ�� ਸਵਾ�ਤ� ਸ�ਨ�ਹਾ ਪ��ਹਨ ਨਹ�� �ਾ ਸ�ਿ�: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:278
+#: ../camel/providers/nntp/camel-nntp-store.c:359
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ਸਰਵਰ %s ਨ� �ਲਤ� ��ਡ %d ਭ��ਿ� ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:434
+#: ../camel/providers/nntp/camel-nntp-store.c:527
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET �ਬਰਾ� %s ਰਾਹ�"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:927
+#: ../camel/providers/nntp/camel-nntp-store.c:1045
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -3994,7 +4068,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1024
+#: ../camel/providers/nntp/camel-nntp-store.c:1160
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4005,7 +4079,7 @@ msgstr ""
 "\n"
 "�ਸ ਤਰਾ� ਦਾ ��� �ਬਰ-ਸਮ�ਹ ਨਹ�� ਹ�। ਸਾ�ਦ ��ਣ� ��ਾ� ਮ�ੱਢਲਾ ਫ�ਲਡਰ ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1064
+#: ../camel/providers/nntp/camel-nntp-store.c:1202
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4016,95 +4090,83 @@ msgstr ""
 "\n"
 "�ਸ ਤਰਾ� ਦਾ ��� �ਬਰ-ਸਮ�ਹ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1094
+#: ../camel/providers/nntp/camel-nntp-store.c:1235
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "ਤ�ਸ�� �ਬਰ ਸੰਭਾਲ ਵਿੱ� ਫ�ਲਡਰ ਨਹ�� ਬਣਾ ਸ�ਦ� ਹ�: ਸਵ��ਾਰ ਹ� �ਰ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1106
+#: ../camel/providers/nntp/camel-nntp-store.c:1251
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "�ਬਰ ਸੰਭਾਲ ਵਿੱ� ਫ�ਲਡਰ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1119
+#: ../camel/providers/nntp/camel-nntp-store.c:1268
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "ਤ�ਸ�� �ਬਰ ਸੰਭਾਲ ਵਿੱ� ਫ�ਲਡਰ ਨਹ�� ਹ�ਾ ਸ�ਦ� ਹ�: �ਸਵ��ਾਰ ਹ� �ਰ�।"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1257
-#, c-format
-msgid "Authentication requested but no username provided"
-msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�, ਪਰ ��� ਯ��਼ਰ ਦਿੱਤਾ ਨਹ�� �ਿ�"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1269
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "ਸਰਵਰ ਨਾਲ ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1395
+#: ../camel/providers/nntp/camel-nntp-store.c:1479
 msgid "NNTP Command failed: "
 msgstr "NNTP �ਮਾ�ਡ �ਸਫਲ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1553
 #, c-format
 msgid "Not connected."
 msgstr "��ਨ��� ਨਹ�� ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:238
-#: ../camel/providers/nntp/camel-nntp-summary.c:340
+#: ../camel/providers/nntp/camel-nntp-summary.c:234
+#: ../camel/providers/nntp/camel-nntp-summary.c:345
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: ਨਵ�� ਸ�ਨ�ਹਿ�� ਦ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:249
+#: ../camel/providers/nntp/camel-nntp-summary.c:246
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover ਤ� �ਸਧਾਰਨ ਸਰਵਰ �ਵਾਬ ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:356
+#: ../camel/providers/nntp/camel-nntp-summary.c:362
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head ਤ� �ਸਧਾਰਨ ਸਰਵਰ �ਵਾਬ ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:401
+#: ../camel/providers/nntp/camel-nntp-summary.c:407
 #, c-format
 msgid "Operation failed: %s"
 msgstr "�ਾਰਵਾ� �ਸਫਲ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:251
+#: ../camel/providers/pop3/camel-pop3-folder.c:277
+#: ../camel/providers/pop3/camel-pop3-folder.c:334
+#, c-format
+msgid "No message with UID %s"
+msgstr "UID %s ਨਾਲ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "POP ਸ�ਨ�ਹ� %d ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+msgid "Unknown reason"
+msgstr "�ਣ�ਾਣ �ਾਰਨ"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:486
 msgid "Retrieving POP summary"
 msgstr "POP ਸੰ��ਪ �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:274
+#: ../camel/providers/pop3/camel-pop3-folder.c:509
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "POP ਸੰ��ਪ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦ� ਹ�: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:324
+#: ../camel/providers/pop3/camel-pop3-folder.c:561
 msgid "Expunging old messages"
 msgstr "ਹ�ਾ� ਸ�ਨ�ਹ� ਸ�ੰ��� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:332
+#: ../camel/providers/pop3/camel-pop3-folder.c:575
 msgid "Expunging deleted messages"
 msgstr "ਹ�ਾ� ਸ�ਨ�ਹ� ਫ�ਲ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:566
-#: ../camel/providers/pop3/camel-pop3-folder.c:596
-#, c-format
-msgid "No message with UID %s"
-msgstr "UID %s ਨਾਲ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
-
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:603
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "POP ਸ�ਨ�ਹ� %d ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:707
-msgid "Unknown reason"
-msgstr "�ਣ�ਾਣ �ਾਰਨ"
-
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
 msgstr "ਸ�ਨ�ਹਾ ਸ��ਰ��਼"
@@ -4113,24 +4175,29 @@ msgstr "ਸ�ਨ�ਹਾ ਸ��ਰ��਼"
 msgid "_Leave messages on server"
 msgstr "ਸਰਵਰ ਤ� ਸ�ਨ�ਹ� �ੱਡ�(_L)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "%s ਦਿਨਾ� ਬਾ�ਦ ਹ�ਾ�(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "ਲ��ਲ �ਨਬਾ�ਸ ਤ�� ਫ�ਲਾ� ਹ�ਾ�(_e)"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
 msgstr "ਸਭ POP3 ��ਸ਼��ਸ਼ਨ ਲ� ਸਹਿਯ�� �ਯ��(_s)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:58
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "��ਨ��� ਲ� POP ਸਰਵਰ ਤ�� ਸ�ਨ�ਹ� ਪ�ਰਾਪਤ �ਰਨ ਲ�।"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:75
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4138,7 +4205,7 @@ msgstr ""
 "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ POP ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ-ਪਾਠ ਪਾਸਵਰਡ ਨਾਲ �����ਾ,�ਹ ਹ� ��ਣ ਹ�, �� �ਿ ��ਸਰ POP "
 "ਸਰਵਰਾ� ਤ� �ਪਲੱਬਧ ਹ�ੰਦ� ਹ�।"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:82
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4152,38 +4219,38 @@ msgstr ""
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:168
+#: ../camel/providers/pop3/camel-pop3-store.c:181
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP ਸਰਵਰ %s ਤ�� ਸ�ਨ�ਹਾ ਪ�ਨ ਵਿੱ� ਫ�ਲ�ਹ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/pop3/camel-pop3-store.c:217
-#: ../camel/providers/pop3/camel-pop3-store.c:224
+#: ../camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "POP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:187
+#: ../camel/providers/pop3/camel-pop3-store.c:200
 msgid "STLS not supported by server"
 msgstr "ਸਰਵਰ ਵਲ�� STLS ਸਹਾ�� ਨਹ��"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:205
+#: ../camel/providers/pop3/camel-pop3-store.c:218
 #, 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:218
+#: ../camel/providers/pop3/camel-pop3-store.c:231
 msgid "TLS negotiations failed"
 msgstr "TLS �ੱਲਬਾਤ ਫ�ਲ�ਹ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:238
 msgid "TLS is not available in this build"
 msgstr "�ਸ ਨਿਰਮਾਣ ਵਿੱ� TLS �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:300
-#: ../camel/providers/pop3/camel-pop3-store.c:452
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4191,22 +4258,22 @@ msgid ""
 msgstr "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ: ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� ਲ� ਸਹਾ�� ਨਹ��।"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:323
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "POP ਸਰਵਰ %2$s%3$s �ੱਤ� SASL '%1$s' ਲਾ��ਨ �ਸਫਲ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:340
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP ਸਰਵਰ %s �ੱਤ� ਲਾ��ਨ �ਰਨ ਤ�� �ਸਫਲ: SASL ਪਰ����ਾਲ �ਲਤ�"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:357
+#: ../camel/providers/pop3/camel-pop3-store.c:374
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "POP ਸਰਵਰ %s ਤ� ਪ�ਰਮਾਣ�ਿਤਾ ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:421
+#: ../camel/providers/pop3/camel-pop3-store.c:439
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4215,7 +4282,7 @@ msgstr ""
 "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਲ� �ਸਮੱਰਥ ਹ�।\t�ਲਤ APOP ID ਮਿਲਿ� ਹ�। Impersonation ਹਮਲ� ਦਾ "
 "ਸ਼ੱ� ਹ�। �ਪਣ� ਪਰਸ਼ਾਸ਼� ਨਾਲ ਸੰਪਰ� �ਰ�।"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:471
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4225,7 +4292,7 @@ msgstr ""
 "ਪਾਸਵਰਡ ਭ��ਣ ਵਿੱ� �ਸਫਲ: %s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:484
+#: ../camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4235,7 +4302,7 @@ msgstr ""
 "ਯ��਼ਰ ਨਾ�%s ਭ��ਣ ਦ�ਰਾਨ �ਲਤ�"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:497
+#: ../camel/providers/pop3/camel-pop3-store.c:518
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4244,27 +4311,27 @@ msgstr ""
 "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਮਰੱਥ ਹ�।\n"
 "ਪਾਸਵਰਡ%s ਭ��ਣ ਦ�ਰਾਨ �ਲਤ�"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:653
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:666
+#: ../camel/providers/pop3/camel-pop3-store.c:558
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 ਸਰਵਰ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:670
+#: ../camel/providers/pop3/camel-pop3-store.c:562
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "POP3 ਸਰਵਿਸ %2$s �ੱਤ� %1$s ਲ�"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:685
+#: ../camel/providers/pop3/camel-pop3-store.c:694
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:721
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s' ਫ�ਲਡਰ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:709
+#: ../camel/providers/pop3/camel-pop3-store.c:738
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ਸ��ਰ � ��� ਫ�ਲਡਰ ਲ�� ਨਹ�� ਹ�"
@@ -4279,48 +4346,48 @@ msgid ""
 "system."
 msgstr "ਲ��ਲ ਸਿਸ�ਮ ਤ� ਪੱਤਰ ਭ��ਣ ਲ� \"sendmail\" ਨ�ੰ ਵਰਤ��।"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "sendmail ਪਰ��ਰਾਮ ਰਾਹ�� ਪੱਤਰ ਭ���"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "ਪ�ਰਾਪਤ ਸ��� ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "sendmail ਨਾਲ ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: ਪੱਤਰ ਭ��ਿ� ਨਹ�� �ਿ� ਹ�।"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail ਨ�ੰ ਵੰਡਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: ਪੱਤਰ ਨਹ�� ਭ��ਿ� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
 msgid "Could not send message: "
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਿ�: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail ਸੰ��ਤ %s ਨਾਲ ਬੰਦ ਹ� �� ਹ�: ਪੱਤਰ ਨਹ�� ਭ��ਿ� �ਿ� ਹ�।"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਿ�: ਪੱਤਰ ਨਹ�� ਭ��ਿ� �ਿ�"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail ਸਥਿਤ� %d ਨਾਲ ਬੰਦ: ਪੱਤਰ ਨਹ�� ਭ��ਿ� �ਿ�।"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
-msgid "sendmail"
-msgstr "sendmail"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
-msgid "Mail delivery via the sendmail program"
-msgstr "sendmail ਪਰ��ਰਾਮ ਰਾਹ�� ਪੱਤਰ ਭ���"
-
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "SMTP"
@@ -4329,312 +4396,364 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "ਰਿਮ�� mailhub ਨ�ੰ SMTP ਵਰਤ �� ਪੱਤਰ ਭ��ਣ ਲ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:116
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Welcome response error: "
+msgstr "�� ���� ਨ�ੰ �ਵਾਬ �ਲਤ�: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "SMTP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਨਾਲ ��� ਵਿੱ� �ਸਫਲ: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS �ਮਾ�ਡ �ਸਫਲ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP ਸਰਵਰ %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "SMTP ਪੱਤਰ ਪਹ�ੰ� %s ਰਾਹ�"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "SMTP ਸਰਵਰ %s ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ �ਿਸਮ %s ਲ� ਸਹਾ�� ਨਹ�� ਹ�।"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:488
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"SMTP ਸਰਵਰ ਲ� ਪ�ਰਮਾਣ�ਿਤਾ ਵਰਤਣ ਤ�� �ਸਫਲ।\n"
+"%s\n"
+"\n"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:606
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: ਸ�ਵਾ ���� ਨਹ�� ਹ�।"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: ਭ��ਣ ਵਾਲ� ਦਾ �ਡਰ�ੱਸ �ਾ�� ਨਹ�� ਹ�।"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:617
+msgid "Sending message"
+msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:642
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: ��� ਪ�ਰਾਪਤ �ਰਤਾ ਨਹ�� ਹ�।"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:655
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: �ੱ� �ਾ� ਵਧ�ਰ� ਪ�ਰਾਪਤ-�ਰਤਾ �ਲਤ"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
 msgid "Syntax error, command unrecognized"
 msgstr "ਸੰ���ਸ �ਲਤ�, �ਮਾ�ਡ ਪ�ਾਣ� ਨਹ�� �ਾ ਸ��"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:118
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Syntax error in parameters or arguments"
 msgstr "ਪ�ਰਾਮ��ਰ �ਾ� �ਰ��ਮਿੰ� ਵਿੱ� ਸੰ���ਸ �ਲਤ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:120
+#: ../camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Command not implemented"
 msgstr "�ਮਾ�ਡ ਲਾ�� ਨਹ�� ��ਤ� �ਾ ਸ�� ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:122
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
 msgid "Command parameter not implemented"
 msgstr "�ਮਾ�ਡ ਪ�ਰਾਮ��ਰ ਲਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:124
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
 msgid "System status, or system help reply"
 msgstr "ਸਿਸ�ਮ ਸਥਿਤ� �ਾ� ਸਿਸ�ਮ ਮੱਦਦ �ਵਾਬ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:126
+#: ../camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Help message"
 msgstr "ਮੱਦਦ ਸ�ਨ�ਹਾ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:128
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Service ready"
 msgstr "ਸਰਵਿਸ ਤਿ�ਰ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:130
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
 msgid "Service closing transmission channel"
 msgstr "ਸਰਵਿਸ ਬੰਦ �ਰਨ ਲ� ਸੰ�ਾਰ ��ਨਲ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
 msgid "Service not available, closing transmission channel"
 msgstr "ਸਰਵਿਸ �ਪਲੱਬਧ ਨਹ�� ਹ�, ਸੰ�ਾਰ ��ਨਲ ਬੰਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:134
+#: ../camel/providers/smtp/camel-smtp-transport.c:736
 msgid "Requested mail action okay, completed"
 msgstr "ਲ���ਦਾ ਪੱਤਰ �ਾਰਵਾ� ਠ�� ਹ�, ਸਮਾਪਤ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:738
 msgid "User not local; will forward to <forward-path>"
 msgstr "ਯ��਼ਰ ਲ��ਲ ਨਹ�� ਹ�; �ੱ�� <forward-path> ਭ��ਿ� �ਾਵ��ਾ।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:138
+#: ../camel/providers/smtp/camel-smtp-transport.c:740
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ਲ���ਦ� ਪੱਤਰ �ਾਰਵਾ� ��ਤ� ਨਹ�� �ਾ ਸ�ਦ�: mailbox �ਪਲੱਬਧ ਨਹ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:140
+#: ../camel/providers/smtp/camel-smtp-transport.c:742
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ਲ���ਦ� �ਾਰਵਾ� ��ਤ� ਨਹ�� �ਾ ਸ�ਦ�: mailbox �ਪਲੱਬਧ ਨਹ��।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:142
+#: ../camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Requested action aborted: error in processing"
 msgstr "ਲ���ਦ� �ਾਰਵਾ� �ੱਡ� �� ��, �ਾਰਵਾ� ਵਿੱ� �ਲਤ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:144
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
 msgid "User not local; please try <forward-path>"
 msgstr "ਯ��਼ਰ ਲ��ਲ ਨਹ�� ਹ�; �ਿਰਪਾ �ਰ�� <forward-path> ਵਰਤ��"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:146
+#: ../camel/providers/smtp/camel-smtp-transport.c:748
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ਲ���ਦ� �ਾਰਵਾ� ��ਤ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: ਲ���ਦ� ਸਿਸ�ਮ ਥਾ� �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:148
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "ਲ���ਦ� ਪੱਤਰ �ਾਰਵਾ� �ਧ�ਰ�: �ਪਲੱਬਧ ਲ�� ਸ�ਮਾ ਤ�� ਵਧ�ਰ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "ਲ���ਦ� �ਾਰਵਾ� ਸੰਭਵ ਨਹ��: mailbox ਨਾ� ਸੰਭਵ ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
+#: ../camel/providers/smtp/camel-smtp-transport.c:754
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ਮ�ਲ �ੰਪ�ੱ� ਸ਼�ਰ�; <CRLF>.<CRLF> ਨਾਲ ਸਮਾਪਤ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
 msgid "Transaction failed"
 msgstr "�ਰਾ�ਸ਼��ਸ਼ਨ ਫ�ਲ�ਹ ਹ��"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:760
 msgid "A password transition is needed"
 msgstr "�ੱ� ਪਾਸਵਰਡ ਤਬਦ�ਲ� ਲ���ਦ� ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:160
+#: ../camel/providers/smtp/camel-smtp-transport.c:762
 msgid "Authentication mechanism is too weak"
 msgstr "ਪ�ਰਮਾਣਿ�ਤਾ ਢੰ� ਬਹ�ਤ �ਮ��ਰ ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:764
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� ਲ� ���ਰਿਪਸ਼ਨ ਲ���ਦ� ਹ�"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:164
+#: ../camel/providers/smtp/camel-smtp-transport.c:766
 msgid "Temporary authentication failure"
 msgstr "�ਰ�� ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:252
-#: ../camel/providers/smtp/camel-smtp-transport.c:258
-msgid "Welcome response error: "
-msgstr "�� ���� ਨ�ੰ �ਵਾਬ �ਲਤ�: "
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:294
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "SMTP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਨਾਲ ��� ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:302
-#: ../camel/providers/smtp/camel-smtp-transport.c:314
-#: ../camel/providers/smtp/camel-smtp-transport.c:320
-msgid "STARTTLS command failed: "
-msgstr "STARTTLS �ਮਾ�ਡ �ਸਫਲ: "
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:450
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP ਸਰਵਰ %s ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ �ਿਸਮ %s ਲ� ਸਹਾ�� ਨਹ�� ਹ�।"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:526
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"SMTP ਸਰਵਰ ਲ� ਪ�ਰਮਾਣ�ਿਤਾ ਵਰਤਣ ਤ�� �ਸਫਲ।\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:664
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP ਸਰਵਰ %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:666
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP ਪੱਤਰ ਪਹ�ੰ� %s ਰਾਹ�"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:686
-#, c-format
-msgid "Cannot send message: service not connected."
-msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: ਸ�ਵਾ ���� ਨਹ�� ਹ�।"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:693
-#, c-format
-msgid "Cannot send message: sender address not valid."
-msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: ਭ��ਣ ਵਾਲ� ਦਾ �ਡਰ�ੱਸ �ਾ�� ਨਹ�� ਹ�।"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:697
-msgid "Sending message"
-msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:713
-#, c-format
-msgid "Cannot send message: no recipients defined."
-msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: ��� ਪ�ਰਾਪਤ �ਰਤਾ ਨਹ�� ਹ�।"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:725
-#, c-format
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ: �ੱ� �ਾ� ਵਧ�ਰ� ਪ�ਰਾਪਤ-�ਰਤਾ �ਲਤ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:961
+#: ../camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "SMTP Greeting"
 msgstr "SMTP ਸ਼�ੱਭ-ਸ�ਨ�ਹਾ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
-#: ../camel/providers/smtp/camel-smtp-transport.c:1000
-#: ../camel/providers/smtp/camel-smtp-transport.c:1007
+#: ../camel/providers/smtp/camel-smtp-transport.c:1050
+#: ../camel/providers/smtp/camel-smtp-transport.c:1067
+#: ../camel/providers/smtp/camel-smtp-transport.c:1075
 msgid "HELO command failed: "
 msgstr "HELO �ਮਾ�ਡ �ਸਫਲ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1143
 msgid "SMTP Authentication"
 msgstr "SMTP ਪ�ਰਮਾਣ�ਿਤਾ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1081
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
 #, c-format
 msgid "Error creating SASL authentication object."
 msgstr "�ਲਤ�, SASL ਪ�ਰਮਾਣ�ਿਤਾ ��ਾ� ਬਣਾ�ਣ ਵਿੱ�।"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1097
-#: ../camel/providers/smtp/camel-smtp-transport.c:1107
-#: ../camel/providers/smtp/camel-smtp-transport.c:1115
+#: ../camel/providers/smtp/camel-smtp-transport.c:1169
+#: ../camel/providers/smtp/camel-smtp-transport.c:1180
+#: ../camel/providers/smtp/camel-smtp-transport.c:1189
 msgid "AUTH command failed: "
 msgstr "AUTH �ਮਾ�ਡ �ਸਫਲ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1214
-#: ../camel/providers/smtp/camel-smtp-transport.c:1226
-#: ../camel/providers/smtp/camel-smtp-transport.c:1233
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#: ../camel/providers/smtp/camel-smtp-transport.c:1311
+#: ../camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM �ਮਾ�ਡ �ਸਫਲ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#: ../camel/providers/smtp/camel-smtp-transport.c:1347
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO �ਮਾ�ਡ ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1270
-#: ../camel/providers/smtp/camel-smtp-transport.c:1278
+#: ../camel/providers/smtp/camel-smtp-transport.c:1363
+#: ../camel/providers/smtp/camel-smtp-transport.c:1372
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1316
-#: ../camel/providers/smtp/camel-smtp-transport.c:1325
-#: ../camel/providers/smtp/camel-smtp-transport.c:1335
-#: ../camel/providers/smtp/camel-smtp-transport.c:1392
-#: ../camel/providers/smtp/camel-smtp-transport.c:1408
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
-#: ../camel/providers/smtp/camel-smtp-transport.c:1426
+#: ../camel/providers/smtp/camel-smtp-transport.c:1414
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
+#: ../camel/providers/smtp/camel-smtp-transport.c:1434
+#: ../camel/providers/smtp/camel-smtp-transport.c:1493
+#: ../camel/providers/smtp/camel-smtp-transport.c:1512
+#: ../camel/providers/smtp/camel-smtp-transport.c:1525
+#: ../camel/providers/smtp/camel-smtp-transport.c:1533
 msgid "DATA command failed: "
 msgstr "DATA �ਮਾ�ਡ ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1448
-#: ../camel/providers/smtp/camel-smtp-transport.c:1460
-#: ../camel/providers/smtp/camel-smtp-transport.c:1467
+#: ../camel/providers/smtp/camel-smtp-transport.c:1558
+#: ../camel/providers/smtp/camel-smtp-transport.c:1572
+#: ../camel/providers/smtp/camel-smtp-transport.c:1580
 msgid "RSET command failed: "
 msgstr "RSET �ਮਾ�ਡ ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1489
-#: ../camel/providers/smtp/camel-smtp-transport.c:1502
-#: ../camel/providers/smtp/camel-smtp-transport.c:1508
+#: ../camel/providers/smtp/camel-smtp-transport.c:1605
+#: ../camel/providers/smtp/camel-smtp-transport.c:1619
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
 msgid "QUIT command failed: "
 msgstr "QUIT �ਮਾ�ਡ ਫ�ਲ�ਹ: "
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:47
+#| msgid "Anniversary"
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "ਵਰ�ਹ�-�ੰਢ"
+
+#: ../libedataserver/e-categories.c:48
+#| msgid "Birthday"
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "�ਨਮਦਿਨ"
+
+#: ../libedataserver/e-categories.c:49
+#| msgid "Business"
+msgctxt "CategoryName"
 msgid "Business"
-msgstr "ਵਪਾਰ"
+msgstr "ਵਪਾਰ�"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:50
+#| msgid "Competition"
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "ਮ��ਾਬਲਾ"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:51
+#| msgid "Favorites"
+msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "ਪਸੰਦ�ਦਾ"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:52
+#| msgid "Gifts"
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "ਤ�ਹਫ�"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:53
+#| msgid "Goals/Objectives"
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "ਨਿਸ਼ਾਨ�/����"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:54
+#| msgid "Holiday"
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "��ੱ��"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:55
+#| msgid "Holiday Cards"
+msgctxt "CategoryName"
 msgid "Holiday Cards"
-msgstr "��ੱ���� �ਾਰਡ"
+msgstr "��ੱ�� �ਾਰਡ"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:57
+#| msgid "Hot Contacts"
+msgctxt "CategoryName"
 msgid "Hot Contacts"
-msgstr "ਤ�� ਸੰਪਰ�"
+msgstr "ਤ�ਰੰਤ ਸੰਪਰ�"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:58
+#| msgid "Ideas"
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "ਢੰ�"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:59
+#| msgid "International"
+msgctxt "CategoryName"
 msgid "International"
 msgstr "�ੰਤਰਰਾਸ਼�ਰ�"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:60
+#| msgid "Key Customer"
+msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "�ਾਸ �ਾਹ�"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:61
+#| msgid "Miscellaneous"
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "ਫ���ਲ"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:62
+#| msgid "Personal"
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "ਨਿੱ��"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:63
+#| msgid "Phone Calls"
+msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "ਫ�ਨ �ਾਲ"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:65
+#| msgid "Status"
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "ਹਾਲਤ"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:66
+#| msgid "Strategies"
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "ਨ�ਤ�"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:67
+#| msgid "Suppliers"
+msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "ਸਪਲਾ�ਰ"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:68
+#| msgid "Time & Expenses"
+msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "ਸਮਾ� �ਤ� �ਰ��"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:69
+#| msgid "VIP"
+msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:70
+#| msgid "Waiting"
+msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "�ਡ�� �ਾਰ�"
 
@@ -4759,7 +4878,7 @@ msgstr "%H:%M"
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
 #: ../libedataserver/e-time-utils.c:1842
 msgid "%H%M"
-msgstr "%H:%M"
+msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
 #: ../libedataserver/e-time-utils.c:1846
@@ -4776,55 +4895,51 @@ msgstr "LDAP ਸਰਵਰ ਨ�ੰ ��ਿ�ਤ ਦ� ਤ�ਰ 'ਤ� ਵ
 msgid "Failed to authenticate.\n"
 msgstr "ਡਾ�ਾ ���ਡਿ� �ਰਨ ਵਿੱ� �ਸਫਲ ਹ�।\n"
 
+#: ../libedataserverui/e-categories-dialog.c:134
+msgid "Category Properties"
+msgstr "���ਾ�ਰ� ��ਣ"
+
 #: ../libedataserverui/e-categories-dialog.c:145
+msgid "Category _Name"
+msgstr "���ਾ�ਰ� ਨਾ�(_N)"
+
+#: ../libedataserverui/e-categories-dialog.c:151
+msgid "Category _Icon"
+msgstr "���ਾ�ਰ� ���ਾਨ(_I)"
+
+#: ../libedataserverui/e-categories-dialog.c:192
 msgid "Category Icon"
 msgstr "���ਾ�ਰ� ���ਾਨ"
 
-#: ../libedataserverui/e-categories-dialog.c:151
+#: ../libedataserverui/e-categories-dialog.c:198
 msgid "_No Image"
 msgstr "��� �ਿੱਤਰ ਨਹ��(_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:368
+#: ../libedataserverui/e-categories-dialog.c:409
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "ਸੰਰ�ਨਾ ਵਿੱ� ਪਹਿਲਾ� ਹ� '%s' ���ਾ�ਰ� ਹ�। �ਿਰਪਾ �ਰ�� ਵੱ�ਰਾ ਨਾ� ਵਰਤ��।"
 
-#: ../libedataserverui/e-categories-dialog.c:676
-msgid "Icon"
-msgstr "���ਾਨ"
-
-#: ../libedataserverui/e-categories-dialog.c:681
-msgid "Category"
-msgstr "���ਾ�ਰ�"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:1
-msgid "Category Properties"
-msgstr "���ਾ�ਰ� ��ਣ"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:2
-msgid "Category _Icon"
-msgstr "���ਾ�ਰ� ���ਾਨ(_I)"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:3
-msgid "Category _Name"
-msgstr "���ਾ�ਰ� ਨਾ�(_N)"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:4
+#: ../libedataserverui/e-categories-dialog.c:664
 msgid "Currently _used categories:"
 msgstr "�ਸ ਸਮ�� ਵਰਤ��� ���ਾ�ਰ���(_u):"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:5
+#: ../libedataserverui/e-categories-dialog.c:671
 msgid "_Available Categories:"
 msgstr "�ਪਲੱਬਧ ���ਾ�ਰ���(_A):"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:6
+#: ../libedataserverui/e-categories-dialog.c:714
 msgid "_Edit"
 msgstr "ਸ�ਧ(_E)"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:7
-msgid "categories"
+#: ../libedataserverui/e-categories-dialog.c:770
+msgid "Icon"
+msgstr "���ਾਨ"
+
+#: ../libedataserverui/e-categories-dialog.c:775
+msgid "Category"
 msgstr "���ਾ�ਰ�"
 
 #: ../libedataserverui/e-category-completion.c:292
@@ -4832,79 +4947,83 @@ msgstr "���ਾ�ਰ�"
 msgid "Create category \"%s\""
 msgstr "���ਾ�ਰ� \"%s\" ਬਣਾ�"
 
-#: ../libedataserverui/e-name-selector-dialog.c:319
-msgid "Select Contacts from Address Book"
-msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ��� ਸੰਪਰ� ��ਣ�"
+#: ../libedataserverui/e-name-selector-dialog.c:176
+#| msgid "Hot Contacts"
+msgid "Show Contacts"
+msgstr "ਸੰਪਰ� ਵ���"
 
-#: ../libedataserverui/e-name-selector-dialog.c:658
-msgid "_Add"
-msgstr "ਸ਼ਾਮਲ(_A)"
+#: ../libedataserverui/e-name-selector-dialog.c:198
+msgid "Address B_ook:"
+msgstr "�ਡਰ�ੱਸ �ਿਤਾਬ(_o):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:662
-msgid "_Remove"
-msgstr "ਹ�ਾ�(_R)"
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Cate_gory:"
+msgstr "���ਾ�ਰ�(_g):"
+
+#: ../libedataserverui/e-name-selector-dialog.c:224
+msgid "_Search:"
+msgstr "���(_S):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:890
-#: ../libedataserverui/e-name-selector-dialog.ui.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:242
+#: ../libedataserverui/e-name-selector-dialog.c:984
 msgid "Any Category"
 msgstr "��� ਵ� ���ਾ�ਰ�"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:1
-msgid "*"
-msgstr "*"
+#: ../libedataserverui/e-name-selector-dialog.c:244
+#| msgid "Contacts"
+msgid "Co_ntacts"
+msgstr "ਸੰਪਰ�(_n)"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>ਸੰਪਰ�(_n)</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>ਸੰਪਰ� ਵ���</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:4
-msgid "Address B_ook:"
-msgstr "�ਡਰ�ੱਸ �ਿਤਾਬ(_o):"
+#: ../libedataserverui/e-name-selector-dialog.c:289
+msgid "Search"
+msgstr "���"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Address Book"
 msgstr "�ਡਰ�ੱਸ �ਿਤਾਬ"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:7
-msgid "Cate_gory:"
-msgstr "���ਾ�ਰ�(_g):"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:8
+#: ../libedataserverui/e-name-selector-dialog.c:295
 msgid "Contacts"
 msgstr "ਸੰਪਰ�"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:9
-msgid "Search"
-msgstr "���"
+#: ../libedataserverui/e-name-selector-dialog.c:415
+msgid "Select Contacts from Address Book"
+msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ��� ਸੰਪਰ� ��ਣ�"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:10
-msgid "_Search:"
-msgstr "���(_S):"
+#: ../libedataserverui/e-name-selector-dialog.c:754
+msgid "_Add"
+msgstr "ਸ਼ਾਮਲ(_A)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:758
+msgid "_Remove"
+msgstr "ਹ�ਾ�(_R)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:898
+#, c-format
+#| msgid "Error reading mail file: %s"
+msgid "Error loading address book: %s"
+msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਲ�ਡ �ਰਨ ਦ�ਰਾਨ �ਲਤ�: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2636
+#: ../libedataserverui/e-name-selector-entry.c:2658
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s ਲਾ�ਨ '� ਫ�ਲਾ�(_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2651
+#: ../libedataserverui/e-name-selector-entry.c:2673
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s �ਾਪ� �ਰ�(_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2661
+#: ../libedataserverui/e-name-selector-entry.c:2683
 #, c-format
 msgid "C_ut %s"
 msgstr "%s �ੱ��(_U)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2678
+#: ../libedataserverui/e-name-selector-entry.c:2700
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ਸ�ਧ(_E)"
@@ -4914,28 +5033,28 @@ msgstr "%s ਸ�ਧ(_E)"
 msgid "_Delete %s"
 msgstr "%s ਹ�ਾ�(_D)"
 
-#: ../libedataserverui/e-passwords.c:257
+#: ../libedataserverui/e-passwords.c:127
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr "��ਰਿੰ� �� �ਣ-ਵਰਤ��ਯ�� ਹ�: ��� ਹ�ਸ� �ਾ� ਯ��਼ਰ ਨਹ��"
 
-#: ../libedataserverui/e-passwords.c:1120
+#: ../libedataserverui/e-passwords.c:701
 msgid "You have the Caps Lock key on."
 msgstr "ਤ�ਸ�� ��ਪਸ ਲਾ� ਨ�ੰ �ਾਲ� ��ਤਾ ਹ�।"
 
-#: ../libedataserverui/e-passwords.c:1241
+#: ../libedataserverui/e-passwords.c:824
 msgid "_Remember this passphrase"
 msgstr "�ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1242
+#: ../libedataserverui/e-passwords.c:825
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "�ਸ ਸ਼�ਸ਼ਨ ਲ� �ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1247
+#: ../libedataserverui/e-passwords.c:830
 msgid "_Remember this password"
 msgstr "�ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1248
+#: ../libedataserverui/e-passwords.c:831
 msgid "_Remember this password for the remainder of this session"
 msgstr "�ਸ ਸ਼�ਸਨ ਲ� �ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
@@ -4944,7 +5063,7 @@ msgstr "�ਸ ਸ਼�ਸਨ ਲ� �ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ
 msgid "Select destination"
 msgstr "�ਿ�ਾਣਾ ��ਣ�"
 
-#: ../libedataserverui/e-source-selector-dialog.c:172
+#: ../libedataserverui/e-source-selector-dialog.c:174
 msgid "_Destination"
 msgstr "�ਿ�ਾਣਾ(_D)"
 
@@ -4964,6 +5083,21 @@ msgstr "ਸਰਵਰ ਤ�� ��� �ਵਾਬ ਨਹ��"
 msgid "Bad parameter"
 msgstr "�ਲਤ ਪ�ਰਾਮ��ਰ"
 
+#~ msgid "Verifying message"
+#~ msgstr "ਸ�ਨ�ਹ� ਦ� �ਾ�� �ਾਰ� ਹ�"
+
+#~ msgid "categories"
+#~ msgstr "���ਾ�ਰ�"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "<b>Co_ntacts</b>"
+#~ msgstr "<b>ਸੰਪਰ�(_n)</b>"
+
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>ਸੰਪਰ� ਵ���</b>"
+
 #~| msgid "Unknown User"
 #~ msgid "UnknownUser"
 #~ msgstr "�ਣ�ਾਣ-ਯ��਼ਰ"



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