[evolution-data-server] update for Punjabi



commit 0f71ac534af6f71d19b8c2953a22245cefa3bf02
Author: A S Alam <aalam users sf net>
Date:   Fri Sep 3 08:07:46 2010 +0530

    update for Punjabi

 po/pa.po |  611 +++++++++++++++++++++++++-------------------------------------
 1 files changed, 245 insertions(+), 366 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index a2eba58..6046afa 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: evolution-data-server.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
 "cgi?product=evolution-data-server&component=Misc.\n"
-"POT-Creation-Date: 2010-08-12 23:04+0000\n"
-"PO-Revision-Date: 2010-08-17 06:29+0530\n"
+"POT-Creation-Date: 2010-09-01 08:23+0000\n"
+"PO-Revision-Date: 2010-09-03 08:04+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
 "MIME-Version: 1.0\n"
@@ -31,13 +31,13 @@ msgstr "ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4491
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4482
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "��� �ਾਰ� ਹ�..."
 
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4650
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "ਸੰਪਰ� (%d) ਡਾ�ਨਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ... "
@@ -50,7 +50,6 @@ msgid "Updating contacts cache (%d)... "
 msgstr "ਸੰਪਰ� ����� (%d) �ੱਪਡ�� ��ਤ� �ਾ ਰਹ� ਹ�... "
 
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
-#| msgid "Not connected."
 msgid "Not connected"
 msgstr "��ਨ��� ਨਹ�� ਹ�"
 
@@ -62,43 +61,42 @@ msgstr "ਵੱ�ਰਾ ਨਾ� ਵਰਤ�� (DN)"
 msgid "Using Email Address"
 msgstr "�ਮ�ਲ �ਡਰ�ੱਸ ਵਰਤ ��"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1031
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ���ਿ� �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1156
-#| msgid "Invalid argument"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
 msgid "Invalid DN syntax"
 msgstr "�ਲਤ DN ਸੰ���ਸ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1672
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਸ਼ਾਮਿਲ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1804
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਹ�ਾ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2238
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰ� ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4341
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
 msgid "Receiving LDAP search results..."
 msgstr "LDAP ਤ�� ��� ਨਤ��� ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4513
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
 msgid "Error performing search"
 msgstr "��� �ਲਾ�ਣ ਵਿੱ� �ਲਤ�"
 
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
 #, c-format
-msgid "Create resource '%s' failed with http status: %d"
-msgstr "'%s' ਬਣਾ�ਣ ਲ� ਫ�ਲ�ਹ, http ਹਾਲਤ ਨਾਲ: %d"
+#| msgid "Create resource '%s' failed with http status: %d"
+msgid "Create resource '%s' failed with HTTP status: %d"
+msgstr "'%s' ਸਰ�ਤ ਬਣਾ�ਣ ਲ� ਫ�ਲ�ਹ, HTTP ਹਾਲਤ ਨਾਲ: %d"
 
-#: ../addressbook/libebook/e-book.c:2940
+#: ../addressbook/libebook/e-book.c:2995
 #, c-format
-#| msgid "%s: there was no source for uid `%s' stored in gconf."
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: ��-�ਾਨਫ ਵਿੱ� ਸ��ਰ ��ਤ� UID `%s' ਲ� ��� ਸਰ�ਤ ਨਹ�� ਹ�।"
 
@@ -368,32 +366,26 @@ msgid "GroupWise Work Screen Name 3"
 msgstr "�ਰ�ਪਵਾ�� �ੰਮ ਸ�ਰ�ਨ ਨਾ� ੩"
 
 #: ../addressbook/libebook/e-contact.c:203
-#| msgid "Jabber Home Id 1"
 msgid "Jabber Home ID 1"
 msgstr "Jabber Home ID ੧"
 
 #: ../addressbook/libebook/e-contact.c:204
-#| msgid "Jabber Home Id 2"
 msgid "Jabber Home ID 2"
 msgstr "Jabber Home ID ੨"
 
 #: ../addressbook/libebook/e-contact.c:205
-#| msgid "Jabber Home Id 3"
 msgid "Jabber Home ID 3"
 msgstr "Jabber Home ID à©©"
 
 #: ../addressbook/libebook/e-contact.c:206
-#| msgid "Jabber Work Id 1"
 msgid "Jabber Work ID 1"
 msgstr "Jabber Work ID ੧"
 
 #: ../addressbook/libebook/e-contact.c:207
-#| msgid "Jabber Work Id 2"
 msgid "Jabber Work ID 2"
 msgstr "Jabber Work ID ੨"
 
 #: ../addressbook/libebook/e-contact.c:208
-#| msgid "Jabber Work Id 3"
 msgid "Jabber Work ID 3"
 msgstr "Jabber Work ID à©©"
 
@@ -446,32 +438,26 @@ msgid "MSN Work Screen Name 3"
 msgstr "MSN Work Screen Name à©©"
 
 #: ../addressbook/libebook/e-contact.c:221
-#| msgid "ICQ Home Id 1"
 msgid "ICQ Home ID 1"
 msgstr "ICQ Home ID ੧"
 
 #: ../addressbook/libebook/e-contact.c:222
-#| msgid "ICQ Home Id 2"
 msgid "ICQ Home ID 2"
 msgstr "ICQ Home ID ੨"
 
 #: ../addressbook/libebook/e-contact.c:223
-#| msgid "ICQ Home Id 3"
 msgid "ICQ Home ID 3"
 msgstr "ICQ Home ID à©©"
 
 #: ../addressbook/libebook/e-contact.c:224
-#| msgid "ICQ Work Id 1"
 msgid "ICQ Work ID 1"
 msgstr "ICQ Work ID ੧"
 
 #: ../addressbook/libebook/e-contact.c:225
-#| msgid "ICQ Work Id 2"
 msgid "ICQ Work ID 2"
 msgstr "ICQ Work ID ੨"
 
 #: ../addressbook/libebook/e-contact.c:226
-#| msgid "ICQ Work Id 3"
 msgid "ICQ Work ID 3"
 msgstr "ICQ Work ID à©©"
 
@@ -529,12 +515,10 @@ msgid "AIM Screen Name List"
 msgstr "AIM ਸ�ਰ�ਨ ਨਾ� ਲਿਸ�"
 
 #: ../addressbook/libebook/e-contact.c:250
-#| msgid "GroupWise Id List"
 msgid "GroupWise ID List"
 msgstr "�ਰ�ੱਵਾ�� ID ਲਿਸ�"
 
 #: ../addressbook/libebook/e-contact.c:251
-#| msgid "Jabber Id List"
 msgid "Jabber ID List"
 msgstr "Jabber ID ਲਿਸ�"
 
@@ -547,7 +531,6 @@ msgid "MSN Screen Name List"
 msgstr "MSN Screen ਨਾ� ਲਿਸ�"
 
 #: ../addressbook/libebook/e-contact.c:254
-#| msgid "ICQ Id List"
 msgid "ICQ ID List"
 msgstr "ICQ ID ਲਿਸ�"
 
@@ -579,37 +562,30 @@ msgid "X.509 Certificate"
 msgstr "X.509 ਸਰ��ਫਿ���"
 
 #: ../addressbook/libebook/e-contact.c:267
-#| msgid "Gadu-Gadu Home Id 1"
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu �ਰ ID ੧"
 
 #: ../addressbook/libebook/e-contact.c:268
-#| msgid "Gadu-Gadu Home Id 2"
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu �ਰ ID ੨"
 
 #: ../addressbook/libebook/e-contact.c:269
-#| msgid "Gadu-Gadu Home Id 3"
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu �ਰ ID ੩"
 
 #: ../addressbook/libebook/e-contact.c:270
-#| msgid "Gadu-Gadu Work Id 1"
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu �ੰਮ ID ੧"
 
 #: ../addressbook/libebook/e-contact.c:271
-#| msgid "Gadu-Gadu Work Id 2"
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu �ੰਮ ID ੨"
 
 #: ../addressbook/libebook/e-contact.c:272
-#| msgid "Gadu-Gadu Work Id 3"
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu �ੰਮ ID ੩"
 
 #: ../addressbook/libebook/e-contact.c:273
-#| msgid "Gadu-Gadu Id List"
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID ਲਿਸ�"
 
@@ -672,244 +648,216 @@ msgstr "�ਾਲ� URI"
 msgid "Invalid source"
 msgstr "�ਲਤ ਸਰ�ਤ"
 
-#: ../addressbook/libedata-book/e-data-book.c:166
-#: ../calendar/libedata-cal/e-data-cal.c:104
+#: ../addressbook/libedata-book/e-data-book.c:171
+#: ../calendar/libedata-cal/e-data-cal.c:109
 msgid "Success"
 msgstr "ਸਫ਼ਲ"
 
-#: ../addressbook/libedata-book/e-data-book.c:167
-#: ../calendar/libedata-cal/e-data-cal.c:105
-#| msgid "Repository is offline"
+#: ../addressbook/libedata-book/e-data-book.c:172
+#: ../calendar/libedata-cal/e-data-cal.c:110
 msgid "Repository offline"
 msgstr "Repository �ਫਲਾ�ਨ ਹ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:168
-#: ../calendar/libecal/e-cal.c:3945 ../calendar/libedata-cal/e-data-cal.c:106
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libecal/e-cal.c:4065 ../calendar/libedata-cal/e-data-cal.c:111
 msgid "Permission denied"
 msgstr "�ਧਿ�ਾਰ ਪਾਬੰਦ� ਹ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:169
-#| msgid "Object not found"
+#: ../addressbook/libedata-book/e-data-book.c:174
 msgid "Contact not found"
 msgstr "ਸੰਪਰ� ਨਹ�� ਲੱਭਿ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:170
-#| msgid "Object ID already exists"
+#: ../addressbook/libedata-book/e-data-book.c:175
 msgid "Contact ID already exists"
 msgstr "ਸੰਪਰ� ID ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:171
-#: ../calendar/libedata-cal/e-data-cal.c:111
-#| msgid "Authentication failed"
+#: ../addressbook/libedata-book/e-data-book.c:176
+#: ../calendar/libedata-cal/e-data-cal.c:116
 msgid "Authentication Failed"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਫ�ਲ�ਹ ਹ��"
 
-#: ../addressbook/libedata-book/e-data-book.c:172
-#: ../calendar/libedata-cal/e-data-cal.c:112
-#| msgid "Authentication required"
+#: ../addressbook/libedata-book/e-data-book.c:177
+#: ../calendar/libedata-cal/e-data-cal.c:117
 msgid "Authentication Required"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libedata-cal/e-data-cal.c:113
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:118
 msgid "Unsupported field"
 msgstr "��ਰ-ਸਹਾ�� ��ਤਰ"
 
-#: ../addressbook/libedata-book/e-data-book.c:174
-#: ../calendar/libedata-cal/e-data-cal.c:115
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:120
 msgid "Unsupported authentication method"
 msgstr "�਼�ਰ-ਸਹਾ�� ਪਰਮਾਣ�ਿਤਾ ਢੰ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:175
-#: ../calendar/libedata-cal/e-data-cal.c:116
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:121
 msgid "TLS not available"
 msgstr "TLS �ਪਲੱਬਧ ਨਹ��"
 
-#: ../addressbook/libedata-book/e-data-book.c:176
-#| msgid "Folder '%s/%s' does not exist."
-msgid "Address Book does not exist"
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਮ���ਦ ਨਹ�� ਹ�"
+#: ../addressbook/libedata-book/e-data-book.c:181
+#| msgid "Address Book does not exist"
+msgid "Address book does not exist"
+msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:177
+#: ../addressbook/libedata-book/e-data-book.c:182
 msgid "Book removed"
 msgstr "�ਿਤਾਬ ਹ�ਾ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:119
-#| msgid "This message is not available in offline mode."
+#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../calendar/libedata-cal/e-data-cal.c:124
 msgid "Not available in offline mode"
 msgstr "�ਫਲਾ�ਨ ਵਿੱ� �ਪਲੱਬਧ ਨਹ�� ਹ�।"
 
-#: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../addressbook/libedata-book/e-data-book.c:184
+#: ../calendar/libedata-cal/e-data-cal.c:125
 msgid "Search size limit exceeded"
 msgstr "��� ਸਾ��਼ ਲਿਮ� ਵੱਧ ��"
 
-#: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:126
 msgid "Search time limit exceeded"
 msgstr "��� �ਾ�ਮ ਲਿਮ� ਵੱਧ ��"
 
-#: ../addressbook/libedata-book/e-data-book.c:181
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:127
 msgid "Invalid query"
 msgstr "�ਲਤ �ਿ�ਰ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:182
-#: ../calendar/libedata-cal/e-data-cal.c:123
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:128
 msgid "Query refused"
 msgstr "�ਿ�ਰ� ਤ�� �ਨ�ਾਰ ��ਤਾ �ਿ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:183
-#: ../calendar/libedata-cal/e-data-cal.c:124
-#| msgid "%s: could not cancel"
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:129
 msgid "Could not cancel"
 msgstr "ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:131
 msgid "Invalid server version"
 msgstr "�ਲਤ ਸਰਵਰ ਵਰ�ਨ"
 
-#: ../addressbook/libedata-book/e-data-book.c:186
-#| msgid "Namespace"
+#: ../addressbook/libedata-book/e-data-book.c:191
 msgid "No space"
 msgstr "ਥਾ� ਨਹ�� ਬਾ��"
 
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libecal/e-cal.c:3929 ../calendar/libedata-cal/e-data-cal.c:127
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libecal/e-cal.c:4049 ../calendar/libedata-cal/e-data-cal.c:132
 msgid "Invalid argument"
 msgstr "�ਲਤ �ਰ��ਮਿੰ�"
 
-#: ../addressbook/libedata-book/e-data-book.c:188
-#: ../calendar/libecal/e-cal.c:3967 ../calendar/libedata-cal/e-data-cal.c:128
-#| msgid "Protocol not supported"
+#: ../addressbook/libedata-book/e-data-book.c:193
+#: ../calendar/libecal/e-cal.c:4087 ../calendar/libedata-cal/e-data-cal.c:133
 msgid "Not supported"
 msgstr "ਸਹਾ�� ਨਹ��"
 
-#: ../addressbook/libedata-book/e-data-book.c:196
-#: ../calendar/libedata-cal/e-data-cal.c:136
-#| msgid "I/O error"
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../calendar/libedata-cal/e-data-cal.c:141
 msgid "Other error"
 msgstr "ਹ�ਰ �ਲਤ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:307
+#: ../addressbook/libedata-book/e-data-book.c:322
 #, c-format
-#| msgid "Cannot open book"
 msgid "Cannot open book: %s"
 msgstr "%s: ਬ�ੱ� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:329
+#: ../addressbook/libedata-book/e-data-book.c:344
 #, c-format
-#| msgid "Cannot remove book"
 msgid "Cannot remove book: %s"
 msgstr "%s: ਬ�ੱ� ਹ�ਾ� �ਾ ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:346
-#: ../addressbook/libedata-book/e-data-book.c:365
+#: ../addressbook/libedata-book/e-data-book.c:361
+#: ../addressbook/libedata-book/e-data-book.c:380
 #, c-format
-#| msgid "Cannot get contact"
 msgid "Cannot get contact: %s"
 msgstr "%s: ਸੰਪਰ� ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../addressbook/libedata-book/e-data-book.c:395
 #, c-format
-#| msgid "Empty query"
 msgid "Empty query: %s"
 msgstr "%s: �ਿ�ਰ� �ਾਲ� ਹ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:396
+#: ../addressbook/libedata-book/e-data-book.c:411
 #, c-format
-#| msgid "Cannot get contact"
 msgid "Cannot get contact list: %s"
 msgstr "%s: ਸੰਪਰ� ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:433
+#: ../addressbook/libedata-book/e-data-book.c:448
 #, c-format
-#| msgid "Cannot authenticate user"
 msgid "Cannot authenticate user: %s"
 msgstr "%s: ਪਰਮਾਣਿਤ ਹ��� ਯ��਼ਰ ਨਹ�� ਹ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:448
-#: ../addressbook/libedata-book/e-data-book.c:467
+#: ../addressbook/libedata-book/e-data-book.c:463
+#: ../addressbook/libedata-book/e-data-book.c:482
 #, c-format
-#| msgid "Cannot add contact"
 msgid "Cannot add contact: %s"
 msgstr "%s: ਸੰਪਰ� ਸ਼ਾਮਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:485
-#: ../addressbook/libedata-book/e-data-book.c:504
+#: ../addressbook/libedata-book/e-data-book.c:500
+#: ../addressbook/libedata-book/e-data-book.c:519
 #, c-format
-#| msgid "Cannot modify contact"
 msgid "Cannot modify contact: %s"
 msgstr "%s: ਸੰਪਰ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:543
+#: ../addressbook/libedata-book/e-data-book.c:558
 #, c-format
-#| msgid "Cannot remove contacts"
 msgid "Cannot remove contacts: %s"
 msgstr "%s: ਸੰਪਰ� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:580
+#: ../addressbook/libedata-book/e-data-book.c:595
 #, c-format
-#| msgid "Cannot get message %s: %s"
 msgid "Cannot get supported fields: %s"
 msgstr "%s: ਸਹਾ�� ��ਤਰ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:595
+#: ../addressbook/libedata-book/e-data-book.c:610
 #, c-format
-#| msgid "Cannot get message %s: %s"
 msgid "Cannot get required fields: %s"
 msgstr "%s: ਲ���ਦ� ��ਤਰ ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:610
+#: ../addressbook/libedata-book/e-data-book.c:625
 #, c-format
-#| msgid "Unsupported authentication method"
-msgid "Cannot get supported auth methods: %s"
+#| msgid "Cannot get supported auth methods: %s"
+msgid "Cannot get supported authentication methods: %s"
 msgstr "%s: ਸਹਾ�� ਪਰਮਾਣ�ਿਤਾ ਢੰ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:636
-#: ../addressbook/libedata-book/e-data-book.c:647
+#: ../addressbook/libedata-book/e-data-book.c:651
+#: ../addressbook/libedata-book/e-data-book.c:662
 #, c-format
-#| msgid "Invalid query"
 msgid "Invalid query: %s"
 msgstr "%s: �ਲਤ �ਿ�ਰ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:683
+#: ../addressbook/libedata-book/e-data-book.c:698
 #, c-format
-#| msgid "Cannot get changes"
 msgid "Cannot get changes: %s"
 msgstr "%s: ਬਦਲਾ� ਨਹ�� ਲ� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:722
+#: ../addressbook/libedata-book/e-data-book.c:737
 #, c-format
-#| msgid "Operation failed: %s"
 msgid "Cancel operation failed: %s"
 msgstr "%s: �ਪਰ�ਸ਼ਨ ਰੱਦ �ਰਨ ਲ� ਫ�ਲ�ਹ"
 
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:498
 #, c-format
-#| msgid ""
-#| "Unexpected GnuPG status message encountered:\n"
-#| "\n"
-#| "%s"
 msgid "Unexpected HTTP status code %d returned"
 msgstr "�ਲਤ HTTP ਹਾਲਤ ��ਡ %d ਮਿਲਿ�"
 
@@ -1176,7 +1124,8 @@ msgstr "ਨਿ�ਨਤਮ"
 msgid "Undefined"
 msgstr "ਨਾ-ਪ�ਰਭਾਸ਼ਿਤ"
 
-#: ../calendar/libecal/e-cal.c:1128 ../libedataserverui/e-book-auth-util.c:206
+#: ../calendar/libecal/e-cal.c:1227 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:435
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਦਿ� (ਯ��਼ਰ %s)"
@@ -1185,62 +1134,62 @@ 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:1142
+#: ../calendar/libecal/e-cal.c:1241
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਯ��਼ਰ %s ਲ� ਪਰਾ�ਸ� ਯ�� �ਰਨ ਲ� ਦਿ�"
 
-#: ../calendar/libecal/e-cal.c:3931
+#: ../calendar/libecal/e-cal.c:4051
 msgid "Backend is busy"
 msgstr "ਪਿੱ�ਲਾ ਤਾ� ਰ��ਿ� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:3933
+#: ../calendar/libecal/e-cal.c:4053
 msgid "Repository is offline"
 msgstr "Repository �ਫਲਾ�ਨ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:3935
+#: ../calendar/libecal/e-cal.c:4055
 msgid "No such calendar"
 msgstr "�ੱਦਾ� ਦਾ ��� ��ਲੰਡਰ ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:3937 ../calendar/libedata-cal/e-data-cal.c:108
+#: ../calendar/libecal/e-cal.c:4057 ../calendar/libedata-cal/e-data-cal.c:113
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "��ਾ� ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:3939 ../calendar/libedata-cal/e-data-cal.c:109
+#: ../calendar/libecal/e-cal.c:4059 ../calendar/libedata-cal/e-data-cal.c:114
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "�ਲਤ ��ਾ�"
 
-#: ../calendar/libecal/e-cal.c:3941
+#: ../calendar/libecal/e-cal.c:4061
 msgid "URI not loaded"
 msgstr "URI ਲ�ਡ ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:3943
+#: ../calendar/libecal/e-cal.c:4063
 msgid "URI already loaded"
 msgstr "URI ਪਹਿਲਾ� ਹ� ਲ�ਡ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:3947 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4067 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "�ਣ�ਾਣ ਯ��਼ਰ"
 
-#: ../calendar/libecal/e-cal.c:3949 ../calendar/libedata-cal/e-data-cal.c:110
+#: ../calendar/libecal/e-cal.c:4069 ../calendar/libedata-cal/e-data-cal.c:115
 msgid "Object ID already exists"
 msgstr "��ਾ� ID ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:3951
+#: ../calendar/libecal/e-cal.c:4071
 msgid "Protocol not supported"
 msgstr "ਪਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:3953
+#: ../calendar/libecal/e-cal.c:4073
 msgid "Operation has been canceled"
 msgstr "�ਾਰਵਾ� ਰੱਦ ��ਤ� �� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:3955
+#: ../calendar/libecal/e-cal.c:4075
 msgid "Could not cancel operation"
 msgstr "�ਾਰਵਾ� ਨ�ੰ ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/libecal/e-cal.c:3957
+#: ../calendar/libecal/e-cal.c:4077
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
 #: ../camel/providers/groupwise/camel-groupwise-store.c:618
@@ -1251,17 +1200,17 @@ msgstr "�ਾਰਵਾ� ਨ�ੰ ਰੱਦ ਨਹ�� ��ਤਾ �ਾ
 msgid "Authentication failed"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ"
 
-#: ../calendar/libecal/e-cal.c:3959
+#: ../calendar/libecal/e-cal.c:4079
 #: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Authentication required"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�"
 
-#: ../calendar/libecal/e-cal.c:3961
-#| msgid "A CORBA exception has occurred"
-msgid "A DBUS exception has occurred"
-msgstr "DBUS �ਪਵਾਦ ਮਿਲਿ�"
+#: ../calendar/libecal/e-cal.c:4081
+#| msgid "A DBUS exception has occurred"
+msgid "A D-Bus exception has occurred"
+msgstr "D-BUS ��ਰਾ ���"
 
-#: ../calendar/libecal/e-cal.c:3963
+#: ../calendar/libecal/e-cal.c:4083
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:158
 #: ../camel/providers/imap/camel-imap-command.c:457
 #: ../camel/providers/imap/camel-imap-store.c:627
@@ -1270,7 +1219,7 @@ msgstr "DBUS �ਪਵਾਦ ਮਿਲਿ�"
 msgid "Unknown error"
 msgstr "�ਣਪ�ਾਤ� �ਲਤ�"
 
-#: ../calendar/libecal/e-cal.c:3965
+#: ../calendar/libecal/e-cal.c:4085
 msgid "No error"
 msgstr "��� �ਲਤ� ਨਹ��"
 
@@ -1367,182 +1316,159 @@ msgid ""
 "be a boolean false (#f)"
 msgstr "\"%s\" ਲ� ਸਭ �ਰ��ਮਿੰ� �ਾ� ਤਾ� ਸਤਰ ਹ�ਣ �ਾ� ਸਿਰਫ �ੱ� �ਰ��ਮਿੰ� ਬ�ਲ��ਨ (�ਲਤ) ਹ�ਵ�"
 
-#: ../calendar/libedata-cal/e-data-cal.c:107
+#: ../calendar/libedata-cal/e-data-cal.c:112
 msgid "Invalid range"
 msgstr "�ਲਤ ਰ��਼"
 
-#: ../calendar/libedata-cal/e-data-cal.c:114
+#: ../calendar/libedata-cal/e-data-cal.c:119
 msgid "Unsupported method"
 msgstr "�਼�ਰ-ਸਹਾ�� ਢੰ�"
 
-#: ../calendar/libedata-cal/e-data-cal.c:117
-#| msgid "Folder '%s' does not exist."
+#: ../calendar/libedata-cal/e-data-cal.c:122
 msgid "Calendar does not exist"
 msgstr "��ਲੰਡਰ ਮ���ਦ ਨਹ��"
 
-#: ../calendar/libedata-cal/e-data-cal.c:118
+#: ../calendar/libedata-cal/e-data-cal.c:123
 #| msgid "Unknown User"
-msgid "UnknownUser"
-msgstr "�ਣ�ਾਣ-ਯ��਼ਰ"
+msgid "Unknown user"
+msgstr "�ਣ�ਾਣ ਯ��਼ਰ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:589
+#: ../calendar/libedata-cal/e-data-cal.c:604
 #, c-format
-#| msgid "Cannot retrieve calendar address"
 msgid "Cannot retrieve calendar address: %s"
-msgstr "��ਲੰਡਰ �ਡਰ�ੱਲ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
+msgstr "��ਲੰਡਰ �ਡਰ�ੱਸ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:609
+#: ../calendar/libedata-cal/e-data-cal.c:624
 #, c-format
-#| msgid "Cannot retrieve calendar alarm e-mail address"
 msgid "Cannot retrieve calendar alarm e-mail address: %s"
 msgstr "%s: ��ਲੰਡਰ �ਲਾਰਮ �ਮ�ਲ �ਡਰ�ੱਸ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:629
+#: ../calendar/libedata-cal/e-data-cal.c:644
 #, c-format
-#| msgid "Cannot retrieve calendar's ldap attribute"
-msgid "Cannot retrieve calendar's ldap attribute: %s"
-msgstr "%s: ��ਲੰਡਰ ਦਾ ldap ��ਣ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
+#| msgid "Cannot retrieve calendar's ldap attribute: %s"
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "%s: ��ਲੰਡਰ ਦਾ LDAP ��ਣ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:649
+#: ../calendar/libedata-cal/e-data-cal.c:664
 #, c-format
-#| msgid "Cannot retrieve calendar scheduling information"
 msgid "Cannot retrieve calendar scheduling information: %s"
 msgstr "%s: ��ਲੰਡਰ ਸ�ਡ��ਲ �ਾਣ�ਾਰ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:668
+#: ../calendar/libedata-cal/e-data-cal.c:683
 #, c-format
-#| msgid "Cannot open calendar"
 msgid "Cannot open calendar: %s"
 msgstr "%s: ��ਲੰਡਰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:689
+#: ../calendar/libedata-cal/e-data-cal.c:704
 #, c-format
-#| msgid "Cannot refresh calendar"
 msgid "Cannot refresh calendar: %s"
 msgstr "%s: ��ਲੰਡਰ ਤਾ�਼ਾ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:708
+#: ../calendar/libedata-cal/e-data-cal.c:723
 #, c-format
-#| msgid "Cannot remove calendar"
 msgid "Cannot remove calendar: %s"
 msgstr "%s: ��ਲੰਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:729
+#: ../calendar/libedata-cal/e-data-cal.c:744
 #, c-format
-#| msgid "Cannot create calendar object"
 msgid "Cannot create calendar object: %s"
 msgstr "%s: ��ਲੰਡਰ �ਬ���� ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:753
+#: ../calendar/libedata-cal/e-data-cal.c:768
 #, c-format
-#| msgid "Cannot modify calendar object"
 msgid "Cannot modify calendar object: %s"
 msgstr "%s: ��ਲੰਡਰ �ਬ���� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:779
+#: ../calendar/libedata-cal/e-data-cal.c:794
 #, c-format
-#| msgid "Cannot remove calendar object"
 msgid "Cannot remove calendar object: %s"
 msgstr "%s: ��ਲੰਡਰ �ਬ���� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:800
+#: ../calendar/libedata-cal/e-data-cal.c:815
 #, c-format
-#| msgid "Cannot receive calendar objects"
 msgid "Cannot receive calendar objects: %s"
 msgstr "%s: ��ਲੰਡਰ �ਬ���� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:819
+#: ../calendar/libedata-cal/e-data-cal.c:834
 #, c-format
-#| msgid "Cannot discard calendar alarm"
 msgid "Cannot discard calendar alarm: %s"
 msgstr "%s: ��ਲੰਡਰ �ਲਾਰਮ �ਣਡਿੱਠਾ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:840
+#: ../calendar/libedata-cal/e-data-cal.c:855
 #, c-format
-#| msgid "Cannot send calendar objects"
 msgid "Cannot send calendar objects: %s"
 msgstr "%s: ��ਲੰਡਰ �ਬ���� ਭ��� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:865
+#: ../calendar/libedata-cal/e-data-cal.c:880
 #, c-format
-#| msgid "Cannot retrieve default calendar object path"
 msgid "Cannot retrieve default calendar object path: %s"
 msgstr "%s: ਡਿਫਾਲ� ��ਲੰਡਰ �ਬ���� ਪਾਥ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:885
+#: ../calendar/libedata-cal/e-data-cal.c:900
 #, c-format
-#| msgid "Cannot retrieve calendar object path"
 msgid "Cannot retrieve calendar object path: %s"
 msgstr "%s: ��ਲੰਡਰ �ਬ���� ਪਾਥ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:905
+#: ../calendar/libedata-cal/e-data-cal.c:920
 #, c-format
-#| msgid "Cannot retrieve calendar object list"
 msgid "Cannot retrieve calendar object list: %s"
 msgstr "%s: ��ਲੰਡਰ �ਬ���� ਲਿਸ� ਨਹ�� ਲ� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:933
+#: ../calendar/libedata-cal/e-data-cal.c:948
 #, c-format
-#| msgid "Could not retrieve attachment list"
 msgid "Could not retrieve attachment list: %s"
 msgstr "%s: ����ਮ��� ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:959
+#: ../calendar/libedata-cal/e-data-cal.c:974
 #, c-format
-#| msgid "Could not complete calendar query"
 msgid "Could not complete calendar query: %s"
 msgstr "%s: ��ਲੰਡਰ �ਿ�ਰ� ਪ�ਰ� ਨਹ�� ��ਤ� �ਾ ਸ��"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:979
+#: ../calendar/libedata-cal/e-data-cal.c:994
 #, c-format
-#| msgid "Could not retrieve calendar time zone"
 msgid "Could not retrieve calendar time zone: %s"
 msgstr "%s: ��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਲਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:999
+#: ../calendar/libedata-cal/e-data-cal.c:1014
 #, c-format
-#| msgid "Could not add calendar time zone"
 msgid "Could not add calendar time zone: %s"
 msgstr "%s: ��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਸ਼ਾਮਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1018
+#: ../calendar/libedata-cal/e-data-cal.c:1033
 #, c-format
-#| msgid "Could not set default calendar time zone"
 msgid "Could not set default calendar time zone: %s"
 msgstr "%s: ਡਿਫਾਲ� ��ਲੰਡਰ ਸਮਾ� ��ਤਰ ਸ�ੱ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1041
+#: ../calendar/libedata-cal/e-data-cal.c:1056
 #, c-format
-#| msgid "Cannot retrieve calendar changes"
 msgid "Cannot retrieve calendar changes: %s"
 msgstr "%s: ��ਲੰਡਰ ਬਦਲਾ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1072
+#: ../calendar/libedata-cal/e-data-cal.c:1087
 #, c-format
-#| msgid "Cannot retrieve calendar free/busy list"
 msgid "Cannot retrieve calendar free/busy list: %s"
 msgstr "%s: ��ਲੰਡਰ ਵਿਹਲ�/ਰ��ਿ� ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
@@ -1619,7 +1545,6 @@ msgstr "��ਸ਼ �ੰਦਰਾ� ਨ�ੰ ਹ�ਾ�� ਨਹ�� 
 
 #: ../camel/camel-data-wrapper.c:89
 #, c-format
-#| msgid "No such message available."
 msgid "No stream available"
 msgstr "��� ਸ�ਰ�ਮ �ਪਲੱਬਧ ਨਹ�� ਹ�।"
 
@@ -1687,9 +1612,9 @@ msgstr "�ਸ �ਾਰਵਾ� ਨ�ੰ ਸੰਪ�ਰਨ �ਰਨ ਲ�
 #: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
 #: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
 #: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
-#: ../camel/camel-tcp-stream-raw.c:245
-#: ../camel/providers/imapx/camel-imapx-server.c:4639
-#: ../camel/providers/imapx/camel-imapx-server.c:4656
+#: ../camel/camel-tcp-stream-raw.c:250
+#: ../camel/providers/imapx/camel-imapx-server.c:4654
+#: ../camel/providers/imapx/camel-imapx-server.c:4671
 #: ../camel/providers/nntp/camel-nntp-summary.c:396
 #: ../camel/providers/pop3/camel-pop3-folder.c:269
 #: ../camel/providers/pop3/camel-pop3-folder.c:625
@@ -1697,7 +1622,6 @@ msgstr "�ਸ �ਾਰਵਾ� ਨ�ੰ ਸੰਪ�ਰਨ �ਰਨ ਲ�
 #: ../camel/providers/pop3/camel-pop3-store.c:466
 #: ../libedataserverui/e-book-auth-util.c:229
 #, c-format
-#| msgid "Canceled"
 msgid "Cancelled"
 msgstr "ਰੱਦ ��ਤਾ"
 
@@ -1833,7 +1757,6 @@ msgstr "(%s) ਲ� ਫ�ਲਡਰ ਸ�ੱ� ਦ� ਲ�� ਹ�"
 
 #: ../camel/camel-folder.c:125
 #, c-format
-#| msgid "Scanning for changed messages in %s"
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "'%s' ਵਿੱ� ਨਵ�� ਸਪਮ ਸ�ਨ�ਹਾ ਸਿੱ�ਿ� �ਾ ਰਿਹਾ ਹ�"
@@ -1841,7 +1764,6 @@ msgstr[1] "'%s' ਵਿੱ� ਨਵ�� ਸਪਮ ਸ�ਨ�ਹ� ਸਿੱ
 
 #: ../camel/camel-folder.c:147
 #, c-format
-#| msgid "Scanning for changed messages in %s"
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "'%s' ਵਿੱ� ਨਵਾ� ਹਮ ਸ�ਨ�ਹਾ ਸਿੱ�ਿ� �ਾ ਰਿਹਾ ਹ�"
@@ -1849,7 +1771,6 @@ msgstr[1] "'%s' ਵਿੱ� ਨਵ�� ਹਮ ਸ�ਨ�ਹ� ਸਿੱ�
 
 #: ../camel/camel-folder.c:171
 #, c-format
-#| msgid "Filtering new message(s)"
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "'%s' ਵਿੱ� ਨਵਾ� ਸ�ਨ�ਹਾ ਫਿਲ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
@@ -1936,7 +1857,6 @@ msgid "Failed to encrypt: No valid recipients specified."
 msgstr "���ਰਿਪ� ਲ� �ਸਫਲ:��� �ਾ�� ਪ�ਰਾਪਤ �ਰਨ ਨਿਰਧਾਰਿਤ ਨਹ�� ਹ�।"
 
 #: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
-#| msgid "Could not generate signing data: %s"
 msgid "Could not generate signing data: "
 msgstr "ਦਸਤ�ਤ� ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: "
 
@@ -1955,12 +1875,10 @@ msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ਸ�ਨ�ਹਾ ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�� ਹਨ: �ਲਤ ਸ�ਨ�ਹਾ ਫਾਰਮਿ�"
 
 #: ../camel/camel-gpg-context.c:1695
-#| msgid "Cannot verify message signature: Incorrect message format"
 msgid "Cannot verify message signature: "
 msgstr "ਸ�ਨ�ਹਾ ਦਸਤ�ਤ �ਾ��� ਨਹ�� �ਾ ਸ�� ਹਨ: "
 
 #: ../camel/camel-gpg-context.c:1814
-#| msgid "Could not generate encrypting data: %s"
 msgid "Could not generate encrypting data: "
 msgstr "�ੰ��ਰਿਪ�ਡ ਡਾ�ਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: "
 
@@ -2010,7 +1928,6 @@ msgstr "%s ਲ� ਫਾ�ਲ ਤ� ਲਾੱ� ਬਣਾ�� ਨਹ��
 
 #: ../camel/camel-lock.c:145
 #, c-format
-#| msgid "Timed out trying to get lock file on %s. Try again later."
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "%s ਤ� ਫਾ�ਲ ਲਾ� ਪ�ਰਾਪਤ �ਰਨ ਦ�ਰਾਨ ਸਮਾ�-�ੰਤਰਾਲ ਸਮਾਪਤ। ਬਾ�ਦ '� ��ਸ਼ਿਸ਼ �ਰ�।"
 
@@ -2080,13 +1997,11 @@ msgstr "�ਰ�� ਪੱਤਰ ਫਾ�ਲ ਨ�ੰ ਨ�ਲ �ਰਨ ਵ
 
 #: ../camel/camel-multipart-signed.c:285
 #, c-format
-#| msgid "No description available"
 msgid "No content available"
 msgstr "��� ਸਮੱ�ਰ� �ਪਲੱਬਧ ਨਹ��"
 
 #: ../camel/camel-multipart-signed.c:293
 #, c-format
-#| msgid "No description available"
 msgid "No signature available"
 msgstr "��� ਦਸਤ�ਤ �ਪਲੱਬਧ ਨਹ��"
 
@@ -2367,13 +2282,15 @@ msgstr "POP ਸਰ�ਤ URI"
 
 #: ../camel/camel-sasl-popb4smtp.c:89
 #, c-format
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "�ੱ� ਨਾ-�ਾਣ� �ਰਾ�ਸਪ�ਰ� ਰਾਹ� POP SMTP ਤ�� ਪਹਿਲਾ�"
+#| msgid "POP Before SMTP auth using an unknown transport"
+msgid "POP Before SMTP authentication using an unknown transport"
+msgstr "�ੱ� ਨਾ-�ਾਣ� �ਰਾ�ਸਪ�ਰ� ਰਾਹ� POP SMTP ਪਰਮਾਣ�ਿਤਾ ਤ�� ਪਹਿਲਾ�"
 
 #: ../camel/camel-sasl-popb4smtp.c:97
 #, c-format
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "�ੱ� ਨਾ-ਪ�ਪ �ਰਾ�ਸਪ�ਰ� ਰਾਹ� POP SMTP ਤ�� ਪਹਿਲਾ�"
+#| msgid "POP Before SMTP auth using a non-pop source"
+msgid "POP Before SMTP authentication using a non-POP source"
+msgstr "�ੱ� �਼�ਰ-POP ਸਰ�ਤ ਰਾਹ� POP SMTP ਪਰਮਾਣ�ਿਤਾ ਤ�� ਪਹਿਲਾ�"
 
 #: ../camel/camel-search-private.c:112
 #, c-format
@@ -2630,78 +2547,71 @@ msgstr "ਰੱਦ�"
 msgid "Junk"
 msgstr "�ੰ�"
 
-#: ../camel/camel-tcp-stream-raw.c:804
+#: ../camel/camel-tcp-stream-raw.c:809
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ਪਰਾ�ਸ� ਹ�ਸ� SOCKS5 ਲ� ਸਹਾ�� ਨਹ��"
 
-#: ../camel/camel-tcp-stream-raw.c:810
+#: ../camel/camel-tcp-stream-raw.c:815
 #, c-format
-#| msgid "No support for authentication type %s"
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "ਢ�ੱ�ਵ� ਪਰਮਾਣ�ਿਤਾ �ਿਸਮ ਨਹ�� ਲੱਭ� �ਾ ਸ��: code 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:822
+#: ../camel/camel-tcp-stream-raw.c:827
 msgid "General SOCKS server failure"
 msgstr "�ਮ SOCKS ਸਰਵਰ ਫ�ਲ�ਹ ਹ�"
 
-#: ../camel/camel-tcp-stream-raw.c:823
+#: ../camel/camel-tcp-stream-raw.c:828
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS ਸਰਵਰ ਦ� ਨਿਯਮ ��ਨ��ਸ਼ਨ ਮਨ�਼�ਰ ਨਹ�� �ਰਦ�"
 
-#: ../camel/camel-tcp-stream-raw.c:824
+#: ../camel/camel-tcp-stream-raw.c:829
 msgid "Network is unreachable from SOCKS server"
 msgstr "ਨ�ੱ�ਵਰ� SOCKS ਸਰਵਰ ਤ�� ਪਹ�ੰ�ਯ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-tcp-stream-raw.c:825
+#: ../camel/camel-tcp-stream-raw.c:830
 msgid "Host is unreachable from SOCKS server"
 msgstr "ਹ�ਸ� SOCKS ਸਰਵਰ ਤ�� ਪਹ�ੰ�ਯ�� ਨਹ�� ਹ�"
 
-#: ../camel/camel-tcp-stream-raw.c:826
-#| msgid "Connection canceled"
+#: ../camel/camel-tcp-stream-raw.c:831
 msgid "Connection refused"
 msgstr "��ਨ��ਸ਼ਨ ਤ�� �ਨ�ਾਰ ��ਤਾ।"
 
-#: ../camel/camel-tcp-stream-raw.c:827
+#: ../camel/camel-tcp-stream-raw.c:832
 msgid "Time-to-live expired"
 msgstr "�ਾ�ਮ-��-ਲਿਵ �ਤਮ"
 
-#: ../camel/camel-tcp-stream-raw.c:828
-#| msgid "STLS not supported by server"
+#: ../camel/camel-tcp-stream-raw.c:833
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKS ਸਰਵਰ ਵਲ�� �ਮਾ�ਡ ਸਹਾ�� ਨਹ��"
 
-#: ../camel/camel-tcp-stream-raw.c:829
-#| msgid "STLS not supported by server"
+#: ../camel/camel-tcp-stream-raw.c:834
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS ਸਰਵਰ ਵਲ�� �ਡਰ�ੱਸ �ਿਸਮ ਸਹਾ�� ਨਹ��"
 
-#: ../camel/camel-tcp-stream-raw.c:830
-#| msgid "Unknown error: %s"
+#: ../camel/camel-tcp-stream-raw.c:835
 msgid "Unknown error from SOCKS server"
 msgstr "SOCKS ਸਰਵਰ ਤ�� �ਣ�ਾਣ �ਲਤ�"
 
-#: ../camel/camel-tcp-stream-raw.c:860
+#: ../camel/camel-tcp-stream-raw.c:865
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "SOCKS ਸਰਵਰ ਤ�� �ਣ�ਾਣ �ਡਰ�ਸ �ਿਸਮ ਮਿਲ�"
 
-#: ../camel/camel-tcp-stream-raw.c:877
+#: ../camel/camel-tcp-stream-raw.c:882
 #, c-format
-#| msgid "Invalid response from server"
 msgid "Incomplete reply from SOCKS server"
 msgstr "SOCKS ਸਰਵਰ ਤ�� �ਧ�ਰਾ �ਵਾਬ"
 
-#: ../camel/camel-tcp-stream-raw.c:892
+#: ../camel/camel-tcp-stream-raw.c:897
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ਹ�ਸ�-ਨਾ� ਬਹ�ਤ ਲੰਮਾ ਹ� (ਵੱਧ�-ਵੱਧ ੨੫੫ �ੱ�ਰ)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:924 ../camel/camel-tcp-stream-raw.c:934
+#: ../camel/camel-tcp-stream-raw.c:929 ../camel/camel-tcp-stream-raw.c:939
 #, c-format
-#| msgid "Invalid response from server"
 msgid "Invalid reply from proxy server"
 msgstr "ਪਰਾ�ਸ� ਸਰਵਰ ਤ�� �ਲਤ �ਵਾਬ"
 
@@ -2785,7 +2695,6 @@ msgstr "URL '%s' ਨ�ੰ ਪਾਰਸ ਨਹ� ��ਤਾ �ਾ ਸ�ਦ
 
 #: ../camel/camel-vee-folder.c:1044
 #, c-format
-#| msgid "Error storing '%s': %s"
 msgid "Error storing '%s': "
 msgstr "'%s' ਸ��ਰ �ਰਨ ਦ�ਰਾਨ �ਲਤ�: "
 
@@ -2846,7 +2755,6 @@ msgstr "�ੰ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ��"
 #: ../camel/providers/nntp/camel-nntp-folder.c:337
 #: ../camel/providers/pop3/camel-pop3-folder.c:714
 #, c-format
-#| msgid "Cannot get message %s: %s"
 msgid "Cannot get message %s: "
 msgstr "%s ਸ�ਨ�ਹਾ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ: "
 
@@ -2881,8 +2789,8 @@ msgstr "ਹ�ਾ� �� ਸ�ਨ�ਹ� %s ਲ� ��� ��ਤਾ
 #: ../camel/providers/groupwise/camel-groupwise-store.c:779
 #: ../camel/providers/imap/camel-imap-folder.c:3814
 #: ../camel/providers/imap/camel-imap-folder.c:3892
-#: ../camel/providers/imapx/camel-imapx-server.c:3704
-#: ../camel/providers/imapx/camel-imapx-server.c:3828
+#: ../camel/providers/imapx/camel-imapx-server.c:3719
+#: ../camel/providers/imapx/camel-imapx-server.c:3844
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s ਵਿੱ� ਨਵ�� ਸ�ਨਹਿ�� ਲ� ਸੰ��ਪ �ਾਣ�ਾਰ� ਲ� �ਾ ਰਹ� ਹ�"
@@ -2909,7 +2817,6 @@ msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "�ਫਲਾ�ਨ ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: ����� �ਪਲੱਬਧ ਨਹ��"
 
 #: ../camel/providers/groupwise/camel-groupwise-journal.c:320
-#| msgid "Cannot append message in offline mode: %s"
 msgid "Cannot append message in offline mode: "
 msgstr "�ਫਲਾ�ਨ ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: "
 
@@ -2985,7 +2892,7 @@ msgstr "url ਵਿੱ� ਹ�ਸ� �ਾ� ਯ��਼ਰ �ਪਲੱਬ
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:207
 #: ../camel/providers/imap/camel-imap-store.c:1188
-#: ../camel/providers/imapx/camel-imapx-server.c:2958
+#: ../camel/providers/imapx/camel-imapx-server.c:2972
 #, c-format
 msgid "You did not enter a password."
 msgstr "ਤ�ਸ�� ਪਾਸਵਰਡ ਨਹ�� ਭਰਿ� ਹ�।"
@@ -3009,7 +2916,6 @@ msgstr "�ਫਲਾ�ਨ ਢੰ� ਵਿੱ� GroupWise ਫ�ਲਡਰ ਬ
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:1196
 #, c-format
-#| msgid "Cannot delete folder '%s': Special folder"
 msgid "Cannot create a special system folder"
 msgstr "�ਾਸ ਸਿਸ�ਮ ਫ�ਲਡਰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
@@ -3135,24 +3041,23 @@ msgid "Could not create directory %s: %s"
 msgstr "ਡਾ�ਰ���ਰ� %s ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s"
 
 #: ../camel/providers/imap/camel-imap-folder.c:960
-#: ../camel/providers/imapx/camel-imapx-server.c:3743
+#: ../camel/providers/imapx/camel-imapx-server.c:3759
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s ਵਿੱ� ਤਬਦ�ਲ ਸ�ਨ�ਹਿ�� ਦ� �ਾ�� �ਾਰ� ਹ�"
 
 #: ../camel/providers/imap/camel-imap-folder.c:3231
-#| msgid "Unable to retrieve message: %s"
 msgid "Unable to retrieve message: "
 msgstr "ਸ�ਨ�ਹਾ ਲ�ਣ ਲ� �ਸਮਰੱਥ: "
 
 #: ../camel/providers/imap/camel-imap-folder.c:3266
-#: ../camel/providers/imapx/camel-imapx-server.c:4918
+#: ../camel/providers/imapx/camel-imapx-server.c:4935
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ਸ�ਨ�ਹਾ ID %s ਪ�ਰਾਪਤ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
 #: ../camel/providers/imap/camel-imap-folder.c:3267
-#: ../camel/providers/imapx/camel-imapx-server.c:4919
+#: ../camel/providers/imapx/camel-imapx-server.c:4936
 msgid "No such message available."
 msgstr "�ੰ� ਦਾ ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�।"
 
@@ -3180,7 +3085,6 @@ msgstr "FETCH �ਵਾਬ ਵਿੱ� ਸ�ਨ�ਹਾ ਭਾ� ਨਹ�
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:193
 #: ../camel/providers/imap/camel-imap-message-cache.c:253
-#| msgid "Could not open cache directory: %s"
 msgid "Could not open cache directory: "
 msgstr "��ਸ਼ ਡਾ�ਰ���ਰ� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��: "
 
@@ -3191,13 +3095,11 @@ msgstr "ਸ�ਨ�ਹਾ %s ��ਸ ਲ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:388
 #, c-format
-#| msgid "Failed to cache message %s: %s"
 msgid "Failed to cache message %s: "
 msgstr "ਸ�ਨ�ਹਾ %s ��ਸ਼ �ਰਨ ਲ� ਫ�ਲ�ਹ: "
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:525
 #, c-format
-#| msgid "Failed to cache %s: %s"
 msgid "Failed to cache %s: "
 msgstr "��ਸ %s ਲ� �ਸਫਲ: "
 
@@ -3222,7 +3124,6 @@ msgid "_Use custom command to connect to server"
 msgstr "ਸਰਵਰ ਨਾਲ ���ਨ ਲ� ਪਸੰਦ�ਦਾ �ਮਾ�ਡ ਵਰਤ��(_U)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:52
-#| msgid "Command:"
 msgid "Co_mmand:"
 msgstr "�ਮਾ�ਡ(_m):"
 
@@ -3243,7 +3144,6 @@ msgid "O_verride server-supplied folder namespace"
 msgstr "ਸਰਵਰ-ਰਾਹ�� �ਪਲੱਬਧ ਫ�ਲਡਰ ਨਾ�-ਥਾ� �ੱਪਰ(_v)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:62
-#| msgid "Namespace:"
 msgid "Names_pace:"
 msgstr "ਨ�ਮ-ਸਪ�ਸ(_p):"
 
@@ -3306,7 +3206,6 @@ msgstr "SSL �ਪਲੱਬਧ ਨਹ� ਹ�"
 #: ../camel/providers/imap/camel-imap-store.c:466
 #: ../camel/providers/nntp/camel-nntp-store.c:252
 #, c-format
-#| msgid "Could not connect to %s: %s"
 msgid "Could not connect to %s: "
 msgstr "%s ਨਾਲ ��ਨ��� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ: "
 
@@ -3314,20 +3213,20 @@ msgstr "%s ਨਾਲ ��ਨ��� ਨਹ�� ��ਤਾ �ਾ ਸ�
 #: ../camel/providers/imap/camel-imap-store.c:592
 #: ../camel/providers/imap/camel-imap-store.c:599
 #: ../camel/providers/imap/camel-imap-store.c:626
-#: ../camel/providers/imapx/camel-imapx-server.c:2811
-#: ../camel/providers/imapx/camel-imapx-server.c:2847
+#: ../camel/providers/imapx/camel-imapx-server.c:2825
+#: ../camel/providers/imapx/camel-imapx-server.c:2861
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "IMAP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ: %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:573
-#: ../camel/providers/imapx/camel-imapx-server.c:2812
+#: ../camel/providers/imapx/camel-imapx-server.c:2826
 #: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "ਪ�ਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
 
 #: ../camel/providers/imap/camel-imap-store.c:593
-#: ../camel/providers/imapx/camel-imapx-server.c:2848
+#: ../camel/providers/imapx/camel-imapx-server.c:2862
 msgid "SSL negotiations failed"
 msgstr "SSL �ੱਲਬਾਤ �ਸਫਲ"
 
@@ -3337,13 +3236,13 @@ msgid "SSL is not available in this build"
 msgstr "�ਸ ਨਿਰਮਾਣ ਵਿੱ� SSL �ਪਲੱਬਧ ਨਹ��"
 
 #: ../camel/providers/imap/camel-imap-store.c:748
-#: ../camel/providers/imapx/camel-imapx-server.c:2648
+#: ../camel/providers/imapx/camel-imapx-server.c:2662
 #, c-format
 msgid "Connection cancelled"
 msgstr "��ਨ��ਸ਼ਨ ਰੱਦ ��ਤਾ"
 
 #: ../camel/providers/imap/camel-imap-store.c:753
-#: ../camel/providers/imapx/camel-imapx-server.c:2653
+#: ../camel/providers/imapx/camel-imapx-server.c:2667
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "�ਮਾ�ਡ \"%s\" ਨਾਲ ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
@@ -3363,20 +3262,20 @@ msgid "Inbox"
 msgstr "��ਣ-ਬ�ਸਾ"
 
 #: ../camel/providers/imap/camel-imap-store.c:1129
-#: ../camel/providers/imapx/camel-imapx-server.c:2914
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ਸਰਵਰ %s ਲ���ਦ� ਪ�ਰਮਾਣਿਤ �ਿਸਮ %s ਲ� ਸਹਾ�� ਨਹ�� ਹ�"
 
 #: ../camel/providers/imap/camel-imap-store.c:1141
-#: ../camel/providers/imapx/camel-imapx-server.c:2926
+#: ../camel/providers/imapx/camel-imapx-server.c:2940
 #: ../camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� %s ਲ� ਸਹਾ� ਨਹ�� ਹ�"
 
 #: ../camel/providers/imap/camel-imap-store.c:1220
-#: ../camel/providers/imapx/camel-imapx-server.c:2996
+#: ../camel/providers/imapx/camel-imapx-server.c:3010
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3414,7 +3313,6 @@ msgid "Server unexpectedly disconnected"
 msgstr "ਸਰਵਰ ��ਾਨ� ਡਿਸ-��ਨ��� ਹ� �ਿ�"
 
 #: ../camel/providers/imap/camel-imap-store.c:3065
-#| msgid "Server unexpectedly disconnected: %s"
 msgid "Server unexpectedly disconnected: "
 msgstr "ਸਰਵਰ �ਸਧਾਰਨ ਤ�ਰ ਤ� ਡਿਸ-��ਨ��� ਹ� �ਿ�: "
 
@@ -3425,12 +3323,10 @@ msgstr "%s ਲ� ਫ�ਲਡਰ ਸੰ��ਪ ਬਣਾ�� ਨਹ�� 
 
 #: ../camel/providers/imapx/camel-imapx-folder.c:83
 #, c-format
-#| msgid "Could not create cache for %s"
 msgid "Could not create cache for %s: "
 msgstr "%s ਲ� ��ਸ਼ ਨਹ�� ਬਣਾ� �ਾ ਸ��: "
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:43
-#| msgid "Use I_dle if the server supports it"
 msgid "Use _Quick Resync if the server supports it"
 msgstr "ਤ�ਰੰਤ ਸਿੰ�, �� ਸਰਵਰ �ਸ ਲ� ਸਹਾ�� ਹ�(_Q)"
 
@@ -3455,35 +3351,29 @@ msgid "IMAP+"
 msgstr "IMAP+"
 
 #: ../camel/providers/imapx/camel-imapx-server.c:1365
-#| msgid "Error writing mail temp file: %s"
 msgid "Error writing to cache stream: "
 msgstr "��ਸ ਸ�ਰ�ਮ ਲਿ�ਣ ਲ� �ਲਤ�: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2008
+#: ../camel/providers/imapx/camel-imapx-server.c:2019
 #, c-format
-#| msgid "Cannot authenticate user"
 msgid "Not authenticated"
 msgstr "ਪਰਮਾਣਿਤ ਨਹ�� ਹ�"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2739
+#: ../camel/providers/imapx/camel-imapx-server.c:2753
 #, c-format
-#| msgid "Could not connect to %s (port %s): %s"
 msgid "Could not connect to %s (port %s): "
 msgstr "%s (ਪ�ਰ� %s) ਨਾਲ ��ਨ��� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3168
-#| msgid "Posting failed: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:3182
 msgid "Closing tmp stream failed: "
 msgstr "�ਰ�਼� ਸ�ਰ�ਮ ਬੰਦ �ਰਨ ਲ� ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5042
+#: ../camel/providers/imapx/camel-imapx-server.c:5059
 #, c-format
-#| msgid "Cannot create message: %s"
 msgid "Cannot create spool file: %s"
 msgstr "ਸਪ�ਲ ਫਾ�ਲ ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5057
-#| msgid "Cannot create message: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:5074
 msgid "Cannot create spool file: "
 msgstr "ਸਪ�ਲ ਫਾ�ਲ ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�: "
 
@@ -3500,7 +3390,6 @@ msgstr "ਸਰ�ਤ ਸ�ਰ�ਮ ਨ� ��� ਡਾ�ਾ ਨਹ��
 
 #: ../camel/providers/imapx/camel-imapx-stream.c:80
 #, c-format
-#| msgid "service unavailable"
 msgid "Source stream unavailable"
 msgstr "ਸਰ�ਤ ਸ�ਰ�ਮ �ਪਲੱਬਧ ਨਹ��"
 
@@ -3526,9 +3415,6 @@ msgstr "�ੰਡ��ਸ ਸ�ਨ�ਹਾ ਭਾ� ਡਾ�ਾ"
 
 #: ../camel/providers/local/camel-local-folder.c:686
 #, c-format
-#| msgid ""
-#| "Cannot get message: %s from folder %s\n"
-#| "  %s"
 msgid ""
 "Cannot get message %s from folder %s\n"
 "%s"
@@ -3652,7 +3538,6 @@ msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਸੰ��ਪ ਵਿੱ� ਸੰਭਾ
 
 #: ../camel/providers/local/camel-maildir-folder.c:195
 #, c-format
-#| msgid "Cannot append message to maildir folder: %s: %s"
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "maildir ਫ�ਲਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ ਨਹ� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: "
 
@@ -3662,15 +3547,11 @@ msgstr "maildir ਫ�ਲਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ ਨਹ� ��ਤ
 #: ../camel/providers/local/camel-mh-folder.c:227
 #: ../camel/providers/local/camel-mh-folder.c:235
 #, c-format
-#| msgid ""
-#| "Cannot get message: %s from folder %s\n"
-#| "  %s"
 msgid "Cannot get message %s from folder %s: "
 msgstr "%2$s ਫ�ਲਡਰ ਤ�� %1$s ਸ�ਨ�ਹਾ ਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ: "
 
 #: ../camel/providers/local/camel-maildir-folder.c:399
 #, c-format
-#| msgid "Cannot transfer message to destination folder"
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "ਸ�ਨ�ਹ� ਨ�ੰ �ਿ�ਾਣਾ ਫ�ਲਡਰ ਵਿੱ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
@@ -3749,13 +3630,11 @@ msgstr "%s ਤ� ਫ�ਲਡਰ ਲਾੱ� ਬਣਾ�� ਨਹ�� �
 
 #: ../camel/providers/local/camel-mbox-folder.c:194
 #, c-format
-#| msgid "Cannot open mailbox: %s: %s\n"
 msgid "Cannot open mailbox: %s: "
 msgstr "mailbox ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: "
 
 #: ../camel/providers/local/camel-mbox-folder.c:260
 #, c-format
-#| msgid "Cannot append message to mbox file: %s: %s"
 msgid "Cannot append message to mbox file: %s: "
 msgstr "mbox ਫਾ�ਲ ਵਿੱ� ਸ�ਨ�ਹਾ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s: "
 
@@ -3837,7 +3716,6 @@ msgstr "ਫ�ਲਡਰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ 
 
 #: ../camel/providers/local/camel-mbox-summary.c:533
 #, c-format
-#| msgid "Fatal mail parser error near position %ld in folder %s"
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "%2$s ਫ�ਲਡਰ '� %1$s ਸਥਿਤ� ਨ��� ਮ�ਲ ਪਾਰਸ �ਰਨ ਦ�ਰਾਨ �ਾਤ� �ਲਤ�"
 
@@ -3860,7 +3738,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "�ਰ�� mailbox ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:715
-#: ../camel/providers/local/camel-mbox-summary.c:933
+#: ../camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ਸਰ�ਤ ਫ�ਲਡਰ %s ਨ�ੰ ਬੰਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
@@ -3876,39 +3754,46 @@ msgid "Could not rename folder: %s"
 msgstr "ਫ�ਲਡਰ ਦਾ ਨਾ� ਬਦਲਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:829
-#: ../camel/providers/local/camel-mbox-summary.c:1071
+#: ../camel/providers/local/camel-mbox-summary.c:1070
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ਫ�ਲਡਰ ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:870
-#: ../camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/local/camel-mbox-summary.c:1104
-#: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../camel/providers/local/camel-mbox-summary.c:869
+#: ../camel/providers/local/camel-mbox-summary.c:1102
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"MBOX ਫਾ�ਲ �਼ਰਾਬ ਹ� �� ਹ�, �ਸ ਨ�ੰ ਠ�� �ਰ� ��। (ਵਲ�� (From) ਲਾ�ਨ ਦ� ਲ�� ਸ�, ਪਰ �ਹ ਮਿਲ� "
+"ਨਹ��।)"
+
+#: ../camel/providers/local/camel-mbox-summary.c:878
+#: ../camel/providers/local/camel-mbox-summary.c:1111
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ਸੰ��ਪ ਤ� ਫ�ਲਡਰ ਮ�ਲ ਨਹ�� �ਾ ਰਹ� ਹਨ, ਸਮ�ਾਲ� �ਰਨ ਮ�ਰ�� ਵ�"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1030
+#: ../camel/providers/local/camel-mbox-summary.c:1029
 #: ../camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "�ਣ�ਾਣ� �ਲਤ�: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1183
-#: ../camel/providers/local/camel-mbox-summary.c:1213
+#: ../camel/providers/local/camel-mbox-summary.c:1181
+#: ../camel/providers/local/camel-mbox-summary.c:1211
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "�ਰ�� mailbox �ੱਤ� ਲਿ�ਣਾ �ਸਫਲ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1202
+#: ../camel/providers/local/camel-mbox-summary.c:1200
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "�ਰ�� mailbox �ੱਤ� ਲਿ�ਣ ਲ� ਫ�ਲ�ਹ: %s: %s"
 
 #: ../camel/providers/local/camel-mh-folder.c:165
 #, c-format
-#| msgid "Cannot append message to mh folder: %s: %s"
 msgid "Cannot append message to mh folder: %s: "
 msgstr "mh ਫ�ਲਡਰ ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਤ�� �ਸਫਲ: %s: "
 
@@ -3999,23 +3884,28 @@ msgstr "ਸਪ�ਲ ਫ�ਲਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�
 #: ../camel/providers/local/camel-spool-summary.c:178
 #: ../camel/providers/local/camel-spool-summary.c:190
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
-msgstr "�ਰ�� ਫ�ਲਡਰ %s ਨ�ੰ ਸਮ�ਾਲ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
+#| msgid "Could not sync temporary folder %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
+msgstr "�ਰ�� ਫ�ਲਡਰ %s ਨ�ੰ ਸ��ਰ�ਨਾ��਼ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
 #: ../camel/providers/local/camel-spool-summary.c:208
 #, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "ਸਪ�ਲ ਫ�ਲਡਰ %s ਨ�ੰ ਸਮ�ਾਲ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
+#| msgid "Could not sync spool folder %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
+msgstr "ਸਪ�ਲ ਫ�ਲਡਰ %s ਨ�ੰ ਸ��ਰ�ਨਾ��਼ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s"
 
 #: ../camel/providers/local/camel-spool-summary.c:240
 #: ../camel/providers/local/camel-spool-summary.c:259
 #: ../camel/providers/local/camel-spool-summary.c:272
 #, c-format
+#| msgid ""
+#| "Could not sync spool folder %s: %s\n"
+#| "Folder may be corrupt, copy saved in '%s'"
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
-"ਸਪ�ਲ ਫ�ਲਡਰ %s ਨ�ੰ ਸਮ�ਾਲ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s\n"
+"ਸਪ�ਲ ਫ�ਲਡਰ %s ਨ�ੰ ਸ��ਰ�ਨਾ��਼ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�: %s\n"
 "ਫ�ਲਡਰ ਨਿ�ਾਰਾ ਹ� ਸ�ਦਾ ਹ�, ਨ�ਲ '%s' ਵਿੱ� ਸੰਭਾਲ� �� ਹ�।"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:197
@@ -4043,7 +3933,6 @@ msgid "Posting failed: %s"
 msgstr "ਭ��ਣ �ਾਰਵਾ� �ਸਫਲ: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:513
-#| msgid "Posting failed: %s"
 msgid "Posting failed: "
 msgstr "ਪ�ਸ� �ਰਨ ਲ� ਫ�ਲ�ਹ: "
 
@@ -4081,7 +3970,6 @@ msgstr "�ਸ ��ਣ ਨਾਲ NNTP ਸਰਵਰ ਤ� ਪਲ�ਨ-��
 
 #: ../camel/providers/nntp/camel-nntp-store.c:265
 #, c-format
-#| msgid "Could not read greeting from %s: %s"
 msgid "Could not read greeting from %s: "
 msgstr "%s ਤ�� ਸਵਾ�ਤ� ਸ�ਨ�ਹਾ ਪ��ਹਨ ਨਹ�� �ਾ ਸ�ਿ�: "
 
@@ -4154,7 +4042,6 @@ msgid "Cannot authenticate to server: %s"
 msgstr "ਸਰਵਰ ਨਾਲ ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
 #: ../camel/providers/nntp/camel-nntp-store.c:1395
-#| msgid "NNTP Command failed: %s"
 msgid "NNTP Command failed: "
 msgstr "NNTP �ਮਾ�ਡ �ਸਫਲ: "
 
@@ -4316,7 +4203,6 @@ msgstr "POP ਸਰਵਰ %s �ੱਤ� ਲਾ��ਨ �ਰਨ ਤ�� �
 
 #: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
-#| msgid "Failed to authenticate on POP server %s: %s"
 msgid "Failed to authenticate on POP server %s: "
 msgstr "POP ਸਰਵਰ %s ਤ� ਪ�ਰਮਾਣ�ਿਤਾ ਫ�ਲ�ਹ: "
 
@@ -4365,13 +4251,11 @@ msgstr "POP ਸਰਵਰ %s ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:666
 #, c-format
-#| msgid "IMAP server %s"
 msgid "POP3 server %s"
 msgstr "POP3 ਸਰਵਰ %s"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:670
 #, c-format
-#| msgid "IMAP service for %s on %s"
 msgid "POP3 server for %s on %s"
 msgstr "POP3 ਸਰਵਿਸ %2$s �ੱਤ� %1$s ਲ�"
 
@@ -4411,7 +4295,6 @@ msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail ਨ�ੰ ਵੰਡਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s: ਪੱਤਰ ਨਹ�� ਭ��ਿ� �ਾ ਸ�ਦਾ ਹ�"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:194
-#| msgid "Could not send message: %s"
 msgid "Could not send message: "
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਿ�: "
 
@@ -4544,7 +4427,6 @@ msgstr "�ਰ�� ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:252
 #: ../camel/providers/smtp/camel-smtp-transport.c:258
-#| msgid "Welcome response error"
 msgid "Welcome response error: "
 msgstr "�� ���� ਨ�ੰ �ਵਾਬ �ਲਤ�: "
 
@@ -4558,7 +4440,6 @@ msgstr "SMTP ਸਰਵਰ %s ਨਾਲ ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਨਾ
 #: ../camel/providers/smtp/camel-smtp-transport.c:302
 #: ../camel/providers/smtp/camel-smtp-transport.c:314
 #: ../camel/providers/smtp/camel-smtp-transport.c:320
-#| msgid "STARTTLS command failed: %s"
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS �ਮਾ�ਡ �ਸਫਲ: "
 
@@ -4619,7 +4500,6 @@ msgstr "SMTP ਸ਼�ੱਭ-ਸ�ਨ�ਹਾ"
 #: ../camel/providers/smtp/camel-smtp-transport.c:985
 #: ../camel/providers/smtp/camel-smtp-transport.c:1000
 #: ../camel/providers/smtp/camel-smtp-transport.c:1007
-#| msgid "HELO command failed: %s"
 msgid "HELO command failed: "
 msgstr "HELO �ਮਾ�ਡ �ਸਫਲ: "
 
@@ -4635,51 +4515,44 @@ msgstr "�ਲਤ�, SASL ਪ�ਰਮਾਣ�ਿਤਾ ��ਾ� ਬਣਾ
 #: ../camel/providers/smtp/camel-smtp-transport.c:1097
 #: ../camel/providers/smtp/camel-smtp-transport.c:1107
 #: ../camel/providers/smtp/camel-smtp-transport.c:1115
-#| msgid "AUTH command failed: %s"
 msgid "AUTH command failed: "
 msgstr "AUTH �ਮਾ�ਡ �ਸਫਲ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1212
-#: ../camel/providers/smtp/camel-smtp-transport.c:1224
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#| msgid "MAIL FROM command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1214
+#: ../camel/providers/smtp/camel-smtp-transport.c:1226
+#: ../camel/providers/smtp/camel-smtp-transport.c:1233
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM �ਮਾ�ਡ �ਸਫਲ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1254
-#| msgid "RSET command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO �ਮਾ�ਡ ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1268
-#: ../camel/providers/smtp/camel-smtp-transport.c:1276
+#: ../camel/providers/smtp/camel-smtp-transport.c:1270
+#: ../camel/providers/smtp/camel-smtp-transport.c:1278
 #, c-format
-#| msgid "RCPT TO <%s> failed"
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:1323
-#: ../camel/providers/smtp/camel-smtp-transport.c:1333
-#: ../camel/providers/smtp/camel-smtp-transport.c:1390
-#: ../camel/providers/smtp/camel-smtp-transport.c:1406
-#: ../camel/providers/smtp/camel-smtp-transport.c:1417
-#: ../camel/providers/smtp/camel-smtp-transport.c:1424
-#| msgid "DATA command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1316
+#: ../camel/providers/smtp/camel-smtp-transport.c:1325
+#: ../camel/providers/smtp/camel-smtp-transport.c:1335
+#: ../camel/providers/smtp/camel-smtp-transport.c:1392
+#: ../camel/providers/smtp/camel-smtp-transport.c:1408
+#: ../camel/providers/smtp/camel-smtp-transport.c:1419
+#: ../camel/providers/smtp/camel-smtp-transport.c:1426
 msgid "DATA command failed: "
 msgstr "DATA �ਮਾ�ਡ ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1446
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
-#: ../camel/providers/smtp/camel-smtp-transport.c:1465
-#| msgid "RSET command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1448
+#: ../camel/providers/smtp/camel-smtp-transport.c:1460
+#: ../camel/providers/smtp/camel-smtp-transport.c:1467
 msgid "RSET command failed: "
 msgstr "RSET �ਮਾ�ਡ ਫ�ਲ�ਹ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1487
-#: ../camel/providers/smtp/camel-smtp-transport.c:1500
-#: ../camel/providers/smtp/camel-smtp-transport.c:1506
-#| msgid "QUIT command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1489
+#: ../camel/providers/smtp/camel-smtp-transport.c:1502
+#: ../camel/providers/smtp/camel-smtp-transport.c:1508
 msgid "QUIT command failed: "
 msgstr "QUIT �ਮਾ�ਡ ਫ�ਲ�ਹ: "
 
@@ -4894,10 +4767,12 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:668
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP ਸਰਵਰ ਨ�ੰ ��ਿ�ਤ ਦ� ਤ�ਰ 'ਤ� ਵਰਤ��"
 
 #: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:430
 msgid "Failed to authenticate.\n"
 msgstr "ਡਾ�ਾ ���ਡਿ� �ਰਨ ਵਿੱ� �ਸਫਲ ਹ�।\n"
 
@@ -4969,7 +4844,7 @@ msgstr "ਸ਼ਾਮਲ(_A)"
 msgid "_Remove"
 msgstr "ਹ�ਾ�(_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:858
+#: ../libedataserverui/e-name-selector-dialog.c:890
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "��� ਵ� ���ਾ�ਰ�"
@@ -5011,30 +4886,30 @@ msgid "_Search:"
 msgstr "���(_S):"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2586
+#: ../libedataserverui/e-name-selector-entry.c:2636
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s ਲਾ�ਨ '� ਫ�ਲਾ�(_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2601
+#: ../libedataserverui/e-name-selector-entry.c:2651
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s �ਾਪ� �ਰ�(_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2611
+#: ../libedataserverui/e-name-selector-entry.c:2661
 #, c-format
 msgid "C_ut %s"
 msgstr "%s �ੱ��(_U)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2628
+#: ../libedataserverui/e-name-selector-entry.c:2678
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ਸ�ਧ(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:517
+#: ../libedataserverui/e-name-selector-list.c:516
 #, c-format
 msgid "_Delete %s"
 msgstr "%s ਹ�ਾ�(_D)"
@@ -5044,23 +4919,23 @@ msgstr "%s ਹ�ਾ�(_D)"
 msgid "Keyring key is unusable: no user or host name"
 msgstr "��ਰਿੰ� �� �ਣ-ਵਰਤ��ਯ�� ਹ�: ��� ਹ�ਸ� �ਾ� ਯ��਼ਰ ਨਹ��"
 
-#: ../libedataserverui/e-passwords.c:1116
+#: ../libedataserverui/e-passwords.c:1120
 msgid "You have the Caps Lock key on."
 msgstr "ਤ�ਸ�� ��ਪਸ ਲਾ� ਨ�ੰ �ਾਲ� ��ਤਾ ਹ�।"
 
-#: ../libedataserverui/e-passwords.c:1238
+#: ../libedataserverui/e-passwords.c:1241
 msgid "_Remember this passphrase"
 msgstr "�ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1239
+#: ../libedataserverui/e-passwords.c:1242
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "�ਸ ਸ਼�ਸ਼ਨ ਲ� �ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1244
+#: ../libedataserverui/e-passwords.c:1247
 msgid "_Remember this password"
 msgstr "�ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../libedataserverui/e-passwords.c:1245
+#: ../libedataserverui/e-passwords.c:1248
 msgid "_Remember this password for the remainder of this session"
 msgstr "�ਸ ਸ਼�ਸਨ ਲ� �ਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
@@ -5089,6 +4964,10 @@ msgstr "ਸਰਵਰ ਤ�� ��� �ਵਾਬ ਨਹ��"
 msgid "Bad parameter"
 msgstr "�ਲਤ ਪ�ਰਾਮ��ਰ"
 
+#~| msgid "Unknown User"
+#~ msgid "UnknownUser"
+#~ msgstr "�ਣ�ਾਣ-ਯ��਼ਰ"
+
 #~| msgid "Could not cancel operation"
 #~ msgid "Cannot complete operation"
 #~ msgstr "�ਪਰ�ਸ਼ਨ ਪ�ਰਾ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"



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