[evolution-data-server/gnome-2-30] complete Translation for Punjabi by A S Alam



commit c17b58f8ff804228648820721165fb30d3cfdba2
Author: A S Alam <aalam users sf net>
Date:   Sun Mar 28 09:37:08 2010 +0530

    complete Translation for Punjabi by A S Alam

 po/pa.po | 2501 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1327 insertions(+), 1174 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index f2f5a7a..81b5cf7 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -4,17 +4,17 @@
 # Robert Brady <rwb197 zepler org> 2000
 #
 #
-# A S Alam <aalam users sf net>, 2005, 2006, 2007, 2009.
+# A S Alam <aalam users sf net>, 2005, 2006, 2007, 2009, 2010.
 # 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=general\n"
-"POT-Creation-Date: 2009-08-11 14:04+0000\n"
-"PO-Revision-Date: 2009-09-13 09:22+0530\n"
+"POT-Creation-Date: 2010-03-22 20:40+0000\n"
+"PO-Revision-Date: 2010-03-28 09:36+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
-"Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
+"Language-Team: Punjabi/Panjabi <kde-i18n-doc kde org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,171 +22,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2329
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
 #: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2260
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2282
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2327
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "��� �ਾਰ� ਹ�..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2695
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "ਸੰਪਰ� (%d) ਡਾ�ਨਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2844
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "ਸੰਪਰ� ����� (%d) �ੱਪਡ�� ��ਤ� �ਾ ਰਹ� ਹ�... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
 msgid "Using Distinguished Name (DN)"
 msgstr "ਵੱ�ਰਾ ਨਾ� ਵਰਤ�� (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
 msgid "Using Email Address"
 msgstr "�ਮ�ਲ �ਡਰ�ੱਸ ਵਰਤ ��"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ���ਿ� �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਸ਼ਾਮਿਲ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਹ�ਾ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
 msgid "Receiving LDAP search results..."
 msgstr "LDAP ਤ�� ��� ਨਤ��� ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
 msgid "Error performing search"
 msgstr "��� �ਲਾ�ਣ ਵਿੱ� �ਲਤ�"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:287 ../addressbook/libebook/e-book.c:291
-#: ../addressbook/libebook/e-book.c:495 ../addressbook/libebook/e-book.c:499
-#: ../addressbook/libebook/e-book.c:637 ../addressbook/libebook/e-book.c:641
-#: ../addressbook/libebook/e-book.c:727 ../addressbook/libebook/e-book.c:731
-#: ../addressbook/libebook/e-book.c:1024 ../addressbook/libebook/e-book.c:1029
-#: ../addressbook/libebook/e-book.c:1206 ../addressbook/libebook/e-book.c:1210
-#: ../addressbook/libebook/e-book.c:1365 ../addressbook/libebook/e-book.c:1369
-#: ../addressbook/libebook/e-book.c:1570 ../addressbook/libebook/e-book.c:1574
-#: ../addressbook/libebook/e-book.c:1813 ../addressbook/libebook/e-book.c:1817
-#: ../addressbook/libebook/e-book.c:2050 ../addressbook/libebook/e-book.c:2054
-#: ../addressbook/libebook/e-book.c:2257 ../addressbook/libebook/e-book.c:2261
-#: ../addressbook/libebook/e-book.c:3445
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "\"%s\" ਬ�ੱ� ਤ� ਪਹਿਲਾ� \"%s\""
-
-#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:508
-#: ../addressbook/libebook/e-book.c:650 ../addressbook/libebook/e-book.c:740
-#: ../addressbook/libebook/e-book.c:1039 ../addressbook/libebook/e-book.c:1220
-#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1583
-#: ../addressbook/libebook/e-book.c:1826 ../addressbook/libebook/e-book.c:2064
-#: ../addressbook/libebook/e-book.c:2270 ../addressbook/libebook/e-book.c:2679
-#: ../addressbook/libebook/e-book.c:2877
-#, c-format
-msgid "book busy"
-msgstr "ਬ�ੱ� ਰ�ੱ��"
-
-#: ../addressbook/libebook/e-book.c:331 ../addressbook/libebook/e-book.c:335
-#: ../addressbook/libebook/e-book.c:539 ../addressbook/libebook/e-book.c:543
-#: ../addressbook/libebook/e-book.c:677 ../addressbook/libebook/e-book.c:681
-#: ../addressbook/libebook/e-book.c:767 ../addressbook/libebook/e-book.c:771
-#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069
-#: ../addressbook/libebook/e-book.c:1250 ../addressbook/libebook/e-book.c:1253
-#: ../addressbook/libebook/e-book.c:1406 ../addressbook/libebook/e-book.c:1410
-#: ../addressbook/libebook/e-book.c:1619 ../addressbook/libebook/e-book.c:1623
-#: ../addressbook/libebook/e-book.c:1873 ../addressbook/libebook/e-book.c:1877
-#: ../addressbook/libebook/e-book.c:2094 ../addressbook/libebook/e-book.c:2098
-#: ../addressbook/libebook/e-book.c:2296 ../addressbook/libebook/e-book.c:2300
-#: ../addressbook/libebook/e-book.c:2531 ../addressbook/libebook/e-book.c:2705
-#: ../addressbook/libebook/e-book.c:2709 ../addressbook/libebook/e-book.c:2903
-#: ../addressbook/libebook/e-book.c:2907 ../addressbook/libebook/e-book.c:3454
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "CORBA �ਪਵਾਦ \"%s\" �ਾਲ"
-
-#: ../addressbook/libebook/e-book.c:2520
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: ਮ���ਦਾ ��� �ਾਰਵਾ� ਨਹ�� ਹ�"
-
-#: ../addressbook/libebook/e-book.c:2549 ../addressbook/libebook/e-book.c:2594
-#: ../addressbook/libebook/e-book.c:2633
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
-
-#: ../addressbook/libebook/e-book.c:2665 ../addressbook/libebook/e-book.c:2669
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "\"%s\" ਬ�ੱ� ਦ� ਬਾ�ਦ \"%s\""
-
-#: ../addressbook/libebook/e-book.c:2733
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: ਰੱਦ ��ਤਾ"
-
-#: ../addressbook/libebook/e-book.c:3310
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: �ਲਤ ਸਰ�ਤ ��ਡ"
-
-#: ../addressbook/libebook/e-book.c:3318 ../addressbook/libebook/e-book.c:3383
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: URI `%s' ਲ� ��� ਫ���ਰ� �ਪਲੱਬਧ ਨਹ�� ਹ�"
-
-#: ../addressbook/libebook/e-book.c:3329
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�"
-
-#: ../addressbook/libebook/e-book.c:3595
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: gconf ਵਿੱ� ��� ��ਦ-ਸੰਪਰ� UID ਸੰਭਾਲਿ� ਨਹ�� ਹ�।"
-
-#: ../addressbook/libebook/e-book.c:3727
+#: ../addressbook/libebook/e-book.c:2152
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s: ��-�ਾਨਫ ਵਿੱ� UID `%s' ਲ� ��� ਸਰ�ਤ ਨਹ�� ਹ�।"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "ਵੱ�ਰਾ ID"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "ਫਾ�ਲ ਹ�ਠਾ�"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "�ਿਤਾਬ URI"
 
@@ -194,806 +104,875 @@ msgstr "�ਿਤਾਬ URI"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "ਪ�ਰਾ ਨਾ�"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "�ਪਲੱਬਧ ਨਾ�"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "ਪਰਿਵਾਰਿ� ਨਾ�"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "�ਮ ਨਾ�"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
 msgstr "�ਮ�ਲ ੧"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
 msgstr "�ਮ�ਲ ੨"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
 msgstr "�ਮ�ਲ ੩"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
 msgstr "�ਮ�ਲ ੪"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "ਮ�ਲਰ"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "�ਰ �ਡਰ�ੱਸ ਲ�ਬਲ"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "�ੰਮ �ਡਰ�ੱਸ ਲ�ਬਲ"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "ਹ�ਰ �ਡਰ�ੱਸ ਲ�ਬਲ"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "ਸਹਾ�� ਫ�ਨ"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "ਵਪਾਰਿ� ਫ�ਨ"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
 msgstr "ਵਪਾਰਿ� ਫ�ਨ 2"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "ਵਪਾਰਿ� ਫ��ਸ"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "�ਾਲਬ�� ਫ�ਨ"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "�ਾਰ ਫ�ਨ"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "�ੰਪਨ� ਫ�ਨ"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "�ਰ ਫ�ਨ"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
 msgstr "�ਰ ਫ�ਨ 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "�ਰ ਫ��ਸ"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "ਮ�ਬਾ�ਨ ਫ�ਨ"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "ਹ�ਰ ਫ�ਨ"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "ਹ�ਰ ਫ��ਸ"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "ਪ��ਰ"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "ਪ�ਰਾ�ਮਰ� ਫ�ਨ"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "ਰ�ਡ��"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "��ਲ��ਸ"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "ਸੰਸਥਾ"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "ਸੰਸਥਾ ਯ�ਨਿ�"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "ਦਫਤਰ"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "�ਾ��ਲ"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "�ੰਮ"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "ਮ�ਨ��ਰ"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "ਸਹਾ��"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "ਮ�ੱ� ਸਫਾ URL"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "ਵ�ਬਲਾ� URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:609
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:671
 msgid "Categories"
 msgstr "���ਾ�ਰ�"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "��ਲੰਡਰ URI"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� URL"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "ICS ��ਲੰਡਰ"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "ਵ�ਡਿ� �ਾਨਫਰਸਿੰ� URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "ਸਾਥ� ਦਾ ਨਾ�"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "�ਿੱਪਣ�"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
 msgstr "AIM �ਰ ਸ�ਰ�ਨ ਨਾ� ੧"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "AIM �ਰ ਸ�ਰ�ਨ ਨਾ� ੨"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "AIM �ਰ ਸ�ਰ�ਨ ਨਾ� ੩"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "AIM �ੰਮ ਸ�ਰ�ਨ ਨਾ� ੧"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "AIM �ੰਮ ਸ�ਰ�ਨ ਨਾ� ੨"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "AIM �ੰਮ ਸ�ਰ�ਨ ਨਾ� ੩"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
 msgstr "�ਰ�ਪਵਾ�� �ਰ ਸ�ਰ�ਨ ਨਾ� ੧"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
 msgstr "�ਰ�ਪਵਾ�� �ਰ ਸ�ਰ�ਨ ਨਾ� ੨"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
 msgstr "�ਰ�ਪਵਾ�� �ਰ ਸ�ਰ�ਨ ਨਾ� ੩"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
 msgstr "�ਰ�ਪਵਾ�� �ੰਮ ਸ�ਰ�ਨ ਨਾ� ੧"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
 msgstr "�ਰ�ਪਵਾ�� �ੰਮ ਸ�ਰ�ਨ ਨਾ� ੨"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
 msgstr "�ਰ�ਪਵਾ�� �ੰਮ ਸ�ਰ�ਨ ਨਾ� ੩"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:203
 msgid "Jabber Home Id 1"
 msgstr "Jabber Home Id ੧"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:204
 msgid "Jabber Home Id 2"
 msgstr "Jabber Home Id ੨"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:205
 msgid "Jabber Home Id 3"
 msgstr "Jabber Home Id à©©"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Work Id 1"
 msgstr "Jabber Work Id ੧"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Work Id 2"
 msgstr "Jabber Work Id ੨"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Work Id 3"
 msgstr "Jabber Work Id à©©"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! Home Screen Name ੧"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! Home Screen Name ੨"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! Home Screen Name à©©"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! Work Screen Name ੧"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! Work Screen Name ੨"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! Work Screen Name à©©"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
 msgstr "MSN Home Screen Name ੧"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
 msgstr "MSN Home Screen Name ੨"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
 msgstr "MSN Home Screen Name à©©"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
 msgstr "MSN Work Screen Name ੧"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
 msgstr "MSN Work Screen Name ੨"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
 msgstr "MSN Work Screen Name à©©"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:221
 msgid "ICQ Home Id 1"
 msgstr "ICQ Home Id ੧"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:222
 msgid "ICQ Home Id 2"
 msgstr "ICQ Home Id ੨"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:223
 msgid "ICQ Home Id 3"
 msgstr "ICQ Home Id à©©"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Work Id 1"
 msgstr "ICQ Work Id ੧"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Work Id 2"
 msgstr "ICQ Work Id ੨"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Work Id 3"
 msgstr "ICQ Work Id à©©"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "��ਰ� ਰ�ਵਿ�਼ਨ"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "ਨਾ� �ਾ� ਸੰਸਥਾ"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "�ਡਰ�ੱਸ ਲਿਸ�"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "�ਰ �ਡਰ�ੱਸ"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "�ੰਮ ਫ�ਨ"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "ਹ�ਰ �ਡਰ�ੱਸ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
 msgstr "���ਾ�ਰ� ਲਿਸ�"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "ਤਸਵ�ਰ"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "ਲ���"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "ਨਾ�"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
 msgstr "�ਮ�ਲ ਲਿਸ�"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr "AIM ਸ�ਰ�ਨ ਨਾ� ਲਿਸ�"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:250
 msgid "GroupWise Id List"
 msgstr "�ਰ�ੱਵਾ�� Id ਲਿਸ�"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:251
 msgid "Jabber Id List"
 msgstr "Jabber Id ਲਿਸ�"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! Screen ਨਾ� ਲਿਸ�"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:253
 msgid "MSN Screen Name List"
 msgstr "MSN Screen ਨਾ� ਲਿਸ�"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:254
 msgid "ICQ Id List"
 msgstr "ICQ Id ਲਿਸ�"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "HTML ਮ�ਲ �ਾਹ�ਦ� ਹ�"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
 msgstr "ਲਿਸ�"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
 msgstr "ਵ��ਾ� �ਡਰ�ੱਸ ਲਿਸ� �ਰ�"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "�ਨਮ ਦਿਨ"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
 #: ../libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "ਵਰ�-�ੰਢ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "X.509 ਸਰ��ਫਿ���"
 
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Gadu-Gadu Home Id 1"
 msgstr "Gadu-Gadu �ਰ Id ੧"
 
-#: ../addressbook/libebook/e-contact.c:266
+#: ../addressbook/libebook/e-contact.c:268
 msgid "Gadu-Gadu Home Id 2"
 msgstr "Gadu-Gadu �ਰ Id ੨"
 
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook/e-contact.c:269
 msgid "Gadu-Gadu Home Id 3"
 msgstr "Gadu-Gadu �ਰ Id ੩"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Work Id 1"
 msgstr "Gadu-Gadu �ੰਮ Id ੧"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Work Id 2"
 msgstr "Gadu-Gadu �ੰਮ Id ੨"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Work Id 3"
 msgstr "Gadu-Gadu �ੰਮ Id ੩"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Id List"
 msgstr "Gadu-Gadu Id ਲਿਸ�"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "ਭ���ਲਿ� �ਾਣ�ਾਰ�"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "��ਲ�ਫ�ਨ"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
 msgstr "Skype Home Name ੧"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
 msgstr "Skype Home Name ੨"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
 msgstr "Skype Home Name à©©"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
 msgstr "Skype Work Name ੧"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
 msgstr "Skype Work Name ੨"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
 msgstr "Skype Work Name à©©"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
 msgstr "Skype Name ਲਿਸ�"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "SIP �ਡਰ�ੱਸ"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1515
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "ਬਿਨਾ� ਨਾ� ਸ���"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
+#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#, c-format
+msgid "Empty URI"
+msgstr "�ਾਲ� URI"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:305
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:323
+#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#, c-format
+#| msgid "%s: Invalid source."
+msgid "Invalid source"
+msgstr "�ਲਤ ਸਰ�ਤ"
+
+#: ../addressbook/libedata-book/e-data-book.c:301
+#| msgid "Cannot open message"
+msgid "Cannot open book"
+msgstr "ਬ�ੱ� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ�ਦ�"
+
+#: ../addressbook/libedata-book/e-data-book.c:319
+msgid "Cannot remove book"
+msgstr "ਬ�ੱ� ਹ�ਾ� �ਾ ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../addressbook/libedata-book/e-data-book.c:346
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact"
+msgstr "ਸੰਪਰ� ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../addressbook/libedata-book/e-data-book.c:358
+msgid "Empty query"
+msgstr "�ਿ�ਰ� �ਾਲ� ਹ�"
+
+#: ../addressbook/libedata-book/e-data-book.c:402
+#| msgid "Cannot authenticate to server: %s"
+msgid "Cannot authenticate user"
+msgstr "ਯ��਼ਰ ਪਰਮਾਣਿਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
+
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../addressbook/libedata-book/e-data-book.c:429
+#| msgid "Cannot add encryption certificate"
+msgid "Cannot add contact"
+msgstr "ਸੰਪਰ� ਸ਼ਾਮਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
+
+#: ../addressbook/libedata-book/e-data-book.c:444
+#: ../addressbook/libedata-book/e-data-book.c:459
+#| msgid "Cannot create encoder context"
+msgid "Cannot modify contact"
+msgstr "ਸੰਪਰ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../addressbook/libedata-book/e-data-book.c:494
+#| msgid "Cannot create encoder context"
+msgid "Cannot remove contacts"
+msgstr "ਸੰਪਰ� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../addressbook/libedata-book/e-data-book.c:569
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+msgid "Invalid query"
+msgstr "�ਲਤ �ਿ�ਰ�"
+
+#: ../addressbook/libedata-book/e-data-book.c:598
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get changes"
+msgstr "ਬਦਲਾ� ਨਹ�� ਲ� �ਾ ਸ�ਦ�"
+
+#: ../addressbook/libedata-book/e-data-book.c:699
+#| msgid "Could not cancel operation"
+msgid "Cannot complete operation"
+msgstr "�ਪਰ�ਸ਼ਨ ਪ�ਰਾ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
 #: ../libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "�ਨਮਦਿਨ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
 #, c-format
 msgid "Birthday: %s"
 msgstr "�ਨਮਦਿਨ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ਵਰ��ੰਢ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:234
+#: ../calendar/backends/file/e-cal-backend-file.c:236
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "��ਲੰਡਰ ਡਾ�� ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: ਨਿ�ਾਰਾ URI"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#: ../calendar/backends/file/e-cal-backend-file.c:247
+#: ../calendar/backends/file/e-cal-backend-file.c:243
+#: ../calendar/backends/file/e-cal-backend-file.c:249
 msgid "Cannot save calendar data"
 msgstr "��ਲੰਡਰ ਡਾ�� ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
 msgid "Could not create thread for getting deltas"
 msgstr "����� ਥਰਿੱਡ ਨ�ੰ ਵਿ�ਸਤ ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
-#: ../calendar/backends/google/e-cal-backend-google.c:1189
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
-#: ../calendar/backends/http/e-cal-backend-http.c:659
-#: ../calendar/backends/weather/e-cal-backend-weather.c:486
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
+#: ../calendar/backends/google/e-cal-backend-google.c:1144
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1105
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1403
+#: ../calendar/backends/http/e-cal-backend-http.c:678
+#: ../calendar/backends/weather/e-cal-backend-weather.c:492
 msgid "Could not create cache file"
 msgstr "����� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1118
 msgid "Could not create thread for populating cache"
 msgstr "����� ਥਰਿੱਡ ਨ�ੰ ਵਿ�ਸਤ ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2121
 msgid "Reply Requested: by "
 msgstr "�ਵਾਬ ਦ� ਬ�ਨਤ�: ਵਲ��"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2126
 msgid "Reply Requested: When convenient"
 msgstr "�ਵਾਬ ਲ� ਬ�ਨਤ�: �ਦ�� ਠ�� ਲੱ��"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:280
 #, c-format
 msgid "Loading %s items"
 msgstr "��ਾ��� %s ਲ�ਡ ��ਤ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:944
 msgid "Calendar"
 msgstr "��ਲੰਡਰ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1002
 msgid "Invalid server URI"
 msgstr "�ਲਤ ਸਰਵਰ URI"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
-#: ../calendar/libecal/e-cal.c:5117
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1021
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1030
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
+#: ../calendar/libecal/e-cal.c:4024
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1334
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1370
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1385
+#: ../camel/providers/groupwise/camel-groupwise-store.c:591
+#: ../camel/providers/groupwise/camel-groupwise-store.c:766
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:154
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:181
 msgid "Authentication failed"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:316
+#: ../calendar/backends/http/e-cal-backend-http.c:335
 msgid "Redirected to Invalid URI"
 msgstr "�ਲਤ URI ਲ� ਭ��ਿ� "
 
-#: ../calendar/backends/http/e-cal-backend-http.c:339
+#: ../calendar/backends/http/e-cal-backend-http.c:358
 msgid "Bad file format."
 msgstr "�ਲਤ ਫਾ�ਲ ਫਾਰਮਿ�"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:346
+#: ../calendar/backends/http/e-cal-backend-http.c:365
 msgid "Not a calendar."
 msgstr "��� ��ਲੰਡਰ ਨਹ��"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
+#: ../calendar/backends/weather/e-cal-backend-weather.c:152
 msgid "Could not retrieve weather data"
 msgstr "����� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
 msgid "Weather: Fog"
 msgstr "ਮ�ਸਮ: ਧ�ੰਦ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy"
-msgstr "ਮ�ਸਮ: ਬੱਦਲਵਾ�"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Cloudy Night"
 msgstr "ਮ�ਸਮ: ਬੱਦਲਵਾ� ਵਾਲ� ਰਾਤ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+msgid "Weather: Cloudy"
+msgstr "ਮ�ਸਮ: ਬੱਦਲਵਾ�"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Overcast"
 msgstr "ਮ�ਸਮ: �ਵਰ�ਾਸ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Showers"
 msgstr "ਮ�ਸਮ: ਫ�ਹਾਰ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Snow"
 msgstr "ਮ�ਸਮ: ਬਰ�"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Sunny"
-msgstr "ਮ�ਸਮ: �ਿ�ਿ� ਦਿਨ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Clear Night"
 msgstr "ਮ�ਸਮ: ਸਾਫ਼ ਰਾਤ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+msgid "Weather: Sunny"
+msgstr "ਮ�ਸਮ: �ਿ�ਿ� ਦਿਨ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Thunderstorms"
 msgstr "ਮ�ਸਮ: ਬਰ��ਲਾ ਤ�ਫਾਨ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:400
+#: ../calendar/backends/weather/e-cal-backend-weather.c:405
 msgid "Forecast"
 msgstr "�ਨ�ਮਾਨ"
 
-#: ../calendar/libecal/e-cal-component.c:1320
+#: ../calendar/libecal/e-cal-component.c:1286
 msgid "Untitled appointment"
 msgstr "ਬਿਨਾ� ਨਾ� ਰ���ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3945
+#: ../calendar/libecal/e-cal-recur.c:3951
 msgid "1st"
 msgstr "੧ਹਿਲਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3946
+#: ../calendar/libecal/e-cal-recur.c:3952
 msgid "2nd"
 msgstr "੨�ਾ"
 
-#: ../calendar/libecal/e-cal-recur.c:3947
+#: ../calendar/libecal/e-cal-recur.c:3953
 msgid "3rd"
 msgstr "੩�ਾ"
 
-#: ../calendar/libecal/e-cal-recur.c:3948
+#: ../calendar/libecal/e-cal-recur.c:3954
 msgid "4th"
 msgstr "੪ਥਾ"
 
-#: ../calendar/libecal/e-cal-recur.c:3949
+#: ../calendar/libecal/e-cal-recur.c:3955
 msgid "5th"
 msgstr "੫ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3950
+#: ../calendar/libecal/e-cal-recur.c:3956
 msgid "6th"
 msgstr "੬ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3957
 msgid "7th"
 msgstr "੭ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3958
 msgid "8th"
 msgstr "੮ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3959
 msgid "9th"
 msgstr "੯ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3960
 msgid "10th"
 msgstr "੧੦ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3961
 msgid "11th"
 msgstr "੧੧ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3962
 msgid "12th"
 msgstr "੧੨ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3963
 msgid "13th"
 msgstr "੧੩ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3964
 msgid "14th"
 msgstr "੧੪ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3965
 msgid "15th"
 msgstr "੧੫ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3966
 msgid "16th"
 msgstr "੧੬ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3967
 msgid "17th"
 msgstr "੧੭ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3968
 msgid "18th"
 msgstr "੧੮ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3969
 msgid "19th"
 msgstr "੧੯ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3970
 msgid "20th"
 msgstr "੨੦ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3971
 msgid "21st"
 msgstr "੨੧ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:3972
 msgid "22nd"
 msgstr "੨੨ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:3973
 msgid "23rd"
 msgstr "੨੩ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:3974
 msgid "24th"
 msgstr "੨੪ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:3975
 msgid "25th"
 msgstr "੨੫ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:3976
 msgid "26th"
 msgstr "੨੬ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:3977
 msgid "27th"
 msgstr "੨੭ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:3978
 msgid "28th"
 msgstr "੨੮ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "29th"
 msgstr "੨੯ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "30th"
 msgstr "੩੦ਵਾ�"
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "31st"
 msgstr "੩੧ਵਾ�"
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
+#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
 msgid "High"
 msgstr "�ੱ�"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
+#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
 msgid "Low"
 msgstr "ਨਿ�ਨਤਮ"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:710
+#: ../calendar/libecal/e-cal-util.c:713
 msgid "Undefined"
 msgstr "ਨਾ-ਪ�ਰਭਾਸ਼ਿਤ"
 
-#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1173 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਦਿ� (ਯ��਼ਰ %s)"
@@ -1002,94 +981,94 @@ 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:1707
+#: ../calendar/libecal/e-cal.c:1187
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਯ��਼ਰ %s ਲ� ਪਰਾ�ਸ� ਯ�� �ਰਨ ਲ� ਦਿ�"
 
-#: ../calendar/libecal/e-cal.c:5089
+#: ../calendar/libecal/e-cal.c:3996
 msgid "Invalid argument"
 msgstr "�ਲਤ �ਰ��ਮਿੰ�"
 
-#: ../calendar/libecal/e-cal.c:5091
+#: ../calendar/libecal/e-cal.c:3998
 msgid "Backend is busy"
 msgstr "ਪਿੱ�ਲਾ ਤਾ� ਰ��ਿ� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5093
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4000
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
 msgid "Repository is offline"
 msgstr "Repository �ਫਲਾ�ਨ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5095
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4002
+#: ../calendar/libedata-cal/e-cal-backend-util.c:131
 msgid "No such calendar"
 msgstr "�ੱਦਾ� ਦਾ ��� ��ਲੰਡਰ ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5097
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:4004
+#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "��ਾ� ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5099
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4006
+#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "�ਲਤ ��ਾ�"
 
-#: ../calendar/libecal/e-cal.c:5101
+#: ../calendar/libecal/e-cal.c:4008
 msgid "URI not loaded"
 msgstr "URI ਲ�ਡ ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5103
+#: ../calendar/libecal/e-cal.c:4010
 msgid "URI already loaded"
 msgstr "URI ਪਹਿਲਾ� ਹ� ਲ�ਡ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5105
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:573
+#: ../calendar/libecal/e-cal.c:4012
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
 msgid "Permission denied"
 msgstr "�ਧਿ�ਾਰ ਪਾਬੰਦ� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5107
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4014
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "�ਣ�ਾਣ ਯ��਼ਰ"
 
-#: ../calendar/libecal/e-cal.c:5109
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4016
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
 msgid "Object ID already exists"
 msgstr "��ਾ� ID ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5111
+#: ../calendar/libecal/e-cal.c:4018
 msgid "Protocol not supported"
 msgstr "ਪਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5113
+#: ../calendar/libecal/e-cal.c:4020
 msgid "Operation has been canceled"
 msgstr "�ਾਰਵਾ� ਰੱਦ ��ਤ� �� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5115
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4022
+#: ../calendar/libedata-cal/e-cal-backend-util.c:145
 msgid "Could not cancel operation"
 msgstr "�ਾਰਵਾ� ਨ�ੰ ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5119
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../calendar/libecal/e-cal.c:4026
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
 #: ../camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication required"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:5121
+#: ../calendar/libecal/e-cal.c:4028
 msgid "A CORBA exception has occurred"
 msgstr "�ੱ� CORBA �ਪਵਾਦ ��� ਹ�|"
 
-#: ../calendar/libecal/e-cal.c:5123
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
+#: ../calendar/libecal/e-cal.c:4030
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../camel/camel-net-utils.c:523
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:214
 #: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:743
+#: ../camel/providers/imap/camel-imap-store.c:741
 #: ../camel/providers/imap4/camel-imap4-engine.c:1547
 #: ../camel/providers/imap4/camel-imap4-engine.c:1585
 #: ../camel/providers/imap4/camel-imap4-engine.c:1629
@@ -1097,91 +1076,87 @@ msgstr "�ੱ� CORBA �ਪਵਾਦ ��� ਹ�|"
 #: ../camel/providers/imap4/camel-imap4-store.c:311
 #: ../camel/providers/imap4/camel-imap4-store.c:818
 #: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:552
-#: ../camel/providers/pop3/camel-pop3-store.c:559
-#: ../camel/providers/pop3/camel-pop3-store.c:565
-#: ../servers/exchange/storage/e-storage.c:587
-#: ../servers/groupwise/e-gw-connection.c:241
+#: ../camel/providers/pop3/camel-pop3-store.c:584
+#: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "�ਣਪ�ਾਤ� �ਲਤ�"
 
-#: ../calendar/libecal/e-cal.c:5125
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:555
+#: ../calendar/libecal/e-cal.c:4032
+#: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "No error"
 msgstr "��� �ਲਤ� ਨਹ��"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" ਲ� ��� �ਰ��ਮਿੰ� ਲ� ��� ਨਹ�� �ਾਹ�ਦਾ ਹ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" ਲ� �ੱ� �ਰ��ਮਿੰ� ਲ���ਦਾ ਹ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" ਲ� ਪਹਿਲਾ� �ਰ��ਮਿੰ� ਸਤਰ ਹ�ਣ� ਲਾ�ਮ� ਹ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "\"%s\" ਲ� ਪਹਿਲਾ� �ਰ��ਮਿੰ� ISO 8601 date/time ਸਤਰ ਹ�ਣਾ ਲਾ�ਮ� ਹ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" ਲ� ਦ� �ਰ��ਮਿੰ� ਲ���ਦ� ਹਨ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" ਲ� ਪਹਿਲਾ� �ਰ��ਮਿੰ� time_t �ਾਹ�ਦਾ ਹ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" ਲ� ਦ��ਾ �ਰ��ਮਿੰ� ਪ�ਰਨ �ੰ� �ਾਹ�ਦਾ ਹ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\"ਲ� ਦ��ਾ �ਰ��ਮਿੰ� time_t ਲ���ਦਾ ਹ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" ਲ� ਦ��ਾ �ਰ��ਮਿੰ� �ੱ� ਸਤਰ ਹ�ਣ� ਲਾ�ਮ� ਹ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1192,62 +1167,212 @@ msgstr ""
 "\"description\", �ਾ� \"location\", �ਾ� \"attendee\", �ਾ� \"organizer\", �ਾ� "
 "\"classification\" ਹ�ਣਾ ਲਾ�ਮ� ਹ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" ਲ� �ੱ��-�ੱ� �ੱ� �ਰ��ਮਿੰ� ਲਾ�ਮ� ਹ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr "\"%s\" ਲ� ਸਭ �ਰ��ਮਿੰ� �ਾ� ਤਾ� ਸਤਰ ਹ�ਣ �ਾ� ਸਿਰਫ �ੱ� �ਰ��ਮਿੰ� ਬ�ਲ��ਨ (�ਲਤ) ਹ�ਵ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
 msgid "Invalid range"
 msgstr "�ਲਤ ਰ��਼"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
 msgid "Unsupported field"
 msgstr "��ਰ-ਸਹਾ�� ��ਤਰ"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
 msgid "Unsupported method"
 msgstr "�਼�ਰ-ਸਹਾ�� ਢੰ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
 msgid "Unsupported authentication method"
 msgstr "�਼�ਰ-ਸਹਾ�� ਪਰਮਾਣ�ਿਤਾ ਢੰ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "TLS not available"
 msgstr "TLS �ਪਲੱਬਧ ਨਹ��"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
 msgid "Offline mode unavailable"
 msgstr "�ਫਲਾ�ਨ ਮ�ਡ �ਪਲੱਬਧ ਨਹ��"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
 msgid "Search size limit exceeded"
 msgstr "��� ਸਾ��਼ ਲਿਮ� ਵੱਧ ��"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
 msgid "Search time limit exceeded"
 msgstr "��� �ਾ�ਮ ਲਿਮ� ਵੱਧ ��"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "�ਲਤ �ਿ�ਰ�"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Query refused"
 msgstr "�ਿ�ਰ� ਤ�� �ਨ�ਾਰ ��ਤਾ �ਿ�"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../calendar/libedata-cal/e-cal-backend-util.c:150
 msgid "Invalid server version"
 msgstr "�ਲਤ ਸਰਵਰ ਵਰ�ਨ"
 
+#: ../calendar/libedata-cal/e-data-cal.c:501
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar address"
+msgstr "��ਲੰਡਰ �ਡਰ�ੱਸ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../calendar/libedata-cal/e-data-cal.c:519
+#, c-format
+#| msgid "Cannot save calendar data: Malformed URI."
+msgid "Cannot retrieve calendar alarm e-mail address"
+msgstr "��ਲੰਡਰ �ਲਾਰਮ �ਮ�ਲ �ਡਰ�ੱਸ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../calendar/libedata-cal/e-data-cal.c:537
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar's ldap attribute"
+msgstr "��ਲੰਡਰ ਦਾ ldap ��ਣ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../calendar/libedata-cal/e-data-cal.c:555
+#, c-format
+#| msgid "Cannot create CMS Recipient information"
+msgid "Cannot retrieve calendar scheduling information"
+msgstr "��ਲੰਡਰ ਸ�ਡ��ਲ �ਾਣ�ਾਰ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
+
+#: ../calendar/libedata-cal/e-data-cal.c:572
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot open calendar"
+msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../calendar/libedata-cal/e-data-cal.c:591
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot refresh calendar"
+msgstr "��ਲੰਡਰ ਤਾ�਼ਾ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
+
+#: ../calendar/libedata-cal/e-data-cal.c:608
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar"
+msgstr "��ਲੰਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../calendar/libedata-cal/e-data-cal.c:627
+#, c-format
+#| msgid "Cannot create encoder context"
+msgid "Cannot create calendar object"
+msgstr "��ਲੰਡਰ �ਬ���� ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../calendar/libedata-cal/e-data-cal.c:649
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot modify calendar object"
+msgstr "��ਲੰਡਰ �ਬ���� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../calendar/libedata-cal/e-data-cal.c:673
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar object"
+msgstr "��ਲੰਡਰ �ਬ���� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../calendar/libedata-cal/e-data-cal.c:692
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot receive calendar objects"
+msgstr "��ਲੰਡਰ �ਬ���� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
+
+#: ../calendar/libedata-cal/e-data-cal.c:709
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot discard calendar alarm"
+msgstr "��ਲੰਡਰ �ਲਾਰਮ �ਣਡਿੱਠਾ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦ�"
+
+#: ../calendar/libedata-cal/e-data-cal.c:728
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot send calendar objects"
+msgstr "��ਲੰਡਰ �ਬ���� ਭ��� ਨਹ�� �ਾ ਸ�ਦ�"
+
+#: ../calendar/libedata-cal/e-data-cal.c:763
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve default calendar object path"
+msgstr "ਡਿਫਾਲ� ��ਲੰਡਰ �ਬ���� ਪਾਥ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../calendar/libedata-cal/e-data-cal.c:781
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object path"
+msgstr "��ਲੰਡਰ �ਬ���� ਪਾਥ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+
+#: ../calendar/libedata-cal/e-data-cal.c:799
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object list"
+msgstr "��ਲੰਡਰ �ਬ���� ਲਿਸ� ਨਹ�� ਲ� �ਾ ਸ�ਦ�"
+
+#: ../calendar/libedata-cal/e-data-cal.c:837
+#, c-format
+#| msgid "Could not retrieve weather data"
+msgid "Could not retrieve attachment list"
+msgstr "����ਮ��� ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
+
+#: ../calendar/libedata-cal/e-data-cal.c:859
+#, c-format
+#| msgid "Could not create cache file"
+msgid "Could not complete calendar query"
+msgstr "��ਲੰਡਰ �ਿ�ਰ� ਪ�ਰ� ਨਹ�� ��ਤ� �ਾ ਸ��"
+
+#: ../calendar/libedata-cal/e-data-cal.c:877
+#, c-format
+#| msgid "Could not retrieve weather data"
+msgid "Could not retrieve calendar time zone"
+msgstr "��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਲਿ� ਨਹ�� �ਾ ਸ�ਿ�"
+
+#: ../calendar/libedata-cal/e-data-cal.c:895
+#, c-format
+#| msgid "Could not cancel operation"
+msgid "Could not add calendar time zone"
+msgstr "��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਸ਼ਾਮਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
+
+#: ../calendar/libedata-cal/e-data-cal.c:912
+#, c-format
+msgid "Could not set default calendar time zone"
+msgstr "ਡਿਫਾਲ� ��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਸ�ੱ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
+
+#: ../calendar/libedata-cal/e-data-cal.c:933
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar changes"
+msgstr "��ਲੰਡਰ ਬਦਲਾ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
+
+#: ../calendar/libedata-cal/e-data-cal.c:983
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar free/busy list"
+msgstr "��ਲੰਡਰ ਵਿਹਲ�/ਰ��ਿ� ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#, c-format
+#| msgid "Invalid server URI"
+msgid "Invalid URI"
+msgstr "�ਲਤ URI"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "'%2$s' ਵਿੱ��� '%1$s' ਲ� ਬ����ਡ ਫ���ਰ� ਨਹ�� ਹ�"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#, c-format
+#| msgid "Could not create cache file"
+msgid "Could not instantiate backend"
+msgstr "ਬ����ਡ ਸ਼�ਰ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
+
 #: ../camel/camel-cipher-context.c:102
 msgid "Signing is not supported by this cipher"
 msgstr "�ਸ ��ਪਤ-ਲ��ਣ ਦਸਤ�ਤਾ� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
@@ -1288,16 +1413,16 @@ msgstr "ਤ�ਸ�� �ਸ ��ਪਤ-ਲ��ਣ ਤ�� �� �ਯ
 msgid "You may not export keys with this cipher"
 msgstr "ਤ�ਸ�� ��ਪਤ-ਲ��ਣ ਲ� �� ਨਿਰਯਾਤ ਨਹ�� �ਰ ਸ�ਦ�"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:135
 msgid "Unable to create cache path"
 msgstr "����� ਮਾਰ� ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-data-cache.c:402
+#: ../camel/camel-data-cache.c:403
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "����� �ੰਦਰਾ� ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/camel-db.c:412
+#: ../camel/camel-db.c:416
 msgid "Insufficient memory"
 msgstr "ਲ���ਦ� ਮ�ਮ�ਰ� ਨਹ��"
 
@@ -1342,11 +1467,14 @@ msgid "Preparing folder '%s' for offline"
 msgstr "ਫ�ਲਡਰ '%s' ਨ�ੰ �ਫਲਾ�ਨ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:223
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:3014
+#: ../camel/providers/groupwise/camel-groupwise-store.c:216
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imap/camel-imap-store.c:1843
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imap/camel-imap-store.c:3068
+#: ../camel/providers/imapx/camel-imapx-store.c:167
+#: ../camel/providers/imapx/camel-imapx-store.c:620
+#: ../camel/providers/imapx/camel-imapx-store.c:650
 msgid "You must be working online to complete this operation"
 msgstr "�ਸ �ਾਰਵਾ� ਨ�ੰ ਸੰਪ�ਰਨ �ਰਨ ਲ� ਤ�ਹਾਨ�ੰ �ਨ-ਲਾ�ਨ ਰਹਿਣਾ �ਾਹ�ਦਾ ਹ�"
 
@@ -1436,8 +1564,8 @@ msgstr "�ਲਤ �ਰ��ਮਿੰ�(user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "ਫਿਲ�ਰ ��� �ਲਾ�ਣ ਦ�ਰਾਨ �ਲਤ�: %s: %s"
 
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:455
+#: ../camel/camel-folder-search.c:610
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1446,8 +1574,8 @@ msgstr ""
 "��� ਸਮ��ਰਨ ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ ਦਾ ਸ�ਦਾ ਹ�: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:620
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1456,72 +1584,73 @@ msgstr ""
 "��� ਸਮ��ਰਨ ਨ�ੰ �ਲਾ�ਣ ਵਿੱ� �ਸਫਲ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:812 ../camel/camel-folder-search.c:854
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ਲ� �ੱ� �ੱ�ਲਾ ਬ�ਲ ਨਤ��ਾ �ਾਹ�ਦਾ ਹ�"
 
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:907
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) %s ਵਿੱ� ਮਨ�਼�ਰ ਨਹ�� ਹ�"
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:913 ../camel/camel-folder-search.c:920
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ਲ� �ੱ� ਮ�ਲ ਸਤਰ �ਾਹ�ਦ� ਹ�"
 
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:947
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ਲ� �ੱ� ਲ�� ਨਤ��� ਦ� ਲ�� ਹ�"
 
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:956
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ਲ� ਫ�ਲਡਰ ਸ�ੱ� ਦ� ਲ�� ਹ�"
 
-#: ../camel/camel-folder.c:683
+#: ../camel/camel-folder.c:690
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ�: %s ਲ�"
 
-#: ../camel/camel-folder.c:1388
+#: ../camel/camel-folder.c:1401
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: ਸਮ��ਰਨ ਨਾਲ ���: %s ਲ�"
 
-#: ../camel/camel-folder.c:1429
+#: ../camel/camel-folder.c:1442
 #, c-format
 msgid "Unsupported operation: count by expression: for %s"
 msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: ਸਮ��ਰਨ �ਿਣਤ�: %s ਲ�"
 
-#: ../camel/camel-folder.c:1468
+#: ../camel/camel-folder.c:1483
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "ਨਾ-ਸਹਾ�� �ਾਰਵਾ�: UID ਨਾਲ ���: %s ਲ�"
 
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1596
+#: ../camel/providers/local/camel-maildir-folder.c:387
 msgid "Moving messages"
 msgstr "ਸ�ਨ�ਹ� ਭ��� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1596
 msgid "Copying messages"
 msgstr "ਸ�ਨ�ਹਿ�� ਦ� ਨ�ਲ ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../camel/camel-folder.c:1922
+#: ../camel/camel-folder.c:1945
 msgid "Learning junk"
 msgstr "�ੰ� ਸਿੱ� ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-folder.c:1939
+#: ../camel/camel-folder.c:1963
 msgid "Learning non-junk"
 msgstr "ਨਾ-ਰੱਦ� ਸਿੱ�ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-folder.c:1958
+#: ../camel/camel-folder.c:1983
 msgid "Filtering new message(s)"
 msgstr "ਨਵ�� ਸ�ਨ�ਹ� �ਾਣ� �ਾ ਰਹ� ਹਨ"
 
-#: ../camel/camel-gpg-context.c:751
+#: ../camel/camel-gpg-context.c:760
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1532,15 +1661,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:766
+#: ../camel/camel-gpg-context.c:775
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid ਸੰ��ਤ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ।"
 
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
+#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg passphrase ਸੰ��ਤ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ।"
 
-#: ../camel/camel-gpg-context.c:824
+#: ../camel/camel-gpg-context.c:833
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1549,7 +1678,7 @@ msgstr ""
 "ਤ�ਹਾਨ�ੰ ਤ�ਹਾਡ� ਸਮਾਰ�-�ਾਰਡ ਲ� �ੱ� PIN �ਣ-ਲਾ� �ਰਨ\n"
 "ਲ� ਲ���ਦਾ ਹ�: \"%s\""
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:837
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1558,93 +1687,88 @@ msgstr ""
 "ਤ�ਹਾਨ�ੰ ਯ��਼ਰ ਲ� ਪਾਸ-ਪ�ਰਸੰ� ਲ���ਦਾ ਹ�, �� �ਿ\n"
 "��ਲ ਸ��: \"%s\""
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:842
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG ਤ�� '%s' ਤ�� ਨਾ-ਲ���ਦਾ �ਵਾਬ ਪ�ਰਾਪਤ ਹ���"
 
-#: ../camel/camel-gpg-context.c:858 ../camel/camel-gpg-context.c:1067
+#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
 #: ../camel/providers/nntp/camel-nntp-store.c:1313
 msgid "Canceled."
 msgstr "ਰੱਦ ��ਤਾ ਹ�।"
 
-#: ../camel/camel-gpg-context.c:872
+#: ../camel/camel-gpg-context.c:881
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "��ਪਤ �� ਨ�ੰ ��ਲਣ ਵਿੱ� �ਸਫਲ: ੩ �ਲਤ ਪਾਸ-ਪ�ਰ� ਦਿੱਤ� ਹਨ।"
 
-#: ../camel/camel-gpg-context.c:880
+#: ../camel/camel-gpg-context.c:889
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG ਤ�� ਨਾ-ਲ���ਦਾ �ਵਾਬ ਪ�ਰਾਪਤ ਹ���: %s"
 
-#: ../camel/camel-gpg-context.c:943
+#: ../camel/camel-gpg-context.c:988
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "���ਰਿਪ� ਲ� �ਸਫਲ:��� �ਾ�� ਪ�ਰਾਪਤ �ਰਨ ਨਿਰਧਾਰਿਤ ਨਹ�� ਹ�।"
 
 #. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1205 ../camel/camel-gpg-context.c:1330
-#: ../camel/camel-gpg-context.c:1852 ../camel/camel-gpg-context.c:1897
+#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
+#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg ਨ�ੰ �ਲਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/camel-gpg-context.c:1298 ../camel/camel-smime-context.c:602
+#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "ਦਸਤ�ਤ� ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/camel-gpg-context.c:1345 ../camel/camel-gpg-context.c:1546
-#: ../camel/camel-gpg-context.c:1562 ../camel/camel-gpg-context.c:1642
-#: ../camel/camel-gpg-context.c:1657 ../camel/camel-gpg-context.c:1773
-#: ../camel/camel-gpg-context.c:1788 ../camel/camel-gpg-context.c:1868
-#: ../camel/camel-gpg-context.c:1913
+#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1646 ../camel/camel-gpg-context.c:1728
+#: ../camel/camel-gpg-context.c:1743 ../camel/camel-gpg-context.c:1859
+#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1969
+#: ../camel/camel-gpg-context.c:2014
 msgid "Failed to execute gpg."
 msgstr "gpg ਨ�ੰ �ਲਾ�ਣ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-gpg-context.c:1364
-msgid "This is a digitally signed message part"
-msgstr "�ਹ ਸ�ਨ�ਹ� ਦਾ ਡਿ���ਲ ਦਸਤ�ਤ� ਭਾ� ਹ�"
-
-#: ../camel/camel-gpg-context.c:1450 ../camel/camel-gpg-context.c:1456
-#: ../camel/camel-gpg-context.c:1462 ../camel/camel-gpg-context.c:1477
-#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
+#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
+#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
+#: ../camel/camel-smime-context.c:947
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ਸ�ਨ�ਹਾ ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�� ਹਨ: �ਲਤ ਸ�ਨ�ਹਾ ਫਾਰਮਿ�"
 
-#: ../camel/camel-gpg-context.c:1516
+#: ../camel/camel-gpg-context.c:1600
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "ਸ�ਨ�ਹਾ ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�� ਹਨ: �ਰ�� ਫਾ�ਲ ਨਹ�� ਬਣਾ� �ਾ ਸ�� ਹ�: %s"
 
-#: ../camel/camel-gpg-context.c:1625
+#: ../camel/camel-gpg-context.c:1711
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "�ੰ��ਰਿਪ�ਡ ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s"
 
-#: ../camel/camel-gpg-context.c:1675
+#: ../camel/camel-gpg-context.c:1761
 msgid "This is a digitally encrypted message part"
 msgstr "�ਹ ਸ�ਨ�ਹ� ਦਾ ਡਿ���ਲ ���ਰਿਪ�ਡ ਭਾ� ਹ�"
 
-#: ../camel/camel-gpg-context.c:1728 ../camel/camel-gpg-context.c:1736
-#: ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
+#: ../camel/camel-gpg-context.c:1841
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ਸ�ਨ�ਹਾ ਡ�-�ਰਿਪ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: �ਲਤ ਸ�ਨ�ਹਾ ਫਾਰਮਿ�"
 
-#: ../camel/camel-gpg-context.c:1745
+#: ../camel/camel-gpg-context.c:1831
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME ਭਾ� ਡਿ��ਰਿਪ� �ਰਨ ਤ�� �ਸਫਲ: ਪ�ਰ����ਾਲ �ਲਤ�"
 
-#: ../camel/camel-gpg-context.c:1810 ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
 msgid "Encrypted content"
 msgstr "���ਰਿਪ�ਡ ਭਾ�"
 
-#: ../camel/camel-gpg-context.c:1829
+#: ../camel/camel-gpg-context.c:1930
 msgid "Unable to parse message content"
 msgstr "ਸ�ਨ�ਹਾ ਭਾ� ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ"
 
-#: ../camel/camel-gpg-context.c:1853 ../camel/camel-gpg-context.c:1898
-#: ../camel/camel-tcp-stream-openssl.c:627
+#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:1999
 #: ../camel/providers/imap4/camel-imap4-utils.c:614
 #: ../camel/providers/smtp/camel-smtp-transport.c:165
 #: ../camel/providers/smtp/camel-smtp-transport.c:220
@@ -1749,40 +1873,40 @@ msgstr "�ਰ�� ਪੱਤਰ ਫਾ�ਲ ਨ�ੰ ਨ�ਲ �ਰਨ ਵ
 msgid "parse error"
 msgstr "ਪਾਰਸ �ਲਤ�"
 
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:806
-#: ../camel/providers/pop3/camel-pop3-store.c:446
-#: ../camel/providers/pop3/camel-pop3-store.c:546
+#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:817
+#: ../camel/providers/pop3/camel-pop3-store.c:478
+#: ../camel/providers/pop3/camel-pop3-store.c:578
 msgid "Canceled"
 msgstr "ਰੱਦ ��ਤਾ"
 
-#: ../camel/camel-net-utils.c:522
+#: ../camel/camel-net-utils.c:523
 msgid "cannot create thread"
 msgstr "ਥਰਿੱਡ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:682
 #, c-format
 msgid "Resolving: %s"
 msgstr "ਹੱਲ ��ਤਾ �ਾ ਰਿਹਾ ਹ�: %s"
 
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:704
 msgid "Host lookup failed"
 msgstr "ਹ�ਸ� ��� �ਸਫਲ"
 
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:706
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "ਹ�ਸ� ��� �ਸਫਲ: %s: %s"
 
-#: ../camel/camel-net-utils.c:810
+#: ../camel/camel-net-utils.c:821
 msgid "Resolving address"
 msgstr "�ਡਰ�ੱਸ ���ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-net-utils.c:830
+#: ../camel/camel-net-utils.c:841
 msgid "Name lookup failed"
 msgstr "ਨਾ� ��� �ਸਫਲ"
 
-#: ../camel/camel-net-utils.c:833
+#: ../camel/camel-net-utils.c:844
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "ਨਾ� ��� �ਸਫਲ: %s"
@@ -1820,7 +1944,7 @@ msgstr "%s ਨ�ੰ ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ਨ�ੰ ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: �ਸ ਮ�ਡ��ਲ ਵਿੱ� ��� ਸ਼�ਰ��ਤ� ��ਡ ਨਹ�� ਹ�।"
 
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ਪਰ����ਾਲ '%s' ਲ� ��� �ਪਲੱਬਧ �ਰਤਾ ਨਹ�� ਹ�"
@@ -1872,8 +1996,7 @@ msgstr "CRAM-MD5"
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr ""
-"�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ਸ�ਰੱ�ਿ�ਤ CRAM-MD5 ਪਾਸਵਰਡ ਨਾਲ ���ਦਾ ਹ�, ���ਰ ਸਰਵਰ ਸਹਾ� ਹ��� ਤਾ�।"
+msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ਸ�ਰੱ�ਿ�ਤ CRAM-MD5 ਪਾਸਵਰਡ ਨਾਲ ���ਦਾ ਹ�, ���ਰ ਸਰਵਰ ਸਹਾ� ਹ��� ਤਾ�।"
 
 #: ../camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
@@ -1911,43 +2034,43 @@ msgstr "ਸਰਵਰ �ਵਾਬ ਵਿੱ� ਨਾ-ਸੰਪ�ਰਨ ਪ�
 msgid "Server response does not match"
 msgstr "ਸਰਵਰ �ਵਾਬ ਮ�ਲ ਨਹ�� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/camel-sasl-gssapi.c:63
+#: ../camel/camel-sasl-gssapi.c:72
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:65
+#: ../camel/camel-sasl-gssapi.c:74
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ��ਬ�ਰਸ ੫ ਪ�ਰਮਾਣ�ਿਤਾ ਵਰਤ �� ਸਰਵਰ ਨਾਲ �����ਾ।"
 
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:168
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "ਨਿਰਧਾਰਿਤ ਢੰ� ਪ�ਰਮਾਣ-ਪੱਤਰ ਦ��ਰਾ ਸਹਾ�� ਨਹ�� ਹ� �ਾ� �ਹ ਸਥਾਪਨ ਦ��ਰਾ ਪ�ਾਣਿ� ਨਹ�� �ਿ�।"
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:173
 msgid "The provided target_name parameter was ill-formed."
 msgstr "�ਪਲੱਬਧ ਨਿਯਤ ਨਾ� ਪ�ਰਾਮ��ਰ �ਲਤ ਢਾ��� ਵਿੱ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:176
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "�ਪਲੱਬਧ ਨਿਯਤ ਨਾ� ਪ�ਰਾਮ��ਰ �ਲਤ ਹ� �ਾ� ਨਾ ਸਹਾ�� �ਿਸਮ ਦਾ ਨਾ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:171
+#: ../camel/camel-sasl-gssapi.c:180
 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:176
+#: ../camel/camel-sasl-gssapi.c:185
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token ਵਿੱ� �ਲਤ ਦਸਤ�ਤ ਹਨ �ਾ� ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�ਦ� ਹਨ।"
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:189
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -1955,50 +2078,32 @@ msgstr ""
 "�ਪਲੱਬਧ ਪ�ਰਮਾਣ-ਪੱਤਰ ਪ�ਰਸੰ� ਸ਼�ਰ��ਤ ਲ� ਠ�� ਨਹ�� ਹਨ, �ਾ� ਪ�ਰਮਾਣ-ਪੱਤਰ ਸੰਭਾਲ �ਰਤਾ �ਿਸ� �ਾ�� "
 "ਹਵਾਲ� ਲ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:194
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "�ਪਲੱਬਧ �ਰਵਾ�� ਪ�ਰਸੰ� ਸਹ�� ਪ�ਰਸੰ� ਦਾ ਹਵਾਲਾ ਨਹ�� ਦ� ਰਿਹਾ ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:188
+#: ../camel/camel-sasl-gssapi.c:197
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token ਤ� ��ਸਾਰਤਾ �ਾ�� �ਸਫਲ ਰਹ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:200
 msgid "The consistency checks performed on the credential failed."
 msgstr "ਪ�ਰਮਾਣ-ਪੱਤਰ ਦ� ਪ�ਰਮਾਣ�ਿਤਾ �ਾ�� �ਸਫਲ ਰਹ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:203
 msgid "The referenced credentials have expired."
 msgstr "ਹਵਾਲਾ ਪ�ਰਮਾਣ-ਪੱਤਰ ਦ� ਮਿ�ਦ ਸਮਾਪਤ ਹ� ��ੱ�� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
-#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
-#: ../camel/camel-sasl-kerberos4.c:230
-#: ../camel/providers/imap/camel-imap-store.c:1274
+#: ../camel/camel-sasl-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
+#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
+#: ../camel/providers/imap/camel-imap-store.c:1272
 msgid "Bad authentication response from server."
 msgstr "ਸਰਵਰ ਤ�� �ਲਤ �ਵਾਬ ਮਿਲਿ� ਹ�।"
 
-#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:383
 msgid "Unsupported security layer."
 msgstr "ਨਾ ਸਹਾ�� ਸ�ਰੱ�ਿ� ਪਰਤ।"
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ��ਰਬਰ�ਸ ੪ ਪ�ਰਮਾਣਿਤ ਨਾਲ �����ਾ।"
-
-#: ../camel/camel-sasl-kerberos4.c:173
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"��ਰਬਰ�ਸ �ਿ�� ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ:\n"
-"%s"
-
 #: ../camel/camel-sasl-login.c:36
 msgid "Login"
 msgstr "ਲਾ��ਨ"
@@ -2047,7 +2152,7 @@ msgstr "�ੱ� ਨਾ-�ਾਣ� �ਰਾ�ਸਪ�ਰ� ਰਾਹ� P
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "�ੱ� ਨਾ-ਪ�ਪ �ਰਾ�ਸਪ�ਰ� ਰਾਹ� POP SMTP ਤ�� ਪਹਿਲਾ�"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:147
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ਨਿਯਮਿਤ ਸਮ��ਰਨ �ੰਪਾ�ਲ�ਸ਼ਨ �ਸਫਲ: %s: %s"
@@ -2067,7 +2172,7 @@ msgstr "URL '%s' ਨ�ੰ ਹ�ਸ� ਭਾ� ਲ���ਦਾ ਹ�"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' ਨ�ੰ ਰਸਤਾ ਭਾ� ਲ���ਦਾ ਹ�"
 
-#: ../camel/camel-session.c:307
+#: ../camel/camel-session.c:305
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2076,209 +2181,209 @@ msgstr ""
 "ਡਾ�ਰ���ਰ� %s ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ:\n"
 "%s"
 
-#: ../camel/camel-session.c:479
+#: ../camel/camel-session.c:484
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ਹ�ਸ� %3$s ਲ� %2$s ਵਾਸਤ� %1$s ਪਾਸਵਰਡ ਦਿ� ��।"
 
-#: ../camel/camel-session.c:817
+#: ../camel/camel-session.c:832
 msgid "Camel session doesn't support forwarding of a message."
 msgstr "��ਮਲ ਸ਼�ਸ਼ਨ ਸ�ਨ�ਹਾ �ੱ�� ਭ��ਣ ਲ� ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' ਲ� ਸਰ��ਫਿ��� ਲੱਭਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:453
 msgid "Cannot create CMS message"
 msgstr "CMS ਸ�ਨ�ਹਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot create CMS signed data"
 msgstr "CMS ਦਸਤ�ਤ� ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ਦਸਤ�ਤ� ਡਾ�ਾ ਨੱਥ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot attach CMS data"
 msgstr "CMS ਡਾ�ਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot create CMS Signer information"
 msgstr "CMS ਦਸਤ�ਤ� �ਾਣ�ਾਰ� ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:483
 msgid "Cannot find certificate chain"
 msgstr "ਸਰ��ਫਿ��� ਲ�� ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:489
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ਦਸਤ�ਤ� ਸਮਾ� ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ਲ� ���ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਮ���ਦ ਨਹ��"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:530
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ��ਣ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:535
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ਵਿਸ਼�ਸਤਾ ਨ�ੰ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:540
 msgid "Cannot add encryption certificate"
 msgstr "�ੰ��ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਸ਼ਾਮਿਲ ਨਹ�� ਹ� ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:546
 msgid "Cannot add CMS Signer information"
 msgstr "CMS ਦਸਤ�ਤ� �ਾਣ�ਾਰ� ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
 msgid "Cannot create encoder context"
 msgstr "���ਡਰ ਪ�ਰਸੰ� ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:619
+#: ../camel/camel-smime-context.c:622
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS ���ਡਰ ਵਿੱ� ਡਾ�ਾ ਸ਼ਾਮਿਲ �ਰਨ ਤ�� �ਸਮਰੱਥ"
 
-#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
 msgid "Failed to encode data"
 msgstr "ਡਾ�ਾ ���ਡਿ� �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:700
 msgid "Unverified"
 msgstr "ਨਾ-�ਾ��ਿ�"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:702
 msgid "Good signature"
 msgstr "ਵਧ�� ਦਸਤ�ਤ"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:704
 msgid "Bad signature"
 msgstr "�ਲਤ ਦਸਤ�ਤ"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:706
 msgid "Content tampered with or altered in transit"
 msgstr "ਤਬਦ�ਲ� ਦ�ਰਾਨ ਪ�ਰਸੰ� ਵਿ�� �ਿ� �ਾ� ਸ���ਤ ��ਤਾ "
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:708
 msgid "Signing certificate not found"
 msgstr "ਦਸਤ�ਤ� ਸਰ��ਫਿ��� ਨਹ�� ਲੱਭਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:710
 msgid "Signing certificate not trusted"
 msgstr "ਦਸਤ�ਤ� ਸਰ��ਫਿ��� ਭਰ�ਸ�ਯ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:712
 msgid "Signature algorithm unknown"
 msgstr "�ਣ�ਾਣਾ ਦਸਤ�ਤ� �ਲ��ਰਿਥਮ"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:714
 msgid "Signature algorithm unsupported"
 msgstr "ਦਸਤ�ਤ� �ਲ��ਰਿੱਥਮ ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:716
 msgid "Malformed signature"
 msgstr "ਨਿ�ਾਰਾ ਦਸਤ�ਤ"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:718
 msgid "Processing error"
 msgstr "ਪ�ਰ�ਸ��ਸਿੰ� �ਲਤ�"
 
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:772
 msgid "No signed data in signature"
 msgstr "ਦਸਤ�ਤ ਵਿੱ� ਡਾ�ਾ ਦਸਤ�ਤ� ਨਹ��"
 
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:777
 msgid "Digests missing from enveloped data"
 msgstr "ਸੰ��ਪ ਲਪ��� ਡਾ�� ਤ�� ਬਿਨਾ� ਹ�"
 
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
 msgid "Cannot calculate digests"
 msgstr "ਸੰ��ਪ ਨ�ੰ ਮਿਣਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
 msgid "Cannot set message digests"
 msgstr "ਸ�ਨ�ਹਾ ਸੰ��ਪ ਨ�ੰ ਨਿਰਧਾਰਿਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
 msgid "Certificate import failed"
 msgstr "ਸਰ��ਫਿ��� �ਯਾਤ �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:836
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ਸ�ਨ�ਹਾ ਹ� ਸਰ��ਫਿ��� ਹ�, ਸਰ��ਫਿ��� �ਾ��� ਨਹ�� ਹਨ"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:839
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "ਸਰ��ਫਿ��� ਸਿਰ� ਸ�ਨ�ਹਾ, ਸਰ��ਫਿ��� �ਯਾਤ �ਤ� �ਾ�� ਹ� ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:843
 msgid "Cannot find signature digests"
 msgstr "ਦਸਤ�ਤ� ਸੰ��ਪ ਨਹ�� ਲੱਭਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:859
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ਦਸਤ�ਤ�: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
 msgid "Decoder failed"
 msgstr "ਡ���ਡਰ �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1019
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "�ਮ ਬਲ� ���ਰਿਪਸ਼ਨ �ਲ��ਰਿਥਮ ਨ�ੰ ਲੱਭਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1027
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "���ਰਿਪਸ਼ਨ ਬਲ� �� ਲ� �ਾਰ� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1038
 msgid "Cannot create CMS Message"
 msgstr "CMS ਸ�ਨ�ਹਾ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1044
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS ਲਿਫਾਫਾ ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1050
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS ਲਿਫਾਫਾ ਡਾ�ਾ ਨੱਥ� ਨਹ�� ਹ� ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot attach CMS data object"
 msgstr "CMS ਡਾ�ਾ ��ਾ� ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ� ਹ�"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS ਸ�ਨ�ਹ� �ਾਣ�ਾਰ� ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1070
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS ਸ�ਨ�ਹ� �ਾਣ�ਾਰ� ਸ਼ਾਮਲ ਨਹ�� ��ਤ� �ਾ ਸ�ਦ�"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1095
 msgid "Failed to add data to encoder"
 msgstr "ਡਾ�ਾ ਨ�ੰ ���ਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1191
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: ��� ���ਰਿਪ�ਡ ਪ�ਰਸੰ� ਨਹ�� ਲੱਭਾ ਹ�"
 
-#: ../camel/camel-smime-context.c:1200
+#: ../camel/camel-smime-context.c:1219
 msgid "import keys: unimplemented"
 msgstr "�ਯਾਤ ��: ਨਾ-ਸਥਾਪਿਤ"
 
-#: ../camel/camel-smime-context.c:1208
+#: ../camel/camel-smime-context.c:1227
 msgid "export keys: unimplemented"
 msgstr "ਨਿਰਯਾਤ ��: ਨਾ-ਸਥਾਪਿਤ"
 
@@ -2323,126 +2428,7 @@ msgstr "ਰੱਦ�"
 msgid "Junk"
 msgstr "�ੰ�"
 
-#: ../camel/camel-tcp-stream-openssl.c:564
-msgid "Unable to get issuer's certificate"
-msgstr "�ਾਰ��ਰਤਾ ਦਾ ਸਰ��ਫਿ��� ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ"
-
-#: ../camel/camel-tcp-stream-openssl.c:566
-msgid "Unable to get Certificate Revocation List"
-msgstr "ਸਰ��ਫਿ��� ਥਾ� ਸ��� ਪ�ਰਾਪਤ ਨਹ�� ��ਤ� �ਾ ਸ�� ਹ�"
-
-#: ../camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to decrypt certificate signature"
-msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ ਡਿ��ਰਿਪ� �ਰਨ ਵਿੱ� �ਸਫਲ"
-
-#: ../camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "ਸਰ��ਫਿ��� ਥਾ� ਸ��� ਦਸਤ�ਤ ਡਿ��ਰਿਪ� �ਰਨ ਵਿੱ� �ਸਫਲ"
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decode issuer's public key"
-msgstr "�ਾਰ��ਰਤਾ ਦ� ਪਬਲਿ� ��ੰ�� ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Certificate signature failure"
-msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ �ਸਫਲ"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Certificate Revocation List signature failure"
-msgstr "ਸਰ��ਫਿ��� ਥਾ� ਸ��� ਦਸਤ�ਤ �ਸਫਲ"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate not yet valid"
-msgstr "ਸਰ��ਫਿ��� �ਾ�� ਨਹ�� ਹ�"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate has expired"
-msgstr "ਸਰ��ਫਿ��� ਦ� ਮਿ�ਦ ਪ�ੱ� ��ੱ�� ਹ�"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-#| msgid "Certificate Revocation List signature failure"
-msgid "Certificate Revocation List (CRL) not yet valid"
-msgstr "ਸਰ��ਫਿ��� ਮਨਸ�� ਲਿਸ� (CRL) ਹਾਲ� ਢ�ੱ�ਵ�� ਨਹ�� ਹ�"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-#| msgid "Certificate Revocation List signature failure"
-msgid "Certificate Revocation List (CRL) has expired"
-msgstr "ਸਰ��ਫਿ��� ਮਨਸ�� ਲਿਸ� (CRL) ਦ� ਮਿ�ਦ ਪ�ੱ��"
-
-#: ../camel/camel-tcp-stream-openssl.c:589
-#| msgid "Unable to get Certificate Revocation List"
-msgid "Error in Certificate Revocation List (CRL)"
-msgstr "ਸਰ��ਫਿ��� ਮਨਸ�� ਲਿਸ� (CRL) ਵਿੱ� �ਲਤ�"
-
-#: ../camel/camel-tcp-stream-openssl.c:591
-msgid "Out of memory"
-msgstr "ਮ�ਮ�ਰ� ਤ�� ਬਾਹਰ"
-
-#: ../camel/camel-tcp-stream-openssl.c:593
-msgid "Zero-depth self-signed certificate"
-msgstr "Zero-depth ਸਵ�-ਦਸਤ�ਤ� ਸਰ��ਫਿ���"
-
-#: ../camel/camel-tcp-stream-openssl.c:595
-msgid "Self-signed certificate in chain"
-msgstr "ਲ�� ਵਿੱ� ਸਵ�-ਦਸਤ�ਤ� ਸਰ��ਫਿ��� ਹ�"
-
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Unable to get issuer's certificate locally"
-msgstr "�ਾਰ��ਰਤਾ ਦਾ ਸਰ��ਫਿ��� ਲ��ਲ ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫ਼ਲ"
-
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Unable to verify leaf signature"
-msgstr "ਸਿਰਾ ਦਸਤ�ਤ �ਾ�� �ਰਨ ਤ�� �ਸਫਲ"
-
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Certificate chain too long"
-msgstr "ਸਰ��ਫਿ��� ਲ�� ਬ�� ਲੰਮ� ਹ�"
-
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Certificate Revoked"
-msgstr "ਸਰ��ਫਿ��� ਮ�� ਸ਼ਾਮਿਲ"
-
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Invalid Certificate Authority (CA)"
-msgstr "�ਲਤ ਸਰ��ਫਿ��� �ਥਾਰ�� (CA)"
-
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Path length exceeded"
-msgstr "ਰਸਤਾ ਲੰਬਾ� ਵੱਧ �� ਹ�"
-
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid purpose"
-msgstr "�ਲਤ �ਦ�ਸ਼"
-
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate untrusted"
-msgstr "ਸਰ��ਫਿ��� ਨਾ-ਭਰ�ਸ�ਯ��"
-
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Certificate rejected"
-msgstr "ਸਰ��ਫਿ��� �ਸਵ��ਾਰ"
-
-#: ../camel/camel-tcp-stream-openssl.c:616
-msgid "Subject/Issuer mismatch"
-msgstr "ਵਿਸ਼ਾ/�ਾਰ� �ਰਤਾ ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹਨ"
-
-#: ../camel/camel-tcp-stream-openssl.c:618
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹਨ"
-
-#: ../camel/camel-tcp-stream-openssl.c:620
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/�ਾਰ� �ਰਤਾ ਸ�ਰ��ਲ ਮ�ਲ ਨਹ�� �ਾਦ�"
-
-#: ../camel/camel-tcp-stream-openssl.c:622
-msgid "Key usage does not support certificate signing"
-msgstr "ਵਰਤ� ��ੰ�� ਸਰ��ਫਿ��� ਦਸਤ�ਤਾ� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
-
-#: ../camel/camel-tcp-stream-openssl.c:625
-msgid "Error in application verification"
-msgstr "�ਪਲ���ਸ਼ਨ �ਾ�� ਵਿੱ� �ਲਤ� ਹ�"
-
-#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
+#: ../camel/camel-tcp-stream-ssl.c:870
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2455,35 +2441,16 @@ msgstr ""
 "ਫਿੰ�ਰ ਪ�ਰਿੰ�:       %s\n"
 "ਦਸਤ�ਤ:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:876
 msgid "GOOD"
 msgstr "ਵਧ��"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:876
 msgid "BAD"
 msgstr "����"
 
-#: ../camel/camel-tcp-stream-openssl.c:700
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"%s ਵਲ�� �ਲਤ ਸਰ��ਫਿ���:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"�� ਤ�ਸ�� �ਿਸ� ਵ� ਤਰਾ� ਸਵ��ਾਰ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:883
+#: ../camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2498,7 +2465,7 @@ msgstr ""
 "\n"
 "�� ਤ�ਸ�� ਸਵ��ਾਰ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:924
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2507,7 +2474,7 @@ msgstr ""
 "ਸਰ��ਫਿ��� ਸਮੱਸਿ�: %s\n"
 "�ਾਰ� �ਰਤਾ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:976
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2516,7 +2483,7 @@ msgstr ""
 "�ਲਤ ਸਰ��ਫਿ��� ਡ�ਮ�ਨ: %s\n"
 "�ਾਰ� �ਰਤਾ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:994
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2525,7 +2492,7 @@ msgstr ""
 "ਸਰ��ਫਿ��� ਦ� ਮਿ�ਦ ਪ�ੱ��: %s\n"
 "�ਾਰ� �ਰਤਾ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:1011
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2539,17 +2506,17 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "URL '%s' ਨ�ੰ ਪਾਰਸ ਨਹ� ��ਤਾ �ਾ ਸ�ਦਾ"
 
-#: ../camel/camel-vee-folder.c:580
+#: ../camel/camel-vee-folder.c:577
 #, c-format
 msgid "Error storing '%s': %s"
 msgstr "'%s' ਨ�ੰ ��ਰਮਬੱਧ �ਰਨ ਵਿੱ� �ਲਤ�: %s"
 
-#: ../camel/camel-vee-folder.c:657
+#: ../camel/camel-vee-folder.c:654
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%2$s ਵਿੱ� %1$s ਤਰਾ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
 
-#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
+#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ਫਰ�� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨਹਿ�� ਨ�ੰ �ਾਪ� �ਾ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
@@ -2576,7 +2543,7 @@ msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਰੱਦ� ਵਿੱ� �ਾਪ� ਨ
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ਸ�ਨ�ਹ� ਨ�ੰ �ੰ� ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2585,20 +2552,21 @@ msgstr ""
 "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s\n"
 "  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:255
-#: ../camel/providers/local/camel-maildir-folder.c:281
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
+#: ../camel/providers/local/camel-maildir-folder.c:264
+#: ../camel/providers/local/camel-maildir-folder.c:293
+#: ../camel/providers/local/camel-maildir-folder.c:401
 #: ../camel/providers/local/camel-mbox-folder.c:363
 #: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:216
+#: ../camel/providers/local/camel-mh-folder.c:226
 msgid "No such message"
 msgstr "�ੰ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ��"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
 #: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
+#: ../camel/providers/nntp/camel-nntp-folder.c:173
+#: ../camel/providers/nntp/camel-nntp-folder.c:248
+#: ../camel/providers/nntp/camel-nntp-folder.c:408
 #: ../camel/providers/pop3/camel-pop3-folder.c:268
 #: ../camel/providers/pop3/camel-pop3-folder.c:578
 #: ../camel/providers/pop3/camel-pop3-folder.c:639
@@ -2606,12 +2574,12 @@ msgstr "�ੰ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ��"
 msgid "User canceled"
 msgstr "ਯ��਼ਰ ਨ� ਰੱਦ ��ਤਾ"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
 #: ../camel/providers/imap4/camel-imap4-folder.c:819
+#: ../camel/providers/nntp/camel-nntp-folder.c:164
 #: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:252
+#: ../camel/providers/nntp/camel-nntp-folder.c:175
+#: ../camel/providers/nntp/camel-nntp-folder.c:250
 #: ../camel/providers/pop3/camel-pop3-folder.c:388
 #: ../camel/providers/pop3/camel-pop3-folder.c:581
 #: ../camel/providers/pop3/camel-pop3-folder.c:642
@@ -2621,51 +2589,53 @@ msgstr "ਯ��਼ਰ ਨ� ਰੱਦ ��ਤਾ"
 msgid "Cannot get message %s: %s"
 msgstr "ਸ�ਨ�ਹਾ %s ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2506
 #: ../camel/providers/imap4/camel-imap4-folder.c:837
 msgid "This message is not available in offline mode."
 msgstr "�ਹ ਸ�ਨ�ਹਾ �ਫਲਾ�ਨ ਵਿੱ� �ਪਲੱਬਧ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2009
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2060
 msgid "Could not get message"
 msgstr "����� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
-#: ../camel/providers/imap/camel-imap-folder.c:296
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:982
+#: ../camel/providers/imap/camel-imap-folder.c:295
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ਲ� ਸੰ��ਪ ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012, c-format
-#| msgid "Checking for new messages"
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1055
+#, c-format
 msgid "Checking for deleted messages %s"
 msgstr "ਹ�ਾ� �� ਸ�ਨ�ਹ� %s ਲ� ��� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1330
 msgid "Trash Folder Full. Please Empty."
 msgstr "ਰੱਦ� ਫ�ਲਡਰ ਭਰ �ਿ� ਹ�। �ਾਲ� �ਰ� ��।"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3421
-#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1564
+#: ../camel/providers/groupwise/camel-groupwise-store.c:626
+#: ../camel/providers/groupwise/camel-groupwise-store.c:756
+#: ../camel/providers/imap/camel-imap-folder.c:3429
+#: ../camel/providers/imap/camel-imap-folder.c:3505
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
+#: ../camel/providers/imapx/camel-imapx-server.c:3054
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s ਵਿੱ� ਨਵ�� ਸ�ਨਹਿ�� ਲ� ਸੰ��ਪ �ਾਣ�ਾਰ� ਲ� �ਾ ਰਹ� ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2403
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਲ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਲ ਨਹ�� ਹ� ਸ�ਦਾ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2391
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ਸ�ਨ�ਹਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
@@ -2695,12 +2665,14 @@ msgstr "ਨਵ�� ਮ�ਲ ਲ� ��ੱ� ��ਤ� �ਾ ਰਿਹ
 #: ../camel/providers/hula/camel-hula-provider.c:50
 #: ../camel/providers/imap/camel-imap-provider.c:46
 #: ../camel/providers/imap4/camel-imap4-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "C_heck for new messages in all folders"
 msgstr "ਸਭ ਫ�ਲਡਰਾ� ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� �ਾ��(_h)"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:59
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imap4/camel-imap4-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 #: ../camel/providers/local/camel-local-provider.c:46
 #: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:106
@@ -2717,6 +2689,7 @@ msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ੰ� ਸਮੱ�
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:65
 #: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "��ਣ-ਬ�ਸਾ ਫ�ਲਡਰ ਵਿੱ� �ੰ� ਸ�ਨ�ਹਿ�� ਲ� ��ੱ� �ਰ�(_B)"
 
@@ -2744,7 +2717,7 @@ msgstr "Novell GroupWise ਸਰਵਰ ਵਰਤਣ ਲ�"
 #: ../camel/providers/hula/camel-hula-provider.c:93
 #: ../camel/providers/imap/camel-imap-provider.c:100
 #: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
 #: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid "Password"
@@ -2758,45 +2731,48 @@ msgstr "�ਸ ��ਣ ਨਾਲ GroupWise ਸਰਵਰ ਨਾਲ �ੱ� 
 msgid "Host or user not available in url"
 msgstr "url ਵਿੱ� ਹ�ਸ� �ਾ� ਯ��਼ਰ �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1358
+#: ../camel/providers/groupwise/camel-groupwise-store.c:197
+#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/imapx/camel-imapx-server.c:2302
 msgid "You did not enter a password."
 msgstr "ਤ�ਸ�� ਪਾਸਵਰਡ ਨਹ�� ਭਰਿ� ਹ�।"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../camel/providers/groupwise/camel-groupwise-store.c:312
 msgid "Some features may not work correctly with your current server version"
 msgstr "ਤ�ਹਾਡ� ਸਰਵਰ ਦ� ਮ���ਦਾ ਵਰ�ਨ ਨਾਲ ��� ��ਣ ਠ�� ਤਰਾ� �ੰਮ ਨਹ�� �ਰ ਸ�ਦ� ਹਨ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/groupwise/camel-groupwise-store.c:533
+#: ../camel/providers/imap/camel-imap-store.c:1879
+#: ../camel/providers/imap/camel-imap-store.c:2077
+#: ../camel/providers/imapx/camel-imapx-store.c:331
 #, c-format
 msgid "No such folder %s"
 msgstr "ਫ�ਲਡਰ %s ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1201
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� GroupWise ਫ�ਲਡਰ ਬਣਾ�ਣ� ਸੰਭਵ ਨਹ�� ਹਨ।"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1215
+#: ../camel/providers/imap/camel-imap-store.c:1954
+#: ../camel/providers/imap/camel-imap-store.c:2334
+#: ../camel/providers/imapx/camel-imapx-store.c:687
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "ਮ�ੱਢਲ� ਫ�ਲਡਰ ਵਿੱ� ਸਬ-ਫ�ਲਡਰ ਸਵ��ਾਰ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1294
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "GroupWise ਫ�ਲਡਰ '%s' ਦਾ ਨਾ�-ਤਬਦ�ਲ '%s' ਲ� ��ਤਾ �ਾ ਸ�ਦਾ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1349
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:120
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise ਸਰਵਰ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1351
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "�ਰ�ੱਪਵਾ��਼ ਸ�ਵਾ %s ਲ� %s �ੱਤ�"
@@ -2816,8 +2792,7 @@ msgid ""
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
 "of your mail.\n"
 msgstr ""
-"ਤ�ਸ�� �ਹ ��ਾ��� ਦ� ਸੰਭਾਲਣ ਸਮੱਰਥਾ ਤ�� ਵੱਧ �� ਹ�। ਤ�ਹਾਡਾ ਸ�ਨ�ਹਾ ਤ�ਹਾਡ� ���-ਬ�ਸ� '� ਪਿ� ਹ�। "
-"�ਪਣ� "
+"ਤ�ਸ�� �ਹ ��ਾ��� ਦ� ਸੰਭਾਲਣ ਸਮੱਰਥਾ ਤ�� ਵੱਧ �� ਹ�। ਤ�ਹਾਡਾ ਸ�ਨ�ਹਾ ਤ�ਹਾਡ� ���-ਬ�ਸ� '� ਪਿ� ਹ�। �ਪਣ� "
 "��� ਪੱਤਰ ਹ�ਾ ��/��ਾ�ਵ ਬਣਾ �� ਭ���/ਲਵ� ਬ�ਨ ਦੱਬ �� ਮ�� ਭ���।\n"
 
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:214
@@ -2828,27 +2803,32 @@ msgstr "ਸ�ਨ�ਹਾ ਨਹ�� ਭ��ਿ� �ਾ ਸ�ਦਾ : %s
 
 #: ../camel/providers/hula/camel-hula-provider.c:48
 #: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Checking for New Mail"
 msgstr "ਨਵ�� ਮ�ਲ ਲ� ��ੱ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../camel/providers/hula/camel-hula-provider.c:53
 #: ../camel/providers/imap/camel-imap-provider.c:52
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "Connection to Server"
 msgstr "ਸਰਵਰ ਨਾਲ ��ਨ��� �ਰ�"
 
 #: ../camel/providers/hula/camel-hula-provider.c:55
 #: ../camel/providers/imap/camel-imap-provider.c:54
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "_Use custom command to connect to server"
 msgstr "ਸਰਵਰ ਨਾਲ ���ਨ ਲ� ਪਸੰਦ�ਦਾ �ਮਾ�ਡ ਵਰਤ��(_U)"
 
 #: ../camel/providers/hula/camel-hula-provider.c:57
 #: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
 msgid "Command:"
 msgstr "�ਮਾ�ਡ:"
 
 #: ../camel/providers/hula/camel-hula-provider.c:60
 #: ../camel/providers/imap/camel-imap-provider.c:60
 #: ../camel/providers/imap4/camel-imap4-provider.c:43
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "ਫ�ਲਡਰ"
@@ -2856,12 +2836,14 @@ msgstr "ਫ�ਲਡਰ"
 #: ../camel/providers/hula/camel-hula-provider.c:62
 #: ../camel/providers/imap/camel-imap-provider.c:62
 #: ../camel/providers/imap4/camel-imap4-provider.c:45
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
 msgid "_Show only subscribed folders"
 msgstr "ਮ��ਬਰ� ਫ�ਲਡਰ ਹ� ਵ���(_S)"
 
 #: ../camel/providers/hula/camel-hula-provider.c:64
 #: ../camel/providers/imap/camel-imap-provider.c:64
 #: ../camel/providers/imap4/camel-imap4-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "O_verride server-supplied folder namespace"
 msgstr "ਸਰਵਰ-ਰਾਹ�� �ਪਲੱਬਧ ਫ�ਲਡਰ ਨਾ�-ਥਾ� �ੱਪਰ(_v)"
 
@@ -2894,12 +2876,12 @@ msgstr "�ੰਪ�ੱ� ਸ�ਰ�ਮ ਨਹ��"
 #: ../camel/providers/imap/camel-imap-command.c:229
 #: ../camel/providers/imap/camel-imap-command.c:278
 #: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3051
+#: ../camel/providers/imap/camel-imap-store.c:3105
 msgid "Operation cancelled"
 msgstr "�ਾਰਵਾ� �ਸਫਲ"
 
 #: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3056
+#: ../camel/providers/imap/camel-imap-store.c:3110
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ਸਰਵਰ �ਸਧਾਰਨ ਤ�ਰ ਤ� ਵੱ� ਹ� �ਿ�: %s"
@@ -2939,65 +2921,68 @@ msgstr "IMAP ਸਰਵਰ ਦ� �ਵਾਬ ਵਿੱ� %s �ਾਣ�ਾਰ
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ਸਰਵਰ ਤ�� �ਸਧਾਰਨ ਸਭ ਠ�� ਹ�� �ਵਾਬ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:91
+#: ../camel/providers/imap/camel-imap-folder.c:90
 msgid "Always check for new mail in this folder"
 msgstr "�ਸ ਫ�ਲਡਰ ਵਿੱ� ਹਮ�ਸ਼ਾ ਨਵ�� �ਿੱਠ� ਵ���"
 
-#: ../camel/providers/imap/camel-imap-folder.c:277
+#: ../camel/providers/imap/camel-imap-folder.c:276
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ਡਾ�ਰ���ਰ� %s ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s"
 
 #. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:919
+#: ../camel/providers/imap/camel-imap-folder.c:918
+#: ../camel/providers/imapx/camel-imapx-server.c:2997
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s ਵਿੱ� ਤਬਦ�ਲ ਸ�ਨ�ਹਿ�� ਦ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1987
+#: ../camel/providers/imap/camel-imap-folder.c:1986
 #, c-format
 msgid "Unexpected response status '%s' after APPEND command"
 msgstr "APPEND �ਮਾ�ਡ ਦ� ਬਾ�ਦ ��ਾਨ� �ਵਾਬ ਹਾਲਤ '%s'"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2002
+#: ../camel/providers/imap/camel-imap-folder.c:2001
 msgid "No response on continuation after APPEND command"
 msgstr "APPEND �ਮਾ�ਡ ਦ� ਬਾ�ਦ ��� �ਵਾਬ ਨਹ��"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2047
+#: ../camel/providers/imap/camel-imap-folder.c:2046
 msgid "Unknown error occurred during APPEND command!"
 msgstr "APPEND �ਮਾ�ਡ ਦ� ਦ�ਰਾਨ �ਣ�ਾਣ �ਲਤ� �� ਹ�!"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:2877
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "ਸ�ਨ�ਹਾ ਲ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imapx/camel-imapx-server.c:3943
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ਸ�ਨ�ਹਾ ID %s ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2914
+#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imapx/camel-imapx-server.c:3944
 msgid "No such message available."
 msgstr "�ੰ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2975
-#: ../camel/providers/imap/camel-imap-folder.c:3808
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/imap/camel-imap-folder.c:2974
+#: ../camel/providers/imap/camel-imap-folder.c:3819
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
 msgid "This message is not currently available"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਮ��� ਤ� �ਪਲੱਬਧ ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3624
+#: ../camel/providers/imap/camel-imap-folder.c:3632
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ਸਰਵਰ ਤ�� �ਧ�ਰਾ �ਵਾਬ: ਸ�ਨ�ਹਾ %d ਲ� ��� �ਾਣ�ਾਰ� �ਪਲੱਬਧ ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:3640
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "�ਧ�ਰਾ ਸਰਵਰ �ਵਾਬ: ਸ�ਨ�ਹ� %d ਲ� ��� UID �ਪਲੱਬਧ ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3846
+#: ../camel/providers/imap/camel-imap-folder.c:3857
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH �ਵਾਬ ਵਿੱ� ਸ�ਨ�ਹਾ ਭਾ� ਨਹ�� ਮਿਲਿ�।"
 
@@ -3021,25 +3006,30 @@ msgid "Failed to cache %s: %s"
 msgstr "��ਸ %s ਲ� �ਸਫਲ: %s"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:50
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ਮ��ਬਰ ਬਣਾ� ਫ�ਲਡਰਾ� ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹ� ��ੱ� �ਰ�(_e)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
 #: ../camel/providers/imap4/camel-imap4-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:71
 msgid "Namespace:"
 msgstr "ਨ�ਮ-ਸਪ�ਸ:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
 #: ../camel/providers/imap4/camel-imap4-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "�ਸ ਸਰਵਰ �ੱਤ� �ਨ-ਬਾ�ਸ(INBOX) ਵਿੱ� ਨਵ�� ਸ�ਨਹਿ�� �ੱਤ� ਫਿਲ�ਰ ਲ�ਾ�(_A)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Check new messages for Jun_k contents"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ੰ� ਸਮੱ�ਰ� ਲ� ��ੱ� �ਰ�(_K)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:76
 #: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:82
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ਰਿਮ�� ਮ�ਲ ਲ��ਲ� ���ਮ��ਿ� ਹ� ਸਿ�ਰਾਨਾ��਼ �ਰ�(_z)"
 
@@ -3048,111 +3038,121 @@ msgid "IMAP"
 msgstr "IMAP"
 
 #: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imapx/camel-imapx-provider.c:92
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP ਸਰਵਰਾ� �ੱਤ� ਮ�ਲ ਪ�ਨ �ਤ� ਸੰਭਾਲਣ ਲ�"
 
 #: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imapx/camel-imapx-provider.c:108
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "�ਹ ��ਣ IMAP ਸਰਵਰ ਨਾਲ ਪਲ�ਨ-���ਸ� ਪਾਸਵਰਡ ਨਾਲ ਸ਼ਾਮਿਲ �ਰਨ ਲ� ਸਹਾ�� ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-store.c:437
+#: ../camel/providers/imap/camel-imap-store.c:435
 #: ../camel/providers/imap4/camel-imap4-store.c:210
+#: ../camel/providers/imapx/camel-imapx-store.c:201
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP ਸਰਵਰ %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:439
+#: ../camel/providers/imap/camel-imap-store.c:437
 #: ../camel/providers/imap4/camel-imap4-store.c:212
+#: ../camel/providers/imapx/camel-imapx-store.c:203
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP ਸਰਵਿਸ %2$s �ੱਤ� %1$s ਲ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
+#: ../camel/providers/imap/camel-imap-store.c:566
+#: ../camel/providers/imap/camel-imap-store.c:581
 #: ../camel/providers/imap4/camel-imap4-store.c:247
 #: ../camel/providers/imap4/camel-imap4-store.c:262
 #: ../camel/providers/nntp/camel-nntp-store.c:182
 #: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/pop3/camel-pop3-store.c:192
+#: ../camel/providers/pop3/camel-pop3-store.c:206
 #: ../camel/providers/smtp/camel-smtp-transport.c:259
 #: ../camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "%s ਨਾਲ ��� ਨਹ�� ਸ�ਦਾ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
+#: ../camel/providers/imap/camel-imap-store.c:567
 #: ../camel/providers/imap4/camel-imap4-store.c:248
 #: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/pop3/camel-pop3-store.c:193
 #: ../camel/providers/smtp/camel-smtp-transport.c:260
 msgid "SSL unavailable"
 msgstr "SSL �ਪਲੱਬਧ ਨਹ� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
+#: ../camel/providers/imap/camel-imap-store.c:578
+#: ../camel/providers/imap/camel-imap-store.c:860
+#: ../camel/providers/imapx/camel-imapx-server.c:2164
 msgid "Connection cancelled"
 msgstr "��ਨ��ਸ਼ਨ ਰੱਦ ��ਤਾ"
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
+#: ../camel/providers/imap/camel-imap-store.c:689
+#: ../camel/providers/imap/camel-imap-store.c:708
+#: ../camel/providers/imap/camel-imap-store.c:714
+#: ../camel/providers/imap/camel-imap-store.c:740
 #: ../camel/providers/imap4/camel-imap4-store.c:310
 #: ../camel/providers/imap4/camel-imap4-store.c:325
 #: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../camel/providers/imapx/camel-imapx-server.c:2209
+#: ../camel/providers/imapx/camel-imapx-server.c:2231
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "IMAP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
+#: ../camel/providers/imap/camel-imap-store.c:690
+#: ../camel/providers/imapx/camel-imapx-server.c:2210
 #: ../camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "ਪ�ਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:709
+#: ../camel/providers/imapx/camel-imapx-server.c:2232
 msgid "SSL negotiations failed"
 msgstr "SSL �ੱਲਬਾਤ �ਸਫਲ"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
+#: ../camel/providers/imap/camel-imap-store.c:715
 #: ../camel/providers/imap4/camel-imap4-store.c:335
 #: ../camel/providers/smtp/camel-smtp-transport.c:371
 msgid "SSL is not available in this build"
 msgstr "�ਸ ਨਿਰਮਾਣ ਵਿੱ� SSL �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:863
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "�ਮਾ�ਡ \"%s\" ਨਾਲ ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
+#: ../camel/providers/imap/camel-imap-store.c:1051
+#: ../camel/providers/imap/camel-imap-store.c:2430
 #: ../camel/providers/imap4/camel-imap4-store-summary.c:356
 #: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/local/camel-maildir-folder.c:80
+#: ../camel/providers/imapx/camel-imapx-store.c:383
+#: ../camel/providers/imapx/camel-imapx-store.c:856
+#: ../camel/providers/local/camel-maildir-folder.c:81
 #: ../camel/providers/local/camel-maildir-store.c:219
 #: ../camel/providers/local/camel-maildir-store.c:291
 #: ../camel/providers/local/camel-maildir-store.c:517
 #: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:463
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
+#: ../camel/providers/local/camel-spool-store.c:461
 msgid "Inbox"
 msgstr "��ਣ-ਬ�ਸਾ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1305
+#: ../camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ਸਰਵਰ %s ਲ���ਦ� ਪ�ਰਮਾਣਿਤ �ਿਸਮ %s ਲ� ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:1315
+#: ../camel/providers/imap/camel-imap-store.c:1313
 #: ../camel/providers/smtp/camel-smtp-transport.c:506
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� %s ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/imap/camel-imap-store.c:1389
+#: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imapx/camel-imapx-server.c:2328
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3163,28 +3163,29 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
+#: ../camel/providers/imap/camel-imap-store.c:1891
+#: ../camel/providers/imap/camel-imap-store.c:2272
 #: ../camel/providers/imap4/camel-imap4-store.c:954
+#: ../camel/providers/imapx/camel-imapx-store.c:672
 #, c-format
 msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "ਫ�ਲਡਰ ਨਾ� \"%s\" �ਾ�� ਨਹ�� ਹ�, �ਿ��ਿ �ਸ ਵਿੱ� \"%c\" �ੱ�ਰ ਸ਼ਾਮਿਲ ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-store.c:1978
+#: ../camel/providers/imap/camel-imap-store.c:2008
 #: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
+#: ../camel/providers/local/camel-mbox-store.c:202
 #: ../camel/providers/local/camel-mh-store.c:249
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ਫ�ਲਡਰ '%s' ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�: ਫ�ਲਡਰ ਮ���ਦ ਹ�।"
 
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2283
+#: ../camel/providers/imapx/camel-imapx-store.c:680
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "�ਣ�ਾਣਾ ਮ�ੱਢਲਾ ਫ�ਲਡਰ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3053
-#| msgid "Server unexpectedly disconnected: %s"
+#: ../camel/providers/imap/camel-imap-store.c:3107
 msgid "Server unexpectedly disconnected"
 msgstr "ਸਰਵਰ ��ਾਨ� ਡਿਸ-��ਨ��� ਹ� �ਿ�"
 
@@ -3336,10 +3337,9 @@ msgid "This option will connect to the IMAPv4rev1 server using a plaintext passw
 msgstr "�ਸ ��ਣ ਨਾਲ ਤ�ਸ�� IMAPv4rev1 ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਨਾਲ ��� ਸ�ਦ� ਹ�।"
 
 #: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/imapp/camel-imapp-store.c:249
 #: ../camel/providers/nntp/camel-nntp-store.c:194
 #: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:203
 #: ../camel/providers/smtp/camel-smtp-transport.c:271
 msgid "Connection canceled"
 msgstr "��ਨ��ਸ਼ਨ ਰੱਦ ��ਤਾ"
@@ -3352,7 +3352,7 @@ msgid ""
 msgstr "IMAP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਮ�ਡ ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ: ਸਰਵਰ STARTTLS ਲ� ਸਹਾ�� ਨਹ�� ਹ�।"
 
 #: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:276
 msgid "TLS negotiations failed"
 msgstr "TLS �ੱਲਬਾਤ ਫ�ਲ�ਹ"
 
@@ -3496,37 +3496,35 @@ msgstr "��� ਡਾ�ਾ ਨਹ�"
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "IMAP ਸਰਵਰ %s �ਸਧਾਰਨ ਵੱ� ਹ� �ਿ� ਹ�: %s"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-msgid "Message storage"
-msgstr "ਸ�ਨ�ਹਾ ਸ��ਰ��਼"
+#: ../camel/providers/imapx/camel-imapx-folder.c:86
+#, c-format
+#| msgid "Could not load summary for %s"
+msgid "Could not create folder summary for %s"
+msgstr "%s ਲ� ਫ�ਲਡਰ ਸੰ��ਪ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-folder.c:94
+#, c-format
+#| msgid "Could not create cache file"
+msgid "Could not create cache for %s"
+msgstr "%s ਲ� ���� ਨਹ�� ਬਣਾ� �ਾ ਸ�� ਹ�"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "Use I_dle if the server supports it"
+msgstr "ਵ�ਹਲਾ ਵਰਤ��, �� ਸਰਵਰ �ਸ ਲ� ਸਹਾ�� ਹ�(_d)"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:60
+msgid "Numbe_r of cached connections to use"
+msgstr "ਵਰਤਣ ਲ� ��ਸ਼ ��ਤ� �� ��ਨ��ਸ਼ਨ ਦ� �ਿਣਤ�(_r)"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"ਪ�ਰਯ��ਤਾਮਿ� IMAP 4(.1) �ਲਾ���\n"
-"�ਹ ਨਾ-�ਾ��ਿ� ਤ� ਨਾ-ਸਹਾ�� ��ਡ ਹ�, ਤ�ਸ�� imap ਵਰਤਣਾ ਪਸੰਦ �ਰ���।\n"
-"\n"
-" !!! �ਤਪਾਦਨ �ਮ�ਲ ਲ� ਨਾ ਵਰਤ��  !!!\n"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-server.c:2167
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "%s ਨਾਲ (ਪ�ਰ� %s) �ੱਤ� ��ਨ��� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:348
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "POP ਸਰਵਰ ਨਾਲ %s �ੱਤ� ��ਨ��� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
-
 #: ../camel/providers/local/camel-local-folder.c:178
 msgid "Index message body data"
 msgstr "�ੰਡ��ਸ ਸ�ਨ�ਹਾ ਭਾ� ਡਾ�ਾ"
@@ -3539,8 +3537,8 @@ msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
 #: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402, c-format
-#| msgid "mailbox:%s (%s)"
+#: ../camel/providers/local/camel-local-folder.c:402
+#, c-format
 msgid "mailbox: %s (%s)"
 msgstr "mailbox: %s (%s)"
 
@@ -3607,53 +3605,53 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "ਸ���ਡਰਡ Unix mbox ਸਪ�ਲ ਡਾ�ਰ���ਰ�"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:128
+#: ../camel/providers/local/camel-local-store.c:163
+#: ../camel/providers/local/camel-local-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:126
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ਪ�ਰਬੰਧ�(root) %s ਸੰਭਾਲ �ੱ� �ਸਲ� ਰਸਤਾ ਨਹ� ਹ�।"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:170
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "ਪ�ਰਬੰਧ�(root) %s ਸੰਭਾਲ �ੱ� �ਸਲ� ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�।"
 
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:187
+#: ../camel/providers/local/camel-local-store.c:285
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ਫ�ਲਡਰ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:199
 msgid "Local stores do not have an inbox"
 msgstr "��ਣ-ਬ�ਸ� ਵਿੱ� ਲ��ਲ ਸੰਭਾਲ ਬ�ਸਾ ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:245
 #, c-format
 msgid "Local mail file %s"
 msgstr "ਲ��ਲ ਪੱਤਰ ਫਾ�ਲ %s"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:340
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ਫ�ਲਡਰ %s ਦਾ ਨਾ�-ਤਬਦ�ਲ %s ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:408
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' ਦਾ ਨਾ� ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:433
+#: ../camel/providers/local/camel-mbox-store.c:298
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ਫ�ਲਡਰ �ੰਡ��ਸ ਫਾ�ਲ '%s' ਨ�ੰ ਹ�ਾ�� ਨਹ� �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:456
+#: ../camel/providers/local/camel-mbox-store.c:322
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ਫ�ਲਡਰ ਮ��ਾ ਫਾ�ਲ '%s' ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
@@ -3662,27 +3660,28 @@ msgstr "ਫ�ਲਡਰ ਮ��ਾ ਫਾ�ਲ '%s' ਨ�ੰ ਹ�ਾ��
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਸੰ��ਪ ਵਿੱ� ਸੰਭਾਲਣ ਵਿੱ� �ਸਫਲ: �ਣ�ਾਣਾ �ਾਰਨ"
 
-#: ../camel/providers/local/camel-maildir-folder.c:229
+#: ../camel/providers/local/camel-maildir-folder.c:230
 msgid "Maildir append message canceled"
 msgstr "Maildir ਸ਼ਾਮਿਲ ਸ�ਨ�ਹਾ ਰੱਦ ��ਤਾ"
 
-#: ../camel/providers/local/camel-maildir-folder.c:232
+#: ../camel/providers/local/camel-maildir-folder.c:233
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "maildir ਫ�ਲਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ ਨਹ� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:254
-#: ../camel/providers/local/camel-maildir-folder.c:280
-#: ../camel/providers/local/camel-maildir-folder.c:294
-#: ../camel/providers/local/camel-maildir-folder.c:303
+#: ../camel/providers/local/camel-maildir-folder.c:263
+#: ../camel/providers/local/camel-maildir-folder.c:292
+#: ../camel/providers/local/camel-maildir-folder.c:306
+#: ../camel/providers/local/camel-maildir-folder.c:314
+#: ../camel/providers/local/camel-maildir-folder.c:400
 #: ../camel/providers/local/camel-mbox-folder.c:362
 #: ../camel/providers/local/camel-mbox-folder.c:413
 #: ../camel/providers/local/camel-mbox-folder.c:434
 #: ../camel/providers/local/camel-mbox-folder.c:465
 #: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:215
-#: ../camel/providers/local/camel-mh-folder.c:226
-#: ../camel/providers/local/camel-mh-folder.c:235
+#: ../camel/providers/local/camel-mh-folder.c:225
+#: ../camel/providers/local/camel-mh-folder.c:236
+#: ../camel/providers/local/camel-mh-folder.c:244
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3691,27 +3690,32 @@ msgstr ""
 "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: %s ਫ�ਲਡਰ %s ਤ��\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:304
+#: ../camel/providers/local/camel-maildir-folder.c:315
 msgid "Invalid message contents"
 msgstr "�ਲਤ ਸ�ਨ�ਹਾ ਸਮੱ�ਰ�"
 
+#: ../camel/providers/local/camel-maildir-folder.c:418
+#| msgid "Cannot copy messages to the Junk folder"
+msgid "Cannot transfer message to destination folder"
+msgstr "ਸ�ਨ�ਹ� ਨ�ੰ �ਿ�ਾਣਾ ਫ�ਲਡਰ ਵਿੱ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+
 #: ../camel/providers/local/camel-maildir-store.c:148
 #: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-mbox-store.c:174
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
+#: ../camel/providers/local/camel-mbox-store.c:145
 #: ../camel/providers/local/camel-mh-store.c:217
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤ� �ਾ ਸ�ਦਾ ਹ�: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
+#: ../camel/providers/local/camel-mbox-store.c:153
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
@@ -3734,27 +3738,27 @@ msgid "not a maildir directory"
 msgstr "�ੱ� maildir ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�"
 
 #: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:330
-#: ../camel/providers/local/camel-spool-store.c:344
+#: ../camel/providers/local/camel-spool-store.c:328
+#: ../camel/providers/local/camel-spool-store.c:342
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ਫ�ਲਡਰ '%s' ਦ� �ਾ�� ਨਹ�� ਹ� ਸ�� ਹ�: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:437
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:432
+#: ../camel/providers/local/camel-maildir-summary.c:551
 #, 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:544
 msgid "Checking folder consistency"
 msgstr "ਫ�ਲਡਰ ��ਸਾਰਤਾ ਦ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:637
 msgid "Checking for new messages"
 msgstr "ਨਵ�� ਸ�ਨਹਿ�� ਲ� �ਾ�� �ਾਰ� ਹ�"
 
-#: ../camel/providers/local/camel-maildir-summary.c:744
+#: ../camel/providers/local/camel-maildir-summary.c:724
 #: ../camel/providers/local/camel-mbox-summary.c:526
 #: ../camel/providers/local/camel-mbox-summary.c:722
 #: ../camel/providers/local/camel-mbox-summary.c:842
@@ -3787,23 +3791,23 @@ msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨਾ-ਪ�ਰਾਪਤਯ�� ਨਿ�ਾਰਾਪਨ ਹ�।"
 
 #: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:236
+#: ../camel/providers/local/camel-mh-folder.c:245
 msgid "Message construction failed."
 msgstr "ਸ�ਨ�ਹਾ ਰ�ਨਾ �ਸਫਲ।"
 
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:164
+#: ../camel/providers/local/camel-mbox-store.c:363
 msgid "Cannot create a folder by this name."
 msgstr "�ਸ ਨਾ� ਨਾਲ ਫ�ਲਡਰ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ਫ�ਲਡਰ '%s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: �ੱ� ਨਿਯਮਿਤ ਫਾ�ਲ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:226
+#: ../camel/providers/local/camel-mbox-store.c:237
+#: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3812,46 +3816,46 @@ msgstr ""
 "ਫ�ਲਡਰ '%s' ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:245
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' �� ਨਿਯਮਿਤ ਫਾ�ਲ ਨਹ� ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:252
 #, 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:288
+#: ../camel/providers/local/camel-mbox-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:286
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ਫ�ਲਡਰ ਸੰ��ਪ ਫਾ�ਲ '%s' ਨ�ੰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:376
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ਡਾ�ਰ���ਰ� '%s' ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s।"
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:390
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ਫ�ਲਡਰ ਬਣਾ�� ਨਹ� �ਾ ਸ�ਿ� ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:394
+#: ../camel/providers/local/camel-mbox-store.c:392
 msgid "Folder already exists"
 msgstr "ਫ�ਲਡਰ ਮ���ਦ ਹ�"
 
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:483
 msgid "The new folder name is illegal."
 msgstr "ਨਵਾ� ਫ�ਲਡਰ ਨਾ� �ਲਤ ਹ�।"
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:496
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' ਦਾ ਨਾ� ਬਦਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:577
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' ਦਾ ਨਾ� %s ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
@@ -3885,7 +3889,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "�ਰ�� mailbox ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ਸਰ�ਤ ਫ�ਲਡਰ %s ਨ�ੰ ਬੰਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
@@ -3901,40 +3905,40 @@ msgid "Could not rename folder: %s"
 msgstr "ਫ�ਲਡਰ ਦਾ ਨਾ� ਬਦਲਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1083
+#: ../camel/providers/local/camel-mbox-summary.c:1084
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ਫ�ਲਡਰ ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:897
 #: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1113
-#: ../camel/providers/local/camel-mbox-summary.c:1121
+#: ../camel/providers/local/camel-mbox-summary.c:1114
+#: ../camel/providers/local/camel-mbox-summary.c:1122
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ਸੰ��ਪ ਤ� ਫ�ਲਡਰ ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹਨ, ਸਮ�ਾਲ� �ਰਨ ਮ�ਰ�� ਵ�"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1046
+#: ../camel/providers/local/camel-mbox-summary.c:1047
 #: ../camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "�ਣ�ਾਣ� �ਲਤ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1189
-#: ../camel/providers/local/camel-mbox-summary.c:1215
+#: ../camel/providers/local/camel-mbox-summary.c:1190
+#: ../camel/providers/local/camel-mbox-summary.c:1216
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "�ਰ�� mailbox �ੱਤ� ਲਿ�ਣਾ �ਸਫਲ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1206
+#: ../camel/providers/local/camel-mbox-summary.c:1207
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "�ਰ�� mailbox �ੱਤ� ਲਿ�ਣ ਲ� ਫ�ਲ�ਹ: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:180
 msgid "MH append message canceled"
 msgstr "MH ਸ਼ਾਮਿਲ ਸ�ਨ�ਹਾ ਰੱਦ ��ਤਾ"
 
-#: ../camel/providers/local/camel-mh-folder.c:184
+#: ../camel/providers/local/camel-mh-folder.c:183
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "mh ਫ�ਲਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਤ�� �ਸਫਲ: %s: %s"
@@ -3954,22 +3958,22 @@ msgstr "ਫ�ਲਡਰ '%s' ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ਡਾ�ਰ���ਰ� ਰਸਤਾ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:134
+#: ../camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "ਸਪ�ਲ '%s' ਨ�ੰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:146
+#: ../camel/providers/local/camel-spool-store.c:144
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "ਸਪ�ਲ '%s' �ੱ� ਨਿਯਮਿਤ ਫਾ�ਲ �ਾ� ਡਾ�ਰ���ਰ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:165
+#: ../camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ਫ�ਲਡਰ '%s/%s' ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:175
+#: ../camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3978,12 +3982,12 @@ msgstr ""
 "ਫ�ਲਡਰ '%s' ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:177
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ਫ�ਲਡਰ '%s' ਮ���ਦ ਨਹ�� ਹ�।"
 
-#: ../camel/providers/local/camel-spool-store.c:184
+#: ../camel/providers/local/camel-spool-store.c:182
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3992,30 +3996,30 @@ msgstr ""
 "ਫ�ਲਡਰ '%s' ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:192
+#: ../camel/providers/local/camel-spool-store.c:190
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' �ੱ� mailbox ਫਾ�ਲ ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:207
 msgid "Store does not support an INBOX"
 msgstr "ਸ��ਰ��਼ �ੱ� ��ਣ-ਬ�ਸ� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ਸਪ�ਲ ਪੱਤਰ ਫਾ�ਲ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ਸਪ�ਲ ਫ�ਲਡਰ ਲ�� %s"
 
-#: ../camel/providers/local/camel-spool-store.c:229
+#: ../camel/providers/local/camel-spool-store.c:227
 msgid "Spool folders cannot be renamed"
 msgstr "ਸਪ� ਫ�ਲਡਰਾ� ਦਾ ਨਾ�-ਤਬਦ�ਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../camel/providers/local/camel-spool-store.c:237
+#: ../camel/providers/local/camel-spool-store.c:235
 msgid "Spool folders cannot be deleted"
 msgstr "ਸਪ�ਲ ਫ�ਲਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
@@ -4042,26 +4046,26 @@ msgstr ""
 "ਸਪ�ਲ ਫ�ਲਡਰ %s ਨ�ੰ ਸਮ�ਾਲ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s\n"
 "ਫ�ਲਡਰ ਨਿ�ਾਰਾ ਹ� ਸ�ਦਾ ਹ�, ਨ�ਲ '%s' ਵਿੱ� ਸੰਭਾਲ� �� ਹ�।"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:194
-#: ../camel/providers/nntp/camel-nntp-folder.c:226
+#: ../camel/providers/nntp/camel-nntp-folder.c:135
+#: ../camel/providers/nntp/camel-nntp-folder.c:192
+#: ../camel/providers/nntp/camel-nntp-folder.c:224
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "�ੰਦਰ�ਨ� �ਲਤ�: UID �ਲਤ ਫਾਰਮ�� ਵਿੱ� ਹ�: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:367
-#: ../camel/providers/nntp/camel-nntp-folder.c:370
+#: ../camel/providers/nntp/camel-nntp-folder.c:365
+#: ../camel/providers/nntp/camel-nntp-folder.c:368
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
 #: ../camel/providers/nntp/camel-nntp-folder.c:412
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ਭ��ਣ �ਾਰਵਾ� �ਸਫਲ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:430
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ਤ�ਸ�� �ਫਲਾ�ਨ �ੰਮ �ਰਦ� ਸਮ�� NNTP ਸ�ਨ�ਹ� ਭ�� ਨਹ�� ਸ�ਦ� !"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:443
+#: ../camel/providers/nntp/camel-nntp-folder.c:441
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ਤ�ਸ�� NNTP ਫ�ਲਡਰ ਤ�� ਸ�ਨ�ਹ� ਨ�ਲ ਨਹ�� �ਰ ਸ�ਦ� ਹ�!"
 
@@ -4227,6 +4231,10 @@ msgstr "POP ਸ�ਨ�ਹ� %d ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ
 msgid "Unknown reason"
 msgstr "�ਣ�ਾਣ �ਾਰਨ"
 
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
+msgid "Message storage"
+msgstr "ਸ�ਨ�ਹਾ ਸ��ਰ��਼"
+
 #: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "_Leave messages on server"
 msgstr "ਸਰਵਰ ਤ� ਸ�ਨ�ਹ� �ੱਡ�(_L)"
@@ -4265,56 +4273,64 @@ msgstr ""
 "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ POP ਸਰਵਰ ਨਾਲ APOP ਪਰ����ਾਲ ਰਾਹ� ���ਰਿਪ�ਡ ਪਾਸਵਰਡ ਨਾਲ �����ਾ, �ਹ ਹ� ��ਣ "
 "ਹ�, �� �ਿ ��ਸਰ ਸਰਵਰ ਸਭ ਯ��਼ਰਵਾ� ਨ�ੰ ਦ�ਣ ਦਾ ਵਾ�ਦਾ ਤਾ� �ਰਦ� ਹਨ, ਪਰ ਸੱ� �ੱ� ਹ� ਹ�ੰਦਾ ਹ�।"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:207
+#: ../camel/providers/pop3/camel-pop3-store.c:229
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP ਸਰਵਰ %s ਤ�� ਸ�ਨ�ਹਾ ਪ�ਨ ਵਿੱ� ਫ�ਲ�ਹ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:224
-#: ../camel/providers/pop3/camel-pop3-store.c:238
-#: ../camel/providers/pop3/camel-pop3-store.c:248
-#: ../camel/providers/pop3/camel-pop3-store.c:254
+#: ../camel/providers/pop3/camel-pop3-store.c:246
+#: ../camel/providers/pop3/camel-pop3-store.c:275
+#: ../camel/providers/pop3/camel-pop3-store.c:281
 #, 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:225
+#: ../camel/providers/pop3/camel-pop3-store.c:247
 msgid "STLS not supported by server"
 msgstr "ਸਰਵਰ ਵਲ�� STLS ਸਹਾ�� ਨਹ��"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:263
+#, c-format
+#| msgid "Failed to connect to POP server %s in secure mode: %s"
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "POP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:282
 msgid "TLS is not available in this build"
 msgstr "�ਸ ਨਿਰਮਾਣ ਵਿੱ� TLS �ਪਲੱਬਧ ਨਹ��"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:361
+#: ../camel/providers/pop3/camel-pop3-store.c:388
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:402
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../camel/providers/pop3/camel-pop3-store.c:429
+#: ../camel/providers/pop3/camel-pop3-store.c:567
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ: ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� ਲ� ਸਹਾ�� ਨਹ��।"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:418
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "POP ਸਰਵਰ %2$s �ੱਤ� SASL '%1$s' ਲਾ��ਨ �ਸਫਲ: %3$s"
+#| msgid "SASL '%s' Login failed for POP server %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "POP ਸਰਵਰ %2$s%3$s �ੱਤ� SASL '%1$s' ਲਾ��ਨ �ਸਫਲ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:430
+#: ../camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP ਸਰਵਰ %s �ੱਤ� ਲਾ��ਨ �ਰਨ ਤ�� �ਸਫਲ: SASL ਪਰ����ਾਲ �ਲਤ�"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:449
+#: ../camel/providers/pop3/camel-pop3-store.c:481
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "POP ਸਰਵਰ %s ਤ� ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:508
+#: ../camel/providers/pop3/camel-pop3-store.c:540
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4323,8 +4339,7 @@ msgstr ""
 "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਲ� �ਸਮੱਰਥ ਹ�।\t�ਲਤ APOP ID ਮਿਲਿ� ਹ�। Impersonation ਹਮਲ� ਦਾ "
 "ਸ਼ੱ� ਹ�। �ਪਣ� ਪਰਸ਼ਾਸ਼� ਨਾਲ ਸੰਪਰ� �ਰ�।"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:549
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:581
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4333,16 +4348,33 @@ msgstr ""
 "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ\n"
 "ਪਾਸਵਰਡ ਭ��ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:556
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:591
+#, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending username: %s"
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username%s"
+msgstr ""
+"POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਮੱਰਥ ਹ�।\n"
+"ਯ��਼ਰ ਨਾ�%s ਭ��ਣ ਦ�ਰਾਨ �ਲਤ�"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending password: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending password%s"
 msgstr ""
-"POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ।\n"
-"ਯ��਼ਰ ਨਾ� ਭ��ਣ ਵਿੱ� �ਸਫਲ: %s"
+"POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਮਰੱਥ ਹ�।\n"
+"ਪਾਸਵਰਡ%s ਭ��ਣ ਦ�ਰਾਨ �ਲਤ�"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:669
+#: ../camel/providers/pop3/camel-pop3-store.c:707
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s' ਫ�ਲਡਰ ਨਹ�� ਹ�।"
@@ -4737,7 +4769,7 @@ msgstr "�ਡ�� �ਾਰ�"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1900
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%I:%M:%S %p %a %d/%m/%Y"
 
@@ -4745,7 +4777,7 @@ msgstr "%I:%M:%S %p %a %d/%m/%Y"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%H:%M:%S %a %d/%m/%Y"
 
@@ -4753,7 +4785,7 @@ msgstr "%H:%M:%S %a %d/%m/%Y"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1896
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%I:%M %p %a %d/%m/%Y"
 
@@ -4761,7 +4793,7 @@ msgstr "%I:%M %p %a %d/%m/%Y"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1887
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%H:%M %a %d/%m/%Y"
 
@@ -4779,8 +4811,8 @@ msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1763
-#: ../libedataserver/e-time-utils.c:1882
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1884
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -4820,19 +4852,19 @@ msgstr "%H %d/%m/%Y"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1766
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1824 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1828 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4840,24 +4872,24 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1837 ../libedataserver/e-time-utils.c:1933
+#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1840
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%H%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1844
+#: ../libedataserver/e-time-utils.c:1846
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -4869,54 +4901,59 @@ msgstr "LDAP ਸਰਵਰ ਨ�ੰ ��ਿ�ਤ ਦ� ਤ�ਰ 'ਤ� ਵ
 msgid "Failed to authenticate.\n"
 msgstr "ਡਾ�ਾ ���ਡਿ� �ਰਨ ਵਿੱ� �ਸਫਲ ਹ�।\n"
 
-#: ../libedataserverui/e-categories-dialog.c:327
+#: ../libedataserverui/e-categories-dialog.c:145
+msgid "Category Icon"
+msgstr "���ਾ�ਰ� ���ਾਨ"
+
+#: ../libedataserverui/e-categories-dialog.c:151
+msgid "_No Image"
+msgstr "��� �ਿੱਤਰ ਨਹ��(_N)"
+
+#: ../libedataserverui/e-categories-dialog.c:372
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "ਸੰਰ�ਨਾ ਵਿੱ� ਪਹਿਲਾ� ਹ� '%s' ���ਾ�ਰ� ਹ�। �ਿਰਪਾ �ਰ�� ਵੱ�ਰਾ ਨਾ� ਵਰਤ��।"
 
-#: ../libedataserverui/e-categories-dialog.c:618
+#: ../libedataserverui/e-categories-dialog.c:680
 msgid "Icon"
 msgstr "���ਾਨ"
 
-#: ../libedataserverui/e-categories-dialog.c:623
+#: ../libedataserverui/e-categories-dialog.c:685
 msgid "Category"
 msgstr "���ਾ�ਰ�"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "���ਾ�ਰ� ���ਾਨ"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:2
+#: ../libedataserverui/e-categories-dialog.ui.h:1
 msgid "Category Properties"
 msgstr "���ਾ�ਰ� ��ਣ"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:2
 msgid "Category _Icon"
 msgstr "���ਾ�ਰ� ���ਾਨ(_I)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:3
 msgid "Category _Name"
 msgstr "���ਾ�ਰ� ਨਾ�(_N)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "�ਹਨਾ� ���ਾ�ਰ��� ਨਾਲ ਸਬੰਧਤ ���ਮਾ�(_c):"
+#: ../libedataserverui/e-categories-dialog.ui.h:4
+#| msgid "Item(s) belong to these _categories:"
+msgid "Item(s) _belong to these categories:"
+msgstr "�ਹਨਾ� ���ਾ�ਰ��� ਨਾਲ ਸਬੰਧਤ ���ਮਾ�(_b):"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
 msgstr "�ਪਲੱਬਧ ���ਾ�ਰ���(_A):"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:6
 msgid "_Edit"
 msgstr "ਸ�ਧ(_E)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:7
 msgid "categories"
 msgstr "���ਾ�ਰ�"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:292
 #, c-format
 msgid "Create category \"%s\""
 msgstr "���ਾ�ਰ� \"%s\" ਬਣਾ�"
@@ -4929,111 +4966,110 @@ msgstr "ਰੰ� �ਾਣ�ਾਰ�"
 msgid "The color to render"
 msgstr "ਰ��ਡਰ �ਰਨ ਲ� ਰੰ�"
 
-#: ../libedataserverui/e-name-selector-dialog.c:276
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Select Contacts from Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ��� ਸੰਪਰ� ��ਣ�"
 
-#: ../libedataserverui/e-name-selector-dialog.c:563
+#: ../libedataserverui/e-name-selector-dialog.c:587
 msgid "_Add"
 msgstr "ਸ਼ਾਮਲ(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:588
+#: ../libedataserverui/e-name-selector-dialog.c:612
 msgid "_Remove"
 msgstr "ਹ�ਾ�(_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:765
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:789
+#: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "��� ਵ� ���ਾ�ਰ�"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
+#: ../libedataserverui/e-name-selector-dialog.ui.h:1
 msgid "*"
 msgstr "*"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
+#: ../libedataserverui/e-name-selector-dialog.ui.h:2
 msgid "<b>Co_ntacts</b>"
 msgstr "<b>ਸੰਪਰ�(_n)</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
+#: ../libedataserverui/e-name-selector-dialog.ui.h:3
 msgid "<b>Show Contacts</b>"
 msgstr "<b>ਸੰਪਰ� ਵ���</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
+#: ../libedataserverui/e-name-selector-dialog.ui.h:4
 msgid "Address B_ook:"
 msgstr "�ਡਰ�ੱਸ �ਿਤਾਬ(_o):"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.ui.h:5
 msgid "Address Book"
 msgstr "�ਡਰ�ੱਸ �ਿਤਾਬ"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.ui.h:7
 msgid "Cate_gory:"
 msgstr "���ਾ�ਰ�(_g):"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: ../libedataserverui/e-name-selector-dialog.ui.h:8
 msgid "Contacts"
 msgstr "ਸੰਪਰ�"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
+#: ../libedataserverui/e-name-selector-dialog.ui.h:9
 msgid "Search"
 msgstr "���"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
+#: ../libedataserverui/e-name-selector-dialog.ui.h:10
 msgid "_Search:"
 msgstr "���(_S):"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2455
+#: ../libedataserverui/e-name-selector-entry.c:2511
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s ਲਾ�ਨ '� ਫ�ਲਾ�(_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2470
+#: ../libedataserverui/e-name-selector-entry.c:2526
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s �ਾਪ� �ਰ�(_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2480
+#: ../libedataserverui/e-name-selector-entry.c:2536
 #, c-format
 msgid "C_ut %s"
 msgstr "%s �ੱ��(_U)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2497
+#: ../libedataserverui/e-name-selector-entry.c:2553
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ਸ�ਧ(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:479
 #, c-format
 msgid "_Delete %s"
 msgstr "%s ਹ�ਾ�(_D)"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:240
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr "��ਰਿੰ� �� �ਣ-ਵਰਤ��ਯ�� ਹ�: ��� ਹ�ਸ� �ਾ� ਯ��਼ਰ ਨਹ��"
 
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:1099
 msgid "You have the Caps Lock key on."
 msgstr "ਤ�ਸ�� ��ਪਸ ਲਾ� ਨ�ੰ �ਾਲ� ��ਤਾ ਹ�।"
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:1221
 msgid "_Remember this passphrase"
 msgstr "�ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1222
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "�ਸ ਸ਼�ਸ਼ਨ ਲ� �ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1227
 msgid "_Remember this password"
 msgstr "�ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1228
 msgid "_Remember this password for the remainder of this session"
 msgstr "�ਸ ਸ਼�ਸਨ ਲ� �ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
@@ -5042,203 +5078,320 @@ msgstr "�ਸ ਸ਼�ਸਨ ਲ� �ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ
 msgid "Select destination"
 msgstr "�ਿ�ਾਣਾ ��ਣ�"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:172
 msgid "_Destination"
 msgstr "�ਿ�ਾਣਾ(_D)"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1694
-#: ../servers/exchange/storage/exchange-account.c:955
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s ਲ� ਪਾਸਵਰਡ ਦਿ�"
+#: ../servers/groupwise/e-gw-connection.c:227
+msgid "Invalid connection"
+msgstr "�ਲਤ ��ਨ��ਸ਼ਨ"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1695
-#: ../servers/exchange/storage/exchange-account.c:960
-msgid "Enter password"
-msgstr "ਪਾਸਵਰਡ ਦਿ�"
+#: ../servers/groupwise/e-gw-connection.c:231
+msgid "Invalid response from server"
+msgstr "ਸਰਵਰ ਤ�� �ਲਤ �ਵਾਬ"
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:844
-msgid "Owner"
-msgstr "ਮਾਲ�"
+#: ../servers/groupwise/e-gw-connection.c:233
+msgid "No response from the server"
+msgstr "ਸਰਵਰ ਤ�� ��� �ਵਾਬ ਨਹ��"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:854
-msgid "Publishing Editor"
-msgstr "ਪਰ�ਾਸ਼ਤ ਸੰਪਾਦ�"
+#: ../servers/groupwise/e-gw-connection.c:239
+msgid "Bad parameter"
+msgstr "�ਲਤ ਪ�ਰਾਮ��ਰ"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:862
-msgid "Editor"
-msgstr "ਸੰਪਾਦ�"
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "\"%s\" ਬ�ੱ� ਤ� ਪਹਿਲਾ� \"%s\""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:869
-msgid "Publishing Author"
-msgstr "ਪਰ�ਾਸ਼ਤ ਲ���"
+#~ msgid "book busy"
+#~ msgstr "ਬ�ੱ� ਰ�ੱ��"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:875
-msgid "Author"
-msgstr "ਲ���"
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "CORBA �ਪਵਾਦ \"%s\" �ਾਲ"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:880
-msgid "Non-editing Author"
-msgstr "ਨਾ-ਸੰਪਾਦਿਤ ਲ���"
+#~ msgid "%s: there is no current operation"
+#~ msgstr "%s: ਮ���ਦਾ ��� �ਾਰਵਾ� ਨਹ�� ਹ�"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:884
-msgid "Reviewer"
-msgstr "ਸਮ��ਿ��"
+#~ msgid "%s: could not cancel"
+#~ msgstr "%s: ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:886
-msgid "Contributor"
-msgstr "ਯ��ਦਾਨ"
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "\"%s\" ਬ�ੱ� ਦ� ਬਾ�ਦ \"%s\""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:888
-msgid "None"
-msgstr "��� ਨਹ��"
+#~ msgid "%s: canceled"
+#~ msgstr "%s: ਰੱਦ ��ਤਾ"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:903
-msgid "Custom"
-msgstr "ਪਸੰਦ�ਦਾ"
+#~ msgid "%s: no factories available for URI `%s'"
+#~ msgstr "%s: URI `%s' ਲ� ��� ਫ���ਰ� �ਪਲੱਬਧ ਨਹ�� ਹ�"
 
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "Generic error"
-msgstr "�ਮ �ਲਤ�"
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "%s: ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�"
 
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "A folder with the same name already exists"
-msgstr "ਦਿੱਤ� ਨਾ� ਨਾਲ ਫ�ਲਡਰ ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
+#~ msgid "%s: there was no self contact UID stored in gconf"
+#~ msgstr "%s: gconf ਵਿੱ� ��� ��ਦ-ਸੰਪਰ� UID ਸੰਭਾਲਿ� ਨਹ�� ਹ�।"
 
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "The specified folder type is not valid"
-msgstr "ਦਿੱਤ� ਫ�ਲਡਰ �ਿਸਮ �ਾ��਼ ਨਹ�� ਹ�"
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "�ਹ ਸ�ਨ�ਹ� ਦਾ ਡਿ���ਲ ਦਸਤ�ਤ� ਭਾ� ਹ�"
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "I/O error"
-msgstr "I/O �ਲਤ�"
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "Not enough space to create the folder"
-msgstr "ਫ�ਲਡਰ ਬਣਾ�ਣ ਲ� ਲ���ਦ� �ਾਲ� ਥਾ� ਨਹ��"
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ਸਰਵਰ ਨਾਲ ��ਰਬਰ�ਸ ੪ ਪ�ਰਮਾਣਿਤ ਨਾਲ �����ਾ।"
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The folder is not empty"
-msgstr "ਫ�ਲਡਰ �ਾਲ� ਨਹ�� ਹ�"
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "��ਰਬਰ�ਸ �ਿ�� ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ:\n"
+#~ "%s"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "The specified folder was not found"
-msgstr "ਦਿੱਤਾ ਫ�ਲਡਰ ਮਿਲਿ� ਨਹ�� ਹ�"
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "�ਾਰ��ਰਤਾ ਦਾ ਸਰ��ਫਿ��� ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Function not implemented in this storage"
-msgstr "�ਸ ਸ��ਰ��਼ ਵਿੱ� ਫੰ�ਸ਼ਨ ਹਾਲ� ਬਣਿ� ਨਹ�� ਹ�"
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "ਸਰ��ਫਿ��� ਥਾ� ਸ��� ਪ�ਰਾਪਤ ਨਹ�� ��ਤ� �ਾ ਸ�� ਹ�"
 
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "Operation not supported"
-msgstr "�ਾਰਵਾ� ਸਹਾ�� ਨਹ�� ਹ�"
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ ਡਿ��ਰਿਪ� �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified type is not supported in this storage"
-msgstr "�ਸ ਸ��ਰ��਼ ਵਿੱ� ਦਿੱਤ� �ਿਸਮ ਸਹਾ�� ਨਹ�� ਹ�"
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "ਸਰ��ਫਿ��� ਥਾ� ਸ��� ਦਸਤ�ਤ ਡਿ��ਰਿਪ� �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "The specified folder cannot be modified or removed"
-msgstr "ਦਿੱਤਾ ਫ�ਲਡਰ ਸ�ਧਿ� �ਾ� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "�ਾਰ��ਰਤਾ ਦ� ਪਬਲਿ� ��ੰ�� ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "�ੱ� ਫ�ਲਡਰ ਨ�ੰ �ਸ ਦ� �ਧ�ਨ ਦ� �ਧ�ਨ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�"
+#~ msgid "Certificate signature failure"
+#~ msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ �ਸਫਲ"
 
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "Cannot create a folder with that name"
-msgstr "�ਸ� ਨਾ� ਨਾਲ ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "ਸਰ��ਫਿ��� ਥਾ� ਸ��� ਦਸਤ�ਤ �ਸਫਲ"
 
-#: ../servers/exchange/storage/e-storage.c:585
-msgid "This operation cannot be performed in off-line mode"
-msgstr "�ਹ �ਾਰਵਾ� �ਫਲਾ�ਨ ਢੰ� ਰਾਹ�� ��ਤ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�"
+#~ msgid "Certificate not yet valid"
+#~ msgstr "ਸਰ��ਫਿ��� �ਾ�� ਨਹ�� ਹ�"
 
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:640
-#, c-format
-msgid "%s's Folders"
-msgstr "%s ਦ� ਫ�ਲਡਰ"
+#~ msgid "Certificate has expired"
+#~ msgstr "ਸਰ��ਫਿ��� ਦ� ਮਿ�ਦ ਪ�ੱ� ��ੱ�� ਹ�"
 
-#: ../servers/exchange/storage/exchange-account.c:1260
-msgid "Personal Folders"
-msgstr "ਨਿੱ�� ਫ�ਲਡਰ"
+#~| msgid "Certificate Revocation List signature failure"
+#~ msgid "Certificate Revocation List (CRL) not yet valid"
+#~ msgstr "ਸਰ��ਫਿ��� ਮਨਸ�� ਲਿਸ� (CRL) ਹਾਲ� ਢ�ੱ�ਵ�� ਨਹ�� ਹ�"
 
-#: ../servers/exchange/storage/exchange-account.c:1275
-msgid "Favorite Public Folders"
-msgstr "ਪਸੰਦ�ਦਾ ਪਬਲਿ� ਫ�ਲਡਰ"
+#~| msgid "Certificate Revocation List signature failure"
+#~ msgid "Certificate Revocation List (CRL) has expired"
+#~ msgstr "ਸਰ��ਫਿ��� ਮਨਸ�� ਲਿਸ� (CRL) ਦ� ਮਿ�ਦ ਪ�ੱ��"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1292
-msgid "All Public Folders"
-msgstr "ਸਭ ਪਬਲਿ� ਫ�ਲਡਰ"
+#~| msgid "Unable to get Certificate Revocation List"
+#~ msgid "Error in Certificate Revocation List (CRL)"
+#~ msgstr "ਸਰ��ਫਿ��� ਮਨਸ�� ਲਿਸ� (CRL) ਵਿੱ� �ਲਤ�"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1306
-msgid "Global Address List"
-msgstr "�ਲ�ਬਲ �ਡਰ�ੱਸ ਲਿਸ�"
+#~ msgid "Out of memory"
+#~ msgstr "ਮ�ਮ�ਰ� ਤ�� ਬਾਹਰ"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "ਹ�ਾ��� ���ਮਾ�"
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "Zero-depth ਸਵ�-ਦਸਤ�ਤ� ਸਰ��ਫਿ���"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "ਡਰਾਫ�"
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "ਲ�� ਵਿੱ� ਸਵ�-ਦਸਤ�ਤ� ਸਰ��ਫਿ��� ਹ�"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "ਰ��਼ਾਨਾਮ�ਾ"
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "�ਾਰ��ਰਤਾ ਦਾ ਸਰ��ਫਿ��� ਲ��ਲ ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫ਼ਲ"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "�ਿੱਪਣ���"
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "ਸਿਰਾ ਦਸਤ�ਤ �ਾ�� �ਰਨ ਤ�� �ਸਫਲ"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "ਬਾਹਰ�-ਬ�ਸਾ"
+#~ msgid "Certificate chain too long"
+#~ msgstr "ਸਰ��ਫਿ��� ਲ�� ਬ�� ਲੰਮ� ਹ�"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "ਭ����� ���ਮਾ�"
+#~ msgid "Certificate Revoked"
+#~ msgstr "ਸਰ��ਫਿ��� ਮ�� ਸ਼ਾਮਿਲ"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "�ੰਮ"
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "�ਲਤ ਸਰ��ਫਿ��� �ਥਾਰ�� (CA)"
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "�ਲਤ ��ਨ��ਸ਼ਨ"
+#~ msgid "Path length exceeded"
+#~ msgstr "ਰਸਤਾ ਲੰਬਾ� ਵੱਧ �� ਹ�"
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "ਸਰਵਰ ਤ�� �ਲਤ �ਵਾਬ"
+#~ msgid "Invalid purpose"
+#~ msgstr "�ਲਤ �ਦ�ਸ਼"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "ਸਰਵਰ ਤ�� ��� �ਵਾਬ ਨਹ��"
+#~ msgid "Certificate untrusted"
+#~ msgstr "ਸਰ��ਫਿ��� ਨਾ-ਭਰ�ਸ�ਯ��"
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "�ਲਤ ਪ�ਰਾਮ��ਰ"
+#~ msgid "Certificate rejected"
+#~ msgstr "ਸਰ��ਫਿ��� �ਸਵ��ਾਰ"
+
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "ਵਿਸ਼ਾ/�ਾਰ� �ਰਤਾ ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹਨ"
+
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹਨ"
+
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/�ਾਰ� �ਰਤਾ ਸ�ਰ��ਲ ਮ�ਲ ਨਹ�� �ਾਦ�"
+
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "ਵਰਤ� ��ੰ�� ਸਰ��ਫਿ��� ਦਸਤ�ਤਾ� ਲ� ਸਹਾ� ਨਹ�� ਹ�"
+
+#~ msgid "Error in application verification"
+#~ msgstr "�ਪਲ���ਸ਼ਨ �ਾ�� ਵਿੱ� �ਲਤ� ਹ�"
+
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "%s ਵਲ�� �ਲਤ ਸਰ��ਫਿ���:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "�� ਤ�ਸ�� �ਿਸ� ਵ� ਤਰਾ� ਸਵ��ਾਰ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
+
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+#~ msgstr ""
+#~ "ਪ�ਰਯ��ਤਾਮਿ� IMAP 4(.1) �ਲਾ���\n"
+#~ "�ਹ ਨਾ-�ਾ��ਿ� ਤ� ਨਾ-ਸਹਾ�� ��ਡ ਹ�, ਤ�ਸ�� imap ਵਰਤਣਾ ਪਸੰਦ �ਰ���।\n"
+#~ "\n"
+#~ " !!! �ਤਪਾਦਨ �ਮ�ਲ ਲ� ਨਾ ਵਰਤ��  !!!\n"
+
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "POP ਸਰਵਰ ਨਾਲ %s �ੱਤ� ��ਨ��� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "%s ਲ� ਪਾਸਵਰਡ ਦਿ�"
+
+#~ msgid "Enter password"
+#~ msgstr "ਪਾਸਵਰਡ ਦਿ�"
+
+#~ msgid "Owner"
+#~ msgstr "ਮਾਲ�"
+
+#~ msgid "Publishing Editor"
+#~ msgstr "ਪਰ�ਾਸ਼ਤ ਸੰਪਾਦ�"
+
+#~ msgid "Editor"
+#~ msgstr "ਸੰਪਾਦ�"
+
+#~ msgid "Publishing Author"
+#~ msgstr "ਪਰ�ਾਸ਼ਤ ਲ���"
+
+#~ msgid "Author"
+#~ msgstr "ਲ���"
+
+#~ msgid "Non-editing Author"
+#~ msgstr "ਨਾ-ਸੰਪਾਦਿਤ ਲ���"
+
+#~ msgid "Reviewer"
+#~ msgstr "ਸਮ��ਿ��"
+
+#~ msgid "Contributor"
+#~ msgstr "ਯ��ਦਾਨ"
+
+#~ msgid "None"
+#~ msgstr "��� ਨਹ��"
+
+#~ msgid "Custom"
+#~ msgstr "ਪਸੰਦ�ਦਾ"
+
+#~ msgid "Generic error"
+#~ msgstr "�ਮ �ਲਤ�"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "ਦਿੱਤ� ਨਾ� ਨਾਲ ਫ�ਲਡਰ ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "ਦਿੱਤ� ਫ�ਲਡਰ �ਿਸਮ �ਾ��਼ ਨਹ�� ਹ�"
+
+#~ msgid "I/O error"
+#~ msgstr "I/O �ਲਤ�"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "ਫ�ਲਡਰ ਬਣਾ�ਣ ਲ� ਲ���ਦ� �ਾਲ� ਥਾ� ਨਹ��"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "ਫ�ਲਡਰ �ਾਲ� ਨਹ�� ਹ�"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "ਦਿੱਤਾ ਫ�ਲਡਰ ਮਿਲਿ� ਨਹ�� ਹ�"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "�ਸ ਸ��ਰ��਼ ਵਿੱ� ਫੰ�ਸ਼ਨ ਹਾਲ� ਬਣਿ� ਨਹ�� ਹ�"
+
+#~ msgid "Operation not supported"
+#~ msgstr "�ਾਰਵਾ� ਸਹਾ�� ਨਹ�� ਹ�"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "�ਸ ਸ��ਰ��਼ ਵਿੱ� ਦਿੱਤ� �ਿਸਮ ਸਹਾ�� ਨਹ�� ਹ�"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "ਦਿੱਤਾ ਫ�ਲਡਰ ਸ�ਧਿ� �ਾ� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "�ੱ� ਫ�ਲਡਰ ਨ�ੰ �ਸ ਦ� �ਧ�ਨ ਦ� �ਧ�ਨ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "�ਸ� ਨਾ� ਨਾਲ ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "�ਹ �ਾਰਵਾ� �ਫਲਾ�ਨ ਢੰ� ਰਾਹ�� ��ਤ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�"
+
+#~ msgid "%s's Folders"
+#~ msgstr "%s ਦ� ਫ�ਲਡਰ"
+
+#~ msgid "Personal Folders"
+#~ msgstr "ਨਿੱ�� ਫ�ਲਡਰ"
+
+#~ msgid "Favorite Public Folders"
+#~ msgstr "ਪਸੰਦ�ਦਾ ਪਬਲਿ� ਫ�ਲਡਰ"
+
+#~ msgid "All Public Folders"
+#~ msgstr "ਸਭ ਪਬਲਿ� ਫ�ਲਡਰ"
+
+#~ msgid "Global Address List"
+#~ msgstr "�ਲ�ਬਲ �ਡਰ�ੱਸ ਲਿਸ�"
+
+#~ msgid "Deleted Items"
+#~ msgstr "ਹ�ਾ��� ���ਮਾ�"
+
+#~ msgid "Drafts"
+#~ msgstr "ਡਰਾਫ�"
+
+#~ msgid "Journal"
+#~ msgstr "ਰ��਼ਾਨਾਮ�ਾ"
+
+#~ msgid "Notes"
+#~ msgstr "�ਿੱਪਣ���"
+
+#~ msgid "Outbox"
+#~ msgstr "ਬਾਹਰ�-ਬ�ਸਾ"
+
+#~ msgid "Sent Items"
+#~ msgstr "ਭ����� ���ਮਾ�"
+
+#~ msgid "Tasks"
+#~ msgstr "�ੰਮ"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ ਬ�ੱ� ਫਾ�ਲ ਬ����ਡ"
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ ਬ�ੱ� ਫਾ�ਲ ਬ����ਡ"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ਫਾ�ਲ ਤ� webcal"
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ਫਾ�ਲ ਤ� webcal"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਸਰਵਰ �ੰ�ਰਫ�ਸ �ਾ�� ਸ�ਵਾ"
+#~ msgid "Evolution Data Server interface check service"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਸਰਵਰ �ੰ�ਰਫ�ਸ �ਾ�� ਸ�ਵਾ"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਸਰਵਰ ਲਾ��ਨ ਸਰਵਿਸ"
+#~ msgid "Evolution Data Server logging service"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਸਰਵਰ ਲਾ��ਨ ਸਰਵਿਸ"
 
 #~ msgid "CRL not yet valid"
 #~ msgstr "CRL �ਾ�� ਨਹ�� ਹ�"



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