updating for Gnome Punjabi Translation by A S Alam

author Amanpreet Singh Alam <aman@src.gnome.org>

Mon, 16 Mar 2009 02:56:27 +0000 (02:56 +0000)

committer Amanpreet Singh Alam <aman@src.gnome.org>

Mon, 16 Mar 2009 02:56:27 +0000 (02:56 +0000)
author Amanpreet Singh Alam <aman@src.gnome.org>
Mon, 16 Mar 2009 02:56:27 +0000 (02:56 +0000)
committer Amanpreet Singh Alam <aman@src.gnome.org>
Mon, 16 Mar 2009 02:56:27 +0000 (02:56 +0000)
diff --git a/po/pa.po b/po/pa.po

index 03553c4..95f9eeb 100644 (file)
--- a/po/pa.po
+++ b/po/pa.po
@@ -4,48 +4,47 @@
  # Robert Brady <rwb197@zepler.org> 2000
  #
  #
-# Amanpreet Singh Alam <aalam@redhat.com>, 2004.
-# Amanpreet Singh Alam <amanpreetalam@yahoo.com>, 2005.
-# A S Alam <aalam@users.sf.net>, 2007.
+# A S Alam <aalam@users.sf.net>, 2005, 2006, 2007, 2009.
  # ASB <aalam@users.sf.net>, 2007.
  msgid ""
  msgstr ""
  "Project-Id-Version: evolution-data-server.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-18 05:26+0000\n"
-"PO-Revision-Date: 2008-09-11 07:47+0530\n"
-"Last-Translator: Amanpreet Singh Alam <aalam@users.sf.net>\n"
-"Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=evolution-data-server&component=general\n"
+"POT-Creation-Date: 2009-02-25 12:08+0000\n"
+"PO-Revision-Date: 2009-03-14 15:32+0000\n"
+"Last-Translator: A S Alam <aalam@users.sf.net>\n"
+"Language-Team: Punjabi/Panjabi <punjab-l10n@list.sf.net>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"
  "Plural-Forms: nplurals=2; plural=n != 1;\n"
  
-#: ../addressbook/backends/file/e-book-backend-file.c:555
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2360
+#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
  #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
  msgid "Loading..."
  msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
  
-#: ../addressbook/backends/file/e-book-backend-file.c:558
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4282
+#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
  #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
  msgid "Searching..."
  msgstr "ਖੋਜ ਜਾਰੀ ਹੈ..."
  
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4446
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
  #, c-format
  msgid "Downloading contacts (%d)... "
  msgstr "ਸੰਪਰਕ (%d) ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ... "
  
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2874
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3059
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3103
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
  #, c-format
  msgid "Updating contacts cache (%d)... "
  msgstr "ਸੰਪਰਕ ਕੈਂਚੇ (%d) ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ... "
@@ -58,27 +57,27 @@ msgstr "ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ (DN)"
  msgid "Using Email Address"
  msgstr "ਈਮੇਲ ਐਡਰੈੱਸ ਵਰਤ ਕੇ"
  
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1017
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
  msgid "Reconnecting to LDAP server..."
  msgstr "LDAP ਸਰਵਰ ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
  
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1613
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
  msgid "Adding contact to LDAP server..."
  msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰਕ ਸ਼ਾਮਿਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..."
  
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1747
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
  msgid "Removing contact from LDAP server..."
  msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰਕ ਹਟਾਏ ਜਾ ਰਹੇ ਹਨ..."
  
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2058
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
  msgid "Modifying contact from LDAP server..."
  msgstr "LDAP ਸਰਵਰ ਨਾਲ ਸੰਪਰਕ ਤਬਦੀਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..."
  
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4142
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
  msgid "Receiving LDAP search results..."
  msgstr "LDAP ਤੋਂ ਖੋਜ ਨਤੀਜੇ ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..."
  
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4304
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
  msgid "Error performing search"
  msgstr "ਖੋਜ ਚਲਾਉਣ ਵਿੱਚ ਗਲਤੀ"
  
@@ -86,125 +85,93 @@ msgstr "ਖੋਜ ਚਲਾਉਣ ਵਿੱਚ ਗਲਤੀ"
  #. * function names, e.g.
  #. * "e_book_add_contact" on book before
  #. * "e_book_open
-#: ../addressbook/libebook/e-book.c:252
-#: ../addressbook/libebook/e-book.c:256
-#: ../addressbook/libebook/e-book.c:461
-#: ../addressbook/libebook/e-book.c:465
-#: ../addressbook/libebook/e-book.c:604
-#: ../addressbook/libebook/e-book.c:608
-#: ../addressbook/libebook/e-book.c:695
-#: ../addressbook/libebook/e-book.c:699
-#: ../addressbook/libebook/e-book.c:995
-#: ../addressbook/libebook/e-book.c:1000
-#: ../addressbook/libebook/e-book.c:1179
-#: ../addressbook/libebook/e-book.c:1183
-#: ../addressbook/libebook/e-book.c:1338
-#: ../addressbook/libebook/e-book.c:1342
-#: ../addressbook/libebook/e-book.c:1544
-#: ../addressbook/libebook/e-book.c:1548
-#: ../addressbook/libebook/e-book.c:1787
-#: ../addressbook/libebook/e-book.c:1791
-#: ../addressbook/libebook/e-book.c:2025
-#: ../addressbook/libebook/e-book.c:2029
-#: ../addressbook/libebook/e-book.c:2234
-#: ../addressbook/libebook/e-book.c:2238
-#: ../addressbook/libebook/e-book.c:3339
+#: ../addressbook/libebook/e-book.c:288 ../addressbook/libebook/e-book.c:292
+#: ../addressbook/libebook/e-book.c:496 ../addressbook/libebook/e-book.c:500
+#: ../addressbook/libebook/e-book.c:639 ../addressbook/libebook/e-book.c:643
+#: ../addressbook/libebook/e-book.c:730 ../addressbook/libebook/e-book.c:734
+#: ../addressbook/libebook/e-book.c:1028 ../addressbook/libebook/e-book.c:1033
+#: ../addressbook/libebook/e-book.c:1211 ../addressbook/libebook/e-book.c:1215
+#: ../addressbook/libebook/e-book.c:1370 ../addressbook/libebook/e-book.c:1374
+#: ../addressbook/libebook/e-book.c:1575 ../addressbook/libebook/e-book.c:1579
+#: ../addressbook/libebook/e-book.c:1818 ../addressbook/libebook/e-book.c:1822
+#: ../addressbook/libebook/e-book.c:2055 ../addressbook/libebook/e-book.c:2059
+#: ../addressbook/libebook/e-book.c:2263 ../addressbook/libebook/e-book.c:2267
+#: ../addressbook/libebook/e-book.c:3454
  #, c-format
  msgid "\"%s\" on book before \"%s\""
  msgstr "\"%s\" ਬੁੱਕ ਤੇ ਪਹਿਲਾਂ \"%s\""
  
-#: ../addressbook/libebook/e-book.c:265
-#: ../addressbook/libebook/e-book.c:474
-#: ../addressbook/libebook/e-book.c:617
-#: ../addressbook/libebook/e-book.c:708
-#: ../addressbook/libebook/e-book.c:1010
-#: ../addressbook/libebook/e-book.c:1193
-#: ../addressbook/libebook/e-book.c:1352
-#: ../addressbook/libebook/e-book.c:1557
-#: ../addressbook/libebook/e-book.c:1800
-#: ../addressbook/libebook/e-book.c:2039
-#: ../addressbook/libebook/e-book.c:2247
-#: ../addressbook/libebook/e-book.c:2593
-#: ../addressbook/libebook/e-book.c:2792
+#: ../addressbook/libebook/e-book.c:301 ../addressbook/libebook/e-book.c:509
+#: ../addressbook/libebook/e-book.c:652 ../addressbook/libebook/e-book.c:743
+#: ../addressbook/libebook/e-book.c:1043 ../addressbook/libebook/e-book.c:1225
+#: ../addressbook/libebook/e-book.c:1384 ../addressbook/libebook/e-book.c:1588
+#: ../addressbook/libebook/e-book.c:1831 ../addressbook/libebook/e-book.c:2069
+#: ../addressbook/libebook/e-book.c:2276 ../addressbook/libebook/e-book.c:2685
+#: ../addressbook/libebook/e-book.c:2883
  #, c-format
  msgid "book busy"
  msgstr "ਬੁੱਕ ਰੁੱਝੀ"
  
-#: ../addressbook/libebook/e-book.c:296
-#: ../addressbook/libebook/e-book.c:300
-#: ../addressbook/libebook/e-book.c:505
-#: ../addressbook/libebook/e-book.c:509
-#: ../addressbook/libebook/e-book.c:644
-#: ../addressbook/libebook/e-book.c:648
-#: ../addressbook/libebook/e-book.c:735
-#: ../addressbook/libebook/e-book.c:739
-#: ../addressbook/libebook/e-book.c:1037
-#: ../addressbook/libebook/e-book.c:1040
-#: ../addressbook/libebook/e-book.c:1223
-#: ../addressbook/libebook/e-book.c:1226
-#: ../addressbook/libebook/e-book.c:1379
-#: ../addressbook/libebook/e-book.c:1383
-#: ../addressbook/libebook/e-book.c:1593
-#: ../addressbook/libebook/e-book.c:1597
-#: ../addressbook/libebook/e-book.c:1847
-#: ../addressbook/libebook/e-book.c:1851
-#: ../addressbook/libebook/e-book.c:2069
-#: ../addressbook/libebook/e-book.c:2073
-#: ../addressbook/libebook/e-book.c:2273
-#: ../addressbook/libebook/e-book.c:2277
-#: ../addressbook/libebook/e-book.c:2538
-#: ../addressbook/libebook/e-book.c:2619
-#: ../addressbook/libebook/e-book.c:2623
-#: ../addressbook/libebook/e-book.c:2818
-#: ../addressbook/libebook/e-book.c:2822
-#: ../addressbook/libebook/e-book.c:3348
+#: ../addressbook/libebook/e-book.c:332 ../addressbook/libebook/e-book.c:336
+#: ../addressbook/libebook/e-book.c:540 ../addressbook/libebook/e-book.c:544
+#: ../addressbook/libebook/e-book.c:679 ../addressbook/libebook/e-book.c:683
+#: ../addressbook/libebook/e-book.c:770 ../addressbook/libebook/e-book.c:774
+#: ../addressbook/libebook/e-book.c:1070 ../addressbook/libebook/e-book.c:1073
+#: ../addressbook/libebook/e-book.c:1255 ../addressbook/libebook/e-book.c:1258
+#: ../addressbook/libebook/e-book.c:1411 ../addressbook/libebook/e-book.c:1415
+#: ../addressbook/libebook/e-book.c:1624 ../addressbook/libebook/e-book.c:1628
+#: ../addressbook/libebook/e-book.c:1878 ../addressbook/libebook/e-book.c:1882
+#: ../addressbook/libebook/e-book.c:2099 ../addressbook/libebook/e-book.c:2103
+#: ../addressbook/libebook/e-book.c:2302 ../addressbook/libebook/e-book.c:2306
+#: ../addressbook/libebook/e-book.c:2537 ../addressbook/libebook/e-book.c:2711
+#: ../addressbook/libebook/e-book.c:2715 ../addressbook/libebook/e-book.c:2909
+#: ../addressbook/libebook/e-book.c:2913 ../addressbook/libebook/e-book.c:3463
  #, c-format
  msgid "CORBA exception making \"%s\" call"
  msgstr "CORBA ਅਪਵਾਦ \"%s\" ਕਾਲ"
  
-#: ../addressbook/libebook/e-book.c:2523
+#: ../addressbook/libebook/e-book.c:2526
  #, c-format
  msgid "%s: there is no current operation"
  msgstr "%s: ਮੌਜੂਦਾ ਕੋਈ ਕਾਰਵਾਈ ਨਹੀਂ ਹੈ"
  
-#: ../addressbook/libebook/e-book.c:2552
+#: ../addressbook/libebook/e-book.c:2555 ../addressbook/libebook/e-book.c:2600
+#: ../addressbook/libebook/e-book.c:2639
  #, c-format
  msgid "%s: could not cancel"
  msgstr "%s: ਰੱਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
  
-#: ../addressbook/libebook/e-book.c:2579
-#: ../addressbook/libebook/e-book.c:2583
+#: ../addressbook/libebook/e-book.c:2671 ../addressbook/libebook/e-book.c:2675
  #, c-format
  msgid "\"%s\" on book after \"%s\""
  msgstr "\"%s\" ਬੁੱਕ ਦੇ ਬਾਅਦ \"%s\""
  
-#: ../addressbook/libebook/e-book.c:2647
+#: ../addressbook/libebook/e-book.c:2739
  #, c-format
  msgid "%s: canceled"
  msgstr "%s: ਰੱਦ ਕੀਤਾ"
  
-#: ../addressbook/libebook/e-book.c:3203
+#: ../addressbook/libebook/e-book.c:3318
  #, c-format
  msgid "%s: Invalid source."
  msgstr "%s: ਗਲਤ ਸਰੋਤ ਕੋਡ"
  
-#: ../addressbook/libebook/e-book.c:3211
-#: ../addressbook/libebook/e-book.c:3277
+#: ../addressbook/libebook/e-book.c:3326 ../addressbook/libebook/e-book.c:3392
  #, c-format
  msgid "%s: no factories available for URI `%s'"
  msgstr "%s: URI `%s' ਲਈ ਕੋਈ ਫੈਕਟਰੀ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
  
-#: ../addressbook/libebook/e-book.c:3223
+#: ../addressbook/libebook/e-book.c:3338
  #, c-format
  msgid "%s: Could not create EBookListener"
  msgstr "%s: ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ"
  
-#: ../addressbook/libebook/e-book.c:3490
+#: ../addressbook/libebook/e-book.c:3605
  #, c-format
  msgid "%s: there was no self contact UID stored in gconf"
  msgstr "%s: gconf ਵਿੱਚ ਕੋਈ ਖੁਦ-ਸੰਪਰਕ UID ਸੰਭਾਲਿਆ ਨਹੀਂ ਹੈ।"
  
-#: ../addressbook/libebook/e-book.c:3623
+#: ../addressbook/libebook/e-book.c:3738
  #, c-format
  msgid "%s: there was no source for uid `%s' stored in gconf."
  msgstr "%s: ਜੀ-ਕਾਨਫ ਵਿੱਚ UID `%s' ਲਈ ਕੋਈ ਸਰੋਤ ਨਹੀਂ ਹੈ।"
@@ -246,19 +213,19 @@ msgstr "ਆਮ ਨਾਂ"
  #. Email fields
  #: ../addressbook/libebook/e-contact.c:128
  msgid "Email 1"
-msgstr "ਈਮੇਲ 1"
+msgstr "ਈਮੇਲ ੧"
  
  #: ../addressbook/libebook/e-contact.c:129
  msgid "Email 2"
-msgstr "ਈਮੇਲ 2"
+msgstr "ਈਮੇਲ ੨"
  
  #: ../addressbook/libebook/e-contact.c:130
  msgid "Email 3"
-msgstr "ਈਮੇਲ 3"
+msgstr "ਈਮੇਲ ੩"
  
  #: ../addressbook/libebook/e-contact.c:131
  msgid "Email 4"
-msgstr "ਈਮੇਲ 4"
+msgstr "ਈਮੇਲ ੪"
  
  #: ../addressbook/libebook/e-contact.c:133
  msgid "Mailer"
@@ -395,7 +362,7 @@ msgstr "ਵੈਬਲਾਗ URL"
  
  #. Contact categories
  #: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:426
+#: ../libedataserverui/e-categories-dialog.c:517
  msgid "Categories"
  msgstr "ਕੈਟਾਗਰੀ"
  
@@ -428,147 +395,147 @@ msgstr "ਟਿੱਪਣੀ"
  #. Instant messaging fields
  #: ../addressbook/libebook/e-contact.c:189
  msgid "AIM Home Screen Name 1"
-msgstr "AIM ਘਰ ਸਕਰੀਨ ਨਾਂ 1"
+msgstr "AIM ਘਰ ਸਕਰੀਨ ਨਾਂ ੧"
  
  #: ../addressbook/libebook/e-contact.c:190
  msgid "AIM Home Screen Name 2"
-msgstr "AIM ਘਰ ਸਕਰੀਨ ਨਾਂ 2"
+msgstr "AIM ਘਰ ਸਕਰੀਨ ਨਾਂ ੨"
  
  #: ../addressbook/libebook/e-contact.c:191
  msgid "AIM Home Screen Name 3"
-msgstr "AIM ਘਰ ਸਕਰੀਨ ਨਾਂ 3"
+msgstr "AIM ਘਰ ਸਕਰੀਨ ਨਾਂ ੩"
  
  #: ../addressbook/libebook/e-contact.c:192
  msgid "AIM Work Screen Name 1"
-msgstr "AIM ਕੰਮ ਸਕਰੀਨ ਨਾਂ 1"
+msgstr "AIM ਕੰਮ ਸਕਰੀਨ ਨਾਂ ੧"
  
  #: ../addressbook/libebook/e-contact.c:193
  msgid "AIM Work Screen Name 2"
-msgstr "AIM ਕੰਮ ਸਕਰੀਨ ਨਾਂ 2"
+msgstr "AIM ਕੰਮ ਸਕਰੀਨ ਨਾਂ ੨"
  
  #: ../addressbook/libebook/e-contact.c:194
  msgid "AIM Work Screen Name 3"
-msgstr "AIM ਕੰਮ ਸਕਰੀਨ ਨਾਂ 3"
+msgstr "AIM ਕੰਮ ਸਕਰੀਨ ਨਾਂ ੩"
  
  #: ../addressbook/libebook/e-contact.c:195
  msgid "GroupWise Home Screen Name 1"
-msgstr "ਗਰੁਪਵਾਈਜ ਘਰ ਸਕਰੀਨ ਨਾਂ 1"
+msgstr "ਗਰੁਪਵਾਈਜ ਘਰ ਸਕਰੀਨ ਨਾਂ ੧"
  
  #: ../addressbook/libebook/e-contact.c:196
  msgid "GroupWise Home Screen Name 2"
-msgstr "ਗਰੁਪਵਾਈਜ ਘਰ ਸਕਰੀਨ ਨਾਂ 2"
+msgstr "ਗਰੁਪਵਾਈਜ ਘਰ ਸਕਰੀਨ ਨਾਂ ੨"
  
  #: ../addressbook/libebook/e-contact.c:197
  msgid "GroupWise Home Screen Name 3"
-msgstr "ਗਰੁਪਵਾਈਜ ਘਰ ਸਕਰੀਨ ਨਾਂ 3"
+msgstr "ਗਰੁਪਵਾਈਜ ਘਰ ਸਕਰੀਨ ਨਾਂ ੩"
  
  #: ../addressbook/libebook/e-contact.c:198
  msgid "GroupWise Work Screen Name 1"
-msgstr "ਗਰੁਪਵਾਈਜ ਕੰਮ ਸਕਰੀਨ ਨਾਂ 1"
+msgstr "ਗਰੁਪਵਾਈਜ ਕੰਮ ਸਕਰੀਨ ਨਾਂ ੧"
  
  #: ../addressbook/libebook/e-contact.c:199
  msgid "GroupWise Work Screen Name 2"
-msgstr "ਗਰੁਪਵਾਈਜ ਕੰਮ ਸਕਰੀਨ ਨਾਂ 2"
+msgstr "ਗਰੁਪਵਾਈਜ ਕੰਮ ਸਕਰੀਨ ਨਾਂ ੨"
  
  #: ../addressbook/libebook/e-contact.c:200
  msgid "GroupWise Work Screen Name 3"
-msgstr "ਗਰੁਪਵਾਈਜ ਕੰਮ ਸਕਰੀਨ ਨਾਂ 3"
+msgstr "ਗਰੁਪਵਾਈਜ ਕੰਮ ਸਕਰੀਨ ਨਾਂ ੩"
  
  #: ../addressbook/libebook/e-contact.c:201
  msgid "Jabber Home Id 1"
-msgstr "Jabber Home Id 1"
+msgstr "Jabber Home Id ੧"
  
  #: ../addressbook/libebook/e-contact.c:202
  msgid "Jabber Home Id 2"
-msgstr "Jabber Home Id 2"
+msgstr "Jabber Home Id ੨"
  
  #: ../addressbook/libebook/e-contact.c:203
  msgid "Jabber Home Id 3"
-msgstr "Jabber Home Id 3"
+msgstr "Jabber Home Id ੩"
  
  #: ../addressbook/libebook/e-contact.c:204
  msgid "Jabber Work Id 1"
-msgstr "Jabber Work Id 1"
+msgstr "Jabber Work Id ੧"
  
  #: ../addressbook/libebook/e-contact.c:205
  msgid "Jabber Work Id 2"
-msgstr "Jabber Work Id 2"
+msgstr "Jabber Work Id ੨"
  
  #: ../addressbook/libebook/e-contact.c:206
  msgid "Jabber Work Id 3"
-msgstr "Jabber Work Id 3"
+msgstr "Jabber Work Id ੩"
  
  #: ../addressbook/libebook/e-contact.c:207
  msgid "Yahoo! Home Screen Name 1"
-msgstr "Yahoo! Home Screen Name 1"
+msgstr "Yahoo! Home Screen Name ੧"
  
  #: ../addressbook/libebook/e-contact.c:208
  msgid "Yahoo! Home Screen Name 2"
-msgstr "Yahoo! Home Screen Name 2"
+msgstr "Yahoo! Home Screen Name ੨"
  
  #: ../addressbook/libebook/e-contact.c:209
  msgid "Yahoo! Home Screen Name 3"
-msgstr "Yahoo! Home Screen Name 3"
+msgstr "Yahoo! Home Screen Name ੩"
  
  #: ../addressbook/libebook/e-contact.c:210
  msgid "Yahoo! Work Screen Name 1"
-msgstr "Yahoo! Work Screen Name 1"
+msgstr "Yahoo! Work Screen Name ੧"
  
  #: ../addressbook/libebook/e-contact.c:211
  msgid "Yahoo! Work Screen Name 2"
-msgstr "Yahoo! Work Screen Name 2"
+msgstr "Yahoo! Work Screen Name ੨"
  
  #: ../addressbook/libebook/e-contact.c:212
  msgid "Yahoo! Work Screen Name 3"
-msgstr "Yahoo! Work Screen Name 3"
+msgstr "Yahoo! Work Screen Name ੩"
  
  #: ../addressbook/libebook/e-contact.c:213
  msgid "MSN Home Screen Name 1"
-msgstr "MSN Home Screen Name 1"
+msgstr "MSN Home Screen Name ੧"
  
  #: ../addressbook/libebook/e-contact.c:214
  msgid "MSN Home Screen Name 2"
-msgstr "MSN Home Screen Name 2"
+msgstr "MSN Home Screen Name ੨"
  
  #: ../addressbook/libebook/e-contact.c:215
  msgid "MSN Home Screen Name 3"
-msgstr "MSN Home Screen Name 3"
+msgstr "MSN Home Screen Name ੩"
  
  #: ../addressbook/libebook/e-contact.c:216
  msgid "MSN Work Screen Name 1"
-msgstr "MSN Work Screen Name 1"
+msgstr "MSN Work Screen Name ੧"
  
  #: ../addressbook/libebook/e-contact.c:217
  msgid "MSN Work Screen Name 2"
-msgstr "MSN Work Screen Name 2"
+msgstr "MSN Work Screen Name ੨"
  
  #: ../addressbook/libebook/e-contact.c:218
  msgid "MSN Work Screen Name 3"
-msgstr "MSN Work Screen Name 3"
+msgstr "MSN Work Screen Name ੩"
  
  #: ../addressbook/libebook/e-contact.c:219
  msgid "ICQ Home Id 1"
-msgstr "ICQ Home Id 1"
+msgstr "ICQ Home Id ੧"
  
  #: ../addressbook/libebook/e-contact.c:220
  msgid "ICQ Home Id 2"
-msgstr "ICQ Home Id 2"
+msgstr "ICQ Home Id ੨"
  
  #: ../addressbook/libebook/e-contact.c:221
  msgid "ICQ Home Id 3"
-msgstr "ICQ Home Id 3"
+msgstr "ICQ Home Id ੩"
  
  #: ../addressbook/libebook/e-contact.c:222
  msgid "ICQ Work Id 1"
-msgstr "ICQ Work Id 1"
+msgstr "ICQ Work Id ੧"
  
  #: ../addressbook/libebook/e-contact.c:223
  msgid "ICQ Work Id 2"
-msgstr "ICQ Work Id 2"
+msgstr "ICQ Work Id ੨"
  
  #: ../addressbook/libebook/e-contact.c:224
  msgid "ICQ Work Id 3"
-msgstr "ICQ Work Id 3"
+msgstr "ICQ Work Id ੩"
  
  #. Last modified time
  #: ../addressbook/libebook/e-contact.c:227
@@ -660,7 +627,7 @@ msgid "Birth Date"
  msgstr "ਜਨਮ ਦਿਨ"
  
  #: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:461
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
  #: ../libedataserver/e-categories.c:43
  msgid "Anniversary"
  msgstr "ਵਰੇ-ਗੰਢ"
@@ -672,27 +639,27 @@ msgstr "X.509 ਸਰਟੀਫਿਕੇਟ"
  
  #: ../addressbook/libebook/e-contact.c:265
  msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu ਘਰ Id 1"
+msgstr "Gadu-Gadu ਘਰ Id ੧"
  
  #: ../addressbook/libebook/e-contact.c:266
  msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu ਘਰ Id 2"
+msgstr "Gadu-Gadu ਘਰ Id ੨"
  
  #: ../addressbook/libebook/e-contact.c:267
  msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu ਘਰ Id 3"
+msgstr "Gadu-Gadu ਘਰ Id ੩"
  
  #: ../addressbook/libebook/e-contact.c:268
  msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu ਕੰਮ Id 1"
+msgstr "Gadu-Gadu ਕੰਮ Id ੧"
  
  #: ../addressbook/libebook/e-contact.c:269
  msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu ਕੰਮ Id 2"
+msgstr "Gadu-Gadu ਕੰਮ Id ੨"
  
  #: ../addressbook/libebook/e-contact.c:270
  msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu ਕੰਮ Id 3"
+msgstr "Gadu-Gadu ਕੰਮ Id ੩"
  
  #: ../addressbook/libebook/e-contact.c:271
  msgid "Gadu-Gadu Id List"
@@ -707,60 +674,100 @@ msgstr "ਭੂਗੋਲਿਕ ਜਾਣਕਾਰੀ"
  msgid "Telephone"
  msgstr "ਟੈਲੀਫੋਨ"
  
-#: ../addressbook/libebook/e-contact.c:1493
+#: ../addressbook/libebook/e-contact.c:278
+#| msgid "MSN Home Screen Name 1"
+msgid "Skype Home Name 1"
+msgstr "Skype Home Name ੧"
+
+#: ../addressbook/libebook/e-contact.c:279
+#| msgid "MSN Home Screen Name 2"
+msgid "Skype Home Name 2"
+msgstr "Skype Home Name ੨"
+
+#: ../addressbook/libebook/e-contact.c:280
+#| msgid "MSN Home Screen Name 3"
+msgid "Skype Home Name 3"
+msgstr "Skype Home Name ੩"
+
+#: ../addressbook/libebook/e-contact.c:281
+#| msgid "MSN Work Screen Name 1"
+msgid "Skype Work Name 1"
+msgstr "Skype Work Name ੧"
+
+#: ../addressbook/libebook/e-contact.c:282
+#| msgid "MSN Work Screen Name 2"
+msgid "Skype Work Name 2"
+msgstr "Skype Work Name ੨"
+
+#: ../addressbook/libebook/e-contact.c:283
+#| msgid "MSN Work Screen Name 3"
+msgid "Skype Work Name 3"
+msgstr "Skype Work Name ੩"
+
+#: ../addressbook/libebook/e-contact.c:284
+#| msgid "AIM Screen Name List"
+msgid "Skype Name List"
+msgstr "Skype Name ਲਿਸਟ"
+
+#: ../addressbook/libebook/e-contact.c:286
+#| msgid "Home Address"
+msgid "SIP address"
+msgstr "SIP ਐਡਰੈੱਸ"
+
+#: ../addressbook/libebook/e-contact.c:1535
  #: ../addressbook/libebook/e-destination.c:761
  msgid "Unnamed List"
  msgstr "ਬਿਨਾਂ ਨਾਂ ਸੂਚੀ"
  
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
  #: ../libedataserver/e-categories.c:44
  msgid "Birthday"
  msgstr "ਜਨਮਦਿਨ"
  
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:489
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
  #, c-format
  msgid "Birthday: %s"
  msgstr "ਜਨਮਦਿਨ: %s"
  
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:513
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
  #, c-format
  msgid "Anniversary: %s"
  msgstr "ਵਰੇਗੰਢ: %s"
  
-#: ../calendar/backends/file/e-cal-backend-file.c:214
+#: ../calendar/backends/file/e-cal-backend-file.c:212
  msgid "Cannot save calendar data: Malformed URI."
  msgstr "ਕੈਲੰਡਰ ਡਾਟੇ ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਨਿਕਾਰਾ URI"
  
-#: ../calendar/backends/file/e-cal-backend-file.c:221
-#: ../calendar/backends/file/e-cal-backend-file.c:227
+#: ../calendar/backends/file/e-cal-backend-file.c:219
+#: ../calendar/backends/file/e-cal-backend-file.c:225
  msgid "Cannot save calendar data"
  msgstr "ਕੈਲੰਡਰ ਡਾਟੇ ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:335
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
  msgid "Could not create thread for getting deltas"
  msgstr "ਕੈਂਚੇ ਥਰਿੱਡ ਨੂੰ ਵਿਕਸਤ ਨਹੀਂ ਜਾ ਸਕਿਆ"
  
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:367
-#: ../calendar/backends/google/e-cal-backend-google.c:1194
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
+#: ../calendar/backends/google/e-cal-backend-google.c:1192
  #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
  #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:569
-#: ../calendar/backends/weather/e-cal-backend-weather.c:466
+#: ../calendar/backends/http/e-cal-backend-http.c:561
+#: ../calendar/backends/weather/e-cal-backend-weather.c:484
  msgid "Could not create cache file"
  msgstr "ਕੈਂਚੇ ਫਾਇਲ ਨੂੰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:380
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
  #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
  msgid "Could not create thread for populating cache"
  msgstr "ਕੈਂਚੇ ਥਰਿੱਡ ਨੂੰ ਵਿਕਸਤ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1795
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1917
  msgid "Reply Requested: by "
  msgstr "ਜਵਾਬ ਦੀ ਬੇਨਤੀ: ਵਲੋਂ"
  
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1922
  msgid "Reply Requested: When convenient"
  msgstr "ਜਵਾਬ ਲਈ ਬੇਨਤੀ: ਜਦੋਂ ਠੀਕ ਲੱਗੇ"
  
@@ -781,222 +788,77 @@ msgstr "ਗਲਤ ਸਰਵਰ URI"
  #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
  #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
  #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5082
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1075
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1107
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1145
-#: ../camel/providers/groupwise/camel-groupwise-store.c:594
-#: ../camel/providers/groupwise/camel-groupwise-store.c:746
+#: ../calendar/libecal/e-cal.c:5098
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1147
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1179
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1217
+#: ../camel/providers/groupwise/camel-groupwise-store.c:588
+#: ../camel/providers/groupwise/camel-groupwise-store.c:753
  #: ../camel/providers/groupwise/camel-groupwise-transport.c:157
  #: ../camel/providers/groupwise/camel-groupwise-transport.c:184
  msgid "Authentication failed"
  msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਅਸਫਲ"
  
-#: ../calendar/backends/http/e-cal-backend-http.c:269
+#: ../calendar/backends/http/e-cal-backend-http.c:268
  msgid "Redirected to Invalid URI"
  msgstr "ਗਲਤ URI ਲਈ ਭੇਜਿਆ "
  
-#: ../calendar/backends/http/e-cal-backend-http.c:290
+#: ../calendar/backends/http/e-cal-backend-http.c:289
  msgid "Bad file format."
  msgstr "ਗਲਤ ਫਾਇਲ ਫਾਰਮਿਟ"
  
-#: ../calendar/backends/http/e-cal-backend-http.c:296
+#: ../calendar/backends/http/e-cal-backend-http.c:295
  msgid "Not a calendar."
  msgstr "ਕੋਈ ਕੈਲੰਡਰ ਨਹੀਂ"
  
-#: ../calendar/backends/weather/e-cal-backend-weather.c:144
+#: ../calendar/backends/weather/e-cal-backend-weather.c:149
  msgid "Could not retrieve weather data"
  msgstr "ਕੈਂਚੇ ਫਾਇਲ ਨੂੰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../calendar/backends/weather/e-cal-backend-weather.c:216
-msgid "Fair"
-msgstr "ਸਾਫ਼"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:217
-msgid "Snow showers"
-msgstr "ਬਰਫ਼ ਫੁਹਾਰ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:218
-msgid "Snow"
-msgstr "ਬਰਫ਼"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:219
-msgid "Partly cloudy"
-msgstr "ਹਲਕਾ ਬੱਦਲਵਾਈ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:220
-msgid "Smoke"
-msgstr "ਧੁੰਦ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:221
-msgid "Thunderstorms"
-msgstr "ਗਰਜ਼"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:222
-msgid "Cloudy"
-msgstr "ਬੱਦਲਵਾਈ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:223
-msgid "Drizzle"
-msgstr "ਬੂੰਦਾਬਾਂਦੀ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:224
-msgid "Sunny"
-msgstr "ਸੋਹਣਾ ਦਿਨ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:225
-msgid "Dust"
-msgstr "ਘੱਟਾ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:226
-msgid "Clear"
-msgstr "ਸਾਫ਼"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:227
-msgid "Mostly cloudy"
-msgstr "ਸੰਘਣੀ ਬੱਦਲਵਾਈ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:228
-msgid "Windy"
-msgstr "ਤੇਜ਼ ਹਵਾ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:229
-msgid "Rain showers"
-msgstr "ਮੀਂਹ ਫੁਹਾਰ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:230
-msgid "Foggy"
-msgstr "ਧੁੰਦ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:231
-msgid "Rain/snow mixed"
-msgstr "ਮੀਂਹ/ਬਰਫ਼ "
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:232
-msgid "Sleet"
-msgstr "ਬਰਫ਼ ਵਾਲਾ ਮੀਂਹ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:233
-msgid "Very hot/humid"
-msgstr "ਬਹੁਤ ਗਰਮ/ਨਮੀਂ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:234
-msgid "Blizzard"
-msgstr "ਬਰਫੀਲਾ ਤੂਫਾਨ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:235
-msgid "Freezing rain"
-msgstr "ਜਮਾਊਂ ਮੀਂਹ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:236
-msgid "Haze"
-msgstr "ਕੋਹਰਾ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:237
-msgid "Blowing snow"
-msgstr "ਬਰਫ਼ ਦੀ ਹਵਾ"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+msgid "Weather: Fog"
+msgstr "ਮੌਸਮ: ਧੁੰਦ"
  
-#: ../calendar/backends/weather/e-cal-backend-weather.c:238
-msgid "Freezing drizzle"
-msgstr "à¨\9cà¨®à¨¾à¨\89à¨£ à¨µà¨¾à¨²à©\80 à¨¬à©\82à©°à¨¦à¨¾à¨¬à¨¾à¨\82à¨¦à©\80"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+msgid "Weather: Cloudy"
+msgstr "à¨®à©\8cà¨¸à¨®: à¨¬à©±à¨¦à¨²à¨µà¨¾à¨\88"
  
-#: ../calendar/backends/weather/e-cal-backend-weather.c:239
-msgid "Very cold/wind chill"
-msgstr "ਬਹੁਤ ਠੰਡ/ਠੰਡੀ ਹਵਾ"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+#| msgid "Weather: Cloudy"
+msgid "Weather: Cloudy Night"
+msgstr "ਮੌਸਮ: ਬੱਦਲਵਾਈ ਵਾਲੀ ਰਾਤ"
  
-#: ../calendar/backends/weather/e-cal-backend-weather.c:240
-msgid "Rain"
-msgstr "ਮੀਂਹ"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#| msgid "Weather: Thunderstorms"
+msgid "Weather: Overcast"
+msgstr "ਮੌਸਮ: ਓਵਰਕਾਸਟ"
  
  #: ../calendar/backends/weather/e-cal-backend-weather.c:250
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
-#: ../calendar/backends/weather/e-cal-backend-weather.c:260
-#: ../calendar/backends/weather/e-cal-backend-weather.c:267
-msgid "Weather: Sunny"
-msgstr "ਮੌਸਮ: ਖਿੜਿਆ ਦਿਨ"
+#| msgid "Weather: Snow"
+msgid "Weather: Showers"
+msgstr "ਮੌਸਮ: ਫੁਹਾਰ"
  
  #: ../calendar/backends/weather/e-cal-backend-weather.c:251
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-#: ../calendar/backends/weather/e-cal-backend-weather.c:268
-#: ../calendar/backends/weather/e-cal-backend-weather.c:271
  msgid "Weather: Snow"
  msgstr "ਮੌਸਮ: ਬਰਫ਼"
  
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+msgid "Weather: Sunny"
+msgstr "ਮੌਸਮ: ਖਿੜਿਆ ਦਿਨ"
+
  #: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Partly Cloudy"
-msgstr "ਮੌਸਮ: ਹਲਕੀ ਬੱਦਲਵਾਈ"
+#| msgid "Weather: Rain"
+msgid "Weather: Clear Night"
+msgstr "ਮੌਸਮ: ਸਾਫ਼ ਰਾਤ"
  
  #: ../calendar/backends/weather/e-cal-backend-weather.c:254
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
-#: ../calendar/backends/weather/e-cal-backend-weather.c:264
-#: ../calendar/backends/weather/e-cal-backend-weather.c:270
-msgid "Weather: Fog"
-msgstr "ਮੌਸਮ: ਧੁੰਦ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
  msgid "Weather: Thunderstorms"
  msgstr "ਮੌਸਮ: ਬਰਫ਼ੀਲਾ ਤੂਫਾਨ"
  
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
-#: ../calendar/backends/weather/e-cal-backend-weather.c:261
-msgid "Weather: Cloudy"
-msgstr "ਮੌਸਮ: ਬੱਦਲਵਾਈ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
-#: ../calendar/backends/weather/e-cal-backend-weather.c:263
-#: ../calendar/backends/weather/e-cal-backend-weather.c:265
-#: ../calendar/backends/weather/e-cal-backend-weather.c:266
-#: ../calendar/backends/weather/e-cal-backend-weather.c:269
-#: ../calendar/backends/weather/e-cal-backend-weather.c:272
-#: ../calendar/backends/weather/e-cal-backend-weather.c:274
-msgid "Weather: Rain"
-msgstr "ਮੌਸਮ: ਮੀਂਹ"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:349
-#, c-format
-msgid "%.1f°C - %s"
-msgstr "%.1f°C - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:351
-#, c-format
-msgid "%.1f°F - %s"
-msgstr "%.1f°F - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:354
-#, c-format
-msgid "%.1f/%.1f°C - %s"
-msgstr "%.1f/%.1f°C - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:356
-#, c-format
-msgid "%.1f/%.1f°F - %s"
-msgstr "%.1f/%.1f°F - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:362
-#, c-format
-msgid "%d%% chance of precipitation\n"
-msgstr "%d%% ਗੜਿਆਂ ਦੀ ਸੰਭਵਾਨਾ\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:369
-#, c-format
-msgid "%.1fcm snow\n"
-msgstr "%.1fਸੈਂਮੀ ਬਰਫ਼\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:371
-#, c-format
-msgid "%.1fin snow\n"
-msgstr "%.1fਇੰਚ ਬਰਫ਼\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:374
-#, c-format
-msgid "%.1f-%.1fcm snow\n"
-msgstr "%.1f-%.1fਸੈਂਮੀ ਬਰਫ਼\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:376
-#, c-format
-msgid "%.1f-%.1fin snow\n"
-msgstr "%.1f-%.1fਇੰਚ ਬਰਫ਼\n"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+msgid "Forecast"
+msgstr "ਅਨੁਮਾਨ"
  
  #: ../calendar/libecal/e-cal-component.c:1322
  msgid "Untitled appointment"
@@ -1004,140 +866,137 @@ msgstr "ਬਿਨਾਂ ਨਾਂ ਰੁਝੇਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4041
  msgid "1st"
-msgstr "1ਹਿਲਾਂ"
+msgstr "੧ਹਿਲਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4042
  msgid "2nd"
-msgstr "2ਜਾ"
+msgstr "੨ਜਾ"
  
  #: ../calendar/libecal/e-cal-recur.c:4043
  msgid "3rd"
-msgstr "3ਜਾ"
+msgstr "੩ਜਾ"
  
  #: ../calendar/libecal/e-cal-recur.c:4044
  msgid "4th"
-msgstr "4ਥਾ"
+msgstr "੪ਥਾ"
  
  #: ../calendar/libecal/e-cal-recur.c:4045
  msgid "5th"
-msgstr "5ਵਾਂ"
+msgstr "੫ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4046
  msgid "6th"
-msgstr "6ਵਾਂ"
+msgstr "੬ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4047
  msgid "7th"
-msgstr "7ਵਾਂ"
+msgstr "੭ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4048
  msgid "8th"
-msgstr "8ਵਾਂ"
+msgstr "੮ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4049
  msgid "9th"
-msgstr "9ਵਾਂ"
+msgstr "੯ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4050
  msgid "10th"
-msgstr "10ਵਾਂ"
+msgstr "੧੦ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4051
  msgid "11th"
-msgstr "11ਵਾਂ"
+msgstr "੧੧ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4052
  msgid "12th"
-msgstr "12ਵਾਂ"
+msgstr "੧੨ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4053
  msgid "13th"
-msgstr "13ਵਾਂ"
+msgstr "੧੩ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4054
  msgid "14th"
-msgstr "14ਵਾਂ"
+msgstr "੧੪ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4055
  msgid "15th"
-msgstr "15ਵਾਂ"
+msgstr "੧੫ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4056
  msgid "16th"
-msgstr "16ਵਾਂ"
+msgstr "੧੬ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4057
  msgid "17th"
-msgstr "17ਵਾਂ"
+msgstr "੧੭ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4058
  msgid "18th"
-msgstr "18ਵਾਂ"
+msgstr "੧੮ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4059
  msgid "19th"
-msgstr "19ਵਾਂ"
+msgstr "੧੯ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4060
  msgid "20th"
-msgstr "20ਵਾਂ"
+msgstr "੨੦ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4061
  msgid "21st"
-msgstr "21ਵਾਂ"
+msgstr "੨੧ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4062
  msgid "22nd"
-msgstr "22ਵਾਂ"
+msgstr "੨੨ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4063
  msgid "23rd"
-msgstr "23ਵਾਂ"
+msgstr "੨੩ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4064
  msgid "24th"
-msgstr "24ਵਾਂ"
+msgstr "੨੪ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4065
  msgid "25th"
-msgstr "25ਵਾਂ"
+msgstr "੨੫ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4066
  msgid "26th"
-msgstr "26ਵਾਂ"
+msgstr "੨੬ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4067
  msgid "27th"
-msgstr "27ਵਾਂ"
+msgstr "੨੭ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4068
  msgid "28th"
-msgstr "28ਵਾਂ"
+msgstr "੨੮ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4069
  msgid "29th"
-msgstr "29ਵਾਂ"
+msgstr "੨੯ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4070
  msgid "30th"
-msgstr "30ਵਾਂ"
+msgstr "੩੦ਵਾਂ"
  
  #: ../calendar/libecal/e-cal-recur.c:4071
  msgid "31st"
-msgstr "31ਵਾਂ"
+msgstr "੩੧ਵਾਂ"
  
-#: ../calendar/libecal/e-cal-util.c:685
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
  msgid "High"
-msgstr "à¨\85à¨§à¨¿à¨\95à¨¤à¨®"
+msgstr "à¨\89à©±à¨\9a"
  
-#: ../calendar/libecal/e-cal-util.c:687
-#: ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
  msgid "Normal"
  msgstr "ਸਧਾਰਨ"
  
-#: ../calendar/libecal/e-cal-util.c:689
-#: ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717
  msgid "Low"
  msgstr "ਨਿਊਨਤਮ"
  
@@ -1146,8 +1005,7 @@ msgstr "ਨਿਊਨਤਮ"
  msgid "Undefined"
  msgstr "ਨਾ-ਪ੍ਰਭਾਸ਼ਿਤ"
  
-#: ../calendar/libecal/e-cal.c:1665
-#: ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1677 ../libedataserverui/e-book-auth-util.c:199
  #, c-format
  msgid "Enter password for %s (user %s)"
  msgstr "%s ਲਈ ਪਾਸਵਰਡ ਦਿਓ (ਯੂਜ਼ਰ %s)"
@@ -1156,111 +1014,111 @@ 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:1679
+#: ../calendar/libecal/e-cal.c:1691
  #, c-format
  msgid "Enter password for %s to enable proxy for user %s"
  msgstr "%s ਲਈ ਪਾਸਵਰਡ ਯੂਜ਼ਰ %s ਲਈ ਪਰਾਕਸੀ ਯੋਗ ਕਰਨ ਲਈ ਦਿਓ"
  
-#: ../calendar/libecal/e-cal.c:5054
+#: ../calendar/libecal/e-cal.c:5070
  msgid "Invalid argument"
  msgstr "ਗਲਤ ਆਰਗੂਮਿੰਟ"
  
-#: ../calendar/libecal/e-cal.c:5056
+#: ../calendar/libecal/e-cal.c:5072
  msgid "Backend is busy"
  msgstr "ਪਿੱਛਲਾ ਤਾਂ ਰੁਝਿਆ ਹੈ"
  
-#: ../calendar/libecal/e-cal.c:5058
-#: ../calendar/libedata-cal/e-cal-backend-util.c:97
+#: ../calendar/libecal/e-cal.c:5074
+#: ../calendar/libedata-cal/e-cal-backend-util.c:105
  msgid "Repository is offline"
-msgstr "Repository à¨\86à¨«à¨²à¨¾à¨\87ਨ ਹੈ"
+msgstr "Repository à¨\86à¨«à¨²à¨¾à¨\88ਨ ਹੈ"
  
-#: ../calendar/libecal/e-cal.c:5060
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libecal/e-cal.c:5076
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
  msgid "No such calendar"
  msgstr "ਇੱਦਾਂ ਦਾ ਕੋਈ ਕੈਲੰਡਰ ਨਹੀਂ ਹੈ"
  
-#: ../calendar/libecal/e-cal.c:5062
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:5078
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
  #: ../servers/groupwise/e-gw-connection.c:233
  msgid "Object not found"
  msgstr "ਇਕਾਈ ਨਹੀਂ ਹੈ"
  
-#: ../calendar/libecal/e-cal.c:5064
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:5080
+#: ../calendar/libedata-cal/e-cal-backend-util.c:113
  #: ../servers/groupwise/e-gw-connection.c:227
  msgid "Invalid object"
  msgstr "ਗਲਤ ਇਕਾਈ"
  
-#: ../calendar/libecal/e-cal.c:5066
+#: ../calendar/libecal/e-cal.c:5082
  msgid "URI not loaded"
  msgstr "URI ਲੋਡ ਨਹੀਂ ਹੈ"
  
-#: ../calendar/libecal/e-cal.c:5068
+#: ../calendar/libecal/e-cal.c:5084
  msgid "URI already loaded"
  msgstr "URI ਪਹਿਲਾਂ ਹੀ ਲੋਡ ਹੈ"
  
-#: ../calendar/libecal/e-cal.c:5070
-#: ../calendar/libedata-cal/e-cal-backend-util.c:99
+#: ../calendar/libecal/e-cal.c:5086
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
  #: ../servers/exchange/storage/e-storage.c:571
  msgid "Permission denied"
  msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੈ"
  
-#: ../calendar/libecal/e-cal.c:5072
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libecal/e-cal.c:5088
+#: ../calendar/libedata-cal/e-cal-backend-util.c:131
  #: ../servers/groupwise/e-gw-connection.c:235
  msgid "Unknown User"
  msgstr "ਅਣਜਾਣ ਯੂਜ਼ਰ"
  
-#: ../calendar/libecal/e-cal.c:5074
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:5090
+#: ../calendar/libedata-cal/e-cal-backend-util.c:115
  msgid "Object ID already exists"
  msgstr "ਇਕਾਈ ID ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
  
-#: ../calendar/libecal/e-cal.c:5076
+#: ../calendar/libecal/e-cal.c:5092
  msgid "Protocol not supported"
  msgstr "ਪਰੋਟੋਕਾਲ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
  
-#: ../calendar/libecal/e-cal.c:5078
+#: ../calendar/libecal/e-cal.c:5094
  msgid "Operation has been canceled"
  msgstr "ਕਾਰਵਾਈ ਰੱਦ ਕੀਤੀ ਗਈ ਹੈ"
  
-#: ../calendar/libecal/e-cal.c:5080
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#: ../calendar/libecal/e-cal.c:5096
+#: ../calendar/libedata-cal/e-cal-backend-util.c:143
  msgid "Could not cancel operation"
  msgstr "ਕਾਰਵਾਈ ਨੂੰ ਰੱਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../calendar/libecal/e-cal.c:5084
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../calendar/libecal/e-cal.c:5100
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
  #: ../camel/providers/smtp/camel-smtp-transport.c:218
  msgid "Authentication required"
  msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
  
-#: ../calendar/libecal/e-cal.c:5086
+#: ../calendar/libecal/e-cal.c:5102
  msgid "A CORBA exception has occurred"
  msgstr "ਇੱਕ CORBA ਅਪਵਾਦ ਆਇਆ ਹੈ|"
  
-#: ../calendar/libecal/e-cal.c:5088
-#: ../calendar/libedata-cal/e-cal-backend-util.c:138
+#: ../calendar/libecal/e-cal.c:5104
+#: ../calendar/libedata-cal/e-cal-backend-util.c:146
  #: ../camel/providers/groupwise/camel-groupwise-transport.c:223
  #: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:742
+#: ../camel/providers/imap/camel-imap-store.c:743
  #: ../camel/providers/imap4/camel-imap4-engine.c:1570
  #: ../camel/providers/imap4/camel-imap4-engine.c:1609
  #: ../camel/providers/imap4/camel-imap4-engine.c:1654
  #: ../camel/providers/imap4/camel-imap4-engine.c:1710
  #: ../camel/providers/imap4/camel-imap4-store.c:315
  #: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
-#: ../camel/providers/pop3/camel-pop3-store.c:553
-#: ../camel/providers/pop3/camel-pop3-store.c:560
-#: ../camel/providers/pop3/camel-pop3-store.c:566
+#: ../camel/providers/imap4/camel-imap4-store.c:1579
+#: ../camel/providers/pop3/camel-pop3-store.c:554
+#: ../camel/providers/pop3/camel-pop3-store.c:561
+#: ../camel/providers/pop3/camel-pop3-store.c:567
  #: ../servers/exchange/storage/e-storage.c:585
  #: ../servers/groupwise/e-gw-connection.c:241
  msgid "Unknown error"
  msgstr "ਅਣਪਛਾਤੀ ਗਲਤੀ"
  
-#: ../calendar/libecal/e-cal.c:5090
-#: ../calendar/libedata-cal/e-cal-backend-util.c:95
+#: ../calendar/libecal/e-cal.c:5106
+#: ../calendar/libedata-cal/e-cal-backend-util.c:103
  #: ../servers/exchange/storage/e-storage.c:553
  msgid "No error"
  msgstr "ਕੋਈ ਗਲਤੀ ਨਹੀਂ"
@@ -1337,8 +1195,14 @@ msgstr "\"%s\" ਲਈ ਦੂਜਾ ਆਰਗੂਮਿੰਟ ਇੱਕ ਸਤਰ
  
  #: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
  #, c-format
-msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
-msgstr "\"%s\" ਲਈ ਪਹਿਲਾਂ ਆਰਗੂਮਿੰਟ  \"any\", \"summary\", ਜਾਂ\"description\", ਜਾਂ \"description\", ਜਾਂ \"location\", ਜਾਂ \"attendee\", ਜਾਂ \"organizer\", ਜਾਂ \"classification\" ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"
+msgid ""
+"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
+msgstr ""
+"\"%s\" ਲਈ ਪਹਿਲਾਂ ਆਰਗੂਮਿੰਟ  \"any\", \"summary\", ਜਾਂ\"description\", ਜਾਂ "
+"\"description\", ਜਾਂ \"location\", ਜਾਂ \"attendee\", ਜਾਂ \"organizer\", ਜਾਂ "
+"\"classification\" ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"
  
  #: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
  #, c-format
@@ -1347,50 +1211,53 @@ msgstr "\"%s\" ਲਈ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਆਰਗੂਮਿੰਟ
  
  #: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
  #, c-format
-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
+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:101
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
  msgid "Invalid range"
  msgstr "ਗਲਤ ਰੇਜ਼"
  
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
  msgid "Unsupported field"
  msgstr "ਗੈਰ-ਸਹਾਇਕ ਖੇਤਰ"
  
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
  msgid "Unsupported method"
  msgstr "ਗ਼ੈਰ-ਸਹਾਇਕ ਢੰਗ"
  
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
  msgid "Unsupported authentication method"
  msgstr "ਗ਼ੈਰ-ਸਹਾਇਕ ਪਰਮਾਣਕਿਤਾ ਢੰਗ"
  
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
  msgid "TLS not available"
  msgstr "TLS ਉਪਲੱਬਧ ਨਹੀਂ"
  
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Offline unavailable"
-msgstr "ਆਫਲਾਈਨ ਉਪਲੱਬਧ ਨਹੀਂ"
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#| msgid "Offline unavailable"
+msgid "Offline mode unavailable"
+msgstr "ਆਫਲਾਈਨ ਮੋਡ ਉਪਲੱਬਧ ਨਹੀਂ"
  
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
  msgid "Search size limit exceeded"
  msgstr "ਖੋਜ ਸਾਈਜ਼ ਲਿਮਟ ਵੱਧ ਗਈ"
  
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
  msgid "Search time limit exceeded"
  msgstr "ਖੋਜ ਟਾਈਮ ਲਿਮਟ ਵੱਧ ਗਈ"
  
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
  msgid "Invalid query"
  msgstr "ਗਲਤ ਕਿਊਰੀ"
  
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
  msgid "Query refused"
  msgstr "ਕਿਊਰੀ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ ਗਿਆ"
  
-#: ../calendar/libedata-cal/e-cal-backend-util.c:140
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
  msgid "Invalid server version"
  msgstr "ਗਲਤ ਸਰਵਰ ਵਰਜਨ"
  
@@ -1438,12 +1305,12 @@ msgstr "ਤੁਸੀਂ ਗੁਪਤ-ਲੇਖਣ ਲਈ ਕੀ ਨਿਰਯਾ
  msgid "Unable to create cache path"
  msgstr "ਕੈਂਚੇ ਮਾਰਗ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ"
  
-#: ../camel/camel-data-cache.c:381
+#: ../camel/camel-data-cache.c:403
  #, c-format
  msgid "Could not remove cache entry: %s: %s"
  msgstr "ਕੈਂਚੇ ਇੰਦਰਾਜ ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s: %s"
  
-#: ../camel/camel-db.c:107
+#: ../camel/camel-db.c:469
  msgid "Insufficient memory"
  msgstr "ਲੋੜੀਦੀ ਮੈਮੋਰੀ ਨਹੀਂ"
  
@@ -1459,7 +1326,7 @@ msgstr ""
  "ਦੁਹਰਾਏ ਨਾ ਜਾ ਸਕਣਗੇ।"
  
  #: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:299
+#: ../camel/providers/imap/camel-imap-journal.c:318
  #, c-format
  msgid ""
  "Could not open '%s':\n"
@@ -1474,13 +1341,11 @@ msgstr ""
  msgid "Resynchronizing with server"
  msgstr "ਸਰਵਰ ਨਾਲ ਮੁੜ-ਸਮਕਾਲੀ"
  
-#: ../camel/camel-disco-folder.c:43
-#: ../camel/camel-offline-folder.c:52
+#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52
  msgid "Copy folder content locally for offline operation"
  msgstr "ਬੰਦ ਕਾਰਵਾਈ ਦੌਰਾਨ ਫੋਲਡਰ ਭਾਗ ਨਕਲ ਕਰੋ"
  
-#: ../camel/camel-disco-folder.c:105
-#: ../camel/camel-offline-folder.c:111
+#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:111
  msgid "Downloading new messages for offline mode"
  msgstr "ਆਫਲਾਇਨ ਮੋਡ ਲਈ ਨਵੇਂ ਸੁਨੇਹੇ ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
  
@@ -1490,10 +1355,11 @@ msgid "Preparing folder '%s' for offline"
  msgstr "ਫੋਲਡਰ '%s' ਨੂੰ ਆਫਲਾਇਨ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
  
  #: ../camel/camel-disco-store.c:403
-#: ../camel/providers/imap/camel-imap-store.c:1002
-#: ../camel/providers/imap/camel-imap-store.c:1810
-#: ../camel/providers/imap/camel-imap-store.c:2226
-#: ../camel/providers/imap/camel-imap-store.c:2989
+#: ../camel/providers/groupwise/camel-groupwise-store.c:226
+#: ../camel/providers/imap/camel-imap-store.c:1003
+#: ../camel/providers/imap/camel-imap-store.c:1813
+#: ../camel/providers/imap/camel-imap-store.c:2229
+#: ../camel/providers/imap/camel-imap-store.c:2997
  msgid "You must be working online to complete this operation"
  msgstr "ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਸੰਪੂਰਨ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਆਨ-ਲਾਇਨ ਰਹਿਣਾ ਚਾਹੀਦਾ ਹੈ"
  
@@ -1501,72 +1367,66 @@ msgstr "ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਸੰਪੂਰਨ ਕਰਨ ਲਈ
  msgid "No description available"
  msgstr "ਕੋਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀਂ"
  
-#: ../camel/camel-filter-driver.c:785
+#: ../camel/camel-filter-driver.c:795 ../camel/camel-filter-search.c:581
  #, c-format
  msgid "Failed to create child process '%s': %s"
  msgstr "ਅਗਲੀ ਕਿਰਿਆ `%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
  
-#: ../camel/camel-filter-driver.c:827
+#: ../camel/camel-filter-driver.c:837
  #, c-format
  msgid "Invalid message stream received from %s: %s"
  msgstr "%s ਤੋਂ ਗਲਤ ਸੁਨੇਹਾ ਲੜੀ ਪ੍ਰਾਪਤ ਹੋਈ ਹੈ: %s"
  
-#: ../camel/camel-filter-driver.c:1016
-#: ../camel/camel-filter-driver.c:1025
+#: ../camel/camel-filter-driver.c:1026 ../camel/camel-filter-driver.c:1035
  msgid "Syncing folders"
  msgstr "ਫੋਲਡਰ ਸਮਕਾਲੀ"
  
-#: ../camel/camel-filter-driver.c:1114
-#: ../camel/camel-filter-driver.c:1494
+#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1530
  #, c-format
  msgid "Error parsing filter: %s: %s"
  msgstr "ਫਿਲਟਰ ਨੂੰ ਪਾਰਸ ਕਰਨ ਵਿੱਚ ਗਲਤੀ: %s: %s"
  
-#: ../camel/camel-filter-driver.c:1123
-#: ../camel/camel-filter-driver.c:1503
+#: ../camel/camel-filter-driver.c:1133 ../camel/camel-filter-driver.c:1539
  #, c-format
  msgid "Error executing filter: %s: %s"
  msgstr "ਫਿਲਟਰ ਚਲਾਉਣ ਵਿੱਚ ਗਲਤੀ: %s: %s"
  
-#: ../camel/camel-filter-driver.c:1191
+#: ../camel/camel-filter-driver.c:1221
  msgid "Unable to open spool folder"
  msgstr "ਸਪੂਲ ਫੋਲਡਰ ਖੋਲਣ ਵਿੱਚ ਗਲਤੀ"
  
-#: ../camel/camel-filter-driver.c:1200
+#: ../camel/camel-filter-driver.c:1230
  msgid "Unable to process spool folder"
  msgstr "ਕਾਰਜ ਸਪੂਲ ਫੋਲਡਰ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ"
  
-#: ../camel/camel-filter-driver.c:1215
+#: ../camel/camel-filter-driver.c:1246
  #, c-format
  msgid "Getting message %d (%d%%)"
  msgstr "%d ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ(%d%%)"
  
-#: ../camel/camel-filter-driver.c:1219
+#: ../camel/camel-filter-driver.c:1250
  msgid "Cannot open message"
  msgstr "ਸੁਨੇਹਾ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../camel/camel-filter-driver.c:1220
-#: ../camel/camel-filter-driver.c:1233
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1269
  #, c-format
  msgid "Failed on message %d"
  msgstr "ਸੁਨੇਹਾ %d ਤੇ ਅਸਫਲ"
  
-#: ../camel/camel-filter-driver.c:1247
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1283 ../camel/camel-filter-driver.c:1374
  msgid "Syncing folder"
  msgstr "ਫੋਲਡਰ ਸਮਕਾਲੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
  
-#: ../camel/camel-filter-driver.c:1251
-#: ../camel/camel-filter-driver.c:1343
+#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1379
  msgid "Complete"
  msgstr "ਮੁਕੰਮਲ"
  
-#: ../camel/camel-filter-driver.c:1308
+#: ../camel/camel-filter-driver.c:1344
  #, c-format
  msgid "Getting message %d of %d"
  msgstr "%2d ਵਿੱਚੋਂ %1d ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
  
-#: ../camel/camel-filter-driver.c:1323
+#: ../camel/camel-filter-driver.c:1359
  #, c-format
  msgid "Failed at message %d of %d"
  msgstr "%2d ਵਿੱਚੋਂ %1d ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
@@ -1583,20 +1443,14 @@ msgstr "(system-flag) ਲਈ ਗਲਤ ਆਰਗੂਮਿੰਟ"
  msgid "Invalid arguments to (user-tag)"
  msgstr "ਗਲਤ ਆਰਗੂਮਿੰਟ(user-tag)"
  
-#: ../camel/camel-filter-search.c:581
-#, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "ਅਗਲੀ ਕਿਰਿਆ '%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
-
  #. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737
-#: ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:737 ../camel/camel-filter-search.c:745
  #, c-format
  msgid "Error executing filter search: %s: %s"
  msgstr "ਫਿਲਟਰ ਖੋਜ ਚਲਾਉਣ ਦੌਰਾਨ ਗਲਤੀ: %s: %s"
  
-#: ../camel/camel-folder-search.c:332
-#: ../camel/camel-folder-search.c:444
+#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:608
  #, c-format
  msgid ""
  "Cannot parse search expression: %s:\n"
@@ -1605,8 +1459,8 @@ msgstr ""
  "ਖੋਜ ਸਮੀਕਰਨ ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਦਾ ਸਕਦਾ ਹੈ: %s:\n"
  "%s"
  
-#: ../camel/camel-folder-search.c:342
-#: ../camel/camel-folder-search.c:454
+#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
+#: ../camel/camel-folder-search.c:618
  #, c-format
  msgid ""
  "Error executing search expression: %s:\n"
@@ -1615,70 +1469,68 @@ msgstr ""
  "ਖੋਜ ਸਮੀਕਰਨ ਨੂੰ ਚਲਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s:\n"
  "%s"
  
-#: ../camel/camel-folder-search.c:643
-#: ../camel/camel-folder-search.c:685
+#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:853
  #, c-format
  msgid "(%s) requires a single bool result"
  msgstr "(%s) ਲਈ ਇੱਕ ਇੱਕਲਾ ਬੂਲ ਨਤੀਜਾ ਚਾਹੀਦਾ ਹੈ"
  
-#: ../camel/camel-folder-search.c:738
+#: ../camel/camel-folder-search.c:906
  #, c-format
  msgid "(%s) not allowed inside %s"
  msgstr "(%s) %s ਵਿੱਚ ਮਨਜ਼ੂਰ ਨਹੀਂ ਹੈ"
  
-#: ../camel/camel-folder-search.c:744
-#: ../camel/camel-folder-search.c:751
+#: ../camel/camel-folder-search.c:912 ../camel/camel-folder-search.c:919
  #, c-format
  msgid "(%s) requires a match type string"
  msgstr "(%s) ਲਈ ਇੱਕ ਮੇਲ ਸਤਰ ਚਾਹੀਦੀ ਹੈ"
  
-#: ../camel/camel-folder-search.c:778
+#: ../camel/camel-folder-search.c:946
  #, c-format
  msgid "(%s) expects an array result"
  msgstr "(%s) ਲਈ ਇੱਕ ਲੜੀ ਨਤੀਜੇ ਦੀ ਲੋੜ ਹੈ"
  
-#: ../camel/camel-folder-search.c:787
+#: ../camel/camel-folder-search.c:955
  #, c-format
  msgid "(%s) requires the folder set"
  msgstr "(%s) ਲਈ ਫੋਲਡਰ ਸੈੱਟ ਦੀ ਲੋੜ ਹੈ"
  
-#: ../camel/camel-folder-search.c:882
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "ਅਣਜਾਣੇ ਸਿਰਲੇਖ ਤੇ ਸਵਾਲ ਜਾਰੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: %s"
-
-#: ../camel/camel-folder.c:693
+#: ../camel/camel-folder.c:696
  #, c-format
  msgid "Unsupported operation: append message: for %s"
  msgstr "ਨਾ-ਸਹਾਇਕ ਕਾਰਵਾਈ: ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ: %s ਲਈ"
  
-#: ../camel/camel-folder.c:1349
+#: ../camel/camel-folder.c:1398
  #, c-format
  msgid "Unsupported operation: search by expression: for %s"
  msgstr "ਨਾ-ਸਹਾਇਕ ਕਾਰਵਾਈ: ਸਮੀਕਰਨ ਨਾਲ ਖੋਜ: %s ਲਈ"
  
-#: ../camel/camel-folder.c:1390
+#: ../camel/camel-folder.c:1440, c-format
+#| msgid "Unsupported operation: search by expression: for %s"
+msgid "Unsupported operation: count by expression: for %s"
+msgstr "ਨਾ-ਸਹਾਇਕ ਕਾਰਵਾਈ: ਸਮੀਕਰਨ ਗਿਣਤੀ: %s ਲਈ"
+
+#: ../camel/camel-folder.c:1480
  #, c-format
  msgid "Unsupported operation: search by UIDs: for %s"
  msgstr "ਨਾ-ਸਹਾਇਕ ਕਾਰਵਾਈ: UID ਨਾਲ ਖੋਜ: %s ਲਈ"
  
-#: ../camel/camel-folder.c:1506
+#: ../camel/camel-folder.c:1596
  msgid "Moving messages"
  msgstr "ਸੁਨੇਹੇ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
  
-#: ../camel/camel-folder.c:1506
+#: ../camel/camel-folder.c:1596
  msgid "Copying messages"
  msgstr "ਸੁਨੇਹਿਆਂ ਦੀ ਨਕਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
  
-#: ../camel/camel-folder.c:1852
+#: ../camel/camel-folder.c:1942
  msgid "Learning junk"
  msgstr "ਜੰਕ ਸਿੱਖ ਰਿਹਾ ਹੈ"
  
-#: ../camel/camel-folder.c:1869
+#: ../camel/camel-folder.c:1959
  msgid "Learning non-junk"
  msgstr "ਨਾ-ਰੱਦੀ ਸਿੱਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"
  
-#: ../camel/camel-folder.c:1888
+#: ../camel/camel-folder.c:1978
  msgid "Filtering new message(s)"
  msgstr "ਨਵੇਂ ਸੁਨੇਹੇ ਛਾਣੇ ਜਾ ਰਹੇ ਹਨ"
  
@@ -1697,8 +1549,7 @@ msgstr ""
  msgid "Failed to parse gpg userid hint."
  msgstr "gpg userid ਸੰਕੇਤ ਨੂੰ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ।"
  
-#: ../camel/camel-gpg-context.c:794
-#: ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
  msgid "Failed to parse gpg passphrase request."
  msgstr "gpg passphrase ਸੰਕੇਤ ਨੂੰ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ।"
  
@@ -1725,9 +1576,8 @@ msgstr ""
  msgid "Unexpected request from GnuPG for '%s'"
  msgstr "GnuPG ਤੋਂ '%s' ਤੋਂ ਨਾ-ਲੋੜੀਦਾ ਜਵਾਬ ਪ੍ਰਾਪਤ ਹੋਇਆ"
  
-#: ../camel/camel-gpg-context.c:862
-#: ../camel/camel-gpg-context.c:1068
-#: ../camel/providers/nntp/camel-nntp-store.c:1281
+#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1071
+#: ../camel/providers/nntp/camel-nntp-store.c:1304
  msgid "Canceled."
  msgstr "ਰੱਦ ਕੀਤਾ ਹੈ।"
  
@@ -1740,85 +1590,72 @@ msgstr "ਗੁਪਤ ਕੀ ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ: 
  msgid "Unexpected response from GnuPG: %s"
  msgstr "GnuPG ਤੋਂ ਨਾ-ਲੋੜੀਦਾ ਜਵਾਬ ਪ੍ਰਾਪਤ ਹੋਇਆ: %s"
  
-#: ../camel/camel-gpg-context.c:937
+#: ../camel/camel-gpg-context.c:947
  msgid "Failed to encrypt: No valid recipients specified."
  msgstr "ਇਕ੍ਰਿਪਟ ਲਈ ਅਸਫਲ:ਕੋਈ ਜਾਇਜ ਪ੍ਰਾਪਤ ਕਰਨ ਨਿਰਧਾਰਿਤ ਨਹੀਂ ਹੈ।"
  
  #. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1206
-#: ../camel/camel-gpg-context.c:1334
-#: ../camel/camel-gpg-context.c:1829
-#: ../camel/camel-gpg-context.c:1874
+#: ../camel/camel-gpg-context.c:1209 ../camel/camel-gpg-context.c:1337
+#: ../camel/camel-gpg-context.c:1850 ../camel/camel-gpg-context.c:1895
  #, c-format
  msgid "Failed to execute gpg: %s"
  msgstr "gpg ਨੂੰ ਚਲਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
  
-#: ../camel/camel-gpg-context.c:1302
-#: ../camel/camel-smime-context.c:392
+#: ../camel/camel-gpg-context.c:1305 ../camel/camel-smime-context.c:598
  #, c-format
  msgid "Could not generate signing data: %s"
  msgstr "ਦਸਤਖਤੀ ਡਾਟਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s"
  
-#: ../camel/camel-gpg-context.c:1349
-#: ../camel/camel-gpg-context.c:1534
-#: ../camel/camel-gpg-context.c:1619
-#: ../camel/camel-gpg-context.c:1634
-#: ../camel/camel-gpg-context.c:1750
-#: ../camel/camel-gpg-context.c:1765
-#: ../camel/camel-gpg-context.c:1845
-#: ../camel/camel-gpg-context.c:1890
+#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1554
+#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-gpg-context.c:1771 ../camel/camel-gpg-context.c:1786
+#: ../camel/camel-gpg-context.c:1866 ../camel/camel-gpg-context.c:1911
  msgid "Failed to execute gpg."
  msgstr "gpg ਨੂੰ ਚਲਾਉਣ ਵਿੱਚ ਅਸਫਲ"
  
-#: ../camel/camel-gpg-context.c:1368
+#: ../camel/camel-gpg-context.c:1371
  msgid "This is a digitally signed message part"
  msgstr "ਇਹ ਸੁਨੇਹੇ ਦਾ ਡਿਜ਼ੀਟਲ ਦਸਤਖਤੀ ਭਾਗ ਹੈ"
  
-#: ../camel/camel-gpg-context.c:1453
-#: ../camel/camel-gpg-context.c:1459
-#: ../camel/camel-gpg-context.c:1465
-#: ../camel/camel-gpg-context.c:1480
-#: ../camel/camel-smime-context.c:695
-#: ../camel/camel-smime-context.c:706
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-gpg-context.c:1458 ../camel/camel-gpg-context.c:1464
+#: ../camel/camel-gpg-context.c:1470 ../camel/camel-gpg-context.c:1485
+#: ../camel/camel-smime-context.c:901 ../camel/camel-smime-context.c:912
+#: ../camel/camel-smime-context.c:919
  msgid "Cannot verify message signature: Incorrect message format"
  msgstr "ਸੁਨੇਹਾ ਦਸਤਖਤ ਜਾਂਚੇ ਨਹੀਂ ਜਾ ਸਕੇ ਹਨ: ਗਲਤ ਸੁਨੇਹਾ ਫਾਰਮਿਟ"
  
-#: ../camel/camel-gpg-context.c:1519
+#: ../camel/camel-gpg-context.c:1524
  #, c-format
  msgid "Cannot verify message signature: could not create temp file: %s"
  msgstr "ਸੁਨੇਹਾ ਦਸਤਖਤ ਜਾਂਚੇ ਨਹੀਂ ਜਾ ਸਕੇ ਹਨ: ਆਰਜ਼ੀ ਫਾਇਲ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕੀ ਹੈ: %s"
  
-#: ../camel/camel-gpg-context.c:1602
+#: ../camel/camel-gpg-context.c:1623
  #, c-format
  msgid "Could not generate encrypting data: %s"
  msgstr "ਇੰਕ੍ਰਿਪਟਡ ਡਾਟਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s"
  
-#: ../camel/camel-gpg-context.c:1652
+#: ../camel/camel-gpg-context.c:1673
  msgid "This is a digitally encrypted message part"
  msgstr "ਇਹ ਸੁਨੇਹੇ ਦਾ ਡਿਜ਼ੀਟਲ ਇਕ੍ਰਿਪਟਡ ਭਾਗ ਹੈ"
  
-#: ../camel/camel-gpg-context.c:1705
-#: ../camel/camel-gpg-context.c:1713
-#: ../camel/camel-gpg-context.c:1732
+#: ../camel/camel-gpg-context.c:1726 ../camel/camel-gpg-context.c:1734
+#: ../camel/camel-gpg-context.c:1753
  msgid "Cannot decrypt message: Incorrect message format"
  msgstr "ਸੁਨੇਹਾ ਡੀ-ਕਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: ਗਲਤ ਸੁਨੇਹਾ ਫਾਰਮਿਟ"
  
-#: ../camel/camel-gpg-context.c:1722
+#: ../camel/camel-gpg-context.c:1743
  msgid "Failed to decrypt MIME part: protocol error"
  msgstr "MIME ਭਾਗ ਡਿਕ੍ਰਿਪਟ ਕਰਨ ਤੋਂ ਅਸਫਲ: ਪ੍ਰੋਟੋਕਾਲ ਗਲਤੀ"
  
-#: ../camel/camel-gpg-context.c:1787
-#: ../camel/camel-smime-context.c:969
+#: ../camel/camel-gpg-context.c:1808 ../camel/camel-smime-context.c:1176
  msgid "Encrypted content"
  msgstr "ਇਕ੍ਰਿਪਟਡ ਭਾਗ"
  
-#: ../camel/camel-gpg-context.c:1806
+#: ../camel/camel-gpg-context.c:1827
  msgid "Unable to parse message content"
  msgstr "ਸੁਨੇਹਾ ਭਾਗ ਪਾਰਸ ਕਰਨ ਤੋਂ ਅਸਫਲ"
  
-#: ../camel/camel-gpg-context.c:1830
-#: ../camel/camel-gpg-context.c:1875
+#: ../camel/camel-gpg-context.c:1851 ../camel/camel-gpg-context.c:1896
  #: ../camel/camel-tcp-stream-openssl.c:635
  #: ../camel/providers/imap4/camel-imap4-utils.c:624
  #: ../camel/providers/smtp/camel-smtp-transport.c:166
@@ -1836,8 +1673,7 @@ msgstr "ਲਾਕਿੰਗ ਸਹਾਇਕ ਪਾਇਪ ਨਹੀਂ ਬਣਾ
  msgid "Cannot fork locking helper: %s"
  msgstr "ਲਾਕਿੰਗ ਸਹਾਇਕ ਨੂੰ ਭਾਗ ਵਿੱਚ ਵੰਡਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ: %s"
  
-#: ../camel/camel-lock-client.c:204
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227
  #, c-format
  msgid "Could not lock '%s': protocol error with lock-helper"
  msgstr "ਲਾੱਕ '%s' ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਲਾੱਕ-ਸਹਾਇਕ ਨਾਲ ਪ੍ਰੋਟੋਕਾਲ ਗਲਤੀ"
@@ -1916,8 +1752,7 @@ msgstr "ਗਲਤੀ ਪੱਤਰ ਫਾਇਲ ਨੂੰ ਪੜਨ ਵਿੱਚ:
  msgid "Error writing mail temp file: %s"
  msgstr "ਆਰਜੀ ਪੱਤਰ ਫਾਇਲ ਤੇ ਲਿਖਣ ਵਿੱਚ ਗਲਤੀ: %s"
  
-#: ../camel/camel-movemail.c:464
-#: ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
  #, c-format
  msgid "Error copying mail temp file: %s"
  msgstr "ਆਰਜੀ ਪੱਤਰ ਫਾਇਲ ਨੂੰ ਨਕਲ ਕਰਨ ਵਿੱਚ ਗਲਤੀ: %s"
@@ -1926,11 +1761,10 @@ msgstr "ਆਰਜੀ ਪੱਤਰ ਫਾਇਲ ਨੂੰ ਨਕਲ ਕਰਨ ਵ
  msgid "parse error"
  msgstr "ਪਾਰਸ ਗਲਤੀ"
  
-#: ../camel/camel-net-utils.c:505
-#: ../camel/camel-net-utils.c:667
+#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
  #: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:447
-#: ../camel/providers/pop3/camel-pop3-store.c:547
+#: ../camel/providers/pop3/camel-pop3-store.c:448
+#: ../camel/providers/pop3/camel-pop3-store.c:548
  msgid "Canceled"
  msgstr "ਰੱਦ ਕੀਤਾ"
  
@@ -1965,13 +1799,12 @@ msgstr "ਨਾਂ ਖੋਜ ਅਸਫਲ"
  msgid "Name lookup failed: %s"
  msgstr "ਨਾਂ ਖੋਜ ਅਸਫਲ: %s"
  
-#: ../camel/camel-offline-folder.c:254
+#: ../camel/camel-offline-folder.c:253
  #, c-format
  msgid "Syncing messages in folder '%s' to disk"
  msgstr "ਫੋਲਡਰ `%s' ਵਿੱਚ ਸੁਨੇਹਿਆਂ ਨੂੰ ਡਿਸਕ ਤੇ ਲਿਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"
  
-#: ../camel/camel-offline-journal.c:164
-#: ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
  #, c-format
  msgid "Cannot write offline journal for folder '%s': %s"
  msgstr "ਫੋਲਡਰ '%s' ਲਈ ਆਫਲਾਈਨ ਜਰਨਲ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s"
@@ -1999,8 +1832,7 @@ msgstr "%s ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹ
  msgid "Could not load %s: No initialization code in module."
  msgstr "%s ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਇਸ ਮੋਡੀਊਲ ਵਿੱਚ ਕੋਈ ਸ਼ੁਰੂਆਤੀ ਕੋਡ ਨਹੀਂ ਹੈ।"
  
-#: ../camel/camel-provider.c:373
-#: ../camel/camel-session.c:177
+#: ../camel/camel-provider.c:373 ../camel/camel-session.c:182
  #, c-format
  msgid "No provider available for protocol '%s'"
  msgstr "ਪਰੋਟੋਕਾਲ '%s' ਲਈ ਕੋਈ ਉਪਲੱਬਧ ਕਰਤਾ ਨਹੀਂ ਹੈ"
@@ -2013,8 +1845,7 @@ msgstr "ਗੁੰਮਨਾਮ"
  msgid "This option will connect to the server using an anonymous login."
  msgstr "ਇਸ ਚੋਣ ਨਾਲ ਸਰਵਰ ਨਾਲ ਅਣਜਾਣ ਦੇ ਤੌਰ ਤੇ ਲਾੱਗਆਨ ਕੀਤਾ ਜਾਵੇਗਾ।"
  
-#: ../camel/camel-sasl-anonymous.c:124
-#: ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
  msgid "Authentication failed."
  msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਅਸਫਲ।"
  
@@ -2050,7 +1881,9 @@ msgid "CRAM-MD5"
  msgstr "CRAM-MD5"
  
  #: ../camel/camel-sasl-cram-md5.c:40
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
  msgstr "ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ ਸਰਵਰ ਨਾਲ ਸੁਰੱਖਿਅਤ CRAM-MD5 ਪਾਸਵਰਡ ਨਾਲ ਜੋੜਦਾ ਹੈ, ਜੇਕਰ ਸਰਵਰ ਸਹਾਈ ਹੋਇਆ ਤਾਂ।"
  
  #: ../camel/camel-sasl-digest-md5.c:48
@@ -2058,8 +1891,12 @@ msgid "DIGEST-MD5"
  msgstr "DIGEST-MD5"
  
  #: ../camel/camel-sasl-digest-md5.c:50
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ ਸਰਵਰ ਨਾਲ ਸੁਰੱਖਿਅਤ DIGEST-MD5 ਪਾਸਵਰਡ ਨਾਲ ਜੋੜਦਾ ਹੈ, ਜੇਕਰ ਸਰਵਰ ਸਹਾਈ ਹੋਇਆ ਤਾਂ।"
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ ਸਰਵਰ ਨਾਲ ਸੁਰੱਖਿਅਤ DIGEST-MD5 ਪਾਸਵਰਡ ਨਾਲ ਜੋੜਦਾ ਹੈ, ਜੇਕਰ ਸਰਵਰ ਸਹਾਈ ਹੋਇਆ "
+"ਤਾਂ।"
  
  #: ../camel/camel-sasl-digest-md5.c:845
  msgid "Server challenge too long (>2048 octets)"
@@ -2094,7 +1931,9 @@ msgid "This option will connect to the server using Kerberos 5 authentication."
  msgstr "ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ ਕੀਬੋਰਸ ੫ ਪ੍ਰਮਾਣਕਿਤਾ ਵਰਤ ਕੇ ਸਰਵਰ ਨਾਲ ਜੋੜੇਗਾ।"
  
  #: ../camel/camel-sasl-gssapi.c:164
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
  msgstr "ਨਿਰਧਾਰਿਤ ਢੰਗ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦੁਆਰਾ ਸਹਾਇਕ ਨਹੀਂ ਹੈ ਜਾਂ ਇਹ ਸਥਾਪਨ ਦੁਆਰਾ ਪਛਾਣਿਆ ਨਹੀਂ ਗਿਆ।"
  
  #: ../camel/camel-sasl-gssapi.c:169
@@ -2102,20 +1941,30 @@ msgid "The provided target_name parameter was ill-formed."
  msgstr "ਉਪਲੱਬਧ ਨਿਯਤ ਨਾਂ ਪੈਰਾਮੀਟਰ ਗਲਤ ਢਾਂਚੇ ਵਿੱਚ ਹੈ।"
  
  #: ../camel/camel-sasl-gssapi.c:172
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
  msgstr "ਉਪਲੱਬਧ ਨਿਯਤ ਨਾਂ ਪੈਰਾਮੀਟਰ ਗਲਤ ਹੈ ਜਾਂ ਨਾ ਸਹਾਇਕ ਕਿਸਮ ਦਾ ਨਾਂ ਹੈ।"
  
  #: ../camel/camel-sasl-gssapi.c:176
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
  msgstr "input_token input_chan_bindings ਪੈਰਾਮੀਟਰ ਦੁਆਰਾ ਨਿਰਧਾਰਿਤ ਤੋਂ ਵੱਖਰਾ ਚੈਨਲ ਵਰਤ ਰਿਹਾ ਹੈ।"
  
  #: ../camel/camel-sasl-gssapi.c:181
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
  msgstr "input_token ਵਿੱਚ ਗਲਤ ਦਸਤਖਤ ਹਨ ਜਾਂ ਦਸਤਖਤ ਜਾਂਚੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ।"
  
  #: ../camel/camel-sasl-gssapi.c:185
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
-msgstr "ਉਪਲੱਬਧ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਪ੍ਰਸੰਗ ਸ਼ੁਰੂਆਤ ਲਈ ਠੀਕ ਨਹੀਂ ਹਨ, ਜਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸੰਭਾਲ ਕਰਤਾ ਕਿਸੇ ਜਾਇਜ ਹਵਾਲੇ ਲਈ ਹੈ।"
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+"ਉਪਲੱਬਧ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਪ੍ਰਸੰਗ ਸ਼ੁਰੂਆਤ ਲਈ ਠੀਕ ਨਹੀਂ ਹਨ, ਜਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸੰਭਾਲ ਕਰਤਾ ਕਿਸੇ ਜਾਇਜ "
+"ਹਵਾਲੇ ਲਈ ਹੈ।"
  
  #: ../camel/camel-sasl-gssapi.c:190
  msgid "The supplied context handle did not refer to a valid context."
@@ -2133,12 +1982,10 @@ msgstr "ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦੀ ਪ੍ਰਮਾਣਕਿਤਾ 
  msgid "The referenced credentials have expired."
  msgstr "ਹਵਾਲਾ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਦੀ ਮਿਆਦ ਸਮਾਪਤ ਹੋ ਚੁੱਕੀ ਹੈ।"
  
-#: ../camel/camel-sasl-gssapi.c:205
-#: ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289
-#: ../camel/camel-sasl-gssapi.c:304
+#: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
+#: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
  #: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../camel/providers/imap/camel-imap-store.c:1273
  msgid "Bad authentication response from server."
  msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਜਵਾਬ ਮਿਲਿਆ ਹੈ।"
  
@@ -2167,8 +2014,7 @@ msgstr ""
  msgid "Login"
  msgstr "ਲਾਗਇਨ"
  
-#: ../camel/camel-sasl-login.c:38
-#: ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
  msgid "This option will connect to the server using a simple password."
  msgstr "ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਨਾਲ ਜੋੜੇਗੀ।"
  
@@ -2181,8 +2027,12 @@ msgid "NTLM / SPA"
  msgstr "NTLM / SPA"
  
  #: ../camel/camel-sasl-ntlm.c:36
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "ਇਹ ਚੋਣ Windows ਆਧਰਿਤ ਸਰਵਰ ਨਾਲ NTLM / Secure Password Authentication ਵਰਤ ਕੇ ਜੋੜੇਗੀ।"
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"ਇਹ ਚੋਣ Windows ਆਧਰਿਤ ਸਰਵਰ ਨਾਲ NTLM / Secure Password Authentication ਵਰਤ ਕੇ "
+"ਜੋੜੇਗੀ।"
  
  #: ../camel/camel-sasl-plain.c:36
  msgid "PLAIN"
@@ -2228,7 +2078,7 @@ msgstr "URL '%s' ਨੂੰ ਹੋਸਟ ਭਾਗ ਲੋੜੀਦਾ ਹੈ"
  msgid "URL '%s' needs a path component"
  msgstr "URL '%s' ਨੂੰ ਰਸਤਾ ਭਾਗ ਲੋੜੀਦਾ ਹੈ"
  
-#: ../camel/camel-session.c:303
+#: ../camel/camel-session.c:308
  #, c-format
  msgid ""
  "Could not create directory %s:\n"
@@ -2237,263 +2087,251 @@ msgstr ""
  "ਡਾਇਰੈਕਟਰੀ %s ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ:\n"
  "%s"
  
-#: ../camel/camel-session.c:478
+#: ../camel/camel-session.c:483
  #, c-format
  msgid "Please enter the %s password for %s on host %s."
  msgstr "ਹੋਸਟ %3$s ਲਈ %2$s ਵਾਸਤੇ %1$s ਪਾਸਵਰਡ ਦਿਓ ਜੀ।"
  
-#: ../camel/camel-smime-context.c:234
-#: ../camel/camel-smime-context.c:778
+#: ../camel/camel-session.c:822
+msgid "Camel session doesn't support forwarding of a message."
+msgstr "ਕੈਮਲ ਸ਼ੈਸ਼ਨ ਸੁਨੇਹਾ ਅੱਗੇ ਭੇਜਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
+
+#: ../camel/camel-smime-context.c:440 ../camel/camel-smime-context.c:984
  #, c-format
  msgid "Cannot find certificate for '%s'"
  msgstr "'%s' ਲਈ ਸਰਟੀਫਿਕੇਟ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ"
  
-#: ../camel/camel-smime-context.c:240
+#: ../camel/camel-smime-context.c:446
  msgid "Cannot create CMS message"
  msgstr "CMS ਸੁਨੇਹਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../camel/camel-smime-context.c:245
+#: ../camel/camel-smime-context.c:451
  msgid "Cannot create CMS signed data"
  msgstr "CMS ਦਸਤਖਤੀ ਡਾਟਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
  
-#: ../camel/camel-smime-context.c:251
+#: ../camel/camel-smime-context.c:457
  msgid "Cannot attach CMS signed data"
  msgstr "CMS ਦਸਤਖਤੀ ਡਾਟਾ ਨੱਥੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
  
-#: ../camel/camel-smime-context.c:258
+#: ../camel/camel-smime-context.c:464
  msgid "Cannot attach CMS data"
  msgstr "CMS ਡਾਟਾ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
  
-#: ../camel/camel-smime-context.c:264
+#: ../camel/camel-smime-context.c:470
  msgid "Cannot create CMS Signer information"
  msgstr "CMS ਦਸਤਖਤੀ ਜਾਣਕਾਰੀ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
  
-#: ../camel/camel-smime-context.c:270
+#: ../camel/camel-smime-context.c:476
  msgid "Cannot find certificate chain"
  msgstr "ਸਰਟੀਫਿਕੇਟ ਲੜੀ ਖੋਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
  
-#: ../camel/camel-smime-context.c:276
+#: ../camel/camel-smime-context.c:482
  msgid "Cannot add CMS Signing time"
  msgstr "CMS ਦਸਤਖਤੀ ਸਮਾਂ ਸ਼ਾਮਲ ਨਹੀਂ ਹੋ ਸਕਦਾ"
  
-#: ../camel/camel-smime-context.c:298
-#: ../camel/camel-smime-context.c:310
+#: ../camel/camel-smime-context.c:504 ../camel/camel-smime-context.c:516
  #, c-format
  msgid "Encryption certificate for '%s' does not exist"
  msgstr "'%s' ਲਈ ਇਕ੍ਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ ਮੌਜੂਦ ਨਹੀਂ"
  
-#: ../camel/camel-smime-context.c:317
+#: ../camel/camel-smime-context.c:523
  msgid "Cannot add SMIMEEncKeyPrefs attribute"
  msgstr "SMIMEEncKeyPrefs ਗੁਣ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../camel/camel-smime-context.c:322
+#: ../camel/camel-smime-context.c:528
  msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
  msgstr "MS SMIMEEncKeyPrefs ਵਿਸ਼ੇਸਤਾ ਨੂੰ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
  
-#: ../camel/camel-smime-context.c:327
+#: ../camel/camel-smime-context.c:533
  msgid "Cannot add encryption certificate"
  msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ ਸ਼ਾਮਿਲ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ"
  
-#: ../camel/camel-smime-context.c:333
+#: ../camel/camel-smime-context.c:539
  msgid "Cannot add CMS Signer information"
  msgstr "CMS ਦਸਤਖਤੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਨਹੀਂ ਹੋ ਸਕਦੀ"
  
-#: ../camel/camel-smime-context.c:403
-#: ../camel/camel-smime-context.c:851
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:1056
  msgid "Cannot create encoder context"
  msgstr "ਇਕੋਡਰ ਪ੍ਰਸੰਗ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../camel/camel-smime-context.c:409
+#: ../camel/camel-smime-context.c:615
  msgid "Failed to add data to CMS encoder"
  msgstr "CMS ਇਕੋਡਰ ਵਿੱਚ ਡਾਟਾ ਸ਼ਾਮਿਲ ਕਰਨ ਤੋਂ ਅਸਮਰੱਥ"
  
-#: ../camel/camel-smime-context.c:414
-#: ../camel/camel-smime-context.c:868
+#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:1073
  msgid "Failed to encode data"
  msgstr "ਡਾਟਾ ਇਕੋਡਿਗ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
  
-#: ../camel/camel-smime-context.c:487
+#: ../camel/camel-smime-context.c:693
  msgid "Unverified"
  msgstr "ਨਾ-ਜਾਂਚਿਆ"
  
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:695
  msgid "Good signature"
  msgstr "ਵਧੀਆ ਦਸਤਖਤ"
  
-#: ../camel/camel-smime-context.c:491
+#: ../camel/camel-smime-context.c:697
  msgid "Bad signature"
  msgstr "ਗਲਤ ਦਸਤਖਤ"
  
-#: ../camel/camel-smime-context.c:493
+#: ../camel/camel-smime-context.c:699
  msgid "Content tampered with or altered in transit"
  msgstr "ਤਬਦੀਲੀ ਦੌਰਾਨ ਪ੍ਰਸੰਗ ਵਿਗੜ ਗਿਆ ਜਾਂ ਸੁਚੇਤ ਕੀਤਾ "
  
-#: ../camel/camel-smime-context.c:495
+#: ../camel/camel-smime-context.c:701
  msgid "Signing certificate not found"
  msgstr "ਦਸਤਖਤੀ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਲੱਭਿਆ ਹੈ"
  
-#: ../camel/camel-smime-context.c:497
+#: ../camel/camel-smime-context.c:703
  msgid "Signing certificate not trusted"
  msgstr "ਦਸਤਖਤੀ ਸਰਟੀਫਿਕੇਟ ਭਰੋਸੇਯੋਗ ਨਹੀਂ ਹੈ"
  
-#: ../camel/camel-smime-context.c:499
+#: ../camel/camel-smime-context.c:705
  msgid "Signature algorithm unknown"
  msgstr "ਅਣਜਾਣਾ ਦਸਤਖਤੀ ਐਲੋਗਰਿਥਮ"
  
-#: ../camel/camel-smime-context.c:501
+#: ../camel/camel-smime-context.c:707
  msgid "Signature algorithm unsupported"
  msgstr "ਦਸਤਖਤੀ ਐਲੋਗਰਿੱਥਮ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
  
-#: ../camel/camel-smime-context.c:503
+#: ../camel/camel-smime-context.c:709
  msgid "Malformed signature"
  msgstr "ਨਿਕਾਰਾ ਦਸਤਖਤ"
  
-#: ../camel/camel-smime-context.c:505
+#: ../camel/camel-smime-context.c:711
  msgid "Processing error"
  msgstr "ਪ੍ਰੋਸੈਂਸਿੰਗ ਗਲਤੀ"
  
-#: ../camel/camel-smime-context.c:542
+#: ../camel/camel-smime-context.c:748
  msgid "No signed data in signature"
  msgstr "ਦਸਤਖਤ ਵਿੱਚ ਡਾਟਾ ਦਸਤਖਤੀ ਨਹੀਂ"
  
-#: ../camel/camel-smime-context.c:549
+#: ../camel/camel-smime-context.c:755
  msgid "Digests missing from enveloped data"
  msgstr "ਸੰਖੇਪ ਲਪੇਟੇ ਡਾਟੇ ਤੋਂ ਬਿਨਾਂ ਹੈ"
  
-#: ../camel/camel-smime-context.c:562
-#: ../camel/camel-smime-context.c:572
+#: ../camel/camel-smime-context.c:768 ../camel/camel-smime-context.c:778
  msgid "Cannot calculate digests"
  msgstr "ਸੰਖੇਪ ਨੂੰ ਮਿਣਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
  
-#: ../camel/camel-smime-context.c:577
+#: ../camel/camel-smime-context.c:783
  msgid "Cannot set message digests"
  msgstr "ਸੁਨੇਹਾ ਸੰਖੇਪ ਨੂੰ ਨਿਰਧਾਰਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ"
  
-#: ../camel/camel-smime-context.c:587
-#: ../camel/camel-smime-context.c:592
+#: ../camel/camel-smime-context.c:793 ../camel/camel-smime-context.c:798
  msgid "Certificate import failed"
  msgstr "ਸਰਟੀਫਿਕੇਟ ਆਯਾਤ ਅਸਫਲ"
  
-#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:808
  #, c-format
  msgid "Certificate is the only message, cannot verify certificates"
  msgstr "ਸੁਨੇਹਾ ਹੀ ਸਰਟੀਫਿਕੇਟ ਹੈ, ਸਰਟੀਫਿਕੇਟ ਜਾਂਚੇ ਨਹੀਂ ਹਨ"
  
-#: ../camel/camel-smime-context.c:605
+#: ../camel/camel-smime-context.c:811
  #, c-format
  msgid "Certificate is the only message, certificates imported and verified"
  msgstr "ਸਰਟੀਫਿਕੇਟ ਸਿਰਫ਼ ਸੁਨੇਹਾ, ਸਰਟੀਫਿਕੇਟ ਆਯਾਤ ਅਤੇ ਜਾਂਚ ਹੋ ਸਕਦਾ ਹੈ"
  
-#: ../camel/camel-smime-context.c:609
+#: ../camel/camel-smime-context.c:815
  msgid "Cannot find signature digests"
  msgstr "ਦਸਤਖਤੀ ਸੰਖੇਪ ਨਹੀਂ ਲੱਭਾ ਹੈ"
  
-#: ../camel/camel-smime-context.c:625
+#: ../camel/camel-smime-context.c:831
  #, c-format
  msgid "Signer: %s <%s>: %s\n"
  msgstr "ਦਸਤਖਤੀ: %s <%s>: %s\n"
  
-#: ../camel/camel-smime-context.c:726
+#: ../camel/camel-smime-context.c:932 ../camel/camel-smime-context.c:1156
  msgid "Decoder failed"
  msgstr "ਡੀਕੋਡਰ ਅਸਫਲ"
  
-#: ../camel/camel-smime-context.c:785
+#: ../camel/camel-smime-context.c:991
  msgid "Cannot find common bulk encryption algorithm"
  msgstr "ਆਮ ਬਲਕ ਇਕ੍ਰਿਪਸ਼ਨ ਐਲੋਗਰਿਥਮ ਨੂੰ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
  
-#. PORT_GetError(); ??
-#: ../camel/camel-smime-context.c:794
+#: ../camel/camel-smime-context.c:999
  msgid "Cannot allocate slot for encryption bulk key"
  msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਬਲਕ ਕੀ ਲਈ ਜਾਰੀ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../camel/camel-smime-context.c:805
+#: ../camel/camel-smime-context.c:1010
  msgid "Cannot create CMS Message"
  msgstr "CMS ਸੁਨੇਹਾ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ ਹੈ"
  
-#: ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:1016
  msgid "Cannot create CMS Enveloped data"
  msgstr "CMS ਲਿਫਾਫਾ ਡਾਟਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
  
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:1022
  msgid "Cannot attach CMS Enveloped data"
  msgstr "CMS ਲਿਫਾਫਾ ਡਾਟਾ ਨੱਥੀ ਨਹੀਂ ਹੋ ਸਕਦੀ"
  
-#: ../camel/camel-smime-context.c:823
+#: ../camel/camel-smime-context.c:1028
  msgid "Cannot attach CMS data object"
  msgstr "CMS ਡਾਟਾ ਇਕਾਈ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ"
  
-#: ../camel/camel-smime-context.c:832
+#: ../camel/camel-smime-context.c:1037
  msgid "Cannot create CMS Recipient information"
  msgstr "CMS ਸੁਨੇਹੀ ਜਾਣਕਾਰੀ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
  
-#: ../camel/camel-smime-context.c:837
+#: ../camel/camel-smime-context.c:1042
  msgid "Cannot add CMS Recipient information"
  msgstr "CMS ਸੁਨੇਹੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"
  
-#: ../camel/camel-smime-context.c:862
+#: ../camel/camel-smime-context.c:1067
  msgid "Failed to add data to encoder"
  msgstr "ਡਾਟਾ ਨੂੰ ਇਕੋਡਰ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
  
-#: ../camel/camel-smime-context.c:949
-#, c-format
-msgid "Decoder failed, error %d"
-msgstr "ਡੀਕੋਡਰ ਅਸਫਲ, ਗਲਤੀ %d"
-
-#: ../camel/camel-smime-context.c:956
+#: ../camel/camel-smime-context.c:1163
  msgid "S/MIME Decrypt: No encrypted content found"
  msgstr "S/MIME Decrypt: ਕੋਈ ਇਕ੍ਰਿਪਟਡ ਪ੍ਰਸੰਗ ਨਹੀਂ ਲੱਭਾ ਹੈ"
  
-#: ../camel/camel-smime-context.c:983
+#: ../camel/camel-smime-context.c:1190
  msgid "import keys: unimplemented"
  msgstr "ਆਯਾਤ ਕੀ: ਨਾ-ਸਥਾਪਿਤ"
  
-#: ../camel/camel-smime-context.c:991
+#: ../camel/camel-smime-context.c:1198
  msgid "export keys: unimplemented"
  msgstr "ਨਿਰਯਾਤ ਕੀ: ਨਾ-ਸਥਾਪਿਤ"
  
-#: ../camel/camel-store.c:272
+#: ../camel/camel-store.c:283
  #: ../camel/providers/groupwise/camel-groupwise-transport.c:174
  msgid "Cannot get folder: Invalid operation on this store"
  msgstr "ਫੋਲਡਰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਇਸ ਸੰਭਾਲ ਤੇ ਗਲਤ ਕਾਰਵਾਈ"
  
-#: ../camel/camel-store.c:305
+#: ../camel/camel-store.c:316
  #, c-format
  msgid "Cannot create folder '%s': folder exists"
  msgstr "ਫੋਲਡਰ '%s' ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਫੋਲਡਰ ਮੌਜੂਦ ਹੈ"
  
-#: ../camel/camel-store.c:369
+#: ../camel/camel-store.c:395
  msgid "Cannot create folder: Invalid operation on this store"
  msgstr "ਫੋਲਡਰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਇਸ ਸੰਭਾਲ ਤੇ ਗਲਤ ਕਾਰਵਾਈ"
  
-#: ../camel/camel-store.c:397
+#: ../camel/camel-store.c:423
  #, c-format
  msgid "Cannot create folder: %s: folder exists"
  msgstr "ਫੋਲਡਰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ %s: ਮੌਜੂਦ ਹੈ"
  
-#: ../camel/camel-store.c:461
-#: ../camel/camel-vee-store.c:384
+#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:384
  #: ../camel/providers/local/camel-maildir-store.c:219
  #, c-format
  msgid "Cannot delete folder: %s: Invalid operation"
  msgstr "ਫੋਲਡਰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s: ਗਲਤ ਕਾਰਵਾਈ"
  
-#: ../camel/camel-store.c:513
-#: ../camel/camel-vee-store.c:421
+#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:421
  #: ../camel/providers/local/camel-maildir-store.c:291
  #, c-format
  msgid "Cannot rename folder: %s: Invalid operation"
  msgstr "ਫੋਲਡਰ ਦਾ ਨਾਂ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s: ਗਲਤ ਕਾਰਵਾਈ"
  
  #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:854
-#: ../camel/camel-vtrash-folder.c:53
-#: ../camel/providers/imap/camel-imap-store.c:1060
+#: ../camel/camel-store.c:899 ../camel/camel-vtrash-folder.c:54
+#: ../camel/providers/imap/camel-imap-store.c:1061
  msgid "Trash"
  msgstr "ਰੱਦੀ"
  
  #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:857
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-store.c:902 ../camel/camel-vtrash-folder.c:56
  msgid "Junk"
  msgstr "ਜੰਕ"
  
@@ -2613,8 +2451,7 @@ msgstr "ਵਰਤੀ ਕੁੰਜੀ ਸਰਟੀਫਿਕੇਟ ਦਸਤਖਤ
  msgid "Error in application verification"
  msgstr "ਕਾਰਜ ਜਾਂਚ ਵਿੱਚ ਗਲਤੀ ਹੈ"
  
-#: ../camel/camel-tcp-stream-openssl.c:700
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
  #, c-format
  msgid ""
  "Issuer:            %s\n"
@@ -2627,13 +2464,11 @@ msgstr ""
  "ਫਿੰਗਰ ਪ੍ਰਿੰਟ:       %s\n"
  "ਦਸਤਖਤ:         %s"
  
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
  msgid "GOOD"
  msgstr "ਵਧੀਆ"
  
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
  msgid "BAD"
  msgstr "ਘਟੀਆ"
  
@@ -2713,23 +2548,21 @@ msgstr ""
  msgid "Could not parse URL '%s'"
  msgstr "URL '%s' ਨੂੰ ਪਾਰਸ ਨਹੀ ਕੀਤਾ ਜਾ ਸਕਦਾ"
  
-#: ../camel/camel-vee-folder.c:585
+#: ../camel/camel-vee-folder.c:582
  #, c-format
  msgid "Error storing '%s': %s"
  msgstr "'%s' ਨੂੰ ਕ੍ਰਮਬੱਧ ਕਰਨ ਵਿੱਚ ਗਲਤੀ: %s"
  
-#: ../camel/camel-vee-folder.c:631
+#: ../camel/camel-vee-folder.c:660
  #, c-format
  msgid "No such message %s in %s"
  msgstr "%2s ਵਿੱਚ %1s ਤਰਾਂ ਦਾ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ"
  
-#: ../camel/camel-vee-folder.c:754
-#: ../camel/camel-vee-folder.c:760
+#: ../camel/camel-vee-folder.c:820 ../camel/camel-vee-folder.c:826
  msgid "Cannot copy or move messages into a Virtual Folder"
  msgstr "ਫਰਜ਼ੀ ਫੋਲਡਰ ਵਿੱਚ ਸੁਨਹਿਆਂ ਨੂੰ ਨਕਲ ਜਾਂ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:115
+#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115
  #: ../camel/camel-vee-store.c:360
  msgid "Unmatched"
  msgstr "ਨਾ-ਮਿਲਦਾ"
@@ -2744,15 +2577,15 @@ msgstr "ਫੋਲਡਰ ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦ
  msgid "Cannot rename folder: %s: No such folder"
  msgstr "ਫੋਲਡਰ ਦਾ ਨਾਂ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s: ਇਸ ਤਰਾਂ ਕੋਈ ਫੋਲਡਰ ਨਹੀਂ ਹੈ"
  
-#: ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-vtrash-folder.c:55
  msgid "Cannot copy messages to the Trash folder"
  msgstr "ਸੁਨੇਹੇ ਨੂੰ ਰੱਦੀ ਵਿੱਚ ਨਕਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-vtrash-folder.c:57
  msgid "Cannot copy messages to the Junk folder"
  msgstr "ਸੁਨੇਹੇ ਨੂੰ ਕਬਾੜ ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:116
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
  #, c-format
  msgid ""
  "Cannot get message: %s\n"
@@ -2761,80 +2594,82 @@ msgstr ""
  "ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s\n"
  "  %s"
  
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:116
-#: ../camel/providers/local/camel-maildir-folder.c:251
-#: ../camel/providers/local/camel-mbox-folder.c:348
-#: ../camel/providers/local/camel-mh-folder.c:204
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/local/camel-maildir-folder.c:248
+#: ../camel/providers/local/camel-maildir-folder.c:275
+#: ../camel/providers/local/camel-mbox-folder.c:347
+#: ../camel/providers/local/camel-mbox-folder.c:399
+#: ../camel/providers/local/camel-mh-folder.c:214
  msgid "No such message"
  msgstr "ਇਸਤਰਾਂ ਦਾ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ"
  
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:128
-#: ../camel/providers/imap4/camel-imap4-folder.c:812
-#: ../camel/providers/nntp/camel-nntp-folder.c:156
-#: ../camel/providers/nntp/camel-nntp-folder.c:232
-#: ../camel/providers/nntp/camel-nntp-folder.c:373
-#: ../camel/providers/pop3/camel-pop3-folder.c:266
-#: ../camel/providers/pop3/camel-pop3-folder.c:560
-#: ../camel/providers/pop3/camel-pop3-folder.c:621
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
+#: ../camel/providers/imap4/camel-imap4-folder.c:821
+#: ../camel/providers/nntp/camel-nntp-folder.c:175
+#: ../camel/providers/nntp/camel-nntp-folder.c:251
+#: ../camel/providers/nntp/camel-nntp-folder.c:411
+#: ../camel/providers/pop3/camel-pop3-folder.c:268
+#: ../camel/providers/pop3/camel-pop3-folder.c:578
  #: ../camel/providers/pop3/camel-pop3-folder.c:639
+#: ../camel/providers/pop3/camel-pop3-folder.c:657
  msgid "User canceled"
  msgstr "ਯੂਜ਼ਰ ਨੇ ਰੱਦ ਕੀਤਾ"
  
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:135
-#: ../camel/providers/imap4/camel-imap4-folder.c:817
-#: ../camel/providers/nntp/camel-nntp-folder.c:147
-#: ../camel/providers/nntp/camel-nntp-folder.c:149
-#: ../camel/providers/nntp/camel-nntp-folder.c:158
-#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
+#: ../camel/providers/imap4/camel-imap4-folder.c:826
+#: ../camel/providers/nntp/camel-nntp-folder.c:166
+#: ../camel/providers/nntp/camel-nntp-folder.c:168
+#: ../camel/providers/nntp/camel-nntp-folder.c:177
+#: ../camel/providers/nntp/camel-nntp-folder.c:253
  #: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:563
-#: ../camel/providers/pop3/camel-pop3-folder.c:624
-#: ../camel/providers/pop3/camel-pop3-folder.c:631
+#: ../camel/providers/pop3/camel-pop3-folder.c:581
  #: ../camel/providers/pop3/camel-pop3-folder.c:642
+#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
  #, c-format
  msgid "Cannot get message %s: %s"
  msgstr "ਸੁਨੇਹਾ %s ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s"
  
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:160
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2164
-#: ../camel/providers/imap4/camel-imap4-folder.c:835
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2303
+#: ../camel/providers/imap4/camel-imap4-folder.c:844
  msgid "This message is not available in offline mode."
  msgstr "ਇਹ ਸੁਨੇਹਾ ਆਫਲਾਇਨ ਵਿੱਚ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
  
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:179
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1696
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1747
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:192
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:199
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1818
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1869
  msgid "Could not get message"
  msgstr "ਕੈਂਚੇ ਫਾਇਲ ਨੂੰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:818
-#: ../camel/providers/imap/camel-imap-folder.c:248
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:883
+#: ../camel/providers/imap/camel-imap-folder.c:265
  #, c-format
  msgid "Could not load summary for %s"
  msgstr "%s ਲਈ ਸੰਖੇਪ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1071
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1143
  msgid "Trash Folder Full. Please Empty."
  msgstr "ਰੱਦੀ ਫੋਲਡਰ ਭਰ ਗਿਆ ਹੈ। ਖਾਲੀ ਕਰੋ ਜੀ।"
  
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1248
-#: ../camel/providers/groupwise/camel-groupwise-store.c:623
-#: ../camel/providers/groupwise/camel-groupwise-store.c:736
-#: ../camel/providers/imap/camel-imap-folder.c:3161
-#: ../camel/providers/imap/camel-imap-folder.c:3238
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1352
+#: ../camel/providers/groupwise/camel-groupwise-store.c:617
+#: ../camel/providers/groupwise/camel-groupwise-store.c:743
+#: ../camel/providers/imap/camel-imap-folder.c:3362
+#: ../camel/providers/imap/camel-imap-folder.c:3438
  #, c-format
  msgid "Fetching summary information for new messages in %s"
  msgstr "%s ਵਿੱਚ ਨਵੇਂ ਸੁਨਹਿਆਂ ਲਈ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ"
  
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2031
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2073
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2157
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2200
  #, c-format
  msgid "Cannot append message to folder '%s': %s"
  msgstr "ਫੋਲਡਰ '%s' ਲਈ ਸੁਨੇਹਾ ਸ਼ਾਮਲ ਨਹੀਂ ਹੋ ਸਕਦਾ: %s"
  
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2188
  #, c-format
  msgid "Cannot create message: %s"
  msgstr "ਸੁਨੇਹਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s"
@@ -2898,8 +2733,9 @@ msgid "SOAP Settings"
  msgstr "SOAP ਸੈਟਿੰਗ"
  
  #: ../camel/providers/groupwise/camel-groupwise-provider.c:76
-msgid "Post Office Agent SOAP Port:"
-msgstr "Post Office Agent SOAP ਪੋਰਟ:"
+#| msgid "Post Office Agent SOAP Port:"
+msgid "Post Office Agent SOAP _Port:"
+msgstr "Post Office Agent SOAP _Port:"
  
  #: ../camel/providers/groupwise/camel-groupwise-provider.c:89
  msgid "Novell GroupWise"
@@ -2923,49 +2759,49 @@ msgstr "ਪਾਸਵਰਡ"
  msgid "This option will connect to the GroupWise server using a plaintext password."
  msgstr "ਇਸ ਚੋਣ ਨਾਲ GroupWise ਸਰਵਰ ਨਾਲ ਇੱਕ ਸਧਾਰਨ ਪਾਠ ਪਾਸਵਰਡ ਰਾਹੀਂ ਜੁੜਿਆ ਜਾਵੇਗਾ।"
  
-#: ../camel/providers/groupwise/camel-groupwise-store.c:103
+#: ../camel/providers/groupwise/camel-groupwise-store.c:104
  msgid "Host or user not available in url"
  msgstr "url ਵਿੱਚ ਹੋਸਟ ਜਾਂ ਯੂਜ਼ਰ ਉਪਲੱਬਧ ਨਹੀਂ"
  
-#: ../camel/providers/groupwise/camel-groupwise-store.c:206
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1357
  msgid "You did not enter a password."
  msgstr "ਤੁਸੀਂ ਪਾਸਵਰਡ ਨਹੀਂ ਭਰਿਆ ਹੈ।"
  
-#: ../camel/providers/groupwise/camel-groupwise-store.c:302
+#: ../camel/providers/groupwise/camel-groupwise-store.c:303
  msgid "Some features may not work correctly with your current server version"
  msgstr "ਤੁਹਾਡੇ ਸਰਵਰ ਦੇ ਮੌਜੂਦਾ ਵਰਜਨ ਨਾਲ ਕੁਝ ਗੁਣ ਠੀਕ ਤਰਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹਨ"
  
-#: ../camel/providers/groupwise/camel-groupwise-store.c:532
-#: ../camel/providers/imap/camel-imap-store.c:1846
-#: ../camel/providers/imap/camel-imap-store.c:2044
+#: ../camel/providers/groupwise/camel-groupwise-store.c:524
+#: ../camel/providers/imap/camel-imap-store.c:1849
+#: ../camel/providers/imap/camel-imap-store.c:2047
  #, c-format
  msgid "No such folder %s"
  msgstr "ਫੋਲਡਰ %s ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
  
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1219
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
  msgid "Cannot create GroupWise folders in offline mode."
  msgstr "ਆਫਲਾਇਨ ਢੰਗ ਵਿੱਚ GroupWise ਫੋਲਡਰ ਬਣਾਉਣੇ ਸੰਭਵ ਨਹੀਂ ਹਨ।"
  
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
-#: ../camel/providers/imap/camel-imap-store.c:1921
-#: ../camel/providers/imap/camel-imap-store.c:2301
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
+#: ../camel/providers/imap/camel-imap-store.c:1924
+#: ../camel/providers/imap/camel-imap-store.c:2304
  msgid "The parent folder is not allowed to contain subfolders"
  msgstr "ਮੁੱਢਲੇ ਫੋਲਡਰ ਵਿੱਚ ਸਬ-ਫੋਲਡਰ ਸਵੀਕਾਰ ਨਹੀਂ ਹੈ।"
  
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1309
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1330
-#, c-format
-msgid "Cannot rename Groupwise folder '%s' to '%s'"
-msgstr "GroupWise à¨«à©\8bà¨²à¨¡à¨° '%s' à¨¦à¨¾ à¨¨à¨¾à¨\82-à¨¤à¨¬à¨¦à©\80à¨² '%s' à¨²à¨\88 à¨¨à¨¹à©\80à¨\82 à¨¹à©\8b à¨¸à¨\95à¨¦à¨¾ à¨¹à©\88"
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1359, c-format
+#| msgid "Cannot rename Groupwise folder '%s' to '%s'"
+msgid "Cannot rename GroupWise folder '%s' to '%s'"
+msgstr "GroupWise à¨«à©\8bà¨²à¨¡à¨° '%s' à¨¦à¨¾ à¨¨à¨¾à¨\82-à¨¤à¨¬à¨¦à©\80à¨² '%s' à¨²à¨\88 à¨\95à©\80à¨¤à¨¾ à¨\9cà¨¾ à¨¸à¨\95à¨¦à¨¾"
  
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1362
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
  #: ../camel/providers/groupwise/camel-groupwise-transport.c:121
  #, c-format
  msgid "GroupWise server %s"
  msgstr "GroupWise ਸਰਵਰ %s"
  
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1364
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
  #, c-format
  msgid "GroupWise service for %s on %s"
  msgstr "ਗਰੁੱਪਵਾਇਜ਼ ਸੇਵਾ %s ਲਈ %s ਉੱਤੇ"
@@ -2980,8 +2816,13 @@ msgid "Sending Message"
  msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
  
  #: ../camel/providers/groupwise/camel-groupwise-transport.c:221
-msgid "You have exceeded this account's storage limit. Your messages are queued in your Outbox. Resend by pressing Send/Receive after deleting/archiving some of your mail.\n"
-msgstr "ਤੁਸੀਂ ਇਹ ਖਾਤੇ ਦੀ ਸੰਭਾਲਣ ਸਮੱਰਥਾ ਤੋਂ ਵੱਧ ਗਏ ਹੋ। ਤੁਹਾਡਾ ਸੁਨੇਹਾ ਤੁਹਾਡੇ ਆਉਟ-ਬਕਸੇ 'ਚ ਪਿਆ ਹੈ। ਆਪਣੇ ਕੁਝ ਪੱਤਰ ਹਟਾ ਕੇ/ਅਕਾਇਵ ਬਣਾ ਕੇ ਭੇਜੋ/ਲਵੋ ਬਟਨ ਦੱਬ ਕੇ ਮੁੜ ਭੇਜੋ।\n"
+msgid ""
+"You have exceeded this account's storage limit. Your messages are queued in "
+"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
+"of your mail.\n"
+msgstr ""
+"ਤੁਸੀਂ ਇਹ ਖਾਤੇ ਦੀ ਸੰਭਾਲਣ ਸਮੱਰਥਾ ਤੋਂ ਵੱਧ ਗਏ ਹੋ। ਤੁਹਾਡਾ ਸੁਨੇਹਾ ਤੁਹਾਡੇ ਆਉਟ-ਬਕਸੇ 'ਚ ਪਿਆ ਹੈ। ਆਪਣੇ "
+"ਕੁਝ ਪੱਤਰ ਹਟਾ ਕੇ/ਅਕਾਇਵ ਬਣਾ ਕੇ ਭੇਜੋ/ਲਵੋ ਬਟਨ ਦੱਬ ਕੇ ਮੁੜ ਭੇਜੋ।\n"
  
  #: ../camel/providers/groupwise/camel-groupwise-transport.c:223
  #: ../camel/providers/sendmail/camel-sendmail-transport.c:209
@@ -3057,12 +2898,12 @@ msgstr "ਇੰਪੁੱਟ ਸਟਰੀਮ ਨਹੀਂ"
  #: ../camel/providers/imap/camel-imap-command.c:231
  #: ../camel/providers/imap/camel-imap-command.c:280
  #: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3029
+#: ../camel/providers/imap/camel-imap-store.c:3037
  msgid "Operation cancelled"
  msgstr "ਕਾਰਵਾਈ ਅਸਫਲ"
  
  #: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3032
+#: ../camel/providers/imap/camel-imap-store.c:3040
  #, c-format
  msgid "Server unexpectedly disconnected: %s"
  msgstr "ਸਰਵਰ ਅਸਧਾਰਨ ਤੌਰ ਤੇ ਵੱਖ ਹੋ ਗਿਆ: %s"
@@ -3102,83 +2943,83 @@ msgstr "IMAP ਸਰਵਰ ਦੇ ਜਵਾਬ ਵਿੱਚ %s ਜਾਣਕਾਰ
  msgid "Unexpected OK response from IMAP server: %s"
  msgstr "IMAP ਸਰਵਰ ਤੋਂ ਅਸਧਾਰਨ ਸਭ ਠੀਕ ਹੈਂ ਜਵਾਬ: %s"
  
-#: ../camel/providers/imap/camel-imap-folder.c:88
+#: ../camel/providers/imap/camel-imap-folder.c:89
  msgid "Always check for new mail in this folder"
  msgstr "ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਹਮੇਸ਼ਾ ਨਵੀਂ ਚਿੱਠੀ ਵੇਖੋ"
  
-#: ../camel/providers/imap/camel-imap-folder.c:229
+#: ../camel/providers/imap/camel-imap-folder.c:246
  #, 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:843
+#: ../camel/providers/imap/camel-imap-folder.c:891
  #, c-format
  msgid "Scanning for changed messages in %s"
  msgstr "%s ਵਿੱਚ ਤਬਦੀਲ ਸੁਨੇਹਿਆਂ ਦੀ ਜਾਂਚ ਜਾਰੀ ਹੈ"
  
-#: ../camel/providers/imap/camel-imap-folder.c:1838
+#: ../camel/providers/imap/camel-imap-folder.c:1950
  #, c-format
  msgid "Unexpected response status '%s' after APPEND command"
  msgstr "APPEND ਕਮਾਂਡ ਦੇ ਬਾਅਦ ਅਚਾਨਕ ਜਵਾਬ ਹਾਲਤ '%s'"
  
-#: ../camel/providers/imap/camel-imap-folder.c:1853
+#: ../camel/providers/imap/camel-imap-folder.c:1965
  msgid "No response on continuation after APPEND command"
  msgstr "APPEND ਕਮਾਂਡ ਦੇ ਬਾਅਦ ਕੋਈ ਜਵਾਬ ਨਹੀਂ"
  
-#: ../camel/providers/imap/camel-imap-folder.c:1895
+#: ../camel/providers/imap/camel-imap-folder.c:2010
  msgid "Unknown error occurred during APPEND command!"
  msgstr "APPEND ਕਮਾਂਡ ਦੇ ਦੌਰਾਨ ਅਣਜਾਣ ਗਲਤੀ ਆਈ ਹੈ!"
  
-#: ../camel/providers/imap/camel-imap-folder.c:2707
+#: ../camel/providers/imap/camel-imap-folder.c:2842
  #, c-format
  msgid "Unable to retrieve message: %s"
  msgstr "ਸੁਨੇਹਾ ਲੈਣ ਵਿੱਚ ਅਸਫਲ: %s"
  
-#: ../camel/providers/imap/camel-imap-folder.c:2748
+#: ../camel/providers/imap/camel-imap-folder.c:2877
  #, c-format
  msgid "Cannot get message with message ID %s: %s"
  msgstr "ਸੁਨੇਹਾ ID %s ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s"
  
-#: ../camel/providers/imap/camel-imap-folder.c:2749
+#: ../camel/providers/imap/camel-imap-folder.c:2878
  msgid "No such message available."
  msgstr "ਇੰਝ ਦਾ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ।"
  
-#: ../camel/providers/imap/camel-imap-folder.c:2788
-#: ../camel/providers/imap/camel-imap-folder.c:3540
-#: ../camel/providers/nntp/camel-nntp-folder.c:220
+#: ../camel/providers/imap/camel-imap-folder.c:2932
+#: ../camel/providers/imap/camel-imap-folder.c:3753
+#: ../camel/providers/nntp/camel-nntp-folder.c:239
  msgid "This message is not currently available"
  msgstr "ਇਹ ਸੁਨੇਹਾ ਮੌਕੇ ਤੇ ਉਪਲੱਬਧ ਹੈ"
  
-#: ../camel/providers/imap/camel-imap-folder.c:3367
+#: ../camel/providers/imap/camel-imap-folder.c:3567
  #, c-format
  msgid "Incomplete server response: no information provided for message %d"
  msgstr "ਸਰਵਰ ਤੋਂ ਅਧੂਰਾ ਜਵਾਬ: ਸੁਨੇਹਾ %d ਲਈ ਕੋਈ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
  
-#: ../camel/providers/imap/camel-imap-folder.c:3375
+#: ../camel/providers/imap/camel-imap-folder.c:3575
  #, c-format
  msgid "Incomplete server response: no UID provided for message %d"
  msgstr "ਅਧੂਰਾ ਸਰਵਰ ਜਵਾਬ: ਸੁਨੇਹੇ %d ਲਈ ਕੋਈ UID ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
  
-#: ../camel/providers/imap/camel-imap-folder.c:3578
+#: ../camel/providers/imap/camel-imap-folder.c:3791
  msgid "Could not find message body in FETCH response."
  msgstr "FETCH ਜਵਾਬ ਵਿੱਚ ਸੁਨੇਹਾ ਭਾਗ ਨਹੀਂ ਮਿਲਿਆ।"
  
-#: ../camel/providers/imap/camel-imap-message-cache.c:160
-#: ../camel/providers/imap/camel-imap-message-cache.c:220
+#: ../camel/providers/imap/camel-imap-message-cache.c:182
+#: ../camel/providers/imap/camel-imap-message-cache.c:246
  #, c-format
  msgid "Could not open cache directory: %s"
  msgstr "ਕੈਚੇ ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s"
  
-#: ../camel/providers/imap/camel-imap-message-cache.c:307
-#: ../camel/providers/imap/camel-imap-message-cache.c:364
-#: ../camel/providers/imap/camel-imap-message-cache.c:395
-#: ../camel/providers/imap/camel-imap-message-cache.c:427
+#: ../camel/providers/imap/camel-imap-message-cache.c:333
+#: ../camel/providers/imap/camel-imap-message-cache.c:390
+#: ../camel/providers/imap/camel-imap-message-cache.c:421
+#: ../camel/providers/imap/camel-imap-message-cache.c:453
  #, c-format
  msgid "Failed to cache message %s: %s"
  msgstr "ਸੁਨੇਹਾ %s ਕੈਚੇ ਲੈਣ ਵਿੱਚ ਅਸਫਲ: %s"
  
-#: ../camel/providers/imap/camel-imap-message-cache.c:478
+#: ../camel/providers/imap/camel-imap-message-cache.c:533
  #, c-format
  msgid "Failed to cache %s: %s"
  msgstr "ਕੈਚੇ %s ਲਈ ਅਸਫਲ: %s"
@@ -3219,49 +3060,49 @@ msgstr "IMAP ਸਰਵਰਾਂ ਉੱਤੇ ਮੇਲ ਪੜਨ ਅਤੇ ਸ
  msgid "This option will connect to the IMAP server using a plaintext password."
  msgstr "ਇਹ ਚੋਣ IMAP ਸਰਵਰ ਨਾਲ ਪਲੇਨ-ਟੈਕਸਟ ਪਾਸਵਰਡ ਨਾਲ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।"
  
-#: ../camel/providers/imap/camel-imap-store.c:436
+#: ../camel/providers/imap/camel-imap-store.c:437
  #: ../camel/providers/imap4/camel-imap4-store.c:214
  #, c-format
  msgid "IMAP server %s"
  msgstr "IMAP ਸਰਵਰ %s"
  
-#: ../camel/providers/imap/camel-imap-store.c:438
+#: ../camel/providers/imap/camel-imap-store.c:439
  #: ../camel/providers/imap4/camel-imap4-store.c:216
  #, c-format
  msgid "IMAP service for %s on %s"
  msgstr "IMAP ਸੇਵਾ %2s ਤੇ %1s ਲਈ"
  
-#: ../camel/providers/imap/camel-imap-store.c:567
-#: ../camel/providers/imap/camel-imap-store.c:582
+#: ../camel/providers/imap/camel-imap-store.c:568
+#: ../camel/providers/imap/camel-imap-store.c:583
  #: ../camel/providers/imap4/camel-imap4-store.c:251
  #: ../camel/providers/imap4/camel-imap4-store.c:266
  #: ../camel/providers/nntp/camel-nntp-store.c:183
  #: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:171
-#: ../camel/providers/pop3/camel-pop3-store.c:185
+#: ../camel/providers/pop3/camel-pop3-store.c:172
+#: ../camel/providers/pop3/camel-pop3-store.c:186
  #: ../camel/providers/smtp/camel-smtp-transport.c:260
  #: ../camel/providers/smtp/camel-smtp-transport.c:275
  #, c-format
  msgid "Could not connect to %s: %s"
  msgstr "%s ਨਾਲ ਜੁੜ ਨਹੀਂ ਸਕਦਾ: %s"
  
-#: ../camel/providers/imap/camel-imap-store.c:568
+#: ../camel/providers/imap/camel-imap-store.c:569
  #: ../camel/providers/imap4/camel-imap4-store.c:252
  #: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:172
+#: ../camel/providers/pop3/camel-pop3-store.c:173
  #: ../camel/providers/smtp/camel-smtp-transport.c:261
  msgid "SSL unavailable"
  msgstr "SSL ਉਪਲੱਬਧ ਨਹੀ ਹੈ"
  
-#: ../camel/providers/imap/camel-imap-store.c:579
-#: ../camel/providers/imap/camel-imap-store.c:861
+#: ../camel/providers/imap/camel-imap-store.c:580
+#: ../camel/providers/imap/camel-imap-store.c:862
  msgid "Connection cancelled"
  msgstr "ਕੁਨੈਕਸ਼ਨ ਰੱਦ ਕੀਤਾ"
  
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imap/camel-imap-store.c:715
-#: ../camel/providers/imap/camel-imap-store.c:741
+#: ../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/imap4/camel-imap4-store.c:314
  #: ../camel/providers/imap4/camel-imap4-store.c:329
  #: ../camel/providers/imap4/camel-imap4-store.c:338
@@ -3269,32 +3110,32 @@ msgstr "ਕੁਨੈਕਸ਼ਨ ਰੱਦ ਕੀਤਾ"
  msgid "Failed to connect to IMAP server %s in secure mode: %s"
  msgstr "IMAP ਸਰਵਰ %s ਨਾਲ ਸੁਰੱਖਿਅਤ ਢੰਗ ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ: %s"
  
-#: ../camel/providers/imap/camel-imap-store.c:691
+#: ../camel/providers/imap/camel-imap-store.c:692
  #: ../camel/providers/smtp/camel-smtp-transport.c:333
  msgid "STARTTLS not supported"
  msgstr "ਪ੍ਰੋਟੋਕਾਲ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
  
-#: ../camel/providers/imap/camel-imap-store.c:710
+#: ../camel/providers/imap/camel-imap-store.c:711
  msgid "SSL negotiations failed"
  msgstr "SSL ਗੱਲਬਾਤ ਅਸਫਲ"
  
-#: ../camel/providers/imap/camel-imap-store.c:716
+#: ../camel/providers/imap/camel-imap-store.c:717
  #: ../camel/providers/imap4/camel-imap4-store.c:339
  #: ../camel/providers/smtp/camel-smtp-transport.c:372
  msgid "SSL is not available in this build"
  msgstr "ਇਸ ਨਿਰਮਾਣ ਵਿੱਚ SSL ਉਪਲੱਬਧ ਨਹੀਂ"
  
-#: ../camel/providers/imap/camel-imap-store.c:864
+#: ../camel/providers/imap/camel-imap-store.c:865
  #, 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:1052
-#: ../camel/providers/imap/camel-imap-store.c:2397
+#: ../camel/providers/imap/camel-imap-store.c:1053
+#: ../camel/providers/imap/camel-imap-store.c:2400
  #: ../camel/providers/imap4/camel-imap4-store-summary.c:368
  #: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:77
+#: ../camel/providers/local/camel-maildir-folder.c:78
  #: ../camel/providers/local/camel-maildir-store.c:219
  #: ../camel/providers/local/camel-maildir-store.c:291
  #: ../camel/providers/local/camel-maildir-store.c:517
@@ -3304,31 +3145,31 @@ msgstr "ਕਮਾਂਡ \"%s\" ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸ
  msgid "Inbox"
  msgstr "ਆਉਣ-ਬਕਸਾ"
  
-#: ../camel/providers/imap/camel-imap-store.c:1054
+#: ../camel/providers/imap/camel-imap-store.c:1055
  #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
  msgid "Drafts"
  msgstr "ਡਰਾਫਟ"
  
-#: ../camel/providers/imap/camel-imap-store.c:1056
+#: ../camel/providers/imap/camel-imap-store.c:1057
  msgid "Sent"
  msgstr "ਭੇਜੇ"
  
-#: ../camel/providers/imap/camel-imap-store.c:1058
+#: ../camel/providers/imap/camel-imap-store.c:1059
  msgid "Templates"
  msgstr "ਟੈਪਲੇਟ"
  
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:1304
  #, c-format
  msgid "IMAP server %s does not support requested authentication type %s"
  msgstr "IMAP ਸਰਵਰ %s ਲੋੜੀਦੀ ਪ੍ਰਮਾਣਿਤ ਕਿਸਮ %s ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
  
-#: ../camel/providers/imap/camel-imap-store.c:1313
+#: ../camel/providers/imap/camel-imap-store.c:1314
  #: ../camel/providers/smtp/camel-smtp-transport.c:507
  #, c-format
  msgid "No support for authentication type %s"
  msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗ %s ਲਈ ਸਹਾਈ ਨਹੀਂ ਹੈ"
  
-#: ../camel/providers/imap/camel-imap-store.c:1385
+#: ../camel/providers/imap/camel-imap-store.c:1388
  #, c-format
  msgid ""
  "Unable to authenticate to IMAP server.\n"
@@ -3339,14 +3180,14 @@ msgstr ""
  "%s\n"
  "\n"
  
-#: ../camel/providers/imap/camel-imap-store.c:1858
-#: ../camel/providers/imap/camel-imap-store.c:2239
+#: ../camel/providers/imap/camel-imap-store.c:1861
+#: ../camel/providers/imap/camel-imap-store.c:2242
  #: ../camel/providers/imap4/camel-imap4-store.c:959
  #, 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:1975
+#: ../camel/providers/imap/camel-imap-store.c:1978
  #: ../camel/providers/local/camel-maildir-store.c:192
  #: ../camel/providers/local/camel-mbox-store.c:204
  #: ../camel/providers/local/camel-mh-store.c:249
@@ -3354,7 +3195,7 @@ msgstr "ਫੋਲਡਰ ਨਾਂ \"%s\" ਜਾਇਜ ਨਹੀਂ ਹੈ, ਕ
  msgid "Cannot create folder '%s': folder exists."
  msgstr "ਫੋਲਡਰ '%s' ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ: ਫੋਲਡਰ ਮੌਜੂਦ ਹੈ।"
  
-#: ../camel/providers/imap/camel-imap-store.c:2250
+#: ../camel/providers/imap/camel-imap-store.c:2253
  #, c-format
  msgid "Unknown parent folder: %s"
  msgstr "ਅਣਜਾਣਾ ਮੁੱਢਲਾ ਫੋਲਡਰ: %s"
@@ -3403,7 +3244,9 @@ msgid "IMAP4 server %s unexpectedly disconnected: %s"
  msgstr "IMAP4 ਸਰਵਰ %s ਅਸਧਾਰਨ ਬੰਦ ਹੋ ਗਿਆ ਹੈ: %s"
  
  #: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Enable extended Mailing-List detection required for some filter and vFolder rules"
+msgid ""
+"Enable extended Mailing-List detection required for some filter and vFolder "
+"rules"
  msgstr "ਕੁਝ ਫਿਲਟਰਾਂ ਅਤੇ vFolder ਨਿਯਮਾਂ ਹੋਰ ਮੇਲਿੰਗ-ਲਿਸਟ ਖੋਜ ਲਈ ਚਾਹੀਦੇ ਹਨ"
  
  #: ../camel/providers/imap4/camel-imap4-folder.c:90
@@ -3414,72 +3257,72 @@ msgstr "ਮਿਆਦ ਪੁੱਗੀ ਕੈਸ਼ ਵਾਲੇ ਸੁਨੇਹ
  msgid "Expire cached messages older than X seconds"
  msgstr "X ਸਕਿੰਟਾਂ ਤੋਂ ਪੁਰਾਣੇ ਮਿਆਦ ਪੁੱਗੀ ਕੈਸ਼ ਸੁਨੇਹੇ"
  
-#: ../camel/providers/imap4/camel-imap4-folder.c:423
+#: ../camel/providers/imap4/camel-imap4-folder.c:432
  #, c-format
  msgid "Cannot access folder '%s': %s"
  msgstr "'%s' ਫੋਲਡਰ ਤੇ ਪਹੁੰਚ ਨਹੀਂ ਹੈ: %s"
  
-#: ../camel/providers/imap4/camel-imap4-folder.c:482
+#: ../camel/providers/imap4/camel-imap4-folder.c:491
  #, c-format
  msgid "Cannot sync flags to folder '%s': Unknown error"
  msgstr "ਫੋਲਡਰ '%s' ਨਾਲ ਨਿਸ਼ਾਨ ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ: ਅਣਜਾਣ"
  
-#: ../camel/providers/imap4/camel-imap4-folder.c:488
+#: ../camel/providers/imap4/camel-imap4-folder.c:497
  #, c-format
  msgid "Cannot sync flags to folder '%s': Bad command"
  msgstr "ਫੋਲਡਰ '%s' ਨਾਲ ਸਮਕਾਲੀ ਨਿਸ਼ਾਨ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕੇ: ਗਲਤ ਕਮਾਂਡ"
  
-#: ../camel/providers/imap4/camel-imap4-folder.c:628
+#: ../camel/providers/imap4/camel-imap4-folder.c:637
  #, c-format
  msgid "Cannot expunge folder '%s': Unknown error"
  msgstr "ਫੋਲਡਰ '%s' ਨੂੰ ਸਾਫ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਅਣਜਾਣ ਗਲਤੀ"
  
-#: ../camel/providers/imap4/camel-imap4-folder.c:633
+#: ../camel/providers/imap4/camel-imap4-folder.c:642
  #, c-format
  msgid "Cannot expunge folder '%s': Bad command"
  msgstr "ਫੋਲਡਰ '%s' ਨੂੰ ਸਾਫ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ"
  
-#: ../camel/providers/imap4/camel-imap4-folder.c:889
+#: ../camel/providers/imap4/camel-imap4-folder.c:898
  #, c-format
  msgid "Cannot get message %s from folder '%s': No such message"
  msgstr "ਫੋਲਡਰ '%2$s' ਸੁਨੇਹਾ %1$s ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਇਸਤਰਾਂ ਦਾ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ"
  
-#: ../camel/providers/imap4/camel-imap4-folder.c:894
+#: ../camel/providers/imap4/camel-imap4-folder.c:903
  #, c-format
  msgid "Cannot get message %s from folder '%s': Bad command"
  msgstr "ਫੋਲਡਰ '%2$s' ਸੁਨੇਹਾ %1$s ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ"
  
-#: ../camel/providers/imap4/camel-imap4-folder.c:938
+#: ../camel/providers/imap4/camel-imap4-folder.c:947
  #, c-format
  msgid "Cannot append message to folder '%s': Folder is read-only"
  msgstr "ਫੋਲਡਰ '%s' ਲਈ ਸੁਨੇਹਾ ਸ਼ਾਮਲ ਨਹੀਂ ਹੋ ਸਕਦਾ: ਫੋਲਡਰ ਸਿਰਫ਼ ਪੜਨ ਲਈ ਹੈ"
  
-#: ../camel/providers/imap4/camel-imap4-folder.c:1031
+#: ../camel/providers/imap4/camel-imap4-folder.c:1040
  #, c-format
  msgid "Cannot append message to folder '%s': Unknown error"
  msgstr "ਫੋਲਡਰ '%s' ਵਿੱਚ ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਅਣਜਾਣੀ ਗਲਤੀ"
  
-#: ../camel/providers/imap4/camel-imap4-folder.c:1061
+#: ../camel/providers/imap4/camel-imap4-folder.c:1070
  #, c-format
  msgid "Cannot append message to folder '%s': Bad command"
  msgstr "ਫੋਲਡਰ '%s' ਵਿੱਚ ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ"
  
-#: ../camel/providers/imap4/camel-imap4-folder.c:1181
+#: ../camel/providers/imap4/camel-imap4-folder.c:1190
  #, c-format
  msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
  msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ '%s' ਤੋਂ '%s' ਵਿੱਚ ਭੇਜੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ: ਅਣਜਾਣ ਗਲਤੀ"
  
-#: ../camel/providers/imap4/camel-imap4-folder.c:1185
+#: ../camel/providers/imap4/camel-imap4-folder.c:1194
  #, c-format
  msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
  msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ '%s' ਤੋਂ '%s' ਵਿੱਚ ਨਕਲ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ: ਅਣਜਾਣ ਗਲਤੀ"
  
-#: ../camel/providers/imap4/camel-imap4-folder.c:1193
+#: ../camel/providers/imap4/camel-imap4-folder.c:1202
  #, c-format
  msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
  msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ '%s' ਤੋਂ '%s' ਵਿੱਚ ਭੇਜੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ: ਗਲਤ ਕਮਾਂਡ"
  
-#: ../camel/providers/imap4/camel-imap4-folder.c:1197
+#: ../camel/providers/imap4/camel-imap4-folder.c:1206
  #, c-format
  msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
  msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ '%s' ਤੋਂ '%s' ਵਿੱਚ ਨਕਲ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ: ਗਲਤ ਕਮਾਂਡ"
@@ -3508,18 +3351,20 @@ msgstr "ਇਸ ਚੋਣ ਨਾਲ ਤੁਸੀਂ IMAPv4rev1 ਸਰਵਰ ਨ
  #: ../camel/providers/imapp/camel-imapp-store.c:249
  #: ../camel/providers/nntp/camel-nntp-store.c:195
  #: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:182
+#: ../camel/providers/pop3/camel-pop3-store.c:183
  #: ../camel/providers/smtp/camel-smtp-transport.c:272
  msgid "Connection canceled"
  msgstr "ਕੁਨੈਕਸ਼ਨ ਰੱਦ ਕੀਤਾ"
  
  #: ../camel/providers/imap4/camel-imap4-store.c:300
  #, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
  msgstr "IMAP ਸਰਵਰ %s ਨਾਲ ਸੁਰੱਖਿਅਤ ਮੋਡ ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ: ਸਰਵਰ STARTTLS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
  
  #: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:250
+#: ../camel/providers/pop3/camel-pop3-store.c:251
  msgid "TLS negotiations failed"
  msgstr "TLS ਗੱਲਬਾਤ ਫੇਲ੍ਹ"
  
@@ -3549,7 +3394,7 @@ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
  msgstr "IMAP ਸਰਵਰ %2$s ਉੱਤੇ '%1$s' ਵਾਸਤੇ LIST ਜਾਣਕਾਰੀ ਲਈ ਨਹੀਂ ਜਾ ਸਕਦੀ: %3$s"
  
  #: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
+#: ../camel/providers/imap4/camel-imap4-store.c:1579
  msgid "Bad command"
  msgstr "ਗਲਤ ਕਮਾਂਡ"
  
@@ -3601,35 +3446,37 @@ msgstr "ਫੋਲਡਰ '%s' ਦਾ ਨਾਂ-ਤਬਦੀਲ '%s' ਨਹੀਂ
  msgid "Cannot rename folder '%s' to '%s': Bad command"
  msgstr "ਫੋਲਡਰ '%s' ਦਾਂ ਨਾਂ-ਤਬਦੀਲ '%s' ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ"
  
-#: ../camel/providers/imap4/camel-imap4-store.c:1575
+#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
+#. * The fourth one is an error message.
+#: ../camel/providers/imap4/camel-imap4-store.c:1577
  #, c-format
  msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
  msgstr "IMAP ਸਰਵਰ %3$s ਤੇ ਪੈਟਰਨ '%2$s' ਲਈ %1$s ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ: %4$s"
  
-#: ../camel/providers/imap4/camel-imap4-store.c:1636
+#: ../camel/providers/imap4/camel-imap4-store.c:1638
  msgid "Cannot subscribe to IMAP folders in offline mode."
  msgstr "ਆਫਲਾਇਨ ਢੰਗ ਵਿੱਚ IMAP ਫੋਲਡਰ ਨੂੰ ਸਵੀਕਾਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
  
-#: ../camel/providers/imap4/camel-imap4-store.c:1681
+#: ../camel/providers/imap4/camel-imap4-store.c:1683
  #, c-format
  msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
  msgstr "ਫੋਲਡਰ '%s' ਨੂੰ ਸਵੀਕਾਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ mailbox ਨਾਂ"
  
-#: ../camel/providers/imap4/camel-imap4-store.c:1686
+#: ../camel/providers/imap4/camel-imap4-store.c:1688
  #, c-format
  msgid "Cannot subscribe to folder '%s': Bad command"
  msgstr "ਫੋਲਡਰ '%s' ਲਈ ਮੈਂਬਰ ਨਹੀਂ ਬਣਿਆ ਜਾ ਸਕਦਾ ਹੈ: ਗਲਤ ਕਮਾਂਡ"
  
-#: ../camel/providers/imap4/camel-imap4-store.c:1708
+#: ../camel/providers/imap4/camel-imap4-store.c:1710
  msgid "Cannot unsubscribe from IMAP folders in offline mode."
  msgstr "ਆਫਲਾਇਨ ਢੰਗ ਵਿੱਚ IMAP ਫੋਲਡਰ ਨੂੰ ਅਸਵੀਕਾਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
  
-#: ../camel/providers/imap4/camel-imap4-store.c:1753
+#: ../camel/providers/imap4/camel-imap4-store.c:1755
  #, c-format
  msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
  msgstr "ਫੋਲਡਰ '%s' ਦੀ ਮੈਂਬਰੀ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ: ਗਲਤ mailbox ਨਾਂ"
  
-#: ../camel/providers/imap4/camel-imap4-store.c:1758
+#: ../camel/providers/imap4/camel-imap4-store.c:1760
  #, c-format
  msgid "Cannot unsubscribe from folder '%s': Bad command"
  msgstr "ਫੋਲਡਰ '%s' ਤੋਂ ਮੈਂਬਰੀ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ: ਗਲਤ ਕਮਾਂਡ"
@@ -3692,25 +3539,25 @@ msgstr "%s ਨਾਲ (ਪੋਰਟ %s) ਤੇ ਜੁੜ ਨਹੀਂ ਸਕਿ
  msgid "Could not connect to POP server on %s"
  msgstr "POP ਸਰਵਰ ਨਾਲ %s ਤੇ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
  
-#: ../camel/providers/local/camel-local-folder.c:174
+#: ../camel/providers/local/camel-local-folder.c:176
  msgid "Index message body data"
  msgstr "ਤਤਕਰਾ ਸੁਨੇਹਾ ਭਾਗ ਡਾਟਾ"
  
  #. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:390
+#: ../camel/providers/local/camel-local-folder.c:392
  #, c-format
  msgid "~%s (%s)"
  msgstr "~%s (%s)"
  
  #. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:394
-#: ../camel/providers/local/camel-local-folder.c:397
+#: ../camel/providers/local/camel-local-folder.c:396
+#: ../camel/providers/local/camel-local-folder.c:399
  #, c-format
  msgid "mailbox:%s (%s)"
  msgstr "mailbox:%s (%s)"
  
  #. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:401
+#: ../camel/providers/local/camel-local-folder.c:403
  #, c-format
  msgid "%s (%s)"
  msgstr "%s (%s)"
@@ -3732,7 +3579,9 @@ msgid "Local delivery"
  msgstr "ਲੋਕਲ ਪ੍ਰਾਪਤੀ"
  
  #: ../camel/providers/local/camel-local-provider.c:74
-msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
+msgid ""
+"For retrieving (moving) local mail from standard mbox-formatted spools into "
+"folders managed by Evolution."
  msgstr "ਸਟੈਂਡਰਡ mbox ਫਾਰਮੈਟ ਸਪੂਲ ਤੋਂ ਈਵੇਲੂਸ਼ਨ ਰਾਹੀਂ ਸੰਭਾਲੇ ਫੋਲਡਰ ਵਿੱਚ ਲੋਕਲ ਪੱਤਰ ਪ੍ਰਾਪਤ (ਭੇਜਣ) ਕਰਨ ਲਈ।"
  
  #: ../camel/providers/local/camel-local-provider.c:88
@@ -3769,80 +3618,82 @@ msgstr ""
  msgid "Standard Unix mbox spool directory"
  msgstr "ਸਟੈਂਡਰਡ Unix mbox ਸਪੂਲ ਡਾਇਰੈਕਟਰੀ"
  
-#: ../camel/providers/local/camel-local-store.c:171
-#: ../camel/providers/local/camel-local-store.c:282
+#: ../camel/providers/local/camel-local-store.c:165
+#: ../camel/providers/local/camel-local-store.c:276
  #: ../camel/providers/local/camel-mbox-store.c:359
  #: ../camel/providers/local/camel-spool-store.c:129
  #, c-format
  msgid "Store root %s is not an absolute path"
  msgstr "ਪ੍ਰਬੰਧਕ(root) %s ਸੰਭਾਲ ਇੱਕ ਅਸਲੀ ਰਸਤਾ ਨਹੀ ਹੈ।"
  
-#: ../camel/providers/local/camel-local-store.c:178
+#: ../camel/providers/local/camel-local-store.c:172
  #, c-format
  msgid "Store root %s is not a regular directory"
  msgstr "ਪ੍ਰਬੰਧਕ(root) %s ਸੰਭਾਲ ਇੱਕ ਅਸਲੀ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ।"
  
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:195
-#: ../camel/providers/local/camel-local-store.c:293
+#: ../camel/providers/local/camel-local-store.c:181
+#: ../camel/providers/local/camel-local-store.c:189
+#: ../camel/providers/local/camel-local-store.c:287
  #, c-format
  msgid "Cannot get folder: %s: %s"
  msgstr "ਫੋਲਡਰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s: %s"
  
-#: ../camel/providers/local/camel-local-store.c:207
+#: ../camel/providers/local/camel-local-store.c:201
  msgid "Local stores do not have an inbox"
  msgstr "ਆਉਣ-ਬਕਸੇ ਵਿੱਚ ਲੋਕਲ ਸੰਭਾਲ ਬਕਸਾ ਨਹੀਂ ਹੈ"
  
-#: ../camel/providers/local/camel-local-store.c:253
+#: ../camel/providers/local/camel-local-store.c:247
  #, c-format
  msgid "Local mail file %s"
  msgstr "ਲੋਕਲ ਪੱਤਰ ਫਾਇਲ %s"
  
-#: ../camel/providers/local/camel-local-store.c:348
+#: ../camel/providers/local/camel-local-store.c:342
  #, c-format
  msgid "Could not rename folder %s to %s: %s"
  msgstr "ਫੋਲਡਰ %s ਦਾ ਨਾਂ-ਤਬਦੀਲ %s ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s"
  
-#: ../camel/providers/local/camel-local-store.c:416
+#: ../camel/providers/local/camel-local-store.c:410
  #, c-format
  msgid "Could not rename '%s': %s"
  msgstr "'%s' ਦਾ ਨਾਂ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s"
  
-#: ../camel/providers/local/camel-local-store.c:441
+#: ../camel/providers/local/camel-local-store.c:435
  #: ../camel/providers/local/camel-mbox-store.c:300
  #, c-format
  msgid "Could not delete folder index file '%s': %s"
  msgstr "ਫੋਲਡਰ ਇੰਡੈਕਸ ਫਾਇਲ '%s' ਨੂੰ ਹਟਾਇਆ ਨਹੀ ਜਾ ਸਕਦਾ: %s"
  
-#: ../camel/providers/local/camel-local-store.c:464
+#: ../camel/providers/local/camel-local-store.c:458
  #: ../camel/providers/local/camel-mbox-store.c:324
  #, c-format
  msgid "Could not delete folder meta file '%s': %s"
  msgstr "ਫੋਲਡਰ ਮੈਟਾ ਫਾਇਲ '%s' ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s"
  
-#: ../camel/providers/local/camel-local-summary.c:506
+#: ../camel/providers/local/camel-local-summary.c:515
  msgid "Unable to add message to summary: unknown reason"
  msgstr "ਸੁਨੇਹੇ ਨੂੰ ਸੰਖੇਪ ਵਿੱਚ ਸੰਭਾਲਣ ਵਿੱਚ ਅਸਫਲ: ਅਣਜਾਣਾ ਕਾਰਨ"
  
-#: ../camel/providers/local/camel-maildir-folder.c:220
+#: ../camel/providers/local/camel-maildir-folder.c:222
  msgid "Maildir append message canceled"
  msgstr "Maildir ਸ਼ਾਮਿਲ ਸੁਨੇਹਾ ਰੱਦ ਕੀਤਾ"
  
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:225
  #, c-format
  msgid "Cannot append message to maildir folder: %s: %s"
  msgstr "maildir ਫੋਲਡਰ ਵਿੱਚ ਸ਼ਾਮਿਲ ਨਹੀ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s: %s"
  
-#: ../camel/providers/local/camel-maildir-folder.c:250
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:273
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:368
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mbox-folder.c:407
-#: ../camel/providers/local/camel-mh-folder.c:203
-#: ../camel/providers/local/camel-mh-folder.c:214
-#: ../camel/providers/local/camel-mh-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:247
+#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:288
+#: ../camel/providers/local/camel-maildir-folder.c:297
+#: ../camel/providers/local/camel-mbox-folder.c:346
+#: ../camel/providers/local/camel-mbox-folder.c:398
+#: ../camel/providers/local/camel-mbox-folder.c:419
+#: ../camel/providers/local/camel-mbox-folder.c:450
+#: ../camel/providers/local/camel-mbox-folder.c:458
+#: ../camel/providers/local/camel-mh-folder.c:213
+#: ../camel/providers/local/camel-mh-folder.c:224
+#: ../camel/providers/local/camel-mh-folder.c:233
  #, c-format
  msgid ""
  "Cannot get message: %s from folder %s\n"
@@ -3851,7 +3702,7 @@ msgstr ""
  "ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s ਫੋਲਡਰ %s ਤੋਂ\n"
  "  %s"
  
-#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:298
  msgid "Invalid message contents"
  msgstr "ਗਲਤ ਫੋਲਡਰ ਭਾਗ"
  
@@ -3900,54 +3751,54 @@ msgstr "ਇੱਕ maildir ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ"
  msgid "Could not scan folder '%s': %s"
  msgstr "ਫੋਲਡਰ '%s' ਦੀ ਜਾਂਚ ਨਹੀਂ ਹੋ ਸਕੀ ਹੈ: %s"
  
-#: ../camel/providers/local/camel-maildir-summary.c:433
-#: ../camel/providers/local/camel-maildir-summary.c:567
+#: ../camel/providers/local/camel-maildir-summary.c:439
+#: ../camel/providers/local/camel-maildir-summary.c:558
  #, c-format
  msgid "Cannot open maildir directory path: %s: %s"
  msgstr "maildir ਡਾਇਰੈਕਟਰੀ ਰਸਤਾ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s: %s"
  
-#: ../camel/providers/local/camel-maildir-summary.c:560
+#: ../camel/providers/local/camel-maildir-summary.c:551
  msgid "Checking folder consistency"
  msgstr "ਫੋਲਡਰ ਇਕਸਾਰਤਾ ਦੀ ਜਾਂਚ ਜਾਰੀ ਹੈ"
  
-#: ../camel/providers/local/camel-maildir-summary.c:664
+#: ../camel/providers/local/camel-maildir-summary.c:656
  msgid "Checking for new messages"
  msgstr "ਨਵੇਂ ਸੁਨਹਿਆਂ ਲਈ ਜਾਂਚ ਜਾਰੀ ਹੈ"
  
-#: ../camel/providers/local/camel-maildir-summary.c:756
-#: ../camel/providers/local/camel-mbox-summary.c:517
-#: ../camel/providers/local/camel-mbox-summary.c:690
-#: ../camel/providers/local/camel-mbox-summary.c:786
-#: ../camel/providers/local/camel-spool-summary.c:141
+#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../camel/providers/local/camel-mbox-summary.c:529
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-mbox-summary.c:831
+#: ../camel/providers/local/camel-spool-summary.c:150
  msgid "Storing folder"
  msgstr "ਫੋਲਡਰ ਕ੍ਰਮਬੱਧ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
  
-#: ../camel/providers/local/camel-mbox-folder.c:156
+#: ../camel/providers/local/camel-mbox-folder.c:159
  #: ../camel/providers/local/camel-spool-folder.c:150
  #, c-format
  msgid "Cannot create folder lock on %s: %s"
  msgstr "%s ਤੇ ਫੋਲਡਰ ਲਾੱਕ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s"
  
-#: ../camel/providers/local/camel-mbox-folder.c:217
+#: ../camel/providers/local/camel-mbox-folder.c:220
  #, c-format
  msgid "Cannot open mailbox: %s: %s\n"
  msgstr "mailbox ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s: %s\n"
  
-#: ../camel/providers/local/camel-mbox-folder.c:278
+#: ../camel/providers/local/camel-mbox-folder.c:281
  msgid "Mail append canceled"
  msgstr "ਪੱਤਰ ਸ਼ਾਮਿਲ ਰੱਦ ਕੀਤਾ"
  
-#: ../camel/providers/local/camel-mbox-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:284
  #, c-format
  msgid "Cannot append message to mbox file: %s: %s"
  msgstr "ਪੱਤਰਬਕਸਾ ਫਾਇਲ ਵਿੱਚ ਸੁਨੇਹਾ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s: %s"
  
-#: ../camel/providers/local/camel-mbox-folder.c:400
+#: ../camel/providers/local/camel-mbox-folder.c:451
  msgid "The folder appears to be irrecoverably corrupted."
  msgstr "ਫੋਲਡਰ ਵਿੱਚ ਨਾ-ਪ੍ਰਾਪਤਯੋਗ ਨਿਕਾਰਾਪਨ ਹੈ।"
  
-#: ../camel/providers/local/camel-mbox-folder.c:408
-#: ../camel/providers/local/camel-mh-folder.c:224
+#: ../camel/providers/local/camel-mbox-folder.c:459
+#: ../camel/providers/local/camel-mh-folder.c:234
  msgid "Message construction failed."
  msgstr "ਸੁਨੇਹਾ ਰਚਨਾ ਅਸਫਲ।"
  
@@ -4016,85 +3867,85 @@ msgstr "'%s' ਦਾ ਨਾਂ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ 
  msgid "Could not rename '%s' to %s: %s"
  msgstr "'%s' ਦਾ ਨਾਂ %s ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s"
  
-#: ../camel/providers/local/camel-mbox-summary.c:523
+#: ../camel/providers/local/camel-mbox-summary.c:535
  #, c-format
  msgid "Could not open folder: %s: %s"
  msgstr "ਫੋਲਡਰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s: %s"
  
-#: ../camel/providers/local/camel-mbox-summary.c:571
+#: ../camel/providers/local/camel-mbox-summary.c:585
  #, c-format
  msgid "Fatal mail parser error near position %ld in folder %s"
  msgstr "%ld ਦੇ ਨੇੜੇ %s ਫੋਲਡਰ ਵਿੱਚ ਪੱਤਰ ਪ੍ਰਾਪਤ ਪਾਰਸ ਗਲਤੀ ਹੈ"
  
-#: ../camel/providers/local/camel-mbox-summary.c:627
+#: ../camel/providers/local/camel-mbox-summary.c:648
  #, c-format
  msgid "Cannot check folder: %s: %s"
  msgstr "ਫੋਲਡਰ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ: %s: %s"
  
-#: ../camel/providers/local/camel-mbox-summary.c:695
-#: ../camel/providers/local/camel-mbox-summary.c:791
-#: ../camel/providers/local/camel-spool-summary.c:146
+#: ../camel/providers/local/camel-mbox-summary.c:716
+#: ../camel/providers/local/camel-mbox-summary.c:836
+#: ../camel/providers/local/camel-spool-summary.c:155
  #, c-format
  msgid "Could not open file: %s: %s"
  msgstr "ਫਾਇਲ ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ: %s: %s"
  
-#: ../camel/providers/local/camel-mbox-summary.c:707
-#: ../camel/providers/local/camel-spool-summary.c:159
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-spool-summary.c:168
  #, c-format
  msgid "Cannot open temporary mailbox: %s"
  msgstr "ਆਰਜ਼ੀ mailbox ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s"
  
-#: ../camel/providers/local/camel-mbox-summary.c:720
-#: ../camel/providers/local/camel-mbox-summary.c:896
+#: ../camel/providers/local/camel-mbox-summary.c:741
+#: ../camel/providers/local/camel-mbox-summary.c:945
  #, c-format
  msgid "Could not close source folder %s: %s"
  msgstr "ਸਰੋਤ ਫੋਲਡਰ %s ਨੂੰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s"
  
-#: ../camel/providers/local/camel-mbox-summary.c:729
+#: ../camel/providers/local/camel-mbox-summary.c:750
  #, c-format
  msgid "Could not close temporary folder: %s"
  msgstr "ਆਰਜ਼ੀ ਫੋਲਡਰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
  
-#: ../camel/providers/local/camel-mbox-summary.c:744
+#: ../camel/providers/local/camel-mbox-summary.c:765
  #, c-format
  msgid "Could not rename folder: %s"
  msgstr "ਫੋਲਡਰ ਦਾ ਨਾਂ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s"
  
-#: ../camel/providers/local/camel-mbox-summary.c:802
-#: ../camel/providers/local/camel-mbox-summary.c:1024
+#: ../camel/providers/local/camel-mbox-summary.c:847
+#: ../camel/providers/local/camel-mbox-summary.c:1075
  #, c-format
  msgid "Could not store folder: %s"
  msgstr "ਫੋਲਡਰ ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s"
  
-#: ../camel/providers/local/camel-mbox-summary.c:838
-#: ../camel/providers/local/camel-mbox-summary.c:846
-#: ../camel/providers/local/camel-mbox-summary.c:1055
-#: ../camel/providers/local/camel-mbox-summary.c:1063
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:894
+#: ../camel/providers/local/camel-mbox-summary.c:1105
+#: ../camel/providers/local/camel-mbox-summary.c:1113
  msgid "Summary and folder mismatch, even after a sync"
  msgstr "ਸੰਖੇਪ ਤੇ ਫੋਲਡਰ ਮੇਲ ਨਹੀਂ ਖਾ ਰਹੇ ਹਨ, ਸਮਕਾਲੀ ਕਰਨ ਮਗਰੋਂ ਵੀ"
  
-#: ../camel/providers/local/camel-mbox-summary.c:989
-#: ../camel/providers/local/camel-spool-summary.c:327
+#: ../camel/providers/local/camel-mbox-summary.c:1038
+#: ../camel/providers/local/camel-spool-summary.c:336
  #, c-format
  msgid "Unknown error: %s"
  msgstr "ਅਣਜਾਣੀ ਗਲਤੀ: %s"
  
-#: ../camel/providers/local/camel-mbox-summary.c:1127
-#: ../camel/providers/local/camel-mbox-summary.c:1153
+#: ../camel/providers/local/camel-mbox-summary.c:1181
+#: ../camel/providers/local/camel-mbox-summary.c:1207
  #, c-format
  msgid "Writing to temporary mailbox failed: %s"
  msgstr "ਆਰਜ਼ੀ mailbox ਉੱਤੇ ਲਿਖਣਾ ਅਸਫਲ: %s"
  
-#: ../camel/providers/local/camel-mbox-summary.c:1144
+#: ../camel/providers/local/camel-mbox-summary.c:1198
  #, c-format
  msgid "Writing to temporary mailbox failed: %s: %s"
  msgstr "ਆਰਜ਼ੀ mailbox ਉੱਤੇ ਲਿਖਣ ਲਈ ਫੇਲ੍ਹ: %s: %s"
  
-#: ../camel/providers/local/camel-mh-folder.c:176
+#: ../camel/providers/local/camel-mh-folder.c:178
  msgid "MH append message canceled"
  msgstr "MH ਸ਼ਾਮਿਲ ਸੁਨੇਹਾ ਰੱਦ ਕੀਤਾ"
  
-#: ../camel/providers/local/camel-mh-folder.c:179
+#: ../camel/providers/local/camel-mh-folder.c:181
  #, c-format
  msgid "Cannot append message to mh folder: %s: %s"
  msgstr "mh ਫੋਲਡਰ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਤੋਂ ਅਸਫਲ: %s: %s"
@@ -4109,7 +3960,7 @@ msgstr "'%s' ਫੋਲਡਰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ 
  msgid "Cannot get folder '%s': not a directory."
  msgstr "ਫੋਲਡਰ '%s' ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: ਇੱਕ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ।"
  
-#: ../camel/providers/local/camel-mh-summary.c:246
+#: ../camel/providers/local/camel-mh-summary.c:264
  #, c-format
  msgid "Cannot open MH directory path: %s: %s"
  msgstr "MH ਡਾਇਰੈਕਟਰੀ ਰਸਤਾ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ: %s: %s"
@@ -4179,21 +4030,21 @@ msgstr "ਸਪੂ ਫੋਲਡਰਾਂ ਦਾ ਨਾਂ-ਤਬਦੀਲ ਨਹ
  msgid "Spool folders cannot be deleted"
  msgstr "ਸਪੂਲ ਫੋਲਡਰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
  
-#: ../camel/providers/local/camel-spool-summary.c:172
-#: ../camel/providers/local/camel-spool-summary.c:182
-#: ../camel/providers/local/camel-spool-summary.c:192
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:191
+#: ../camel/providers/local/camel-spool-summary.c:201
  #, c-format
  msgid "Could not sync temporary folder %s: %s"
  msgstr "ਆਰਜ਼ੀ ਫੋਲਡਰ %s ਨੂੰ ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s"
  
-#: ../camel/providers/local/camel-spool-summary.c:208
+#: ../camel/providers/local/camel-spool-summary.c:217
  #, c-format
  msgid "Could not sync spool folder %s: %s"
  msgstr "ਸਪੂਲ ਫੋਲਡਰ %s ਨੂੰ ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s"
  
-#: ../camel/providers/local/camel-spool-summary.c:239
-#: ../camel/providers/local/camel-spool-summary.c:256
-#: ../camel/providers/local/camel-spool-summary.c:267
+#: ../camel/providers/local/camel-spool-summary.c:248
+#: ../camel/providers/local/camel-spool-summary.c:265
+#: ../camel/providers/local/camel-spool-summary.c:276
  #, c-format
  msgid ""
  "Could not sync spool folder %s: %s\n"
@@ -4202,25 +4053,26 @@ msgstr ""
  "ਸਪੂਲ ਫੋਲਡਰ %s ਨੂੰ ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ: %s\n"
  "ਫੋਲਡਰ ਨਿਕਾਰਾ ਹੋ ਸਕਦਾ ਹੈ, ਨਕਲ '%s' ਵਿੱਚ ਸੰਭਾਲੀ ਗਈ ਹੈ।"
  
-#: ../camel/providers/nntp/camel-nntp-folder.c:176
-#: ../camel/providers/nntp/camel-nntp-folder.c:208
+#: ../camel/providers/nntp/camel-nntp-folder.c:137
+#: ../camel/providers/nntp/camel-nntp-folder.c:195
+#: ../camel/providers/nntp/camel-nntp-folder.c:227
  #, c-format
  msgid "Internal error: UID in invalid format: %s"
  msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ: UID ਗਲਤ ਫਾਰਮੈਟ ਵਿੱਚ ਹੈ: %s"
  
-#: ../camel/providers/nntp/camel-nntp-folder.c:330
-#: ../camel/providers/nntp/camel-nntp-folder.c:333
-#: ../camel/providers/nntp/camel-nntp-folder.c:375
-#: ../camel/providers/nntp/camel-nntp-folder.c:377
+#: ../camel/providers/nntp/camel-nntp-folder.c:368
+#: ../camel/providers/nntp/camel-nntp-folder.c:371
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/nntp/camel-nntp-folder.c:415
  #, c-format
  msgid "Posting failed: %s"
  msgstr "ਭੇਜਣ ਕਾਰਵਾਈ ਅਸਫਲ: %s"
  
-#: ../camel/providers/nntp/camel-nntp-folder.c:395
+#: ../camel/providers/nntp/camel-nntp-folder.c:433
  msgid "You cannot post NNTP messages while working offline!"
  msgstr "ਤੁਸੀਂ ਆਫਲਾਈਨ ਕੰਮ ਕਰਦੇ ਸਮੇਂ NNTP ਸੁਨੇਹੇ ਭੇਜ ਨਹੀਂ ਸਕਦੇ !"
  
-#: ../camel/providers/nntp/camel-nntp-folder.c:406
+#: ../camel/providers/nntp/camel-nntp-folder.c:444
  msgid "You cannot copy messages from a NNTP folder!"
  msgstr "ਤੁਸੀਂ NNTP ਫੋਲਡਰ ਤੋਂ ਸੁਨੇਹੇ ਨਕਲ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ!"
  
@@ -4241,7 +4093,9 @@ msgid "This is a provider for reading from and posting to USENET newsgroups."
  msgstr "ਇਹ ਖ਼ਬਰ-ਸਮੂਹ USENET ਤੋਂ ਪੜਨ ਅਤੇ ਭੇਜਣ ਲਈ ਸਹਾਈ ਹੈ।"
  
  #: ../camel/providers/nntp/camel-nntp-provider.c:76
-msgid "This option will authenticate with the NNTP server using a plaintext password."
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
  msgstr "ਇਸ ਚੋਣ ਨਾਲ NNTP ਸਰਵਰ ਤੇ ਸਮਤਲ-ਪਾਠ ਪਾਸਵਰਡ ਪ੍ਰਮਾਣਕਿਤਾ ਲਈ ਵਰਤਿਆ ਜਾਵੇਗਾ।"
  
  #: ../camel/providers/nntp/camel-nntp-store.c:217
@@ -4259,7 +4113,7 @@ msgstr "NNTP ਸਰਵਰ %s ਨੇ ਗਲਤੀ ਕੋਡ %d ਭੇਜਿਆ 
  msgid "USENET News via %s"
  msgstr "USENET ਖਬਰਾਂ %s ਰਾਹੀ"
  
-#: ../camel/providers/nntp/camel-nntp-store.c:798
+#: ../camel/providers/nntp/camel-nntp-store.c:815
  #, c-format
  msgid ""
  "Error retrieving newsgroups:\n"
@@ -4270,7 +4124,7 @@ msgstr ""
  "\n"
  "%s"
  
-#: ../camel/providers/nntp/camel-nntp-store.c:892
+#: ../camel/providers/nntp/camel-nntp-store.c:909
  msgid ""
  "You cannot subscribe to this newsgroup:\n"
  "\n"
@@ -4280,7 +4134,7 @@ msgstr ""
  "\n"
  "ਇਸ ਤਰਾਂ ਦਾ ਕੋਈ ਖਬਰ-ਸਮੂਹ ਨਹੀਂ ਹੈ। ਸਾਇਦ ਚੁਣੀ ਇਕਾਈ ਮੁੱਢਲਾ ਫੋਲਡਰ ਹੈ।"
  
-#: ../camel/providers/nntp/camel-nntp-store.c:924
+#: ../camel/providers/nntp/camel-nntp-store.c:941
  msgid ""
  "You cannot unsubscribe to this newsgroup:\n"
  "\n"
@@ -4290,96 +4144,97 @@ msgstr ""
  "\n"
  "ਇਸ ਤਰਾਂ ਦਾ ਕੋਈ ਖਬਰ-ਸਮੂਹ ਨਹੀਂ ਹੈ।"
  
-#: ../camel/providers/nntp/camel-nntp-store.c:949
+#: ../camel/providers/nntp/camel-nntp-store.c:966
  msgid "You cannot create a folder in a News store: subscribe instead."
  msgstr "ਤੁਸੀਂ ਖਬਰ ਸੰਭਾਲ ਵਿੱਚ ਫੋਲਡਰ ਨਹੀਂ ਬਣਾ ਸਕਦੇ ਹੋ: ਸਵੀਕਾਰ ਹੀ ਕਰੋ।"
  
-#: ../camel/providers/nntp/camel-nntp-store.c:957
+#: ../camel/providers/nntp/camel-nntp-store.c:974
  msgid "You cannot rename a folder in a News store."
  msgstr "ਖਬਰ ਸੰਭਾਲ ਵਿੱਚ ਫੋਲਡਰ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।"
  
-#: ../camel/providers/nntp/camel-nntp-store.c:965
+#: ../camel/providers/nntp/camel-nntp-store.c:982
  msgid "You cannot remove a folder in a News store: unsubscribe instead."
  msgstr "ਤੁਸੀਂ ਖਬਰ ਸੰਭਾਲ ਵਿੱਚ ਫੋਲਡਰ ਨਹੀਂ ਹਟਾ ਸਕਦੇ ਹੋ: ਅਸਵੀਕਾਰ ਹੀ ਕਰੋ।"
  
-#: ../camel/providers/nntp/camel-nntp-store.c:1154
+#: ../camel/providers/nntp/camel-nntp-store.c:1171
  msgid "Authentication requested but no username provided"
  msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ, ਪਰ ਕੋਈ ਯੂਜ਼ਰ ਦਿੱਤਾ ਨਹੀਂ ਗਿਆ"
  
-#: ../camel/providers/nntp/camel-nntp-store.c:1166
+#: ../camel/providers/nntp/camel-nntp-store.c:1183
  #, c-format
  msgid "Cannot authenticate to server: %s"
  msgstr "ਸਰਵਰ ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਹੋਣ ਵਿੱਚ ਅਸਫਲ: %s"
  
-#: ../camel/providers/nntp/camel-nntp-store.c:1283
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
  #, c-format
  msgid "NNTP Command failed: %s"
  msgstr "NNTP ਕਮਾਂਡ ਅਸਫਲ: %s"
  
-#: ../camel/providers/nntp/camel-nntp-store.c:1337
+#: ../camel/providers/nntp/camel-nntp-store.c:1360
  msgid "Not connected."
  msgstr "ਜੁੜਿਆ ਨਹੀ ਹੈ।"
  
-#: ../camel/providers/nntp/camel-nntp-store.c:1390
+#: ../camel/providers/nntp/camel-nntp-store.c:1413
  #, c-format
  msgid "No such folder: %s"
  msgstr "ਇਸਤਰਾਂ ਦਾ ਕੋਈ ਫੋਲਡਰ ਨਹੀਂ ਹੈ: %s"
  
-#: ../camel/providers/nntp/camel-nntp-summary.c:273
-#: ../camel/providers/nntp/camel-nntp-summary.c:369
+#: ../camel/providers/nntp/camel-nntp-summary.c:271
+#: ../camel/providers/nntp/camel-nntp-summary.c:364
  #, c-format
  msgid "%s: Scanning new messages"
  msgstr "%s: ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਦੀ ਜਾਂਚ ਜਾਰੀ ਹੈ"
  
-#: ../camel/providers/nntp/camel-nntp-summary.c:280
+#: ../camel/providers/nntp/camel-nntp-summary.c:278
  #, c-format
  msgid "Unexpected server response from xover: %s"
  msgstr "xover ਤੋ ਅਸਧਾਰਨ ਸਰਵਰ ਜਵਾਬ ਹੈ: %s"
  
-#: ../camel/providers/nntp/camel-nntp-summary.c:383
+#: ../camel/providers/nntp/camel-nntp-summary.c:378
  #, c-format
  msgid "Unexpected server response from head: %s"
  msgstr "head ਤੋ ਅਸਧਾਰਨ ਸਰਵਰ ਜਵਾਬ ਹੈ: %s"
  
-#: ../camel/providers/nntp/camel-nntp-summary.c:423
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
  msgid "Use cancel"
  msgstr "ਰੱਦ ਵਰਤੋਂ"
  
-#: ../camel/providers/nntp/camel-nntp-summary.c:425
+#: ../camel/providers/nntp/camel-nntp-summary.c:416
  #, c-format
  msgid "Operation failed: %s"
  msgstr "ਕਾਰਵਾਈ ਅਸਫਲ: %s"
  
-#: ../camel/providers/pop3/camel-pop3-folder.c:251
+#: ../camel/providers/pop3/camel-pop3-folder.c:253
  msgid "Retrieving POP summary"
  msgstr "POP ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
  
-#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:271
  #, c-format
  msgid "Cannot get POP summary: %s"
  msgstr "POP ਸੰਖੇਪ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦੀ ਹੈ: %s"
  
-#: ../camel/providers/pop3/camel-pop3-folder.c:312
+#: ../camel/providers/pop3/camel-pop3-folder.c:314
  msgid "Expunging old messages"
  msgstr "ਹਟਾਏ ਸੁਨੇਹੇ ਸੁੰਘੜੇ ਜਾ ਰਹੇ ਹਨ"
  
-#: ../camel/providers/pop3/camel-pop3-folder.c:320
+#: ../camel/providers/pop3/camel-pop3-folder.c:322
  msgid "Expunging deleted messages"
  msgstr "ਹਟਾਏ ਸੁਨੇਹੇ ਫੋਲੇ ਜਾ ਰਹੇ ਹਨ"
  
-#: ../camel/providers/pop3/camel-pop3-folder.c:534
+#: ../camel/providers/pop3/camel-pop3-folder.c:530
+#: ../camel/providers/pop3/camel-pop3-folder.c:552
  #, c-format
  msgid "No message with UID %s"
  msgstr "UID %s ਨਾਲ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ"
  
  #. Sigh, most of the crap in this function is so that the cancel button
  #. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:541
+#: ../camel/providers/pop3/camel-pop3-folder.c:559
  #, c-format
  msgid "Retrieving POP message %d"
  msgstr "POP ਸੁਨੇਹੇ %d ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
  
-#: ../camel/providers/pop3/camel-pop3-folder.c:631
+#: ../camel/providers/pop3/camel-pop3-folder.c:649
  msgid "Unknown reason"
  msgstr "ਅਣਪਛਾਤਾ ਕਾਰਨ"
  
@@ -4405,67 +4260,82 @@ msgid "For connecting to and downloading mail from POP servers."
  msgstr "ਜੁੜਨ ਲਈ POP ਸਰਵਰ ਤੋਂ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ।"
  
  #: ../camel/providers/pop3/camel-pop3-provider.c:74
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
-msgstr "ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ POP ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ-ਪਾਠ ਪਾਸਵਰਡ ਨਾਲ ਜੋੜੇਗਾ,ਇਹ ਹੀ ਚੋਣ ਹੈ, ਜੋ ਕਿ ਅਕਸਰ POP ਸਰਵਰਾਂ ਤੇ ਉਪਲੱਬਧ ਹੁੰਦੀ ਹੈ।"
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ POP ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ-ਪਾਠ ਪਾਸਵਰਡ ਨਾਲ ਜੋੜੇਗਾ,ਇਹ ਹੀ ਚੋਣ ਹੈ, ਜੋ ਕਿ ਅਕਸਰ POP "
+"ਸਰਵਰਾਂ ਤੇ ਉਪਲੱਬਧ ਹੁੰਦੀ ਹੈ।"
  
  #: ../camel/providers/pop3/camel-pop3-provider.c:84
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
-msgstr "ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ POP ਸਰਵਰ ਨਾਲ APOP ਪਰੋਟੋਕਾਲ ਰਾਹੀ ਇਕ੍ਰਿਪਟਡ ਪਾਸਵਰਡ ਨਾਲ ਜੋੜੇਗਾ, ਇਹ ਹੀ ਚੋਣ ਹੈ, ਜੋ ਕਿ ਅਕਸਰ ਸਰਵਰ ਸਭ ਯੂਜ਼ਰਵਾਂ ਨੂੰ ਦੇਣ ਦਾ ਵਾਅਦਾ ਤਾਂ ਕਰਦੇ ਹਨ, ਪਰ ਸੱਚ ਘੱਟ ਹੀ ਹੁੰਦਾ ਹੈ।"
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"ਇਹ ਚੋਣ ਤੁਹਾਨੂੰ POP ਸਰਵਰ ਨਾਲ APOP ਪਰੋਟੋਕਾਲ ਰਾਹੀ ਇਕ੍ਰਿਪਟਡ ਪਾਸਵਰਡ ਨਾਲ ਜੋੜੇਗਾ, ਇਹ ਹੀ ਚੋਣ "
+"ਹੈ, ਜੋ ਕਿ ਅਕਸਰ ਸਰਵਰ ਸਭ ਯੂਜ਼ਰਵਾਂ ਨੂੰ ਦੇਣ ਦਾ ਵਾਅਦਾ ਤਾਂ ਕਰਦੇ ਹਨ, ਪਰ ਸੱਚ ਘੱਟ ਹੀ ਹੁੰਦਾ ਹੈ।"
  
-#: ../camel/providers/pop3/camel-pop3-store.c:208
+#: ../camel/providers/pop3/camel-pop3-store.c:209
  #, c-format
  msgid "Failed to read a valid greeting from POP server %s"
  msgstr "POP ਸਰਵਰ %s ਤੋਂ ਸੁਨੇਹਾ ਪੜਨ ਵਿੱਚ ਅਸਫਲ"
  
-#: ../camel/providers/pop3/camel-pop3-store.c:225
-#: ../camel/providers/pop3/camel-pop3-store.c:239
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#: ../camel/providers/pop3/camel-pop3-store.c:226
+#: ../camel/providers/pop3/camel-pop3-store.c:240
+#: ../camel/providers/pop3/camel-pop3-store.c:250
+#: ../camel/providers/pop3/camel-pop3-store.c:256
  #, 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:226
+#: ../camel/providers/pop3/camel-pop3-store.c:227
  msgid "STLS not supported by server"
  msgstr "ਸਰਵਰ ਵਲੋਂ STLS ਸਹਾਇਕ ਨਹੀਂ"
  
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:257
  msgid "TLS is not available in this build"
  msgstr "ਇਸ ਨਿਰਮਾਣ ਵਿੱਚ TLS ਉਪਲੱਬਧ ਨਹੀਂ"
  
-#: ../camel/providers/pop3/camel-pop3-store.c:362
+#: ../camel/providers/pop3/camel-pop3-store.c:363
  #, c-format
  msgid "Could not connect to POP server %s"
  msgstr "POP ਸਰਵਰ %s ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ"
  
-#: ../camel/providers/pop3/camel-pop3-store.c:403
-#: ../camel/providers/pop3/camel-pop3-store.c:536
+#: ../camel/providers/pop3/camel-pop3-store.c:404
+#: ../camel/providers/pop3/camel-pop3-store.c:537
  #, c-format
-msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
  msgstr "POP ਸਰਵਰ %s ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ: ਲੋੜੀਦੇ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗ ਲਈ ਸਹਾਇਕ ਨਹੀਂ।"
  
-#: ../camel/providers/pop3/camel-pop3-store.c:419
+#: ../camel/providers/pop3/camel-pop3-store.c:420
  #, c-format
  msgid "SASL '%s' Login failed for POP server %s: %s"
  msgstr "POP ਸਰਵਰ %2$s ਉੱਤੇ SASL '%1$s' ਲਾਗਇਨ ਅਸਫਲ: %3$s"
  
-#: ../camel/providers/pop3/camel-pop3-store.c:431
+#: ../camel/providers/pop3/camel-pop3-store.c:432
  #, c-format
  msgid "Cannot login to POP server %s: SASL Protocol error"
  msgstr "POP ਸਰਵਰ %s ਤੇ ਲਾੱਗਆਨ ਕਰਨ ਤੋਂ ਅਸਫਲ: SASL ਪਰੋਟੋਕਾਲ ਗਲਤੀ"
  
-#: ../camel/providers/pop3/camel-pop3-store.c:450
+#: ../camel/providers/pop3/camel-pop3-store.c:451
  #, c-format
  msgid "Failed to authenticate on POP server %s: %s"
  msgstr "POP ਸਰਵਰ %s ਤੇ ਪ੍ਰਮਾਣਕਿਤਾ ਅਸਫਲ: %s"
  
-#: ../camel/providers/pop3/camel-pop3-store.c:509
+#: ../camel/providers/pop3/camel-pop3-store.c:510
  #, c-format
-msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
-msgstr "POP ਸਰਵਰ %s ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮੱਰਥ ਹੈ।\tਗਲਤ APOP ID ਮਿਲਿਆ ਹੈ। Impersonation ਹਮਲੇ ਦਾ ਸ਼ੱਕ ਹੈ। ਆਪਣੇ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
+"POP ਸਰਵਰ %s ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮੱਰਥ ਹੈ।\tਗਲਤ APOP ID ਮਿਲਿਆ ਹੈ। Impersonation ਹਮਲੇ ਦਾ "
+"ਸ਼ੱਕ ਹੈ। ਆਪਣੇ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
  
-#: ../camel/providers/pop3/camel-pop3-store.c:550
-#: ../camel/providers/pop3/camel-pop3-store.c:563
+#: ../camel/providers/pop3/camel-pop3-store.c:551
+#: ../camel/providers/pop3/camel-pop3-store.c:564
  #, c-format
  msgid ""
  "Unable to connect to POP server %s.\n"
@@ -4474,7 +4344,7 @@ msgstr ""
  "POP ਸਰਵਰ %s ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ\n"
  "ਪਾਸਵਰਡ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ: %s"
  
-#: ../camel/providers/pop3/camel-pop3-store.c:557
+#: ../camel/providers/pop3/camel-pop3-store.c:558
  #, c-format
  msgid ""
  "Unable to connect to POP server %s.\n"
@@ -4483,7 +4353,7 @@ msgstr ""
  "POP ਸਰਵਰ %s ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ।\n"
  "ਯੂਜ਼ਰ ਨਾਂ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ: %s"
  
-#: ../camel/providers/pop3/camel-pop3-store.c:663
+#: ../camel/providers/pop3/camel-pop3-store.c:671
  #, c-format
  msgid "No such folder '%s'."
  msgstr "'%s' ਫੋਲਡਰ ਨਹੀਂ ਹੈ।"
@@ -4493,7 +4363,9 @@ msgid "Sendmail"
  msgstr "Sendmail"
  
  #: ../camel/providers/sendmail/camel-sendmail-provider.c:40
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
  msgstr "ਲੋਕਲ ਸਿਸਟਮ ਤੇ ਪੱਤਰ ਭੇਜਣ ਲਈ \"sendmail\" ਨੂੰ ਵਰਤੋਂ।"
  
  #: ../camel/providers/sendmail/camel-sendmail-transport.c:115
@@ -4662,7 +4534,7 @@ msgstr "STARTTLS ਕਮਾਂਡ ਅਸਫਲ"
  msgid "SMTP server %s does not support requested authentication type %s."
  msgstr "SMTP ਸਰਵਰ %s ਲੋੜੀਦੀ ਪ੍ਰਮਾਣਕਿਤਾ ਕਿਸਮ %s ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:564
+#: ../camel/providers/smtp/camel-smtp-transport.c:568
  #, c-format
  msgid ""
  "Unable to authenticate to SMTP server.\n"
@@ -4673,93 +4545,93 @@ msgstr ""
  "%s\n"
  "\n"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:697
+#: ../camel/providers/smtp/camel-smtp-transport.c:701
  #, c-format
  msgid "SMTP server %s"
  msgstr "SMTP ਸਰਵਰ %s"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:699
+#: ../camel/providers/smtp/camel-smtp-transport.c:703
  #, c-format
  msgid "SMTP mail delivery via %s"
  msgstr "SMTP ਪੱਤਰ ਪਹੁੰਚ %s ਰਾਹੀ"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:717
+#: ../camel/providers/smtp/camel-smtp-transport.c:721
  msgid "Cannot send message: service not connected."
  msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: ਸੇਵਾ ਜੁੜੀ ਨਹੀਂ ਹੈ।"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
  msgid "Cannot send message: sender address not valid."
  msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: ਭੇਜਣ ਵਾਲੇ ਦਾ ਐਡਰੈੱਸ ਜਾਇਜ ਨਹੀਂ ਹੈ।"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
  msgid "Sending message"
  msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:742
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
  msgid "Cannot send message: no recipients defined."
  msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: ਕੋਈ ਪ੍ਰਾਪਤ ਕਰਤਾ ਨਹੀਂ ਹੈ।"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
  msgid "Cannot send message: one or more invalid recipients"
  msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: ਇੱਕ ਜਾਂ ਵਧੇਰੇ ਪ੍ਰਾਪਤ-ਕਰਤਾ ਗਲਤ"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:982
+#: ../camel/providers/smtp/camel-smtp-transport.c:986
  msgid "SMTP Greeting"
  msgstr "SMTP ਸ਼ੁੱਭ-ਸੁਨੇਹਾ"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1007
+#: ../camel/providers/smtp/camel-smtp-transport.c:1011
  #, c-format
  msgid "HELO command failed: %s"
  msgstr "HELO ਕਮਾਂਡ ਅਸਫਲ: %s"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1024
+#: ../camel/providers/smtp/camel-smtp-transport.c:1028
  msgid "HELO command failed"
  msgstr "HELO ਕਮਾਂਡ ਅਸਫਲ"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1090
+#: ../camel/providers/smtp/camel-smtp-transport.c:1094
  msgid "SMTP Authentication"
  msgstr "SMTP ਪ੍ਰਮਾਣਕਿਤਾ"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1096
+#: ../camel/providers/smtp/camel-smtp-transport.c:1100
  msgid "Error creating SASL authentication object."
  msgstr "ਗਲਤੀ, SASL ਪ੍ਰਮਾਣਕਿਤਾ ਇਕਾਈ ਬਣਾਉਣ ਵਿੱਚ।"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1113
-#: ../camel/providers/smtp/camel-smtp-transport.c:1124
+#: ../camel/providers/smtp/camel-smtp-transport.c:1117
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
  #, c-format
  msgid "AUTH command failed: %s"
  msgstr "AUTH ਕਮਾਂਡ ਅਸਫਲ: %s"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1130
+#: ../camel/providers/smtp/camel-smtp-transport.c:1134
  msgid "AUTH command failed"
  msgstr "AUTH ਕਮਾਂਡ ਅਸਫਲ"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1200
+#: ../camel/providers/smtp/camel-smtp-transport.c:1204
  msgid "Bad authentication response from server.\n"
  msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਪ੍ਰਮਾਣਿਕਤਾ ਜਵਾਬ।\n"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1227
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
  #, c-format
  msgid "MAIL FROM command failed: %s: mail not sent"
  msgstr "MAIL FROM ਕਮਾਂਡ ਅਸਫਲ: %s: ਪੱਤਰ ਭੇਜਿਆ ਨਹੀਂ ਗਿਆ"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1244
+#: ../camel/providers/smtp/camel-smtp-transport.c:1248
  msgid "MAIL FROM command failed"
  msgstr "MAIL FROM ਕਮਾਂਡ ਅਸਫਲ"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1268
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
  #, c-format
  msgid "RCPT TO command failed: %s: mail not sent"
  msgstr "RCPT TO ਕਮਾਂਡ ਅਸਫਲ: %s:ਪੱਤਰ ਭੇਜਿਆ ਨਹੀਂ ਗਿਆ"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1287
+#: ../camel/providers/smtp/camel-smtp-transport.c:1291
  #, c-format
  msgid "RCPT TO <%s> failed"
  msgstr "RCPT TO <%s> ਅਸਫਲ"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1327
-#: ../camel/providers/smtp/camel-smtp-transport.c:1396
-#: ../camel/providers/smtp/camel-smtp-transport.c:1415
+#: ../camel/providers/smtp/camel-smtp-transport.c:1331
+#: ../camel/providers/smtp/camel-smtp-transport.c:1400
+#: ../camel/providers/smtp/camel-smtp-transport.c:1419
  #, c-format
  msgid "DATA command failed: %s: mail not sent"
  msgstr "DATA ਕਮਾਂਡ ਅਸਫਲ: %s: ਪੱਤਰ ਭੇਜਿਆ ਨਹੀਂ ਗਿਆ"
@@ -4767,26 +4639,26 @@ msgstr "DATA ਕਮਾਂਡ ਅਸਫਲ: %s: ਪੱਤਰ ਭੇਜਿਆ ਨ
  #. we should have gotten instructions on how to use the DATA command:
  #. * 354 Enter mail, end with "." on a line by itself
  #.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1344
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1348
+#: ../camel/providers/smtp/camel-smtp-transport.c:1435
  msgid "DATA command failed"
  msgstr "DATA ਕਮਾਂਡ ਅਸਫਲ"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1454
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
  #, c-format
  msgid "RSET command failed: %s"
  msgstr "RSET ਕਮਾਂਡ ਅਸਫਲ: %s"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1470
+#: ../camel/providers/smtp/camel-smtp-transport.c:1474
  msgid "RSET command failed"
  msgstr "RSET ਕਮਾਂਡ ਅਸਫਲ"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1493
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
  #, c-format
  msgid "QUIT command failed: %s"
  msgstr "QUIT ਕਮਾਂਡ ਅਸਫਲ: %s"
  
-#: ../camel/providers/smtp/camel-smtp-transport.c:1507
+#: ../camel/providers/smtp/camel-smtp-transport.c:1511
  msgid "QUIT command failed"
  msgstr "QUIT ਕਮਾਂਡ ਅਸਫਲ"
  
@@ -4876,8 +4748,7 @@ msgstr "ਉਡੀਕ ਜਾਰੀ"
  #. in 12-hour format.
  #. strftime format of a weekday, a date and a
  #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644
-#: ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1911
  msgid "%a %m/%d/%Y %I:%M:%S %p"
  msgstr "%I:%M:%S %p %a %d/%m/%Y"
  
@@ -4885,8 +4756,7 @@ msgstr "%I:%M:%S %p %a %d/%m/%Y"
  #. in 24-hour format.
  #. strftime format of a weekday, a date and a
  #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649
-#: ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1902
  msgid "%a %m/%d/%Y %H:%M:%S"
  msgstr "%H:%M:%S %a %d/%m/%Y"
  
@@ -4894,8 +4764,7 @@ msgstr "%H:%M:%S %a %d/%m/%Y"
  #. in 12-hour format, without seconds.
  #. strftime format of a weekday, a date and a
  #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1654
-#: ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1654 ../libedataserver/e-time-utils.c:1907
  msgid "%a %m/%d/%Y %I:%M %p"
  msgstr "%I:%M %p %a %d/%m/%Y"
  
@@ -4903,8 +4772,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:1659
-#: ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1659 ../libedataserver/e-time-utils.c:1898
  msgid "%a %m/%d/%Y %H:%M"
  msgstr "%H:%M %a %d/%m/%Y"
  
@@ -4922,8 +4790,7 @@ msgstr "%a %d/%m/%Y %H"
  
  #. strptime format of a weekday and a date.
  #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1672
-#: ../libedataserver/e-time-utils.c:1773
+#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1773
  #: ../libedataserver/e-time-utils.c:1893
  msgid "%a %m/%d/%Y"
  msgstr "%a %d/%m/%Y"
@@ -4964,22 +4831,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:1707
-#: ../libedataserver/e-time-utils.c:1776
+#: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1776
  msgid "%m/%d/%Y"
  msgstr "%d/%m/%Y"
  
  #. strptime format for a time of day, in 12-hour format.
  #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1834
-#: ../libedataserver/e-time-utils.c:1956
+#: ../libedataserver/e-time-utils.c:1834 ../libedataserver/e-time-utils.c:1956
  msgid "%I:%M:%S %p"
  msgstr "%I:%M:%S %p"
  
  #. strptime format for a time of day, in 24-hour format.
  #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1838
-#: ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1838 ../libedataserver/e-time-utils.c:1948
  msgid "%H:%M:%S"
  msgstr "%H:%M:%S"
  
@@ -4987,16 +4851,14 @@ msgstr "%H:%M:%S"
  #. in 12-hour format.
  #. strftime format of a time in 12-hour format,
  #. without seconds.
-#: ../libedataserver/e-time-utils.c:1843
-#: ../libedataserver/e-time-utils.c:1953
+#: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953
  msgid "%I:%M %p"
  msgstr "%I:%M %p"
  
  #. strptime format for time of day, without seconds 24-hour format.
  #. strftime format of a time in 24-hour format,
  #. without seconds.
-#: ../libedataserver/e-time-utils.c:1847
-#: ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1847 ../libedataserver/e-time-utils.c:1945
  msgid "%H:%M"
  msgstr "%H:%M"
  
@@ -5018,16 +4880,18 @@ msgstr "LDAP ਸਰਵਰ ਨੂੰ ਅਗਿਆਤ ਦੇ ਤੌਰ 'ਤੇ ਵ
  msgid "Failed to authenticate.\n"
  msgstr "ਡਾਟਾ ਇਕੋਡਿਗ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।\n"
  
-#: ../libedataserverui/e-categories-dialog.c:261
+#: ../libedataserverui/e-categories-dialog.c:362
  #, c-format
-msgid "There is already a category '%s' in the configuration. Please use another name"
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
  msgstr "ਸੰਰਚਨਾ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ '%s' ਕੈਟਾਗਰੀ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ।"
  
-#: ../libedataserverui/e-categories-dialog.c:462
+#: ../libedataserverui/e-categories-dialog.c:526
  msgid "Icon"
  msgstr "ਆਈਕਾਨ"
  
-#: ../libedataserverui/e-categories-dialog.c:467
+#: ../libedataserverui/e-categories-dialog.c:531
  msgid "Category"
  msgstr "ਕੈਟਾਗਰੀ"
  
@@ -5063,19 +4927,32 @@ msgstr "ਸੋਧ(_E)"
  msgid "categories"
  msgstr "ਕੈਟਾਗਰੀ"
  
-#: ../libedataserverui/e-name-selector-dialog.c:266
+#: ../libedataserverui/e-category-completion.c:290, c-format
+#| msgid "Category List"
+msgid "Create category \"%s\""
+msgstr "ਕੈਟਾਗਰੀ \"%s\" ਬਣਾਓ"
+
+#: ../libedataserverui/e-cell-renderer-color.c:222
+msgid "Color Info"
+msgstr "ਰੰਗ ਜਾਣਕਾਰੀ"
+
+#: ../libedataserverui/e-cell-renderer-color.c:223
+msgid "The color to render"
+msgstr "ਰੈਂਡਰ ਕਰਨ ਲਈ ਰੰਗ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:278
  msgid "Select Contacts from Address Book"
  msgstr "ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚੋਂ ਸੰਪਰਕ ਚੁਣੋ"
  
-#: ../libedataserverui/e-name-selector-dialog.c:546
+#: ../libedataserverui/e-name-selector-dialog.c:565
  msgid "_Add"
  msgstr "ਸ਼ਾਮਲ(_A)"
  
-#: ../libedataserverui/e-name-selector-dialog.c:571
+#: ../libedataserverui/e-name-selector-dialog.c:590
  msgid "_Remove"
  msgstr "ਹਟਾਓ(_R)"
  
-#: ../libedataserverui/e-name-selector-dialog.c:744
+#: ../libedataserverui/e-name-selector-dialog.c:767
  #: ../libedataserverui/e-name-selector-dialog.glade.h:6
  msgid "Any Category"
  msgstr "ਕੋਈ ਵੀ ਕੈਟਾਗਰੀ"
@@ -5118,76 +4995,76 @@ 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:2240
+#: ../libedataserverui/e-name-selector-entry.c:2456
  #, c-format
  msgid "E_xpand %s Inline"
  msgstr "%s ਲਾਇਨ 'ਚ ਫੈਲਾਓ(_x)"
  
  #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2255
+#: ../libedataserverui/e-name-selector-entry.c:2471
  #, c-format
  msgid "Cop_y %s"
  msgstr "%s ਕਾਪੀ ਕਰੋ(_y)"
  
  #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2265
+#: ../libedataserverui/e-name-selector-entry.c:2481
  #, c-format
  msgid "C_ut %s"
  msgstr "%s ਕੱਟੋ(_U)"
  
  #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2282
+#: ../libedataserverui/e-name-selector-entry.c:2498
  #, c-format
  msgid "_Edit %s"
  msgstr "%s ਸੋਧ(_E)"
  
-#: ../libedataserverui/e-name-selector-list.c:466
+#: ../libedataserverui/e-name-selector-list.c:472
  #, c-format
  msgid "_Delete %s"
  msgstr "%s ਹਟਾਓ(_D)"
  
-#: ../libedataserverui/e-passwords.c:218
+#: ../libedataserverui/e-passwords.c:234
  #, c-format
  msgid "Keyring key is unusable: no user or host name"
  msgstr "ਕੀਰਿੰਗ ਕੀ ਅਣ-ਵਰਤੋਂਯੋਗ ਹੈ: ਕੋਈ ਹੋਸਟ ਜਾਂ ਯੂਜ਼ਰ ਨਹੀਂ"
  
-#: ../libedataserverui/e-passwords.c:1055
+#: ../libedataserverui/e-passwords.c:1094
  msgid "You have the Caps Lock key on."
  msgstr "ਤੁਸੀਂ ਕੈਪਸ ਲਾਕ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਹੈ।"
  
-#: ../libedataserverui/e-passwords.c:1175
+#: ../libedataserverui/e-passwords.c:1216
  msgid "_Remember this passphrase"
  msgstr "ਇਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)"
  
-#: ../libedataserverui/e-passwords.c:1176
+#: ../libedataserverui/e-passwords.c:1217
  msgid "_Remember this passphrase for the remainder of this session"
  msgstr "ਇਸ ਸ਼ੈਸ਼ਨ ਲਈ ਇਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)"
  
-#: ../libedataserverui/e-passwords.c:1181
+#: ../libedataserverui/e-passwords.c:1222
  msgid "_Remember this password"
  msgstr "ਇਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)"
  
-#: ../libedataserverui/e-passwords.c:1182
+#: ../libedataserverui/e-passwords.c:1223
  msgid "_Remember this password for the remainder of this session"
  msgstr "ਇਸ ਸ਼ੈਸਨ ਲਈ ਇਹ ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ(_R)"
  
  #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:95
+#: ../libedataserverui/e-source-selector-dialog.c:100
  msgid "Select destination"
  msgstr "ਟਿਕਾਣਾ ਚੁਣੋ"
  
-#: ../libedataserverui/e-source-selector-dialog.c:148
+#: ../libedataserverui/e-source-selector-dialog.c:156
  msgid "_Destination"
  msgstr "ਟਿਕਾਣਾ(_D)"
  
-#: ../servers/exchange/lib/e2k-autoconfig.c:1683
-#: ../servers/exchange/storage/exchange-account.c:953
+#: ../servers/exchange/lib/e2k-autoconfig.c:1698
+#: ../servers/exchange/storage/exchange-account.c:959
  #, c-format
  msgid "Enter password for %s"
  msgstr "%s ਲਈ ਪਾਸਵਰਡ ਦਿਓ"
  
-#: ../servers/exchange/lib/e2k-autoconfig.c:1684
-#: ../servers/exchange/storage/exchange-account.c:958
+#: ../servers/exchange/lib/e2k-autoconfig.c:1699
+#: ../servers/exchange/storage/exchange-account.c:964
  msgid "Enter password"
  msgstr "ਪਾਸਵਰਡ ਦਿਓ"
  
@@ -5291,26 +5168,26 @@ msgstr "ਇਹ ਕਾਰਵਾਈ ਆਫਲਾਇਨ ਢੰਗ ਰਾਹੀਂ 
  
  #. i18n: This is the title of an "other user's folders"
  #. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:644
+#: ../servers/exchange/storage/exchange-account.c:642
  #, c-format
  msgid "%s's Folders"
  msgstr "%s ਦੇ ਫੋਲਡਰ"
  
-#: ../servers/exchange/storage/exchange-account.c:1259
+#: ../servers/exchange/storage/exchange-account.c:1265
  msgid "Personal Folders"
  msgstr "ਨਿੱਜੀ ਫੋਲਡਰ"
  
-#: ../servers/exchange/storage/exchange-account.c:1274
+#: ../servers/exchange/storage/exchange-account.c:1280
  msgid "Favorite Public Folders"
  msgstr "ਪਸੰਦੀਦਾ ਪਬਲਿਕ ਫੋਲਡਰ"
  
  #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1291
+#: ../servers/exchange/storage/exchange-account.c:1297
  msgid "All Public Folders"
  msgstr "ਸਭ ਪਬਲਿਕ ਫੋਲਡਰ"
  
  #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1305
+#: ../servers/exchange/storage/exchange-account.c:1311
  msgid "Global Address List"
  msgstr "ਗਲੋਬਲ ਐਡਰੈੱਸ ਸੂਚੀ"
  
@@ -5376,39 +5253,156 @@ msgstr "ਈਵੇਲੂਸ਼ਨ ਡਾਟਾ ਸਰਵਰ ਲਾਗਇਨ ਸ
  msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
  msgstr "ਬਹੁ ਭਾਗ ਗਲਤੀ ਆਈ ਹੈ, ਗਲਤੀ ਬਕਸਾ ਵੇਖਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ\n"
  
-#: ../libedataserverui/e-cell-renderer-color.c:210
-msgid "Color Info"
-msgstr "ਰੰਗ ਜਾਣਕਾਰੀ"
+#~ msgid "Fair"
+#~ msgstr "ਸਾਫ਼"
  
-#: ../libedataserverui/e-cell-renderer-color.c:211
-msgid "The color to render"
-msgstr "ਰੈਂਡਰ ਕਰਨ ਲਈ ਰੰਗ"
+#~ msgid "Snow showers"
+#~ msgstr "ਬਰਫ਼ ਫੁਹਾਰ"
+
+#~ msgid "Snow"
+#~ msgstr "ਬਰਫ਼"
+
+#~ msgid "Partly cloudy"
+#~ msgstr "ਹਲਕਾ ਬੱਦਲਵਾਈ"
+
+#~ msgid "Smoke"
+#~ msgstr "ਧੁੰਦ"
+
+#~ msgid "Thunderstorms"
+#~ msgstr "ਗਰਜ਼"
+
+#~ msgid "Cloudy"
+#~ msgstr "ਬੱਦਲਵਾਈ"
+
+#~ msgid "Drizzle"
+#~ msgstr "ਬੂੰਦਾਬਾਂਦੀ"
+
+#~ msgid "Sunny"
+#~ msgstr "ਸੋਹਣਾ ਦਿਨ"
+
+#~ msgid "Dust"
+#~ msgstr "ਘੱਟਾ"
+
+#~ msgid "Clear"
+#~ msgstr "ਸਾਫ਼"
+
+#~ msgid "Mostly cloudy"
+#~ msgstr "ਸੰਘਣੀ ਬੱਦਲਵਾਈ"
+
+#~ msgid "Windy"
+#~ msgstr "ਤੇਜ਼ ਹਵਾ"
+
+#~ msgid "Rain showers"
+#~ msgstr "ਮੀਂਹ ਫੁਹਾਰ"
+
+#~ msgid "Foggy"
+#~ msgstr "ਧੁੰਦ"
+
+#~ msgid "Rain/snow mixed"
+#~ msgstr "ਮੀਂਹ/ਬਰਫ਼ "
+
+#~ msgid "Sleet"
+#~ msgstr "ਬਰਫ਼ ਵਾਲਾ ਮੀਂਹ"
+
+#~ msgid "Very hot/humid"
+#~ msgstr "ਬਹੁਤ ਗਰਮ/ਨਮੀਂ"
+
+#~ msgid "Blizzard"
+#~ msgstr "ਬਰਫੀਲਾ ਤੂਫਾਨ"
+
+#~ msgid "Freezing rain"
+#~ msgstr "ਜਮਾਊਂ ਮੀਂਹ"
+
+#~ msgid "Haze"
+#~ msgstr "ਕੋਹਰਾ"
+
+#~ msgid "Blowing snow"
+#~ msgstr "ਬਰਫ਼ ਦੀ ਹਵਾ"
+
+#~ msgid "Freezing drizzle"
+#~ msgstr "ਜਮਾਉਣ ਵਾਲੀ ਬੂੰਦਾਬਾਂਦੀ"
+
+#~ msgid "Very cold/wind chill"
+#~ msgstr "ਬਹੁਤ ਠੰਡ/ਠੰਡੀ ਹਵਾ"
+
+#~ msgid "Rain"
+#~ msgstr "ਮੀਂਹ"
+
+#~ msgid "Weather: Partly Cloudy"
+#~ msgstr "ਮੌਸਮ: ਹਲਕੀ ਬੱਦਲਵਾਈ"
+
+#~ msgid "%.1f°C - %s"
+#~ msgstr "%.1f°C - %s"
+
+#~ msgid "%.1f°F - %s"
+#~ msgstr "%.1f°F - %s"
+
+#~ msgid "%.1f/%.1f°C - %s"
+#~ msgstr "%.1f/%.1f°C - %s"
+
+#~ msgid "%.1f/%.1f°F - %s"
+#~ msgstr "%.1f/%.1f°F - %s"
+
+#~ msgid "%d%% chance of precipitation\n"
+#~ msgstr "%d%% ਗੜਿਆਂ ਦੀ ਸੰਭਵਾਨਾ\n"
+
+#~ msgid "%.1fcm snow\n"
+#~ msgstr "%.1fਸੈਂਮੀ ਬਰਫ਼\n"
+
+#~ msgid "%.1fin snow\n"
+#~ msgstr "%.1fਇੰਚ ਬਰਫ਼\n"
+
+#~ msgid "%.1f-%.1fcm snow\n"
+#~ msgstr "%.1f-%.1fਸੈਂਮੀ ਬਰਫ਼\n"
+
+#~ msgid "%.1f-%.1fin snow\n"
+#~ msgstr "%.1f-%.1fਇੰਚ ਬਰਫ਼\n"
+
+#~ msgid "Failed to create create child process '%s': %s"
+#~ msgstr "ਅਗਲੀ ਕਿਰਿਆ '%s' ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
+
+#~ msgid "Performing query on unknown header: %s"
+#~ msgstr "ਅਣਜਾਣੇ ਸਿਰਲੇਖ ਤੇ ਸਵਾਲ ਜਾਰੀ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: %s"
+
+#~ msgid "Decoder failed, error %d"
+#~ msgstr "ਡੀਕੋਡਰ ਅਸਫਲ, ਗਲਤੀ %d"
  
  #~ msgid "Cannot find certificate for `%s'"
  #~ msgstr "`%s' ਲਈ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਲੱਭਾ ਹੈ"
+
  #~ msgid "%sPlease enter the GroupWise password for %s@%s"
  #~ msgstr "%sਕਿਰਪਾ ਕਰਕੇ %s@%s ਲਈ Groupwise ਪਾਸਵਰਡ ਦਿਓ"
+
  #~ msgid "Unable to authenticate to GroupWise server. "
  #~ msgstr "GroupWise ਸਰਵਰ ਤੇ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
+
  #~ msgid "Folder was destroyed and recreated on server."
  #~ msgstr "ਫੋਲਡਰ ਸਰਵਰ ਉੱਤੇ ਹਟਾਇਆ ਗਿਆ ਅਤੇ ਮੁੜ ਬਣਾਇਆ ਗਿਆ"
+
  #~ msgid ""
  #~ "Unexpected server response: Identical UIDs provided for messages %d and %d"
  #~ msgstr "ਅਧੂਰਾ ਸਰਵਰ ਜਵਾਬ: ਸੁਨੇਹੇ %d ਅਤੇ %d ਲਈ ਇੱਕੋ UIDs ਉਪਲੱਬਧ ਕਰਵਾਏ ਗਏ"
+
  #~ msgid "%sPlease enter the IMAP password for %s@%s"
  #~ msgstr "%s ਕਿਰਪਾ ਕਰਕੇ %s@%s ਲਈ IMAP ਪਾਸਵਰਡ ਦਿਓ"
+
  #~ msgid "%sPlease enter the IMAP password for %s on host %s"
  #~ msgstr "%s ਕਿਰਪਾ ਕਰਕੇ %s ਲਈ IMAP ਪਾਸਵਰਡ ਭਰੋ ਲਈ, ਹੋਸਟ %s ਉੱਤੇ"
+
  #~ msgid "Could not save summary: %s: %s"
  #~ msgstr "ਸੰਖੇਪ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s: %s"
+
  #~ msgid "Please enter the NNTP password for %s@%s"
  #~ msgstr "ਕਿਰਪਾ ਕਰਕੇ %s@%s ਲਈ NNTP ਪਾਸਵਰਡ ਦਿਓ"
+
  #~ msgid "%sPlease enter the SMTP password for %s on host %s"
  #~ msgstr "%1s ਕਿਰਪਾ ਕਰਕੇ %3s ਹੋਸਟ ਤੇ %2s ਲਈ SMTP ਪਾਸਵਰਡ ਦਿਓ"
+
  #~ msgid "Category _Color"
  #~ msgstr "ਕੈਟਾਗਰੀ ਰੰਗ(_C)"
+
  #~ msgid "Select User"
  #~ msgstr "ਯੂਜ਼ਰ ਚੁਣੋ"
+
  #~ msgid "Addressbook..."
  #~ msgstr "ਐਡਰੈੱਸ ਕਿਤਾਬ..."
-
author	Amanpreet Singh Alam <aman@src.gnome.org>
	Mon, 16 Mar 2009 02:56:27 +0000 (02:56 +0000)
committer	Amanpreet Singh Alam <aman@src.gnome.org>
	Mon, 16 Mar 2009 02:56:27 +0000 (02:56 +0000)