[evolution] update Punjabi translation



commit 27af441d1f0ca1dcbca0175cbfbf99f6482bb743
Author: A S Alam <aalam users sf net>
Date:   Thu Dec 16 09:07:44 2010 +0530

    update Punjabi translation

 po/pa.po | 9863 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 5157 insertions(+), 4706 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index f383abe..649ffaa 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2004 THE evolution'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the evolution package.
 #
-#: ../shell/main.c:532
+#: ../shell/main.c:615
 # Punjab Linux Technology <punjablinux netscape net>, 2004.
 # A S Alam <aalam users sf net>, 2004, 2005, 2006, 2007, 2009, 2010.
 # Amanpreet Singh Alam <aalam users sf net>, 2008, 2009.
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
-"POT-Creation-Date: 2010-09-10 23:31+0000\n"
-"PO-Revision-Date: 2010-09-11 08:27+0530\n"
+"POT-Creation-Date: 2010-12-08 13:33+0000\n"
+"PO-Revision-Date: 2010-12-16 08:51+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. For Translators: {0} is the name of the address book source
@@ -85,7 +85,7 @@ msgid "Delete address book '{0}'?"
 msgstr "�� �ਡਰ�ੱਸ-ਬ�ੱ� '{0}' ਹ�ਾ�ਣ� ਹ�?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:49
 msgid "Do _Not Delete"
 msgstr "ਨਾ ਹ�ਾ�(_N)"
 
@@ -99,7 +99,7 @@ msgstr "LDAP ਸਰਵਰ ਨਾਲ ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1280
 msgid "Failed to delete contact"
 msgstr "ਸੰਪਰ� ਹ�ਾ�ਣ ਦ�ਰਾਨ �ਲਤ�"
 
@@ -198,36 +198,37 @@ msgid ""
 "changes?"
 msgstr "ਤ�ਸ�� �ਪਣ� ਸੰਪਰ� ਵਿੱ� ਤਬਦ�ਲ��� ��ਤ��� ਹਨ, �� ਤ�ਸ�� �ਹਨਾ� ਨ�ੰ ਸੰਭਾਲਣਾ �ਾਹ���?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#. Translators: {0} is replaced with an address book name which will not be available
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡ� ਸੰਪਰ� {0} ਲ� �ਦ�� ਤੱ� �ਪਲੱਬਧ ਨਹ�� ਹ� ਸ�ਦ� ਹਨ, �ਦ�� ਤੱ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਮ�� �ਾਲ� ਨਹ�� ਹ�ੰਦਾ।"
 
-#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:603
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "ਸ਼ਾਮਿਲ(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "ਰੱਦ �ਰ�(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
 msgstr "ਨਾ ਸੰਭਾਲ�(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Resize"
 msgstr "ਮ��-��ਾਰ(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "_Use as it is"
 msgstr "�ਹ �ੰ� ਹ� ਵਰਤ��(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2020
+#: ../calendar/gui/e-calendar-view.c:2084
 msgid "Anniversary"
 msgstr "ਵਰ�ਹ� �ੰਢ"
 
@@ -238,8 +239,8 @@ msgstr "ਵਰ�ਹ� �ੰਢ"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2019 ../capplet/anjal-settings-main.c:117
-#: ../shell/main.c:122
+#: ../calendar/gui/e-calendar-view.c:2083 ../capplet/anjal-settings-main.c:123
+#: ../shell/main.c:133
 msgid "Birthday"
 msgstr "�ਨਮ-ਦਿਨ"
 
@@ -259,24 +260,24 @@ msgid "Calendar:"
 msgstr "��ਲੰਡਰ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:934
+#: ../addressbook/importers/evolution-vcard-importer.c:957
 msgid "Contact"
 msgstr "ਸੰਪਰ�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:589
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:604
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2583
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:592
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2607
 msgid "Contact Editor"
 msgstr "ਸਬੰਧ ਸੰਪਾਦ�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:295
+#: ../addressbook/gui/merging/eab-contact-merging.c:298
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
+#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "�-ਮ�ਲ"
 
@@ -289,7 +290,7 @@ msgid "Full _Name..."
 msgstr "ਪ�ਰਾ ਨਾ�(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "�ਰ"
@@ -324,7 +325,7 @@ msgid "Nic_kname:"
 msgstr "�ਮ ਨਾ�(_k):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../modules/calendar/e-memo-shell-migrate.c:260
 #: ../plugins/groupwise-features/camel-gw-listener.c:423
 #: ../plugins/groupwise-features/camel-gw-listener.c:448
 #: ../plugins/groupwise-features/camel-gw-listener.c:563
@@ -332,10 +333,10 @@ msgid "Notes"
 msgstr "ਨ��"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1725
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "Other"
 msgstr "ਹ�ਰ"
 
@@ -360,7 +361,7 @@ msgid "Web addresses"
 msgstr "ਵ�ੱਬ �ਡਰ�ੱਸ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Work"
@@ -387,9 +388,9 @@ msgid "_Blog:"
 msgstr "ਬਲ��(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:887
 #: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/itip-formatter/itip-view.c:1921
+#: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
 msgstr "��ਲੰਡਰ(_C):"
 
@@ -467,74 +468,74 @@ msgstr "�ਿੱਥ�(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "�ਿਪ/ਡਾ� ��ਡ(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "�ਾਬਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "ਯਾਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "�ਡ�-�ਡ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "�ਰ�ੱਪਵਾ��਼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "ਸ�ਾ�ਪ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:368
 msgid "Error adding contact"
 msgstr "ਸ਼ਾਮਿਲ ਸੰਪਰ� �ਲਤ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
 msgid "Error modifying contact"
 msgstr "ਸੰਪਰ� ਸ��� �ਲਤ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
 msgid "Error removing contact"
 msgstr "ਹ�ਾ�ਣ ਸੰਪਰ� �ਲਤ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2602
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ਸਬੰਧ ਸੰਪਾਦ� - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3025
 msgid "Please select an image for this contact"
 msgstr "�ਸ ਸੰਪਰ� ਲ� �ਿੱਤਰ ��ਣ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3026
 msgid "_No image"
 msgstr "��� �ਿੱਤਰ ਨਹ��(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3299
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -542,23 +543,23 @@ msgstr ""
 "ਸੰਪਰ� ਡਾ�ਾ �ਲਤ ਹ�:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3303
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' �ੱ� �ਲਤ ਫਾਰਮ�� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3310
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ਦਾ �ਲਤ ਫਾਰਮ�� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3325
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3336
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' �ਾਲ� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3350
 msgid "Invalid contact."
 msgstr "�ਲਤ ਸੰਬੰਧ"
 
@@ -648,7 +649,7 @@ msgid "_Suffix:"
 msgstr "ਪਿ��ਤਰ(_S):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:657
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:659
 msgid "Contact List Editor"
 msgstr "ਸੰਪਰ� ਸ��� ਸੰਪਾਦ�"
 
@@ -665,7 +666,7 @@ msgid "_List name:"
 msgstr "ਲਿਸ� ਨਾ�(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:157
 msgid "_Select..."
 msgstr "��ਣ�(_S)..."
 
@@ -673,24 +674,24 @@ msgstr "��ਣ�(_S)..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "ਲਿਸ� ਵਿੱ� ਹ�ਠਾ� ਸੰਪਰ� ਤ�� �-ਮ�ਲ ਲਿ�� �ਾ� ਸ�ੱ��।(_T)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Members"
 msgstr "ਸੰਪਰ� ਸ��� ਮ��ਬਰ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:907
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1322
 msgid "_Members"
 msgstr "ਮ��ਬਰ(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1160
 msgid "Error adding list"
 msgstr "ਸ਼ਾਮਿਲ ਸ��� �ਲਤ�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1174
 msgid "Error modifying list"
 msgstr "ਸ�ਧ ਸ��� �ਲਤ�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
 msgid "Error removing list"
 msgstr "ਹ�ਾ�ਣ ਸ��� �ਲਤ�"
 
@@ -732,17 +733,17 @@ msgstr ""
 "ਸ਼ਾਮਿਲ ਹ�। �� ਤ�ਸ�� �ਸ ਨ�ੰ �ਿਸ� ਵ� ਤਰਾ� ਸ਼ਾਮਿਲ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:241
+#: ../addressbook/gui/merging/eab-contact-merging.c:244
 msgid "_Merge"
 msgstr "ਮਿਲਾਨ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/gui/merging/eab-contact-merging.c:169
 #: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
 #, c-format
 msgid "Cancelled"
 msgstr "ਰੱਦ ��ਤਾ"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:224
+#: ../addressbook/gui/merging/eab-contact-merging.c:227
 msgid "Merge Contact"
 msgstr "ਸੰਪਰ� ਮਿਲਾਨ"
 
@@ -750,9 +751,9 @@ msgstr "ਸੰਪਰ� ਮਿਲਾਨ"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
-#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/calendar/e-cal-shell-view-actions.c:1691
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Any field contains"
 msgstr "��� ��ਤਰ ਸ਼ਾਮਿਲ"
 
@@ -766,22 +767,22 @@ msgstr "�-ਮ�ਲ �ਸ ਨਾਲ �ਰੰਭ �ਰ�"
 msgid "Name contains"
 msgstr "ਨਾ� ਰੱ�ਦਾ ਹ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:143
+#: ../addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "No contacts"
 msgstr "��� ਸੰਪਰ� ਨਹ��"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:147
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d ਸੰਪਰ�"
 msgstr[1] "%d ਸੰਪਰ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-model.c:327
 msgid "Error getting book view"
 msgstr "ਬ�ੱ� �ਲ� ਲ�ਣ ਵਿੱ� �ਲਤ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:716
+#: ../addressbook/gui/widgets/e-addressbook-model.c:740
 msgid "Search Interrupted"
 msgstr "��� ਰ��� ��"
 
@@ -789,67 +790,77 @@ msgstr "��� ਰ��� ��"
 msgid "Error modifying card"
 msgstr "ਸ�ਧਿ� �ਾਰਡ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:626
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
 msgid "Cut selected contacts to the clipboard"
 msgstr "��ਣ� ਸੰਪਰ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ੱ��"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:632
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
 msgid "Copy selected contacts to the clipboard"
 msgstr "��ਣ� ਸੰਪਰ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:638
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
 msgid "Paste contacts from the clipboard"
 msgstr "�ਲਿੱਪਬ�ਰਡ ਤ�� ਸੰਪਰ� ��ਪ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../addressbook/gui/widgets/e-addressbook-view.c:646
 #: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਹ�ਾ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:650
+#: ../addressbook/gui/widgets/e-addressbook-view.c:652
 msgid "Select all visible contacts"
 msgstr "ਸਭ ਵ��ਾ� ਦਿੰਦ� ਸੰਪਰ� ��ਣ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "�� ਤ�ਸ�� �ਹ ਸੰਪਰ� ਲਿਸ�ਾ� ਨ�ੰ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
 msgid "Are you sure you want to delete this contact list?"
 msgstr "�� ਤ�ਸ�� �ਹ ਸੰਪਰ� ਲਿਸ� ਹ�ਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "�� ਤ�ਸ�� ਸੰਪਰ� ਲਿਸ� (%s)ਨ�ੰ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 msgid "Are you sure you want to delete these contacts?"
 msgstr "�� ਤ�ਸ�� �ਹ ਸਭ ਸੰਪਰ� ਹ�ਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 msgid "Are you sure you want to delete this contact?"
 msgstr "�� ਤ�ਸ�� �ਹ ਸੰਪਰ� ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "�� ਤ�ਸ�� �ਹ ਸੰਪਰ� (%s) ਨ�ੰ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
-#, c-format
+#. Translators: This is shown for more than 5 contacts.
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#, fuzzy, c-format
+#| msgid ""
+#| "Opening %d contacts will open %d new windows as well.\n"
+#| "Do you really want to display all of these contacts?"
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
-msgstr ""
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+"ਸੰਪਰ� %d ��ਲ�ਹਣ ਨਾਲ %d ਵਿੰਡ��਼ ��ਲ�ਹ �ਾਣ����।\n"
+"�� ਤ�ਸ�� �ਹ ਸਭ ਸੰਪਰ� ਵ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
+msgstr[1] ""
 "ਸੰਪਰ� %d ��ਲ�ਹਣ ਨਾਲ %d ਵਿੰਡ��਼ ��ਲ�ਹ �ਾਣ����।\n"
 "�� ਤ�ਸ�� �ਹ ਸਭ ਸੰਪਰ� ਵ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
 msgid "_Don't Display"
 msgstr "ਨਾ ਵ��ਾ�(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "Display _All Contacts"
 msgstr "ਸਭ ਸੰਪਰ� ਵ���(_A)"
 
@@ -984,7 +995,7 @@ msgid "Radio"
 msgstr "ਰ�ਡ��"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:569
+#: ../calendar/gui/e-meeting-list-view.c:571
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "ਰ�ਲ"
@@ -1020,7 +1031,7 @@ msgstr "ਯ�ਨਿ�"
 msgid "Web Site"
 msgstr "ਵ�ਬ ਸਾ��"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1030,7 +1041,7 @@ msgstr ""
 "\n"
 "ਸੰਪਰ� ਦ� ��� �ਾਰ�..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1044,7 +1055,7 @@ msgstr ""
 "\n"
 "�ਾ� �ਥ� ਸੰਪਰ� ਬਣਾ�ਣ ਲ� ਦ� ਵਾਰ ਦਬਾ�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1058,7 +1069,7 @@ msgstr ""
 "\n"
 "�ਥ� ਸੰਪਰ� ਬਣਾ�ਣ ਲ� ਦ� ਵਾਰ ਦਬਾ�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1068,7 +1079,7 @@ msgstr ""
 "\n"
 "ਸੰਪਰ� ਦ� ���।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1078,16 +1089,16 @@ msgstr ""
 "\n"
 "�ਸ �ਲ� ਵਿੱ� ਵ��ਾ� ਲ� ��� ਸ��� ਨਹ�� ਹ�।"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Work Email"
 msgstr "�ੰਮ�ਾ�� �-ਮ�ਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Home Email"
 msgstr "�ਰ �-ਮ�ਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:807
+#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:808
 msgid "Other Email"
 msgstr "ਹ�ਰ �-ਮ�ਲ"
 
@@ -1133,17 +1144,17 @@ msgid "Copy _Email Address"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ ਨ�ਲ(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:396
+#: ../widgets/misc/e-web-view.c:395
 msgid "Copy the email address to the clipboard"
 msgstr "�ਮ�ਲ �ਡਰ�ੱਸ �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:401
+#: ../widgets/misc/e-web-view.c:400
 msgid "_Send New Message To..."
 msgstr "�ਸ ਨ�ੰ ਨਵਾ� ਸ�ਨ�ਹਾ ਭ���(_S)..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:403
+#: ../widgets/misc/e-web-view.c:402
 msgid "Send a mail message to this address"
 msgstr "�ਸ �ਡਰ�ੱਸ ਨ�ੰ ਮ�ਲ ਸ�ਨ�ਹਾ ਭ���"
 
@@ -1179,10 +1190,10 @@ msgid "Video Chat"
 msgstr "ਵ�ਡਿ� �ੱਲਬਾਤ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/dialogs/calendar-setup.c:376
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../modules/calendar/e-cal-shell-view.c:497
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
 #: ../plugins/groupwise-features/camel-gw-listener.c:446
 #: ../plugins/groupwise-features/camel-gw-listener.c:561
@@ -1192,9 +1203,9 @@ msgid "Calendar"
 msgstr "��ਲੰਡਰ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:128
-#: ../calendar/gui/dialogs/event-editor.c:355
+#: ../calendar/gui/dialogs/event-editor.c:127
+#: ../calendar/gui/dialogs/event-editor.c:354
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�"
@@ -1226,16 +1237,15 @@ msgstr "ਵ�ਬ ਲਾ�"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../capplet/settings/mail-capplet-shell.c:366
 #: ../modules/addressbook/e-book-shell-backend.c:116
-#: ../modules/addressbook/e-book-shell-migrate.c:138
-#: ../modules/calendar/e-cal-shell-backend.c:127
-#: ../modules/calendar/e-cal-shell-migrate.c:156
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:121
-#: ../plugins/email-custom-header/email-custom-header.c:320
+#: ../modules/addressbook/e-book-shell-migrate.c:143
+#: ../modules/calendar/e-cal-shell-backend.c:132
+#: ../modules/calendar/e-cal-shell-migrate.c:159
+#: ../modules/calendar/e-memo-shell-backend.c:116
+#: ../modules/calendar/e-memo-shell-migrate.c:117
+#: ../modules/calendar/e-task-shell-backend.c:116
+#: ../modules/calendar/e-task-shell-migrate.c:126
 msgid "Personal"
 msgstr "ਨਿੱ��"
 
@@ -1252,7 +1262,7 @@ msgid "Blog"
 msgstr "Blog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:853
+#: ../widgets/misc/e-web-view.c:852
 #, c-format
 msgid "Click to mail %s"
 msgstr "ਪੱਤਰ %s ਲ� ਦਬਾ�"
@@ -1267,7 +1277,7 @@ msgstr ""
 "ਤਿ�ਰ ਨਾ ��ਤ� �� ਹ�ਵ� �ਾ� ਹਾਲ� ਡਾ�ਨਲ�ਡ ਨਾ ਹ�� ਹ�ਵ�। �ਿਰਪਾ �ਰ�� �ਨਲਾ�ਨ ਢੰ� ਨਾਲ �ਾਲ� ਹ�ਣ "
 "�ਪਰੰਤ �ਡਰ�ੱਸ-ਬ�ੱ� ਡਾ�ਨਲ�ਡ �ਰ� ਤਾ� �ਸ ਨ�ੰ ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਸ��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1276,7 +1286,7 @@ msgstr ""
 "�ਹ �ਡਰ�ੱਸ-ਬ�ੱ� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��। �ਿਰਪਾ �ਰ�� �ਾ�� �ਰ� �ਿ �ਹ ਮਾਰ� %s ਹ� �ਤ� ਤ�ਹਾਡ� ��ਲ "
 "�ਧਿ�ਾਰ ਹਨ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:92
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1284,7 +1294,7 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਦ� �ਸ ਵਰ�ਨ ਵਿੱ� LDAP ਮੱਦਦ ਸ਼ਾਮਿਲ ਨਹ�� ਹ�। ���ਰ ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� LDAP ਮੱਦਦ �ਾਹ�ੰਦ� ਹ�, "
 "ਤ�ਹਾਨ�ੰ �ਵ�ਲ�ਸ਼ਨ ਪ���� LDAP-enabled �ੰਸ�ਾਲ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1292,11 +1302,11 @@ msgstr ""
 "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ��ਲ�ਹਣ ਵਿੱ� �ਸਫਲ। �ਸ ਦਾ �ਰਥ �ਹ ਹ� �ਿ �ਾ� ਤਾ� ਤ�ਸ�� �ਲਤ URI ਸ਼ਾਮਿਲ ��ਤਾ ਹ� "
 "�ਾ� ਸਰਵਰ ਪਹ�ੰ� ਤ�� ਬਾਹਰ ਹ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "Detailed error message:"
 msgstr "ਵ�ਰਵ� ਸਮ�ਤ �ਲਤ� ਸ�ਨ�ਹਾ:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1308,7 +1318,7 @@ msgstr ""
 "�ਾ� �ਡਰ�ੱਸ-ਬ�ੱ� ਲ� ਡਾ�ਰ���ਰ� ਸਰਵਰ ਪਸੰਦ ਨਤ��ਾ� ਸਮਾ� ਵਧਾ\n"
 "ਦਿ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1321,49 +1331,49 @@ msgstr ""
 "ਦਿ�"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਲ� ਬ����ਡ �ਸ ਸਵਾਲ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ: %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਲ� ਬ����ਡ ਨ� �ਸ ਸਵਾਲ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਨ�ਾਰ� ਹ�: %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "�ਹ �ਿ�ਰ� ਨ�ੰ ਸਫਲਤਾਪ�ਰ� ਪ�ਰਾ ਨਹ� ��ਤਾ �ਾ ਸ�ਿ� ਹ�। %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:202
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
 msgid "Select Address Book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:286
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "ਸ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:441
 msgid "Move contact to"
 msgstr "ਸੰਪਰ� ਭ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Copy contact to"
 msgstr "ਸੰਪਰ� ਦ� ਨ�ਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "Move contacts to"
 msgstr "ਸੰਪਰ� ਭ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:448
 msgid "Copy contacts to"
 msgstr "ਸੰਪਰ� ਦ� ਨ�ਲ"
 
@@ -1371,51 +1381,51 @@ msgstr "ਸੰਪਰ� ਦ� ਨ�ਲ"
 msgid "Card View"
 msgstr "�ਾਰਡ ਵ��ਾ�"
 
-#: ../addressbook/importers/evolution-csv-importer.c:720
-#: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../addressbook/importers/evolution-csv-importer.c:721
+#: ../addressbook/importers/evolution-ldif-importer.c:519
+#: ../addressbook/importers/evolution-vcard-importer.c:278
 #: ../calendar/importers/icalendar-importer.c:325
 #: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "�ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�...."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1008
+#: ../addressbook/importers/evolution-csv-importer.c:1021
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "���ਲ�ੱ� CSV �ਾ� ��ਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1009
+#: ../addressbook/importers/evolution-csv-importer.c:1022
 msgid "Outlook CSV and Tab Importer"
 msgstr "���ਲ�ੱ� CSV ਤ� ��ਬ �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1017
+#: ../addressbook/importers/evolution-csv-importer.c:1030
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "ਮ���ਲਾ CSV �ਾ� ��ਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1018
+#: ../addressbook/importers/evolution-csv-importer.c:1031
 msgid "Mozilla CSV and Tab Importer"
 msgstr "ਮ���ਲਾ CSV �ਤ� ��ਬ �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1026
+#: ../addressbook/importers/evolution-csv-importer.c:1039
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "�ਵ�ਲ�ਸ਼ਨ CSV �ਾ� ��ਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1027
+#: ../addressbook/importers/evolution-csv-importer.c:1040
 msgid "Evolution CSV and Tab Importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ CSV �ਤ� ��ਬ �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:742
+#: ../addressbook/importers/evolution-ldif-importer.c:757
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ਡਾ�ਾ �ੰਤਰ ਤਬਦ�ਲ� ਫਾਰਮ�� (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:743
+#: ../addressbook/importers/evolution-ldif-importer.c:758
 msgid "Evolution LDIF importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ LDIF �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:623
+#: ../addressbook/importers/evolution-vcard-importer.c:646
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:624
+#: ../addressbook/importers/evolution-vcard-importer.c:647
 msgid "Evolution vCard Importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ vCard �ੰਪ�ਰ�ਰ"
 
@@ -1440,57 +1450,57 @@ msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਦ� ਸ��� ਨ�ੰ ਪ�ਰ
 msgid "failed to open book"
 msgstr "�ਿਤਾਬ ਨ�ੰ ��ਲਣ ਵਿੱ� �ਸਫਲ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:45
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "ਸ���ਡਰਡ ���ਪ�ੱ� ਫਾ�ਲ ਦ� ਬ�ਾ� ���ਪ�ੱ� ਫਾ�ਲ ਨਿਰਧਾਰਿਤ �ਰ�"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:46
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "ਸਥਾਨ� �ਡਰ�ੱਸ ਫ�ਲਡਰਾ� ਦ� ਸ���"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
 msgstr "�ਾਰਡ vcard �ਾ� csv ਫਾ�ਲ ਵਾ�� ਵ��ਾ�"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard।csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:70
 msgid "Export in asynchronous mode"
 msgstr "�ਸਿ�ਰ�ਨਾ��਼ ਮ�ਡ ਵਿੱ� ਨਿਰਯਾਤ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:73
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "�ੱ� ���ਪ�ੱ� ਫਾ�ਲ ਵਿੱ� �ਸ�ਰ�ਨਸ ਮ�ਡ ਵਿੱ� �ਾਰਡਾ� ਦ� �ਿਣਤ�, ਡਿਫਾਲ� ��ਾਰ 100 ਹ�।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid "NUMBER"
 msgstr "ਨੰਬਰ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:137
 msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "�ਮਾ�ਡ ਲਾ�ਨ �ਰ��ਮਿੰ� �ਲਤ�, �ਿਰਪਾ �ਰ�� ਵ��ਣ ਲ�--help ਵਰਤ��"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:151
 msgid "Only support csv or vcard format."
 msgstr "ਸਿਰਫ csv �ਾ� vcard ਫਾਰਮ�� ਵਰਤ��।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:160
 msgid "In async mode, output must be file."
 msgstr "�ਸਿ�ਰ�ਨਾ��਼ ਮ�ਡ ਵਿੱ� ���ਪ�ੱ� �ੱ� ਫਾ�ਲ ਹ�ਣ� ਲਾ�ਮ� ਹ�।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:168
 msgid "In normal mode, there is no need for the size option."
 msgstr "ਸਧਾਰਨ ਮ�ਡ ਵਿੱ�, ��ਾਰ ��ਣ ਦ� ਲ�� ਨਹ�� ਹ�।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:199
 msgid "Unhandled error"
 msgstr "�ਣਪ�ਾਤ� �ਲਤ�"
 
@@ -1511,9 +1521,10 @@ msgstr "%s (ਯ��਼ਰ %s) ਲ� ਪਾਸਵਰਡ ਭਰ�"
 
 #: ../addressbook/util/addressbook.c:230
 #: ../calendar/common/authentication.c:53
-#: ../plugins/caldav/caldav-browse-server.c:813
-#: ../plugins/google-account-setup/google-source.c:438
-#: ../plugins/publish-calendar/publish-calendar.c:328
+#: ../calendar/gui/e-meeting-store.c:1770
+#: ../plugins/caldav/caldav-browse-server.c:922
+#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/publish-calendar/publish-calendar.c:332
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "ਪਾਸਵਰਡ ਭਰ�"
@@ -1619,19 +1630,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "�� ਤ�ਸ�� �ਸ ਮ�ਲਾ�ਾਤ ਨ�ੰ ਹ�ਾ�ਣ ਲ� ਸਹਿਮਤ ਹ�?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:191
+#: ../calendar/gui/dialogs/delete-comp.c:187
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "�� ਤ�ਸ�� �ਸ ਮ��ਿੰ� ਨ�ੰ ਹ�ਾ� ਦ� ਪ�ਸ਼�� �ਰਦ� ਹ�?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:197
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "�� ਤ�ਸ�� �ਸ ਮ�ਮ� ਨ�ੰ ਹ�ਾ� ਦ� ਪ�ਸ਼�� �ਰਦ� ਹ�?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:194
+#: ../calendar/gui/dialogs/delete-comp.c:190
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "�� ਤ�ਸ�� �ਹ �ੰਮ ਹ�ਾ� ਬਾਰ� ਤਿ�ਰ ਹ�?"
@@ -1711,7 +1722,14 @@ msgstr "ਮ�ਮ� ਸ��� ਲ�ਡ �ਰਨ ਵਿੱ� �ਲਤ�"
 msgid "Error loading task list"
 msgstr "�ੰਮ ਸ��� ਲ�ਡ �ਰਨ ਵਿੱ� �ਲਤ�"
 
-#: ../calendar/calendar.error.xml.h:44
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#: ../calendar/calendar.error.xml.h:46
+#| msgid "Error on '{0}'"
+msgid "Error on {0}: {1}"
+msgstr "{0} ਵਿੱ� �ਲਤ�: {1}"
+
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -1719,7 +1737,7 @@ msgstr ""
 "���ਰ ਤ�ਸ�� ਰੱਦ �ਰਨ ਦ� ਸ��ਨਾ ਨਾ ਭ��� ਤਾ�, ਹ�ਰ ਭਾ� ਲ�ਣ ਵਾਲ� ਮ��ਿੰ� ਦ� ਰੱਦ ਹ�ਣ ਬਾਰ� �ਾਣ ਨਹ�� "
 "ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -1727,7 +1745,7 @@ msgstr ""
 "���ਰ ਤ�ਸ�� ਰੱਦ �ਰਨ ਦਾ ਨ��ਿਸ ਨਾ ਭ��ਿ� ਤਾ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਪਤਾ ਨਹ�� ਲੱ���ਾ �ਿ ਮ�ਮ� ਨ�ੰ ਹ�ਾ "
 "ਦਿੱਤਾ �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -1735,19 +1753,19 @@ msgstr ""
 "���ਰ ਤ�ਸ�� ਰੱਦ �ਰਨ ਦਾ ਨ��ਿਸ ਨਾ ਭ��ਿ� ਤਾ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਪਤਾ ਨਹ�� ਲੱ���ਾ �ਿ �ੰਮ ਨ�ੰ ਹ�ਾ "
 "ਦਿੱਤਾ �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "ਤਾ�� �ਾਣ�ਾਰ� ਭ��ਣ ਨਾਲ ਭਾ� ਲ�ਣ ਵਾਲ� �ਪਣਾ ��ਲੰਡਰ ਠ�� ਰੱ� ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "�ੰਮ ਬਾਰ� ਤਾ�� �ਾਣ�ਾਰ� ਭ��ਣ ਨਾਲ ਭਾ� ਲ�ਣ ਵਾਲ� �ਪਣਾ ��ਲੰਡਰ ਠ�� ਰੱ� ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -1755,7 +1773,7 @@ msgstr ""
 "��� ਨੱਥ��� ਨ�ੰ ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�। ਮ�ਲਾ�ਾਤ ਨ�ੰ ਹ�ਣ� ਸੰਭਾਲਣ ਨਾਲ �ਹ ਨੱਥ� ��ੰਮ ਹ�ਣ ਦਾ �ਤਰਾ "
 "ਹ� ਸ�ਦਾ ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -1763,91 +1781,91 @@ msgstr ""
 "��� ਨੱਥ��� ਨ�ੰ ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�। �ੰਮ ਨ�ੰ ਹ�ਣ� ਸੰਭਾਲਣ ਨਾਲ �ਹ ਨੱਥ� ��ੰਮ ਹ�ਣ ਦਾ �ਤਰਾ ਹ� "
 "ਸ�ਦਾ ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr "ਤ�ਹਾਡ� ਮ���ਦਾ ਸਰਵਰ ਨਾਲ ��� ਫ��ਰ ਠ�� ਤਰਾ� �ੰਮ ਨਹ�� �ਰਨ��।"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "�ਵ�ਲ਼�ਸ਼ਨ ��ਲੰਡਰ �ਸਧਾਰਨ ਤਰ��� ਨਾਲ ਬੰਦ ਹ� �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "�ਵ�ਲ਼�ਸ਼ਨ ��ਲੰਡਰ �ਸਧਾਰਨ ਤਰ��� ਨਾਲ ਬੰਦ ਹ� �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "�ਵ�ਲ਼�ਸ਼ਨ ਮ�ਮ� �ਸਧਾਰਨ ਤਰ��� ਨਾਲ ਬੰਦ ਹ� �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ੰਮ �ਸਧਾਰਨ ਤਰ��� ਨਾਲ ਬੰਦ ਹ� �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "The calendar is not marked for offline usage."
 msgstr "��ਲੰਡਰ ਨ�ੰ �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "The memo list is not marked for offline usage."
 msgstr "ਮ�ਮ� ਸ��� �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਨਹ�� ��ਤ� �ਾ ਸ�ਦ�।"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "The task list is not marked for offline usage."
 msgstr "�ੰਮ ਸ��� �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "�ਹ ��ਲੰਡਰ ਸਦਾ ਲ� ਹ�ਾ ਦਿੱਤਾ �ਾਵ��ਾ।"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
 msgstr "�ਹ ਮ�ਮ� ਸ��� ਸਦਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਵ���।"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
 msgstr "�ਹ �ੰਮ ਸ��� ਸਦਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਵ���।"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this appointment?"
 msgstr "�� ਤ�ਸ�� �ਸ ਮ�ਲਾ�ਾਤ ਬਾਰ� ਤਬਦ�ਲ� ਨ�ੰ ਸੰਭਾਲਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this meeting?"
 msgstr "�� ਤ�ਸ�� �ਹ ਮ��ਿੰ� ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਨ�ੰ ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to save your changes to this memo?"
 msgstr "�� ਤ�ਸ�� �ਹ ਮ�ਮ� ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਨ�ੰ ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this task?"
 msgstr "�� ਤ�ਸ�� �ਸ �ੰਮ ਬਾਰ� ਤਬਦ�ਲ� ਨ�ੰ ਸੰਭਾਲਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "�� ਤ�ਸ�� �ਹ ਮ�ਮ� ਲ� ਰੱਦ �ਰਨ ਦ� ਸ��ਨਾ ਭ��ਣ� �ਾਹ���?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "�� ਤ�ਸ�� ਸਾਰ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਰੱਦ �ਰਨ ਦ� ਸ��ਨਾ ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "�� ਤ�ਸ�� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਮ��ਿੰ� ਲ� ਸੱਦਾ ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send this task to participants?"
 msgstr "�� ਤ�ਸ�� �ਸ �ੰਮ ਬਾਰ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਸ��ਿਤ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "�� ਤ�ਸ�� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਮ��ਿੰ� ਬਾਰ� ਤਾ�� �ਾਣ�ਾਰ� ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated task information to participants?"
 msgstr "�� ਤ�ਸ�� �ੰਮ ਬਾਰ� ਤਾ�� �ਾਣ�ਾਰ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -1856,70 +1874,70 @@ msgstr ""
 "ਤ�ਸ�� �ੱ� ਨਾ-ਸਹਾ�� �ਰ�ੱਪਵਾ��਼ (GroupWise) ਸਰਵਰ ਨਾਲ ���ਨ �ਾ ਰਹ� ਹ� �ਤ� �ਵ�ਲ�ਸ਼ਨ ਦ� ਵਰਤ�� �ਰਨ "
 "ਨਾਲ ਸਮੱਸਿ� � ਸ�ਦ� ਹ�। �ੰ�� ਨਤ��ਿ�� ਲ� ਸਰਵਰ ਨ�ੰ ਸਹਾ�� ਵਰ�ਨ ਲ� �ੱਪ�ਰ�ਡ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "�ਸ ਮ�ਲਾ�ਾਤ ਵਿੱ� ਤ�ਸ�� ਤਬਦ�ਲ��� ਤਾ� ��ਤ��� ���� ਹਨ, ਪਰ ਸੰਭਾਲ��� ਨਹ�� ����।"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "�ਸ ਮ��ਿੰ� ਵਿੱ� ਤ�ਸ�� ਤਬਦ�ਲ��� ��ਤ��� ���� ਹਨ, ਪਰ ਸੰਭਾਲ��� ਨਹ�� ���� ਹਨ।"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
 msgid "You have changed this task, but not yet saved it."
 msgstr "�ਸ �ੰਮ ਵਿੱ� ਤ�ਸ�� ਤਬਦ�ਲ��� ��ਤ��� ���� ਹਨ, ਪਰ ਸੰਭਾਲ��� ਨਹ�� ���� ਹਨ।"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "�ਸ �ੰਮ ਵਿੱ� ਤ�ਸ�� ਤਬਦ�ਲ��� ਤਾ� ��ਤ��� ���� ਹਨ, ਪਰ ਸੰਭਾਲ��� ਨਹ�� ���� ਹਨ।"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡਾ ��ਲੰਡਰ �ਦ�� ਤੱ� �ਪਲੱਬਧ ਨਹ�� ਹ� ਸ���ਾ, �ਦ ਤੱ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ�� �ਾਲ� ਨਹ�� �ਰਦ�।"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:81
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡ� ਮ�ਮ� �ਵ�ਲ�ਸ਼ਨ ਦ� ਮ�� �ਾਲ� ਹ�ਣ ਤੱ� �ਪਲੱਬਧ ਨਹ�� ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡ� �ੰਮ �ਵ�ਲ�ਸ਼ਨ ਦ� ਮ�� �ਾਲ� ਹ�ਣ ਤੱ� �ਪਲੱਬਧ ਨਹ�� ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:80
-#: ../composer/mail-composer.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Discard Changes"
 msgstr "ਤਬਦ�ਲ��� ਰੱਦ(_D)"
 
-#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:271
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:271
 msgid "_Save"
 msgstr "ਸੰਭਾਲ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:85
 msgid "_Save Changes"
 msgstr "ਤਬਦ�ਲ��� ਸੰਭਾਲ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
+#: ../calendar/calendar.error.xml.h:86
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:156
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "ਭ���(_S)"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Send Notice"
 msgstr "ਸ��ਨਾ ਭ���(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ਮਿੰ�"
 msgstr[1] "ਮਿੰ�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "�ੰ�ਾ"
 msgstr[1] "�ੰ��"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
 msgid "Start time"
 msgstr "ਸ਼�ਰ� ਸਮਾ�"
 
@@ -1936,8 +1954,7 @@ msgstr "ਸਭ ਮਨਸ��(_A)"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1598
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1604
-#: ../calendar/gui/e-itip-control.c:1175
-#: ../plugins/itip-formatter/itip-view.c:1043
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "�ਿ�ਾਣਾ:"
 
@@ -1945,7 +1962,8 @@ msgstr "�ਿ�ਾਣਾ:"
 msgid "Snooze _time:"
 msgstr "�ੰਤਰਾਲ ਸਮਾ�(_t):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:882
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "ਮਨਸ��(_D)"
 
@@ -1955,9 +1973,9 @@ msgstr "ਬ��ਾਰ(_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:335
+#: ../plugins/google-account-setup/google-contacts-source.c:375
 msgid "hours"
 msgstr "�ੰ��"
 
@@ -1968,9 +1986,9 @@ msgstr "ਮ�ਲਾ�ਾਤ ਦਾ �ਿ�ਾਣਾ"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../plugins/google-account-setup/google-contacts-source.c:374
 msgid "minutes"
 msgstr "ਮਿੰ�"
 
@@ -1990,16 +2008,18 @@ msgstr "��� �ਿ�ਾਣਾ �ਾਣ�ਾਰ� �ਪਲੱਬਧ 
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
-msgid "You have %d alarms"
-msgstr "ਤ�ਹਾਡ� ਲ� %d �ਲਾਰਮ"
+#| msgid "You have %d alarms"
+msgid "You have %d alarm"
+msgid_plural "You have %d alarms"
+msgstr[0] "ਤ�ਹਾਡ� ਲ� %d �ਲਾਰਮ"
+msgstr[1] "ਤ�ਹਾਡ� ਲ� %d �ਲਾਰਮ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Warning"
 msgstr "��ਤਾਵਨ�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2011,7 +2031,7 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ �ੱ� ਸਧਾਰਨ ਯਾਦ-ਪੱਤਰ ਪ�ੱ��ਿੱ� ਬ�ਸਾ ਹ�\n"
 "ਵ��ਾ ਸ����।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2027,7 +2047,7 @@ msgstr ""
 "\n"
 "�� ਤ�ਸ�� �ਸ �ਾਰ� ਨ�ੰ �ਲਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1752
 msgid "Do not ask me about this program again."
 msgstr "�ਸ �ਾਰ� ਬਾਰ� ਮ�ਨ�ੰ ਮ�� ਨਾ ਪ�ੱ��।"
 
@@ -2064,555 +2084,6 @@ msgid_plural "%d seconds"
 msgstr[0] "%d ਸ�ਿੰ�"
 msgstr[1] "%d ਸ�ਿੰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "�ਲਾਰਮ �ਾਰ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:11
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "ਹਾਲਤ ਪੱ�� ਵਿੱ� �ਲਤ� ਨ�ੰ ਵ��ਾ� �ਾਣ ਦਾ ਸਮਾ� ਸ�ਿੰ�ਾ� ਵਿੱ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
-msgid "Ask for confirmation when deleting items"
-msgstr "���ਮਾ� ਹ�ਾ�ਣ ਸਮ�� ਪ�ਸ਼�� �ਰਵਾ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "�ੱ� ਦ� �ੰਮਾ� ਲ� ਬ���ਰਾ��ਡ ਰੰ�, \"#rrggbb\" ਫਾਰਮ�� ਵਿੱ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "�ੰਮ ਦਾ ਰੰ�, �ਿਨਾ� ਦ� ਮਿ�ਦ ਲੰ� ��ੱ�� ਹ�, \"#rrggbb\" ਫਾਰਮ�� ਵਿੱ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid "Calendars to run alarms for"
-msgstr "�ਲਾਰਮ �ਲਾ�ਣ ਲ� ��ਲੰਡਰ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr "ਸਮਾ� ਰ��ਾ ਵਿੱ� ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ �ਿੱ�ਣ ਲ� ਰੰ� (ਮ�ਲ �ਾਲ� ਹ�)।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਲ� ਰੰ� ਹ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
-msgid "Compress weekends in month view"
-msgstr "ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਹਫਤ� ਸਮ���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
-msgid "Confirm expunge"
-msgstr "ਤੱਥ �ੱਢਣ ਸਮ�� ਪ�ਸ਼��"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
-msgid "Count of default recurrence for a new event. -1 means forever."
-msgstr "ਨਵ�� �ਵ��� ਲ� ਡਿਫਾਲ� ਮ��-ਵਾਪਰਨ ਦ� �ਿਣਤ�। -1 ਦਾ �ਰਥ ਹ� ਹਮ�ਸ਼ਾ� ਲ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr "ਦਿਨ, �ਿੰਨਾ ਤ�� �ਾਰ��ਾਰ� �ੰ�� ਸ਼�ਰ� �ਤ� �ੰਤ ਹ�ੰਦ� ਹਨ, ਵ��ਾ�ਣ ਲ਼�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
-msgid "Default appointment reminder"
-msgstr "ਮ�ਲ ਮ�ਲਾ�ਾਤ ਯਾਦ-ਪੱਤਰ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
-msgid "Default recurrence count"
-msgstr "ਡਿਫਾਲ� ਦ�ਹਰਾ�ਣ �ਿਣਤ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
-msgid "Default reminder units"
-msgstr "ਡਿਫਾਲ� ਰ�ਮਾ�ਡਰ ਯ�ਨਿ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder value"
-msgstr "ਮ�ਲ ਯਾਦਪੱਤਰ ਮ�ੱਲ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
-msgid "Directory for saving alarm audio files"
-msgstr "�ਲਾਰਮ �ਡ�� ਫਾ�ਲਾ� ਨ�ੰ ਸੰਭਾਲਣ ਲ� ਡਾ�ਰ���ਰ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
-msgid "Event Gradient"
-msgstr "��ਨਾ ਰ�ਪ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
-msgid "Event Transparency"
-msgstr "��ਨਾ ਪਾਰਦਰਸ਼ਤਾ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
-msgid "Free/busy server URLs"
-msgstr "ਵ�ਹਲਾ/ਰ��ਿ� ਸਰਵਰ URL"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
-msgid "Free/busy template URL"
-msgstr "ਵ�ਹਲਾ/ਰ��ਿ�� ��ਪਲ�� URL"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
-msgid "Gradient of the events in calendar views."
-msgstr "��ਲੰਡਰ �ਲ� ਵਿੱ� ��ਨਾਵਾ� ਵਿੱ� ਢਾ�ਲ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
-msgid "Hide completed tasks"
-msgstr "ਮ��ੰਮਲ �ੰਮ �ਹਲ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
-msgid "Hide task units"
-msgstr "�ੰਮ ���ਮਾ� �ਹਲ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
-msgid "Hide task value"
-msgstr "�ੰਮ ਮ�ੱਲ �ਹਲ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
-msgid "Horizontal pane position"
-msgstr "�ਿਤਿ�� ਪੱ�� ਸਥਿਤ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "�ਾਰ��ਾਰ� ਦਿਨ �ੰਤ ਹ�ਣ ਤ�� �ੰ��, ��ਵ�� �ੰ�ਾ ਫਾਰਮ�� ਵਿੱ� ੦ ਤ�� ੨੩"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "�ਾਰ��ਾਰ� ਦਿਨ ਸ਼�ਰ� ਹ�ਣ ਤ�� �ੰ��, ��ਵ�� �ੰ�ਾ ਫਾਰਮ�� ਵਿੱ� ੦ ਤ�� ੨੩"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "�� ਸਹ�� ਸ�ੱ� ��ਤਾ ਤਾ�, ਮ�ੱ� ਵਿੰਡ� ਵਿੱ� ਮ�ਮ� �ਲ� ਬਾਹ� ਵ��ਾ� �ਾਵ���।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
-msgid "If \"true\", show the task preview pane in the main window."
-msgstr "�� ਸਹ�� ਸ�ੱ� ��ਤਾ ਤਾ�, ਮ�ੱ� ਵਿੰਡ� ਵਿੱ� �ਾਸ� �ਲ� ਬਾਹ� ਵ��ਾ� �ਾਵ���।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
-msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "ਦਿਨ �ਤ� �ੰਮ ਦ� ਹਫਤਾ �ਲ� ਵਿੱ� �ੰਤਰਾਲ, ਮਿੰ� ਵਿੱ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
-msgid "Last alarm time"
-msgstr "��ਰ� �ਲਾਰਮ ਸਮਾ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:95
-msgid "Level beyond which the message should be logged."
-msgstr "ਲ�ਵਲ, �ਿਸ ਤ�� ਬਾ�ਦ ਸ�ਨ�ਹਾ ਲਾ� '� ਰੱ�ਿ� �ਾਵ��ਾ।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
-msgid "List of recently used second time zones in a Day View."
-msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਤਾ�਼ਾ ਵਰਤ� ਦ��� ਸਮਾ�-��ਤਰ ਦ� ਲਿਸ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
-msgid "List of server URLs for free/busy publishing."
-msgstr "ਵ�ਹਲਾ/ਰ��ਿ� ਪਬਲ���ਸ਼ਨ ਲ� ਸਰਵਰ URL ਦ� ਸ��� ਹ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
-msgid "Marcus Bains Line"
-msgstr "ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਰੰ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
-msgid "Marcus Bains Line Color - Day View"
-msgstr "ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਰੰ� - ਦਿਨ �ਲ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਰੰ� - ਸਮਾ� ਰ��ਾ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr "'day_second_zones' ਵਿੱ� ਯਾਦ ਰੱ�ਣ ਲ� ਤਾ�਼ਾ ਵਰਤ� ਸਮਾ�-��ਤਰਾ� ਦ� ਵੱਧ�-ਵੱਧ �ਿਣਤ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
-msgid "Maximum number of recently used timezones to remember."
-msgstr "ਯਾਦ ਰੱ�ਣ ਲ� ਤਾ�਼ਾ ਵਰਤ� ਸਮਾ�-��ਤਰਾ� ਦ� ਵੱਧ�-ਵੱਧ �ਿਣਤ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-msgid "Memo layout style"
-msgstr "ਮ�ਮ� ਲ���� ਸ�ਾ�ਲ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
-msgid "Memo preview pane position (horizontal)"
-msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਸਥਿਤ� (ਹਰ��ੱ�ਲ)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
-msgid "Memo preview pane position (vertical)"
-msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਸਥਿਤ� (ਵਰ���ਲ)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
-msgid "Minute the workday ends on, 0 to 59."
-msgstr "�ੰਮ ਦਿਨ ਦ� ਮਿੰ� �ਤਮ ਹ�ਣ, ੦ ਤ�� ੫੯"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
-msgid "Minute the workday starts on, 0 to 59."
-msgstr "�ੰਮ ਦਿਨ ਦ� ਮਿੰ� ਸ਼�ਰ� ਹ�ਣ, ੦ ਤ�� ੫੯"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
-msgid "Month view horizontal pane position"
-msgstr "�ਿਤਿ�� ਪਾਸ� ਦ� ਸਥਿਤ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid "Month view vertical pane position"
-msgstr "ਮਹ�ਨਾ ਦਿੱ� ਲੰਬ�ਾਰ� ਪੱ�� ਸਥਿਤ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
-msgid "Number of units for determining a default reminder."
-msgstr "ਮ�ਲ ਯਾਦ-ਪੱਤਰ �ਾਣਨ ਲ� ���ਮਾ� ਦ� �ਿਣਤ� ਹ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
-msgid "Number of units for determining when to hide tasks."
-msgstr "�ੰਮ �ਹਲ� �ਰਨ ਦਾ ਪਤਾ �ਰਨ ਲ� ���ਮਾ� ਦ� �ਿਣਤ� ਹ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
-msgid "Overdue tasks color"
-msgstr "ਮਿ�ਦ ਪ�ੱ�� �ੰਮ ਦਾ ਰੰ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr ""
-"�ਿਤਿ�� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, �� "
-"�ਿ ਮਹ�ਨਾ ਨਾ ਦਿੱ� ਹ�ਵ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"�ਿਤਿ�� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, �� "
-"�ਿ ਮਹ�ਨਾ ਦਿੱ� ਹ�ਵ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਵਰ���ਲ ਹ�ਵ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-msgid "Position of the task preview pane when oriented horizontally."
-msgstr "�ਾਸ� �ਲ� ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਹਰ��ੱ�ਲ ਹ�ਵ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
-msgid "Position of the task preview pane when oriented vertically."
-msgstr "�ਾਸ� �ਲ� ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਵਰ���ਲ ਹ�ਵ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr "ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ�, �� �ਿ ��ਲੰਡਰ ਸ��� �ਤ� ਮਿਤ� ਨ�ਵ����ਰ ��ਲੰਡਰ ਬਾਹ� ਵਿੱ� ਵਿੱ� ਹ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲਾ� ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ� ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, "
-"�ਦ�� �ਿ ਮਹ�ਨਾ ਦਿੱ� ਹ�ਵ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
-msgstr ""
-"ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲਾ� ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ� ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, "
-"�ਦ�� �ਿ ਮਹ�ਨਾ ਦਿੱ� ਨਾ ਹ�ਵ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-msgid "Primary calendar"
-msgstr "ਪ�ਰਾ�ਮਰ� ��ਲੰਡਰ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-msgid "Primary memo list"
-msgstr "ਪ�ਰਾ�ਮਰ� ਮ�ਮ� ਲਿਸ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
-msgid "Primary task list"
-msgstr "ਪ�ਰਾ�ਮਰ� �ਾਸ� ਲਿਸ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
-msgid "Programs that are allowed to be run by alarms."
-msgstr "�ਲਾਰਮ ਵਲ�� �ੱਲਣ ਵਾਲ� �ਾਰ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
-msgid "Recently used second time zones in a Day View"
-msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਵਰਤ� ਤਾ�਼ਾ ਦ��� ਸਮਾ� �਼�ਨ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "�ਲਾਰਮ �ਡ�� ਲ� ਡਾ�ਰ���ਰ� ਸੰਭਾਲ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-msgid "Scroll Month View by a week"
-msgstr "ਮਹ�ਨਾ �ਲ� ਨ�ੰ ਹਫ਼ਤ� ਰਾਹ�� �ੱ�� ਪਿੱ�� �ਰ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� RSVP ��ਤਰ ਵ��ਾ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਰ�ਲ ��ਤਰ ਵ���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
-msgid "Show appointment end times in week and month views"
-msgstr "ਹਫਤਾ ਤ� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਮ�ਲਾ�ਾਤ �ੰਤ ਸਮਾ� ਵ���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid "Show categories field in the event/meeting/task editor"
-msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ���ਾ�ਰ� ��ਤਰ ਵ���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
-msgid "Show display alarms in notification tray"
-msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ� ਵਿੱ� �ਲਾਰਮ ਵ���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
-msgid "Show status field in the event/task/meeting editor"
-msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਹਾਲਤ ��ਤਰ ਵ���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
-msgid "Show the memo preview pane"
-msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਵ���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
-msgid "Show the task preview pane"
-msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਵ���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-msgid "Show timezone field in the event/meeting editor"
-msgstr "��ਨਾ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਸਮਾ� ��ਤਰ ਵ���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-msgid "Show type field in the event/task/meeting editor"
-msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਲਿ�ਣ ��ਤਰ ਵ���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr "ਦਿਨ �ਲ�, �ੰਮ ਹਫ਼ਤਾ �ਲ� �ਤ� ਮਿਤ� ਨ�ਵ����ਰ ਵਿੱ� ਹਫ਼ਤਾ �ਿਣਤ� ਵ���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਦ��ਾ ਸਮਾ�-��ਤਰ ਵ��ਣਾ �� ਸ�ੱ� ��ਤਾ ਤਾ�। ਮ�ੱਲ 'timezone' ��ੰ�� ਵਿੱ� ਵਰਤ� ਵਾ�� ਹ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Task layout style"
-msgstr "�ਾਸ� ਲ���� ਸ�ਾ�ਲ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid "Task preview pane position (horizontal)"
-msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਸਥਿਤ� (ਹਰ��ੱ�ਲ)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
-msgid "Task preview pane position (vertical)"
-msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਸਥਿਤ� (ਵਰ���ਲ)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
-msgid "Tasks due today color"
-msgstr "�ੱ� ਦ� �ੰਮ ਦਾ ਰੰ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"ਵ�ਹਲਾ/ਰ��ਿ� ਵਾ�� ਵਰਤਣ ਲ਼� URL ��ਪਲ�� ਡਾ�ਾ, %u ਨ�ੰ ਪੱਤਰ �ਡਰ�ੱਸ ਦ� ਯ��਼ਰ ��ਤਰ �ਤ� %d ਨ�ੰ ਡ�ਮ�ਨ ਨਾਲ "
-"ਤਬਦ�ਲ �ਰ ਦਿੱਤਾ �ਾਵ��ਾ।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
-"��ਲੰਡਰ ਵਿੱ� ਵਰਤਣ ਲ� ਮਿਤ� ਤ� ਸਮਾ� ਲ� ਮ�ਲ ਸਮਾ�-��ਤਰ, �ੱ� ਨਾ-�ਨ�ਵਾਦ �ਲਸ�ਨ ਸਮਾ�-��ਤਰ ਡਾ�ਾਬ�ਸ "
-"��ਤਰ, �ਿਵ�� �ਿ \"America/New York\" �ਦਿ।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
-"ਲ���� ਸ�ਾ�ਲ ਤਹਿ �ਰਦਾ ਹ� �ਿ ਮ�ਮ� ਲਿਸ� ਨਾਲ ਸਬੰਧਿਤ �ਲ� ਬਾਹ� �ਿੱਥ� ਵ��ਾ� �ਾਵ�। \"0"
-"\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ ਮ�ਮ� ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) �ਲ� "
-"ਬਾਹ� ਨ�ੰ ਮ�ਮ� ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr ""
-"ਲ���� ਸ�ਾ�ਲ ਤਹਿ �ਰਦਾ ਹ� �ਿ �ਾਸ� ਲਿਸ� ਨਾਲ ਸਬੰਧਿਤ �ਲ� ਬਾਹ� �ਿੱਥ� ਵ��ਾ� �ਾਵ�। \"0"
-"\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ �ਾਸ� ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) �ਲ� "
-"ਬਾਹ� ਨ�ੰ �ਾਸ� ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
-msgid "The second timezone for a Day View"
-msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਦ��ਾ ਸਮਾ�-��ਤਰ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr "ਤਿੰਨ ਸੰਭਵ ਮ�ੱਲ ਹਨ। �ਲਤ��� ਲ� 0। ��ਤਾਵਨ� ਲ� 1। ਡ�ਬੱ� ਸ�ਨ�ਹਾ ਲ� 2।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
-msgid "Time divisions"
-msgstr "ਸਮਾ� ਵੰਡ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
-msgid "Time the last alarm ran, in time_t."
-msgstr "ਸਮਾ� �ਦ�� �ਲਾਰਮ �ੱਲਿ�, ਸਮ�� ਵਿੱ�(_t)।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
-msgid "Timezone"
-msgstr "ਸਮਾ�-��ਤਰ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
-msgid ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
-msgstr "��ਲੰਡਰ �ਲ� ਵਿੱ� ��ਨਾਵਾ� ਵਿੱ� ਪਾਰਦਰਸ਼ਤਾ, ਮ�ੱਲ 0 (ਪਾਰਦਰਸ਼�) �ਤ� 1 (ਧ�ੰਧਲਾ)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
-msgid "Twenty four hour time format"
-msgstr "��ਵ�� �ੰ�ਾ ਸਮਾ� ਫਾਰਮ��"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
-msgid "URI of the highlighted (\"primary\") calendar"
-msgstr "ਹਾ�ਲਾ�� (\"ਪ�ਰਾ�ਮਰ�\") ��ਲੰਡਰ ਲ� URI"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
-msgid "URI of the highlighted (\"primary\") memo list"
-msgstr "ਹਾ�ਲਾ�� (\"ਪ�ਰਾ�ਮਰ�\") ਮ�ਮ� ਲਿਸ� ਲ� URI"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
-msgid "URI of the highlighted (\"primary\") task list"
-msgstr "ਹਾ�ਲਾ�� (\"ਪ�ਰਾ�ਮਰ�\") �ਾਸ� ਲ� URI"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "ਮ�ਲ ਰ�ਮਾ�ਡਰ ਲ� ���ਮਾ� ਹਨ, \"ਮਿੰ�\", \"�ੰ��\" or \"ਦਿਨ\""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "�ਾਸ� �ਹਲ� �ਰਨ ਲ� �ਾਣਨ ਲ� ���ਮਾ�, \"ਮਿੰ�\", \"�ੰ��\" �ਾ� \"ਦਿਨ\""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
-msgid "Use system timezone"
-msgstr "ਸਿਸ�ਮ �ਾ�ਮ-�਼�ਨ ਵਰਤ��"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ��ਣ� ਸਮਾ�-��ਤਰ ਦ� ਬ�ਾ� ਸਿਸ�ਮ ਸਮਾ�-��ਤਰ ਵਰਤ��"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
-msgid "Vertical pane position"
-msgstr "ਲੰਬ�ਾਰ� ਬਾਹ� ਸਥਿਤ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
-msgid "Week start"
-msgstr "ਹਫਤਾ ਸ਼�ਰ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "ਹਫਤਾ ਸ਼�ਰ� ਹ�ਣ ਦਾ ਦਿਨ, �ਤਵਾਰ (੦) ਤ�� ਸ਼ਨਿ�ੱਰਵਾਰ (੬)।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
-msgid "Whether or not to use the notification tray for display alarms."
-msgstr "�ਲਾਰਮ ਵ��ਾ�ਣ ਲ� ਸ��ਨਾ ਪੱ�� ਵਿੱ� ਵਰਤਿ� �ਾਵ� �ਾ� ਨਾ।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "�� ਮ�ਲਾ�ਾਤ �ਾ� �ੰਮ ਹ�ਾ�ਣ ਤ� ਪ�ਸ਼�� �ਰਵਾ� �ਾਵ� �ਾ� ਨਾ।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "�� ਮ�ਲ�ਾਤ �ਾ� �ੰਮ ਹ�ਾ�ਣ ਤ� ਪ�ਸ਼�� �ਰਵਾ� �ਾਵ� �ਾ� ਨਾ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr ""
-"�� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਹਫਤਿ�� ਨ�ੰ �ੱ�ਠਾ �ਰਨਾ ਹ� ਤਾ� �ਿ ਸ਼ਨਿ�ੱਰਵਾਰ �ਤ� �ਤਵਾਰ ਨ�ੰ �ੱ� ਦਿਨ ਦ� ਤ�ਰ ਤ� "
-"ਵ��ਾ�� �ਾਵ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to display the end time of events in the week and month views."
-msgstr "�� ਹਫਤਾ ਤ� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ��ਨਾ ਦਾ ਸਮਾ� �ੰਤ ਵ��ਾ�ਣਾ ਹ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "�� ��ਲੰਡਰ ਵਿੱ� ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ (ਮ���ਦਾ ਸਮ�� ਦ� ਰ��ਾ) �ਿੱ�ਣ� ਹ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "�� ਮ��ੰਮਲ �ੰਮਾ� ਨ�ੰ �ੰਮ ਦਿੱ� ਵਿੱ� �ਹਲ� ��ਤ� �ਾਵ� �ਾ� ਨਾ।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
-msgid "Whether to scroll a Month View by a week, not by a month."
-msgstr "�� ਮਹ�ਨਾ �ਲ� ਨ�ੰ ਹਫ਼ਤ� ਰਾਹ�� ਹਿਲਾ�ਣਾ ਹ� ਨਾ �ਿ ਮਹ�ਨ� ਨਾਲ।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
-msgid "Whether to set a default reminder for appointments."
-msgstr "�� ਮ�ਲਾ�ਾਤ ਲ� ਮ�ਲ ਰ�ਮਾ�ਡਰ ਲ�ਾ�� �ਾਵ� �ਾ� ਨਾ।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� RSVP ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "�� ��ਨਾ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ���ਾ�ਰ� ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਰ�ਲ ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਹਾਲਤ ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "�� ਸਮਾ� ਸਵ�ਰ�/ਸ਼ਾਮ ਦ� ਬ�ਾ� ੪ �ੰ�ਿ�� ਵਿੱ� ਵ��ਾ�� �ਾਵ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਸਮਾ� ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� �ਿਸਮ ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
-msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "�� ��ਲੰਡਰ '� �� ਥਾਵਾ� ਵਿੱ� ਹਫ਼ਤਾ ਨੰਬਰ ਵ��ਾ�ਣਾ ਹ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
-msgid "Work days"
-msgstr "�ਾਰ�� ਦਿਨ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Workday end hour"
-msgstr "�ਾਰ��ਾਰ� �ੰਤ �ੰ�ਾ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Workday end minute"
-msgstr "�ਾਰ��ਾਰ� �ੰਤ ਮਿੰ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
-msgid "Workday start hour"
-msgstr "�ਾਰ�ਾ�ਰ� ਸ਼�ਰ� �ੰ�ਾ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
-msgid "Workday start minute"
-msgstr "�ਾਰ��ਾਰ� ਸ਼�ਰ� ਮਿੰ�"
-
 #: ../calendar/gui/cal-editor-utils.c:105
 msgid "Invalid object"
 msgstr "�ਲਤ �ਬ����"
@@ -2658,17 +2129,15 @@ msgstr "���ਾ�ਰ�"
 msgid "Classification"
 msgstr "ਵਰ���ਰਨ"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
-#: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:323
-#: ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:780 ../calendar/gui/e-task-table.c:495
+#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "��ਪਤ"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:60
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
@@ -2691,7 +2160,7 @@ msgstr "ਬਾਹਰ"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
@@ -2702,21 +2171,21 @@ msgstr "�ਿ�ਾਣਾ"
 msgid "Organizer"
 msgstr "ਪ�ਰਬੰਧ�"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
+#: ../calendar/gui/e-cal-model.c:778 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ਨਿੱ��"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
-#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
+#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-cal-model.c:776
+#: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ਸਰਵ�ਨ�"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:322
-#: ../calendar/gui/dialogs/event-editor.c:343
+#: ../calendar/gui/dialogs/event-editor.c:321
+#: ../calendar/gui/dialogs/event-editor.c:342
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "ਦ�ਹਰਾ�"
@@ -2784,7 +2253,7 @@ msgid "Add Alarm"
 msgstr "ਸੰ��ਤ ਸ਼ਾਮਿਲ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
+#: ../calendar/gui/dialogs/event-editor.c:364
 msgid "Alarm"
 msgstr "�ਲਾਰਮ"
 
@@ -2800,7 +2269,7 @@ msgstr "ਸੰ��ਤ �ਵਾ� ਸ�ਧ"
 msgid "Mes_sage:"
 msgstr "ਸ�ਨ�ਹਾ(_s):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
 msgid "Options"
 msgstr "��ਣ"
 
@@ -2846,9 +2315,9 @@ msgstr "ਦਿਨ"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:376
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "days"
 msgstr "ਦਿਨ"
@@ -2883,375 +2352,86 @@ msgid "A_dd"
 msgstr "ਸ਼ਾਮਲ(_d)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
 #: ../calendar/gui/dialogs/event-page.ui.h:1
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Alarms"
 msgstr "�ਲਾਰਮ"
 
-#. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
-#: ../calendar/gui/e-day-view-time-item.c:797
-msgctxt "cal-second-zone"
-msgid "None"
-msgstr "��� ਨਹ��"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
-#: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:319
-msgid "Select..."
-msgstr "��ਣ�..."
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
-msgid "Selected Calendars for Alarms"
-msgstr "�ਲਾਰਮ ਲ� ��ਣ� ��ਲੰਡਰ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
-msgid "Ti_me and date:"
-msgstr "ਸਮਾ� ਤ� ਮਿਤ�(_m):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-msgid "_Date only:"
-msgstr "��ਵਲ ਮਿਤ�(_D):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
-#, no-c-format
-msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr "%u �ਤ� %d ਨ�ੰ �-ਮ�ਲ �ਡਰ�ੱਸ ਵਿੱ��� ਯ��਼ਰ �ਤ� ਡ�ਮ�ਨ ਨਾਲ ਤਬਦ�ਲ ��ਤਾ �ਾਵ��ਾ।"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
-msgid "(Shown in a Day View)"
-msgstr "(ਦਿਨ �ਲ� ਵਿੱ� ਵ���)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
-msgid "05 minutes"
-msgstr "੦੫ ਮਿੰ�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
-msgid "10 minutes"
-msgstr "੧੦ ਮਿੰ�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
-msgid "15 minutes"
-msgstr "੧੫ ਮਿੰ�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
-msgid "30 minutes"
-msgstr "੩੦ ਮਿੰ�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
-msgid "60 minutes"
-msgstr "੬੦ ਮਿੰ�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
-msgid "Alerts"
-msgstr "��ਤਾਵਨ�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:156
-msgid "Date/Time Format"
-msgstr "ਮਿਤ�/ਸਮਾ� ਫਾਰਮ��"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
-msgid "Day _ends:"
-msgstr "ਦਿਨ ਸਮਾਪਤ(_e):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
-msgid "Days"
-msgstr "ਦਿਨ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
-msgid "Default Free/Busy Server"
-msgstr "ਡਿਫਾਲ� ਵ�ਹਲਾ/ਰ��ਿ� ਸਰਵਰ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
-msgid "Display"
-msgstr "ਡਿਸਪਲ��"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ� ਵਿੱ� �ਲਾਰਮ ਵ���(_n)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:738
-msgid "Friday"
-msgstr "ਸ਼�ੱ�ਰਵਾਰ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
-#: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2678
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:21
-msgid "General"
-msgstr "ਸਧਾਰਨ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
-msgid "Hours"
-msgstr "�ੰ��"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
-msgid "Minutes"
-msgstr "ਮਿੰ�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:734
-msgid "Monday"
-msgstr "ਸ�ਮਵਾਰ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../mail/mail-config.ui.h:85
-msgid "Pick a color"
-msgstr "ਰੰ� ��ਣ�"
-
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
-msgid "S_un"
-msgstr "�ਤ(_u)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:739
-msgid "Saturday"
-msgstr "ਸ਼ਨਿੱ�ਰਵਾਰ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
-msgid "Sc_roll Month View by a week"
-msgstr "ਮਹ�ਨ� ਨ�ੰ ਹਫ਼ਤ� ਨਾਲ ਹਿਲਾ�(_r)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
-msgid "Se_cond zone:"
-msgstr "ਦ��ਾ ��ਤਰ(_c):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
-msgid "Select the calendars for alarm notification"
-msgstr "�ਲਾਰਮ ਸ��ਨਾ ਲ� �ਲੰਡਰ ��ਣ�"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
-msgid "Sh_ow a reminder"
-msgstr "ਯਾਦਪੱਤਰ ਵ��ਾ�(_o)"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
-msgid "Show a _reminder"
-msgstr "ਯਾਦਪੱਤਰ ਵ��ਾ�(_r)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-msgid "Show week _numbers"
-msgstr "ਹਫ਼ਤਾ ਨੰਬਰ ਵ���(_n)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:733
-msgid "Sunday"
-msgstr "�ਤਵਾਰ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
-msgid "T_asks due today:"
-msgstr "�ੱ� ਦ� �ੰਮ(_a):"
-
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
-msgid "T_hu"
-msgstr "ਵ�ਰ(_h)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/calendar-setup.c:381
-msgid "Task List"
-msgstr "�ੰਮ ਲਿਸ�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
-msgid "Template:"
-msgstr "��ਪਲ��:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:737
-msgid "Thursday"
-msgstr "ਵ�ਰਵਾਰ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
-#: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:595
-msgid "Time"
-msgstr "ਸਮਾ�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/event-page.ui.h:9
-msgid "Time _zone:"
-msgstr "ਸਮਾ�-��ਤਰ(_z):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
-msgid "Time format:"
-msgstr "ਸਮਾ�-ਫਾਰਮ��:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:735
-msgid "Tuesday"
-msgstr "ਮੰ�ਲਵਾਰ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
-msgid "Use s_ystem time zone"
-msgstr "ਸਿਸ�ਮ ਸਮਾ� ��ਤਰ ਵਰਤ��(_y)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:736
-msgid "Wednesday"
-msgstr "ਬ�ੱਧਵਾਰ"
-
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
-msgid "Wee_k starts on:"
-msgstr "ਹਫਤਾ ਸ਼�ਰ�(_k):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
-msgid "Work Week"
-msgstr "�ੰਮ ਹਫਤਾ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
-msgid "Work days:"
-msgstr "�ਾਰ�� ਦਿਨ:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
-msgid "_12 hour (AM/PM)"
-msgstr "_੧੨ �ੰ�� (ਸਵ�ਰ/ ਸ਼ਾਮ)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
-msgid "_24 hour"
-msgstr "_੨੪ �ੰ��"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
-msgid "_Ask for confirmation when deleting items"
-msgstr "���ਮਾ� ਹ�ਾ�ਣ ਸਮ�� ਪ�ਸ਼�� �ਰਵਾ�(_A)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
-msgid "_Compress weekends in month view"
-msgstr "ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਹਫਤਾ-�ੰਤ ਸਮ���(_C)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
-msgid "_Day begins:"
-msgstr "ਦਿਨ ਸ਼�ਰ�(_D):"
-
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
-msgid "_Fri"
-msgstr "ਸ਼�ੱ�ਰ(_F)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
-msgid "_Hide completed tasks after"
-msgstr "ਸੰਪ�ਰਨ �ੰਮ �ਸ ਬਾ�ਦ �ਹਲ� �ਰ�(_H)"
-
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
-msgid "_Mon"
-msgstr "ਸ�ਮ(_M)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
-msgid "_Overdue tasks:"
-msgstr "ਮਿ�ਦ ਪ�ੱ�� �ੰਮ(_O):"
-
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
-msgid "_Sat"
-msgstr "ਸ਼ਨਿੱ(_S)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
-msgid "_Show appointment end times in week and month view"
-msgstr "ਹਫਤ� �ਤ� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਮ�ਲ�ਾਤ ਵ��ਾ�(_S)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
-msgid "_Time divisions:"
-msgstr "ਸਮਾ� ਵੰਡ(_T):"
-
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
-msgid "_Tue"
-msgstr "ਮੰ�ਲ(_T)"
-
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
-msgid "_Wed"
-msgstr "ਬ�ੱਧ(_W)"
-
-#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
-msgid "before every anniversary/birthday"
-msgstr "ਹਰ�� ਵਰ�ਹ�-�ੰਢ/�ਨਮਦਿਨ ਤ�� ਪਹਿਲਾ�"
-
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
-msgid "before every appointment"
-msgstr "ਹਰ ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ�"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:153
+#: ../calendar/gui/dialogs/calendar-setup.c:159
 msgid "Type:"
 msgstr "�ਿਸਮ:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:510
+#: ../calendar/gui/dialogs/calendar-setup.c:175
+#: ../modules/addressbook/addressbook-config.c:513
 msgid "_Type:"
 msgstr "�ਿਸਮ(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:150
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:284
+#: ../widgets/misc/e-signature-script-dialog.c:285
 msgid "_Name:"
 msgstr "ਨਾ�(_N):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:276
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ਬੰਦ �ਾਰਵਾ� ਦ�ਰਾਨ ��ਲੰਡਰ ਭਾ� �ਾਪ� �ਰ�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:278
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "�ਫਲਾ�ਨ �ਾਰਵਾ� ਲ� �ੰਮ-ਸ��� ਭਾ�ਾ� ਨ�ੰ ਸਥਾਨ� �ਾਪ� �ਰ�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:280
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "�ਫਲਾ�ਨ �ਾਰਵਾ� ਲ� ਮ�ਮ� ਸ��� ਭਾ�ਾ� ਨ�ੰ ਸਥਾਨ� �ਾਪ� �ਰ�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:352
 msgid "Colo_r:"
 msgstr "ਰੰ�(_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:375
+#: ../calendar/gui/dialogs/calendar-setup.c:386
+#: ../calendar/gui/dialogs/calendar-setup.c:397
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:51
+#: ../modules/addressbook/addressbook-config.c:1015
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "ਸਧਾਰਨ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:387
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Task List"
+msgstr "�ੰਮ ਲਿਸ�"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:398
 msgid "Memo List"
 msgstr "ਮ�ਮ� ਲਿਸ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:483
 msgid "Calendar Properties"
 msgstr "��ਲੰਡਰ ਵਿਸ਼�ਸਤਾ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:483
 msgid "New Calendar"
 msgstr "ਨਵਾ� ��ਲੰਡਰ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:539
 msgid "Task List Properties"
 msgstr "�ੰਮ ਲਿਸ� ��ਣ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:539
 msgid "New Task List"
 msgstr "ਨਵ�� �ੰਮ ਲਿਸ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 msgid "Memo List Properties"
 msgstr "ਮ�ਮ� ਸ��� ਵਿਸ਼�ਸ਼ਤਾ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 msgid "New Memo List"
 msgstr "ਨਵ�� ਮ�ਮ� ਲਿਸ�"
 
@@ -3304,237 +2484,237 @@ msgstr "%s  ਤ�ਸ�� ��� ਤਬਦ�ਲ� ਨਹ�� ��ਤ
 msgid "Validation error: %s"
 msgstr "�ਾ�� �ਲਤ�: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:267
 msgid "Could not save attachments"
 msgstr "����ਮ��� ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:522
+#: ../calendar/gui/dialogs/comp-editor.c:543
 msgid "Could not update object"
 msgstr "��ਾ� �ੱਪਡ�� ਨਹ�� ਹ� ਸ�ਦ� ਹ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:637
+#: ../calendar/gui/dialogs/comp-editor.c:658
 msgid "Edit Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਸ�ਧ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:644
+#: ../calendar/gui/dialogs/comp-editor.c:665
 #, c-format
 msgid "Meeting - %s"
 msgstr "ਮ��ਿੰ� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:646
+#: ../calendar/gui/dialogs/comp-editor.c:667
 #, c-format
 msgid "Appointment - %s"
 msgstr "ਮ�ਲਾ�ਾਤ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:673
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ਮਿਲ� �ੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:654
+#: ../calendar/gui/dialogs/comp-editor.c:675
 #, c-format
 msgid "Task - %s"
 msgstr "�ੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:680
 #, c-format
 msgid "Memo - %s"
 msgstr "ਮ�ਮ� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:675
+#: ../calendar/gui/dialogs/comp-editor.c:696
 msgid "No Summary"
 msgstr "ਸੰ��ਪ ਨਹ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:786
+#: ../calendar/gui/dialogs/comp-editor.c:817
 msgid "Keep original item?"
 msgstr "�� �ਸਲ� ���ਮ ਰੱ�ਣ� ਹ�?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
+#: ../calendar/gui/dialogs/comp-editor.c:1013
 msgid "Click here to close the current window"
 msgstr "ਮ���ਦਾ ਵਿੰਡ� ਬੰਦ �ਰਨ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1454
-#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
-#: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:1020 ../mail/e-mail-browser.c:139
+#: ../shell/e-shell-window-actions.c:1434
+#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:412 ../widgets/misc/e-web-view.c:1065
 msgid "Copy the selection"
 msgstr "��ਣ� ਦ� ਨ�ਲ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1461
-#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
-#: ../widgets/misc/e-web-view.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1027 ../mail/e-mail-browser.c:146
+#: ../shell/e-shell-window-actions.c:1441
+#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:1059
 msgid "Cut the selection"
 msgstr "��ਣ� �ੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
-#: ../shell/e-shell-window-actions.c:1468
-#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
+#: ../calendar/gui/dialogs/comp-editor.c:1034
+#: ../shell/e-shell-window-actions.c:1448
+#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "��ਣ� ਹ�ਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011
+#: ../calendar/gui/dialogs/comp-editor.c:1041
 msgid "Click here to view help available"
 msgstr "�ਪਲੱਬਧ ਮੱਦਦ ਵ��ਣ ਲ� �ੱਥ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1503
-#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
-#: ../widgets/misc/e-web-view.c:1072
+#: ../calendar/gui/dialogs/comp-editor.c:1048 ../mail/e-mail-browser.c:153
+#: ../shell/e-shell-window-actions.c:1483
+#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-web-view.c:1071
 msgid "Paste the clipboard"
 msgstr "�ਲਿੱਪਬ�ਰਡ �ਿਪ�ਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
+#: ../calendar/gui/dialogs/comp-editor.c:1069
 msgid "Click here to save the current window"
 msgstr "ਮ���ਦਾ ਵਿੰਡ� ਸੰਭਾਲਣ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1573
-#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
+#: ../calendar/gui/dialogs/comp-editor.c:1076 ../mail/e-mail-browser.c:160
+#: ../shell/e-shell-window-actions.c:1553
+#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "ਸਾਰਾ ���ਸ� ��ਣ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1053
+#: ../calendar/gui/dialogs/comp-editor.c:1083
 msgid "_Classification"
 msgstr "ਵਰ���ਰਨ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:174
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1581
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "ਸ�ਧ(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1615
-#: ../widgets/misc/e-signature-editor.c:220
+#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:167
+#: ../shell/e-shell-window-actions.c:1588
+#: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "ਫਾ�ਲ(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1074
-#: ../shell/e-shell-window-actions.c:1622
+#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../shell/e-shell-window-actions.c:1595
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1111
 msgid "_Insert"
 msgstr "ਸ਼ਾਮਿਲ(_i)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../composer/e-composer-actions.c:315
+#: ../calendar/gui/dialogs/comp-editor.c:1118
+#: ../composer/e-composer-actions.c:301
 msgid "_Options"
 msgstr "��ਣ(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1125 ../mail/e-mail-browser.c:181
+#: ../shell/e-shell-window-actions.c:1630 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "ਵ���(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
-#: ../composer/e-composer-actions.c:243
+#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../composer/e-composer-actions.c:257
 msgid "_Attachment..."
 msgstr "ਨੱਥ�(_a)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "Click here to attach a file"
 msgstr "�ੱ� ਫਾ�ਲ ਨੱਥ� �ਰਨ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "_Categories"
 msgstr "���ਾ�ਰ�(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1147
 msgid "Toggles whether to display categories"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ �ਲ� ���ਾ�ਰ� ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "Time _Zone"
 msgstr "ਸਮਾ� ��ਤਰ(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1155
 msgid "Toggles whether the time zone is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਸਮਾ� ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1164
 msgid "Pu_blic"
 msgstr "ਪਬਲਿ�(_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1166
 msgid "Classify as public"
 msgstr "ਪਬਲਿ� ਵਾ�� ਰੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_Private"
 msgstr "ਨਿੱ��(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1173
 msgid "Classify as private"
 msgstr "ਨਿੱ�� ਵਾ�� ਰੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 msgid "_Confidential"
 msgstr "��ਪਤ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1180
 msgid "Classify as confidential"
 msgstr "��ਪਤ ਦ� ਤ�ਰ 'ਤ� ਰੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1188
 msgid "R_ole Field"
 msgstr "ਰ�ਲ ��ਤਰ(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1190
 msgid "Toggles whether the Role field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਰ�ਲ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
+#: ../calendar/gui/dialogs/comp-editor.c:1196
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1198
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ RSVP ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1204
 msgid "_Status Field"
 msgstr "ਹਾਲਤ ��ਤਰ(_S):"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1206
 msgid "Toggles whether the Status field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਹਾਲਤ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1212
 msgid "_Type Field"
 msgstr "�ਿਸਮ ��ਤਰ(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1184
+#: ../calendar/gui/dialogs/comp-editor.c:1214
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਦਰਸ਼� �ਿਸਮ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1208
+#: ../calendar/gui/dialogs/comp-editor.c:1238
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "ਤਾ�਼ਾ ਦਸਤਾਵ��਼(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1743
-#: ../composer/e-composer-actions.c:431
+#: ../calendar/gui/dialogs/comp-editor.c:1923
+#: ../composer/e-composer-actions.c:461
 msgid "Attach"
 msgstr "ਨੱਥ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2072
-#: ../calendar/gui/dialogs/comp-editor.c:2121
-#: ../calendar/gui/dialogs/comp-editor.c:3086
+#: ../calendar/gui/dialogs/comp-editor.c:2252
+#: ../calendar/gui/dialogs/comp-editor.c:2415
+#: ../calendar/gui/dialogs/comp-editor.c:3382
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "���ਰ �ੱਪਡ�� ��ਤਾ �ਸ ��ਾ� ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਰੱਦ �ਰ ਦਿੱਤ��� �ਾਣ����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3346
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "����ਮ���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3118
+#: ../calendar/gui/dialogs/comp-editor.c:3414
 msgid "Unable to use current version!"
 msgstr "ਮ���ਦਾ ਵਰ�ਨ ਵਰਤਣ ਵਿੱ� �ਸਫਲ!"
 
@@ -3550,11 +2730,11 @@ msgstr "ਨਿਯਤ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ
 msgid "Destination is read only"
 msgstr "ਨਿਯਤ ਸਿਰਫ ਪ�ਨ ਲ� ਹ�"
 
-#: ../calendar/gui/dialogs/delete-comp.c:214
+#: ../calendar/gui/dialogs/delete-comp.c:210
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "ਹ�ਰ ਸਭ ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਦ� ਪੱਤਰ-ਬ�ਸ� ਵਿੱ� �ਹ ��ਾ� ਹ�ਾ�ਣ� ਹ�?(_D)"
 
-#: ../calendar/gui/dialogs/delete-comp.c:217
+#: ../calendar/gui/dialogs/delete-comp.c:213
 msgid "_Retract comment"
 msgstr "�ਿੱਪਣ� ਰ��ਰ�ਸ(_R)"
 
@@ -3634,147 +2814,147 @@ msgstr "�ਸ ਲ� ਪ�ਰਤ�ਨਿਧ:"
 msgid "Enter Delegate"
 msgstr "ਪ�ਰਤ�ਨਿਧ ਦਿ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "_Alarms"
 msgstr "�ਲਾਰਮ(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:218
 msgid "Click here to set or unset alarms for this event"
 msgstr "�ਹ ��ਨਾ ਲ� �ਲਾਰਮ ਨ�ੰ ਸ�ੱ� �ਾ� ਨਾ-ਸ�ੱ� �ਰਨ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "Show Time as _Busy"
 msgstr "ਸਮਾ� ਰ��� ਵਾ�� ਵ��ਾ�(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to show time as busy"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਵੱਲ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "_Recurrence"
 msgstr "ਦ�ਹਰਾ(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Make this a recurring event"
 msgstr "�ਹ ਮ���ਦ�� ਨ�ੰ �ੱਲ ਬਣਾ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:210
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "ਭ��ਣ ��ਣ"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
-#: ../calendar/gui/dialogs/task-editor.c:129
+#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "ਤ�ਨ��� ਭ��ਣ ��ਣ ਸ਼ਾਮਲ"
 
-#: ../calendar/gui/dialogs/event-editor.c:255
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "All _Day Event"
 msgstr "ਸਭ ਦਿਨ ��ਨਾਵਾ�(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:257
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Toggles whether to have All Day Event"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਸਾਰ� ਦਿਨ ਦ��� ��ਨਾਵਾ� ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:266
+#: ../calendar/gui/dialogs/event-editor.c:265
 msgid "_Free/Busy"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:268
+#: ../calendar/gui/dialogs/event-editor.c:267
 msgid "Query free / busy information for the attendees"
 msgstr "�ਸ ��ਲੰਡਰ ਲ� ਵ�ਹਲਾ / ਰ��ਿ� �ਾਣ�ਾਰ� ਪਤਾ �ਰ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2610
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3140
 msgid "Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ"
 
-#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-editor.c:388
 #: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "ਦਰਸ਼�"
 
-#: ../calendar/gui/dialogs/event-editor.c:578
+#: ../calendar/gui/dialogs/event-editor.c:585
 msgid "Print this event"
 msgstr "�ਹ �ਵ��� ਪਰਿੰ� �ਰ�"
 
-#: ../calendar/gui/dialogs/event-page.c:766
+#: ../calendar/gui/dialogs/event-page.c:771
 msgid "Event's start time is in the past"
 msgstr "�ਵ��� ਦ� ਸ਼�ਰ� ਮਿਤ� ਲੰ� ��ੱ�� ਸਮ�� '� ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:812
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "�ਵ��� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਿ�, �ਿ���ਿ ��ਣਿ� ��ਲੰਡਰ ��ਵਲ ਪ��ਹਨ ਲ� ਹ� ਹ�।"
 
-#: ../calendar/gui/dialogs/event-page.c:811
+#: ../calendar/gui/dialogs/event-page.c:816
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "�ਵ��� ਪ�ਰ� ਤਰ�ਹਾ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ, �ਿ���ਿ ਤ�ਸ�� ਪਰਬੰਧ� ਨਹ�� ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2775
+#: ../calendar/gui/dialogs/event-page.c:828
+#: ../calendar/gui/dialogs/event-page.c:2784
 msgid "This event has alarms"
 msgstr "�ਹ ��ਨਾ ਲ� �ਲਾਰਮ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.c:895
 #: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "ਪ�ਰਬੰਧ�(_O):"
 
-#: ../calendar/gui/dialogs/event-page.c:937
+#: ../calendar/gui/dialogs/event-page.c:942
 msgid "_Delegatees"
 msgstr "ਪ�ਰਤ�ਨਿਧ(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:944
 msgid "Atte_ndees"
 msgstr "ਦਰਸ਼�(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1154
+#: ../calendar/gui/dialogs/event-page.c:1159
 msgid "Event with no start date"
 msgstr "ਬਿਨਾ� ਸ਼�ਰ��ਤ ਮਿਤ� ਨਾਲ ��ਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1157
+#: ../calendar/gui/dialogs/event-page.c:1162
 msgid "Event with no end date"
 msgstr "ਬਿਨਾ� �ੰਤ ਮਿਤ� ਨਾਲ ��ਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1328
-#: ../calendar/gui/dialogs/memo-page.c:686
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/memo-page.c:689
+#: ../calendar/gui/dialogs/task-page.c:909
 msgid "Start date is wrong"
 msgstr "ਸ਼�ਰ��ਤ� ਮਿਤ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1343
 msgid "End date is wrong"
 msgstr "ਸਮਾਪਤ� ਮਿਤ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1361
+#: ../calendar/gui/dialogs/event-page.c:1366
 msgid "Start time is wrong"
 msgstr "ਸ਼�ਰ��ਤ� ਸਮਾ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1368
+#: ../calendar/gui/dialogs/event-page.c:1373
 msgid "End time is wrong"
 msgstr "ਸਮਾਪਤ� ਸਮਾ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1530
-#: ../calendar/gui/dialogs/memo-page.c:727
-#: ../calendar/gui/dialogs/task-page.c:967
+#: ../calendar/gui/dialogs/event-page.c:1537
+#: ../calendar/gui/dialogs/memo-page.c:730
+#: ../calendar/gui/dialogs/task-page.c:971
 msgid "The organizer selected no longer has an account."
 msgstr "��ਣ� ਪ�ਰਬੰਧ� ਦਾ ��ਾ��� ਨਹ�� ਰਿਹਾ ਹ�।"
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/memo-page.c:733
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1543
+#: ../calendar/gui/dialogs/memo-page.c:736
+#: ../calendar/gui/dialogs/task-page.c:977
 msgid "An organizer is required."
 msgstr "�ੱ� ਪ�ਰਬੰਧ� ਲ���ਦਾ ਹ�।"
 
-#: ../calendar/gui/dialogs/event-page.c:1561
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1568
+#: ../calendar/gui/dialogs/task-page.c:1001
 msgid "At least one attendee is required."
 msgstr "�ੱ� ਦਰਸ਼� ਤਾ� ਲ���ਦਾ ਹ�।"
 
-#: ../calendar/gui/dialogs/event-page.c:2649
+#: ../calendar/gui/dialogs/event-page.c:2658
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' ��ਲੰਡਰ ��ਲਣ ਵਿੱ� �ਸਫਲ"
@@ -3785,47 +2965,47 @@ msgstr "'%s' ��ਲੰਡਰ ��ਲਣ ਵਿੱ� �ਸਫਲ"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2693
-#: ../calendar/gui/dialogs/memo-page.c:946
-#: ../calendar/gui/dialogs/task-page.c:1787
+#: ../calendar/gui/dialogs/event-page.c:2702
+#: ../calendar/gui/dialogs/memo-page.c:949
+#: ../calendar/gui/dialogs/task-page.c:1791
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ਤ�ਸ�� %s ਦ� ਤ�ਰ �ੱਤ� �ੰਮ �ਰ ਰਹ� ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:2994
+#: ../calendar/gui/dialogs/event-page.c:3013
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� %d ਦਿਨ"
 msgstr[1] "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� %d ਦਿਨ"
 
-#: ../calendar/gui/dialogs/event-page.c:3000
+#: ../calendar/gui/dialogs/event-page.c:3019
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� %d �ੰ�ਾ"
 msgstr[1] "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� %d �ੰ��"
 
-#: ../calendar/gui/dialogs/event-page.c:3006
+#: ../calendar/gui/dialogs/event-page.c:3025
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� %d ਮਿੰ�"
 msgstr[1] "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� %d ਮਿੰ�"
 
-#: ../calendar/gui/dialogs/event-page.c:3019
+#: ../calendar/gui/dialogs/event-page.c:3044
 msgid "Customize"
 msgstr "ਪਸੰਦ"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3050
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "��� ਨਹ��"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:566
 msgid "Atte_ndees..."
 msgstr "ਦਰਸ਼�(_N)..."
 
@@ -3837,6 +3017,11 @@ msgstr "�ਲਾਰਮ ਸ�ਧ:"
 msgid "Event Description"
 msgstr "�ਵ��� ਵ�ਰਵਾ"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+msgid "Time _zone:"
+msgstr "ਸਮਾ�-��ਤਰ(_z):"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "_Alarm"
 msgstr "�ਲਾਰਮ(_A)"
@@ -3844,12 +3029,12 @@ msgstr "�ਲਾਰਮ(_A)"
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:347
+#: ../widgets/misc/e-attachment-dialog.c:349
 msgid "_Description:"
 msgstr "ਵ�ਰਵਾ(_D):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:358
+#: ../plugins/calendar-weather/calendar-weather.c:361
 msgid "_Location:"
 msgstr "�ਿ�ਾਣਾ(_L):"
 
@@ -3891,35 +3076,35 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "�ਦ�� ਤੱ�"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2614
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3144
 msgid "Memo"
 msgstr "ਮ�ਮ�"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
+#: ../calendar/gui/dialogs/memo-editor.c:159
 msgid "Print this memo"
 msgstr "�ਹ ਮ�ਮ� ਪਰਿੰ� �ਰ�"
 
-#: ../calendar/gui/dialogs/memo-page.c:338
+#: ../calendar/gui/dialogs/memo-page.c:341
 msgid "Memo's start date is in the past"
 msgstr "ਮ�ਮ� ਦ� ਸ਼�ਰ� ਮਿਤ� ਲੰ� ��ੱ�� ਸਮ�� '� ਹ�"
 
-#: ../calendar/gui/dialogs/memo-page.c:376
+#: ../calendar/gui/dialogs/memo-page.c:379
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ਮ�ਮ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ, �ਿ���ਿ ��ਣਿ� ਮ�ਮ� ��ਵਲ ਪ��ਹਨ ਲ� ਹ� ਹ�"
 
-#: ../calendar/gui/dialogs/memo-page.c:380
+#: ../calendar/gui/dialogs/memo-page.c:383
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ਮ�ਮ� ਪ�ਰ� ਤਰ�ਹਾ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ, �ਿ���ਿ ਤ�ਸ�� ਪਰਬੰਧ� ਨਹ�� ਹ�"
 
-#: ../calendar/gui/dialogs/memo-page.c:907
+#: ../calendar/gui/dialogs/memo-page.c:910
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' ਵਿੱ� ਮ�ਮ� ��ਲਣ ਤ�� �ਸਮਰੱਥ"
 
-#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
-#: ../em-format/em-format.c:1040 ../mail/em-format-html.c:2289
-#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
+#: ../calendar/gui/dialogs/memo-page.c:1081 ../em-format/em-format-quote.c:282
+#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2401
+#: ../mail/em-format-html.c:2460 ../mail/em-format-html.c:2484
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:75
 msgid "To"
 msgstr "ਵੱਲ"
 
@@ -3938,7 +3123,7 @@ msgid "T_o:"
 msgstr "ਵੱਲ(_o):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.c:428
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "�ਰ�ੱਪ(_G):"
@@ -3979,21 +3164,21 @@ msgstr "�ਹ �ਤ� ਭਵਿੱ�ਤ ਮ��� ਲ�"
 msgid "All Instances"
 msgstr "ਸਭ ਮ���"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:569
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "�ਸ ਮ�ਲਾ�ਾਤ ਵਿੱ� ਲ�� ਹ�, �� �ਿ �ਵ�ਲ�ਸ਼ਨ ਸ�ਧ ਨਹ�� ਸ�ਦਾ ਹ�।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:901
 msgid "Recurrence date is invalid"
 msgstr "�ਵਰਤ� ਮਿਤ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:941
 msgid "End time of the recurrence was before event's start"
 msgstr "ਮ��-ਹ�ਣ ਦਾ ਸਮਾ� �ਵ��� ਸ਼�ਰ� ਹ�ਣ ਦ� ਸਮ�� ਤ�� ਪਹਿਲਾ� ਹ�"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:971
 msgid "on"
 msgstr "�ਾਲ�"
 
@@ -4001,7 +3186,7 @@ msgstr "�ਾਲ�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1018
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "first"
 msgstr "ਪਹਿਲਾ�"
 
@@ -4010,7 +3195,7 @@ msgstr "ਪਹਿਲਾ�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1035
 msgid "second"
 msgstr "ਦ��ਾ"
 
@@ -4018,7 +3203,7 @@ msgstr "ਦ��ਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
 msgid "third"
 msgstr "ਤ��ਾ"
 
@@ -4026,7 +3211,7 @@ msgstr "ਤ��ਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 msgid "fourth"
 msgstr "��ਥਾ"
 
@@ -4034,7 +3219,7 @@ msgstr "��ਥਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 msgid "fifth"
 msgstr "ਪੰ�ਵਾ�"
 
@@ -4042,13 +3227,13 @@ msgstr "ਪੰ�ਵਾ�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1055
 msgid "last"
 msgstr "��ਰ�"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1068
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "Other Date"
 msgstr "ਹ�ਰ ਮਿਤ�"
 
@@ -4056,7 +3241,7 @@ msgstr "ਹ�ਰ ਮਿਤ�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 msgid "1st to 10th"
 msgstr "੧ਲ� ਤ�� ੧੦ਵਾ�"
 
@@ -4064,7 +3249,7 @@ msgstr "੧ਲ� ਤ�� ੧੦ਵਾ�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 msgid "11th to 20th"
 msgstr "੧੧ਵ�� ਤ�� ੨੦ਵਾ�"
 
@@ -4072,45 +3257,80 @@ msgstr "੧੧ਵ�� ਤ�� ੨੦ਵਾ�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
 msgid "21st to 31st"
 msgstr "੨੧ਵ�� ਤ�� ੩੧ਵਾ�"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 msgid "day"
 msgstr "ਦਿਨ"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Monday"
+msgstr "ਸ�ਮਵਾਰ"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1124
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "Tuesday"
+msgstr "ਮੰ�ਲਵਾਰ"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "Wednesday"
+msgstr "ਬ�ੱਧਵਾਰ"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
+msgid "Thursday"
+msgstr "ਵ�ਰਵਾਰ"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+msgid "Friday"
+msgstr "ਸ਼�ੱ�ਰਵਾਰ"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
+msgid "Saturday"
+msgstr "ਸ਼ਨਿੱ�ਰਵਾਰ"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
+msgid "Sunday"
+msgstr "�ਤਵਾਰ"
+
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1240
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
 msgid "on the"
 msgstr "�ਸ ਤ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1412
+#: ../calendar/gui/dialogs/recurrence-page.c:1425
 msgid "occurrences"
 msgstr "ਮ���ਦ��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2119
+#: ../calendar/gui/dialogs/recurrence-page.c:2132
 msgid "Add exception"
 msgstr "�ਪਵਾਦ ਸ਼ਾਮਲ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2160
+#: ../calendar/gui/dialogs/recurrence-page.c:2173
 msgid "Could not get a selection to modify."
 msgstr "ਸ�ਧ ਲ� �ੱ� ��ਣ ਨਹ�� ਮਿਲ�।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2166
+#: ../calendar/gui/dialogs/recurrence-page.c:2179
 msgid "Modify exception"
 msgstr "�ਪਵਾਦ ਸ�ਧ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2223
 msgid "Could not get a selection to delete."
 msgstr "ਹ�ਾ�ਣ ਲ� �ੱ� ��ਣ ਨਹ�� ਮਿਲ�।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2337
+#: ../calendar/gui/dialogs/recurrence-page.c:2357
 msgid "Date/Time"
 msgstr "ਮਿਤ�/ਸਮਾ�"
 
@@ -4122,7 +3342,7 @@ msgstr "ਹਰ��"
 msgid "Exceptions"
 msgstr "���"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
 msgid "Preview"
 msgstr "�ਲ�"
 
@@ -4172,91 +3392,90 @@ msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "ਸਾਲ"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:193
 msgid "Send my alarms with this event"
 msgstr "�ਸ �ਵ��� ਲ� ਮ�ਰ� �ਲਾਰਮ ਭ���"
 
-#: ../calendar/gui/dialogs/send-comp.c:164
+#: ../calendar/gui/dialogs/send-comp.c:195
 msgid "Notify new attendees _only"
 msgstr "��ਵਲ ਦਰਸ਼�ਾ� ਲ� ਸ��ਨਾ ਦਿ�(_o)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:350
-#: ../calendar/gui/dialogs/task-details-page.c:372
+#: ../calendar/gui/dialogs/task-details-page.c:356
+#: ../calendar/gui/dialogs/task-details-page.c:378
 msgid "Completed date is wrong"
 msgstr "ਸੰਪ�ਰਨ ਮਿਤ� �ਲਤ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:483
+#: ../calendar/gui/dialogs/task-details-page.c:489
 msgid "Web Page"
 msgstr "ਵ�ਬ ਪ��਼"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:443
-#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
-#: ../calendar/gui/print.c:2697 ../mail/em-sync-stream.c:151
-#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:442
+#: ../calendar/gui/e-cal-model-tasks.c:716 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:593
+#: ../calendar/gui/print.c:3230 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "ਰੱਦ ��ਤਾ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:441
-#: ../calendar/gui/e-cal-model-tasks.c:715
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
-#: ../calendar/gui/print.c:2694 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:440
+#: ../calendar/gui/e-cal-model-tasks.c:714
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
+#: ../calendar/gui/e-task-table.c:212 ../calendar/gui/e-task-table.c:227
+#: ../calendar/gui/e-task-table.c:592 ../calendar/gui/print.c:3227
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "ਸਮਾਪਤ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "��ਤਮ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:439
-#: ../calendar/gui/e-cal-model-tasks.c:713
-#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-model-tasks.c:438
+#: ../calendar/gui/e-cal-model-tasks.c:712
+#: ../calendar/gui/e-cal-model-tasks.c:789 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:591
+#: ../calendar/gui/print.c:3224
 msgid "In Progress"
 msgstr "ਤਰੱ�� ਵਿੱ� ਹ�"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "ਨਿ�ਨਤਮ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-cal-model.c:1524 ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1225
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:437
-#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
-#: ../calendar/gui/print.c:2688 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:302
+#: ../calendar/gui/e-cal-model-tasks.c:436
+#: ../calendar/gui/e-cal-model-tasks.c:710 ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:590
+#: ../calendar/gui/print.c:3221 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "ਸ਼�ਰ� ਨਹ�� ਹ�"
 
@@ -4272,8 +3491,8 @@ msgstr "ਹਾਲਤ(_U):"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1773
-#: ../calendar/gui/e-meeting-list-view.c:594
+#: ../calendar/gui/e-calendar-view.c:1837
+#: ../calendar/gui/e-meeting-list-view.c:596
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -4282,7 +3501,7 @@ msgstr "ਸਥਿਤ�"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "ਨਾ-ਪ�ਰਭਾਸ਼ਿਤ"
@@ -4300,58 +3519,58 @@ msgstr "ਪਹਿਲ(_P):"
 msgid "_Web Page:"
 msgstr "ਵ�ਬ ਸ�ਾ(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:117
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "ਹਾਲਤ ਵ�ਰਵਾ(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:119
+#: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
 msgstr "�ੰਮ ਦ� ਹਾਲਤ ਵ�ਰਵ� ਲ� ਤਬਦ�ਲ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/task-editor.c:127
+#: ../calendar/gui/dialogs/task-editor.c:126
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "ਭ��ਣ ��ਣ(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2612
+#: ../calendar/gui/dialogs/task-editor.c:331 ../calendar/gui/print.c:3142
 #: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "�ਾਸ�"
 
-#: ../calendar/gui/dialogs/task-editor.c:331
+#: ../calendar/gui/dialogs/task-editor.c:334
 msgid "Task Details"
 msgstr "�ੰਮ ਵ�ਰਵਾ"
 
-#: ../calendar/gui/dialogs/task-editor.c:373
+#: ../calendar/gui/dialogs/task-editor.c:376
 msgid "Print this task"
 msgstr "�ਹ �ੰਮ ਪਰਿੰ� �ਰ�"
 
-#: ../calendar/gui/dialogs/task-page.c:343
+#: ../calendar/gui/dialogs/task-page.c:345
 msgid "Task's start date is in the past"
 msgstr "�ਾਸ� ਦ� ਸ਼�ਰ� ਮਿਤ� ਲੰ� ��ੱ�� ਸਮ�� '� ਹ�"
 
-#: ../calendar/gui/dialogs/task-page.c:344
+#: ../calendar/gui/dialogs/task-page.c:346
 msgid "Task's due date is in the past"
 msgstr "�ਾਸ� ਦ� ਮਿ�ਦ ਲੰ� ��ੱ�� ਸਮ�� '� ਹ�"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:381
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "�ਾਸ� ਸ�ਧ� ਨਹ�� �ਾ ਸ�ਦ�, �ਿ���ਿ ��ਣ� �ਾਸ� ��ਵਲ ਪ��ਹਨ ਲ� ਹ� ਹ�"
 
-#: ../calendar/gui/dialogs/task-page.c:383
+#: ../calendar/gui/dialogs/task-page.c:385
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "�ਾਸ� ਪ�ਰ� ਤਰ�ਹਾ� ਸ�ਧ� ਨਹ�� �ਾ ਸ�ਦ�, �ਿ���ਿ ਤ�ਸ�� ਪਰਬੰਧ� ਨਹ�� ਹ�"
 
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:436
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "ਪਰਬੰਧ�(_z):"
 
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/task-page.c:882
 msgid "Due date is wrong"
 msgstr "ਮਿ�ਦ ਮਿਤ� �ਲਤ"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1748
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' ਵਿੱ� �ਾਸ� ��ਲਣ ਤ�� �ਸਮਰੱਥ"
@@ -4444,7 +3663,7 @@ msgstr "%s, %s ਤ�"
 msgid "%s for an unknown trigger type"
 msgstr "�ਣ�ਾਣ ਤਬਦ�ਲ� �ਿਸਮ ਲ�  %s"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:668
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:674
 msgid "Untitled"
 msgstr "ਬਿਨਾ� ਨਾ�"
 
@@ -4453,37 +3672,33 @@ msgid "Categories:"
 msgstr "���ਾ�ਰ���:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "ਸੰ��ਪ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-component-preview.c:261
 msgid "Start Date:"
 msgstr "ਸ਼�ਰ��ਤ� ਮਿਤ�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "Due Date:"
 msgstr "ਮਿ�ਦ:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1189
-#: ../plugins/itip-formatter/itip-view.c:1074
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../plugins/itip-formatter/itip-view.c:1075
 msgid "Status:"
 msgstr "ਸਥਿਤ�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Priority:"
 msgstr "ਪਹਿਲ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "ਵ�ਰਵਾ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:371
 msgid "Web Page:"
 msgstr "ਵ�ਬ ਸਫਾ:"
 
@@ -4510,16 +3725,16 @@ msgid "Start Date"
 msgstr "ਸ਼�ਰ� ਮਿਤ�"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:563
+#: ../calendar/gui/e-task-table.c:568
 msgid "Free"
 msgstr "ਵ�ਹਲਾ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:549 ../calendar/gui/e-task-table.c:569
 msgid "Busy"
 msgstr "ਰ��ਿ�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:659
+#: ../calendar/gui/e-cal-model-tasks.c:658
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4530,47 +3745,44 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:709
+#: ../calendar/gui/e-cal-model-tasks.c:708
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:1029
 msgid "Yes"
 msgstr "ਹਾ�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-meeting-store.c:193
 msgid "No"
 msgstr "ਨਹ�"
 
-#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.c:1349
-#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-cal-model.c:782 ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1073
+#: ../calendar/gui/print.c:1090 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:98
 #: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2345
-#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../plugins/itip-formatter/itip-formatter.c:2485
 msgid "Unknown"
 msgstr "�ਣ�ਾਣ"
 
-#: ../calendar/gui/e-cal-model.c:1271
+#: ../calendar/gui/e-cal-model.c:1526
 msgid "Recurring"
 msgstr "�ਵਿਰਤ�"
 
-#: ../calendar/gui/e-cal-model.c:1273
+#: ../calendar/gui/e-cal-model.c:1528
 msgid "Assigned"
 msgstr "�ਾਰ� ��ਤ�"
 
-#: ../calendar/gui/e-cal-model.c:2175
+#: ../calendar/gui/e-cal-model.c:2608
 #, c-format
 msgid "Opening %s"
 msgstr "%s ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
@@ -4607,97 +3819,95 @@ msgid "Start date"
 msgstr "ਸ਼�ਰ��ਤ� ਮਿਤ�"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:557
+#: ../calendar/gui/e-meeting-list-view.c:559
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
 #: ../widgets/misc/e-attachment-tree-view.c:582
 msgid "Type"
 msgstr "�ਿਸਮ"
 
-#: ../calendar/gui/e-calendar-view.c:407
+#: ../calendar/gui/e-calendar-view.c:430
 msgid "Cut selected events to the clipboard"
 msgstr "��ਣ� �ਵ��� �ਲਿੱਪਬ�ਰਡ ਤ�� �ੱ��"
 
-#: ../calendar/gui/e-calendar-view.c:413
+#: ../calendar/gui/e-calendar-view.c:436
 msgid "Copy selected events to the clipboard"
 msgstr "��ਣ� �ਵ��� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../calendar/gui/e-calendar-view.c:419
+#: ../calendar/gui/e-calendar-view.c:442
 msgid "Paste events from the clipboard"
 msgstr "�ਵ��� �ਲਿੱਪਬ�ਰਡ ਤ�� ��ਪ�"
 
-#: ../calendar/gui/e-calendar-view.c:425
+#: ../calendar/gui/e-calendar-view.c:448
 msgid "Delete selected events"
 msgstr "��ਣ� �ਵ��� ਹ�ਾ�"
 
-#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
-#: ../calendar/gui/e-task-table.c:266
+#: ../calendar/gui/e-calendar-view.c:467 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "��ਣ��� ���ਮਾ� ਹ�ਾ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:847
-#: ../calendar/gui/e-task-table.c:1070
+#: ../calendar/gui/e-calendar-view.c:661 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-task-table.c:1078
 msgid "Updating objects"
 msgstr "��ਾ� �ੱਪਡ�� ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../calendar/gui/e-calendar-view.c:1720
-#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-calendar-view.c:1784
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2333
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../plugins/itip-formatter/itip-formatter.c:2473
 msgid "Accepted"
 msgstr "ਮਨ�਼�ਰ"
 
-#: ../calendar/gui/e-calendar-view.c:1721
-#: ../calendar/gui/e-itip-control.c:1205
+#: ../calendar/gui/e-calendar-view.c:1785
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2339
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../plugins/itip-formatter/itip-formatter.c:2479
 msgid "Declined"
 msgstr "�ਨ�ਾਰ"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1786
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "Tentative"
 msgstr "�ਰ��"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1787
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2342
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Delegated"
 msgstr "ਪ�ਰਤ�ਨਿਧ�"
 
-#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Needs action"
 msgstr "�ਾਰਵਾ� ਲ���ਦ� ਹ�"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1868 ../calendar/gui/e-memo-table.c:530
-#: ../calendar/gui/e-task-table.c:745
+#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/e-memo-table.c:538
+#: ../calendar/gui/e-task-table.c:753
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ਪ�ਰਬੰਧ�: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/e-memo-table.c:535
-#: ../calendar/gui/e-task-table.c:748
+#: ../calendar/gui/e-calendar-view.c:1936 ../calendar/gui/e-memo-table.c:543
+#: ../calendar/gui/e-task-table.c:756
 #, c-format
 msgid "Organizer: %s"
 msgstr "ਪ�ਰਬੰਧ�: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1888 ../calendar/gui/print.c:2646
+#: ../calendar/gui/e-calendar-view.c:1952 ../calendar/gui/print.c:3176
 #, c-format
 msgid "Location: %s"
 msgstr "�ਿ�ਾਣਾ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1919
+#: ../calendar/gui/e-calendar-view.c:1983
 #, c-format
 msgid "Time: %s %s"
 msgstr "ਸਮਾ�: %s %s"
@@ -4726,23 +3936,38 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:759
+#: ../calendar/gui/e-day-view-time-item.c:761
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i ਮਿੰ� ਵੰਡ"
 
-#: ../calendar/gui/e-day-view-time-item.c:780
+#: ../calendar/gui/e-day-view-time-item.c:782
 msgid "Show the second time zone"
 msgstr "ਦ��ਾ ਸਮਾ� ��ਤਰ ਵ���"
 
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../calendar/gui/e-day-view-time-item.c:799
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.c:175
+#: ../modules/calendar/e-calendar-preferences.c:224
+msgctxt "cal-second-zone"
+msgid "None"
+msgstr "��� ਨਹ��"
+
+#: ../calendar/gui/e-day-view-time-item.c:826
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:251
+msgid "Select..."
+msgstr "��ਣ�..."
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
+#: ../calendar/gui/e-day-view-top-item.c:877 ../calendar/gui/e-day-view.c:1802
+#: ../calendar/gui/e-week-view-main-item.c:214 ../calendar/gui/print.c:1847
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4752,10 +3977,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
-#: ../calendar/gui/e-week-view-main-item.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
+#: ../calendar/gui/e-day-view-top-item.c:881 ../calendar/gui/e-day-view.c:1819
+#: ../calendar/gui/e-week-view-main-item.c:223
+#: ../calendar/gui/ea-gnome-calendar.c:203
+#: ../modules/calendar/e-cal-shell-view-private.c:1005
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4764,454 +3989,33 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
-#: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#: ../calendar/gui/e-day-view-top-item.c:885 ../calendar/gui/e-day-view.c:1835
+#: ../calendar/gui/e-week-view-main-item.c:237
+#: ../calendar/gui/ea-gnome-calendar.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1041
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:819
+#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:904 ../calendar/gui/print.c:920
+#: ../calendar/gui/print.c:2341 ../calendar/gui/print.c:2358
 msgid "am"
 msgstr "ਸਵ�ਰ"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:821
+#: ../calendar/gui/e-day-view.c:1008 ../calendar/gui/e-week-view.c:763
+#: ../calendar/gui/print.c:906 ../calendar/gui/print.c:922
+#: ../calendar/gui/print.c:2343 ../calendar/gui/print.c:2360
 msgid "pm"
 msgstr "ਸ਼ਾਮ"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2646
+#: ../calendar/gui/e-day-view.c:2609
 #, c-format
 msgid "Week %d"
 msgstr "ਹਫ਼ਤਾ %d"
 
-#: ../calendar/gui/e-itip-control.c:761
-msgid "Recurring:"
-msgstr "�ਵਿਰਤ�:"
-
-#: ../calendar/gui/e-itip-control.c:765
-msgid "Yes. (Complex Recurrence)"
-msgstr "ਹਾ� (��ੰ�ਲਦਾਰ �ਵਰਤ�)"
-
-#: ../calendar/gui/e-itip-control.c:782
-#, c-format
-msgid "Every day"
-msgid_plural "Every %d days"
-msgstr[0] "ਹਰ ਦਿਨ"
-msgstr[1] "ਹਰ %d ਦਿਨ"
-
-#: ../calendar/gui/e-itip-control.c:795
-#, c-format
-msgid "Every week"
-msgid_plural "Every %d weeks"
-msgstr[0] "ਹਰ ਹਫਤ�"
-msgstr[1] "ਹਰ %d ਹਫਤ�"
-
-#: ../calendar/gui/e-itip-control.c:802
-#, c-format
-msgid "Every week on "
-msgid_plural "Every %d weeks on "
-msgstr[0] "ਹਰ ਹਫਤ�"
-msgstr[1] "ਹਰ %d ਹਫਤ�"
-
-#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
-msgid " and "
-msgstr " �ਤ� "
-
-#: ../calendar/gui/e-itip-control.c:822
-#, c-format
-msgid "The %s day of "
-msgstr "ਦਿਨ %s "
-
-#: ../calendar/gui/e-itip-control.c:838
-#, c-format
-msgid "The %s %s of "
-msgstr "%s %s ਵਿੱ���"
-
-#: ../calendar/gui/e-itip-control.c:849
-#, c-format
-msgid "every month"
-msgid_plural "every %d months"
-msgstr[0] "ਹਰ ਮਹ�ਨ�"
-msgstr[1] "ਮਹ�ਨ� ਵਿੱ� %d ਵਾਰ"
-
-#: ../calendar/gui/e-itip-control.c:861
-#, c-format
-msgid "Every year"
-msgid_plural "Every %d years"
-msgstr[0] "ਹਰ ਸਾਲ"
-msgstr[1] "ਹਰ %d ਸਾਲ"
-
-#: ../calendar/gui/e-itip-control.c:874
-#, c-format
-msgid "a total of %d time"
-msgid_plural "a total of %d times"
-msgstr[0] "��ੱਲ %d ਵਾਰ"
-msgstr[1] "��ੱਲ %d ਵਾਰ "
-
-#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
-msgid ", ending on "
-msgstr ", ਤ� ਸਮਾਪਤ�"
-
-#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:906
-msgid "Starts"
-msgstr "ਸ਼�ਰ�"
-
-#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:916
-msgid "Ends"
-msgstr "ਸਮਾਪਤ"
-
-#: ../calendar/gui/e-itip-control.c:943
-#: ../plugins/save-calendar/csv-format.c:372
-msgid "Due"
-msgstr "ਬ�ਾ��"
-
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
-msgid "iCalendar Information"
-msgstr "iCalendar �ਾਣ�ਾਰ�"
-
-#  Title
-#. Title
-#: ../calendar/gui/e-itip-control.c:1008
-msgid "iCalendar Error"
-msgstr "iCalendar �ਲਤ�"
-
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
-#: ../plugins/itip-formatter/itip-view.c:362
-#: ../plugins/itip-formatter/itip-view.c:363
-#: ../plugins/itip-formatter/itip-view.c:450
-#: ../plugins/itip-formatter/itip-view.c:451
-#: ../plugins/itip-formatter/itip-view.c:538
-msgid "An unknown person"
-msgstr "�ਣ�ਾਣਾ ਵਿ��ਤ�"
-
-#  Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1145
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr " �ਿਰਪਾ �ਰ�� ਹ�ਠ ਦਿੱਤ� �ਾਣ�ਾਰ� ਤ� ਮ�� ਵਿ�ਾਰ �ਰ� �ਤ� ਮ�ਨ� ਤ�� ਤੱਦ ��� �ਾਰਵਾ� ��ਣ�।"
-
-#. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2320
-msgctxt "cal-itip"
-msgid "None"
-msgstr "��� ਨਹ��"
-
-#: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2336
-msgid "Tentatively Accepted"
-msgstr "�ਰ�� ਮਨ�਼�ਰ"
-
-#: ../calendar/gui/e-itip-control.c:1290
-msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
-msgstr "ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� �� ਹ�, ਪਰ ਤ�ਹਾਡ� ��ਲੰਡਰ ਵਿੱ� ਨਹ�� ਲੱਭ ਸ�ਦ� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1292
-msgid "The task has been canceled, however it could not be found in your task lists"
-msgstr "�ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ �ਿ� ਹ�, ਪਰ ਤ�ਹਾਡ� �ੰਮ ਸ��� ਵਿੱ� ਨਹ�� ਲੱਭ ਸ�ਦਾ ਹ�"
-
-#: ../calendar/gui/e-itip-control.c:1369
-#, c-format
-msgid "%s has published meeting information."
-msgstr "%s ਨ� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1370
-msgid "Meeting Information"
-msgstr "ਮ��ਿੰ� ਬਾਰ� �ਾਣ�ਾਰ�"
-
-#: ../calendar/gui/e-itip-control.c:1376
-#, c-format
-msgid "%s requests the presence of %s at a meeting."
-msgstr "%s ਨ� ਮ��ਿੰ� ਵਿੱ� %s ਦ� ਮ���ਦ�� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1378
-#, c-format
-msgid "%s requests your presence at a meeting."
-msgstr "%s ਨ� ਮ��ਿੰ� ਵਿੱ� ਤ�ਹਾਡ� ਹਾ�਼ਰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1379
-msgid "Meeting Proposal"
-msgstr "ਮ��ਿੰ� ਸ��ਾ�"
-
-#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1385
-#, c-format
-msgid "%s wishes to be added to an existing meeting."
-msgstr "%s �ੱ� ਮ���ਦਾ ਮ��ਿੰ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1386
-msgid "Meeting Update"
-msgstr "ਮ��ਿੰ� �ੱਪਡ��"
-
-#: ../calendar/gui/e-itip-control.c:1390
-#, c-format
-msgid "%s wishes to receive the latest meeting information."
-msgstr "%s ਨਵ�� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦ� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1391
-msgid "Meeting Update Request"
-msgstr "ਮ��ਿੰ� �ੱਪਡ�� ਮੰ�"
-
-#: ../calendar/gui/e-itip-control.c:1398
-#, c-format
-msgid "%s has replied to a meeting request."
-msgstr "%s ਨ� �ੱ� ਮ��ਿੰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1399
-msgid "Meeting Reply"
-msgstr "ਮ��ਿੰ� �ਵਾਬ"
-
-#: ../calendar/gui/e-itip-control.c:1406
-#, c-format
-msgid "%s has canceled a meeting."
-msgstr "%s ਨ� �ੱ� ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1407
-msgid "Meeting Cancelation"
-msgstr "ਮ��ਿੰ� ਰੱਦ"
-
-#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
-#: ../calendar/gui/e-itip-control.c:1534
-#, c-format
-msgid "%s has sent an unintelligible message."
-msgstr "%s ਨ� �ੱ� ਨਾ ਬ�ਸਮ� ਸ�ਨ�ਹਾ ਭ��ਿ� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1418
-msgid "Bad Meeting Message"
-msgstr "�ਲਤ ਮ��ਿੰ� ਸ�ਨ�ਹਾ"
-
-#: ../calendar/gui/e-itip-control.c:1445
-#, c-format
-msgid "%s has published task information."
-msgstr "%s ਨ� �ੰਮ �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1446
-msgid "Task Information"
-msgstr "�ੰਮ �ਾਣ�ਾਰ�"
-
-#: ../calendar/gui/e-itip-control.c:1453
-#, c-format
-msgid "%s requests %s to perform a task."
-msgstr "%s ਨ� %s ਨ�ੰ �ਾਰ� ਪ�ਰਾ �ਰਨ ਲ� ਬ�ਨਤ� ਭ��� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1455
-#, c-format
-msgid "%s requests you perform a task."
-msgstr "%s ਤ�ਹਾਨ�ੰ �ੱ� �ੰਮ ਲ� �ਹਿ ਰਿਹਾ ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1456
-msgid "Task Proposal"
-msgstr "�ੰਮ ਸ��ਾ�"
-
-#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1462
-#, c-format
-msgid "%s wishes to be added to an existing task."
-msgstr "%s ਨ� �ੱ� �ਾਰ� �ੰਮ ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�ਣ ਦ� �ੱ�ਾ �ਤਾ� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1463
-msgid "Task Update"
-msgstr "�ੰਮ �ੱਪਡ��"
-
-#: ../calendar/gui/e-itip-control.c:1467
-#, c-format
-msgid "%s wishes to receive the latest task information."
-msgstr "%s ਤਾ�਼� �ੰਮ �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦਾ ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1468
-msgid "Task Update Request"
-msgstr "�ੰਮ �ੱਪਡ�� ਬ�ਨਤ�"
-
-#: ../calendar/gui/e-itip-control.c:1475
-#, c-format
-msgid "%s has replied to a task assignment."
-msgstr "%s ਨ� �ਾਰ� �ੰਮ ਲ� �ਵਾਬ ਭ��ਿ� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1476
-msgid "Task Reply"
-msgstr "�ੰਮ �ਵਾਬ"
-
-#: ../calendar/gui/e-itip-control.c:1483
-#, c-format
-msgid "%s has canceled a task."
-msgstr "%s ਨ� �ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1484
-msgid "Task Cancelation"
-msgstr "�ੰਮ ਰੱਦ��ਰਨ"
-
-#: ../calendar/gui/e-itip-control.c:1495
-msgid "Bad Task Message"
-msgstr "�ਲਤ �ੰਮ ਸ�ਨ�ਹਾ"
-
-#: ../calendar/gui/e-itip-control.c:1519
-#, c-format
-msgid "%s has published free/busy information."
-msgstr "%s ਨ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1520
-msgid "Free/Busy Information"
-msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ�"
-
-#: ../calendar/gui/e-itip-control.c:1524
-#, c-format
-msgid "%s requests your free/busy information."
-msgstr "%s ਨ� ਤ�ਹਾਡ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਲ� ਬ�ਨਤ� ਭ��� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1525
-msgid "Free/Busy Request"
-msgstr "ਵ�ਹਲਾ/ਰ��ਿ� ਬ�ਨਤ�"
-
-#: ../calendar/gui/e-itip-control.c:1529
-#, c-format
-msgid "%s has replied to a free/busy request."
-msgstr "%s ਨ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� �ਵਾਬ ਭ��ਿ� ਹ�।"
-
-#: ../calendar/gui/e-itip-control.c:1530
-msgid "Free/Busy Reply"
-msgstr "ਵ�ਹਲਾ/ਰ��ਿ�� �ਵਾਬ"
-
-#: ../calendar/gui/e-itip-control.c:1535
-msgid "Bad Free/Busy Message"
-msgstr "�ਲਤ ਵ�ਹਲਾ/ਰ��ਿ� ਸ�ਨ�ਹਾ"
-
-#: ../calendar/gui/e-itip-control.c:1611
-msgid "The message does not appear to be properly formed"
-msgstr "ਸ�ਨ�ਹਾ �ਪਣ� ਸਹ�� ਸਰ�ਪ ਵਿੱ� ਨਹ�� ਹ�"
-
-#: ../calendar/gui/e-itip-control.c:1670
-msgid "The message contains only unsupported requests."
-msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ਨਾ-ਸਹਾ�� ਬ�ਨਤ��� ਹਨ।"
-
-#: ../calendar/gui/e-itip-control.c:1703
-msgid "The attachment does not contain a valid calendar message"
-msgstr "ਨੱਥ� ਵਿੱ� �ੱ� �ਾ�� ��ਲੰਡਰ ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
-
-#: ../calendar/gui/e-itip-control.c:1741
-msgid "The attachment has no viewable calendar items"
-msgstr "ਨੱਥ� ਵਿੱ� ��� ਵ� ਵ��ਣਯ�� ��ਲੰਡਰ ��ਾ� ਨਹ�� ਹ�"
-
-#: ../calendar/gui/e-itip-control.c:1983
-msgid "Update complete\n"
-msgstr "ਨਵ�ਨ��ਰਮ ਪ�ਰਨ\n"
-
-#: ../calendar/gui/e-itip-control.c:2017
-msgid "Object is invalid and cannot be updated\n"
-msgstr "��ਾ� �ਲਤ ਹ� �ਤ� �ੱਪਡ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ\n"
-
-#: ../calendar/gui/e-itip-control.c:2035
-msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "�ਹ �ਵਾਬ �ੱ� ਦਰਸ਼� ਵਲ�� ਨਹ�� ਹ�। �� �ੱ� ਦਰਸ਼� ਵਾ�� ਸ਼ਾਮਿਲ �ਰਨਾ ਹ�?"
-
-#: ../calendar/gui/e-itip-control.c:2053
-msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "�ਲਤ ਹਾਲਤ �ਰ�� ਦਰਸ਼� �ਾਣ�ਾਰ� �ੱਪਡ�� ਨਹ�� ��ਤ� �ਾ ਸ�� ਹ�!\n"
-
-#: ../calendar/gui/e-itip-control.c:2077
-msgid "Attendee status updated\n"
-msgstr "ਦਰਸ਼� ਸਥਿਤ� ਨਵ�ਨ ਹ�\n"
-
-#: ../calendar/gui/e-itip-control.c:2084
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "ਦਰਸ਼� ਹਾਲਤ ਨ�ੰ �ੱਪਡ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�, �ਿ��ਿ ��ਾ� ਹ�ਣ �ਪਲੱਬਧ ਨਹ�� ਰਹ� ਹ�"
-
-#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
-msgid "Item sent!\n"
-msgstr "��ਾ� ਭ���!\n"
-
-#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
-msgid "The item could not be sent!\n"
-msgstr " ��ਾ� ਨ�ੰ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�!\n"
-
-#: ../calendar/gui/e-itip-control.c:2273
-msgid "Choose an action:"
-msgstr "�ਾਰਵਾ� ��ਣ�"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2302
-#: ../calendar/gui/e-meeting-list-view.c:582
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/e-itip-control.c:2342
-msgid "Update"
-msgstr "�ੱਪਡ��"
-
-#: ../calendar/gui/e-itip-control.c:2366
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "ਮਨ�਼�ਰ"
-
-#: ../calendar/gui/e-itip-control.c:2367
-msgid "Tentatively accept"
-msgstr "�ਰ�� ਮਨ�਼�ਰ"
-
-#: ../calendar/gui/e-itip-control.c:2368
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "�ਨ�ਾਰ"
-
-#: ../calendar/gui/e-itip-control.c:2393
-msgid "Send Free/Busy Information"
-msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਭ���"
-
-#: ../calendar/gui/e-itip-control.c:2417
-msgid "Update respondent status"
-msgstr "�ਵਾਬ ਦ�ਣ ਵਾਲਿ�� ਦ� ਹਾਲਤ �ੱਪਡ��"
-
-#: ../calendar/gui/e-itip-control.c:2441
-msgid "Send Latest Information"
-msgstr "ਤਾ�� �ਾਣ�ਾਰ� ਭ���"
-
-#: ../calendar/gui/e-itip-control.c:2465
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:300
-msgid "Cancel"
-msgstr "ਰੱਦ �ਰ�"
-
-#: ../calendar/gui/e-itip-control.ui.h:1
-msgid "--to--"
-msgstr "--ਵੱਲ--"
-
-#: ../calendar/gui/e-itip-control.ui.h:2
-msgid "Calendar Message"
-msgstr "��ਲੰਡਰ ਸ�ਨ�ਹਾ"
-
-#: ../calendar/gui/e-itip-control.ui.h:3
-msgid "Date:"
-msgstr "ਮਿਤ�:"
-
-#: ../calendar/gui/e-itip-control.ui.h:5
-msgid "Loading Calendar"
-msgstr "��ਲੰਡਰ ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
-
-#: ../calendar/gui/e-itip-control.ui.h:6
-msgid "Loading calendar..."
-msgstr "��ਲੰਡਰ ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
-
-#: ../calendar/gui/e-itip-control.ui.h:7
-msgid "Organizer:"
-msgstr "ਪ�ਰਬੰਧ�:"
-
-#: ../calendar/gui/e-itip-control.ui.h:8
-msgid "Server Message:"
-msgstr "ਸਰਵਰ ਸ�ਨ�ਹਾ:"
-
 #: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "ਪ�ਰਧਾਨ"
@@ -5229,72 +4033,90 @@ msgid "Resources"
 msgstr "ਸਰ�ਤ"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/e-meeting-store.c:1023 ../calendar/gui/print.c:1069
 msgid "Individual"
 msgstr "�ੱ�ਲਾ"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1070 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "ਸਮ�ਹ"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:970
+#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/print.c:1071
 msgid "Resource"
 msgstr "ਸਰ�ਤ"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:971
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:1072
 msgid "Room"
 msgstr "�ਮਰਾ"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1086
 msgid "Chair"
 msgstr "��ਰਸ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-store.c:1026 ../calendar/gui/print.c:1087
 msgid "Required Participant"
 msgstr "ਲ���ਦ� ਭਾ� ਲ�ਣ ਵਾਲ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:987
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/print.c:1088
 msgid "Optional Participant"
 msgstr "��ਣਵ�� ਭਾ� ਲ��ਣ ਵਾਲ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/print.c:1089
 msgid "Non-Participant"
 msgstr "��� ਭਾ� ਲ�ਣ ਵਾਲਾ ਨਹ�� ਹ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:1036
 msgid "Needs Action"
 msgstr "�ਾਰਵਾ� ਲ���ਦ� ਹ�"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:537
+#: ../calendar/gui/e-meeting-list-view.c:539
 msgid "Attendee                          "
 msgstr "ਦਰਸ਼�                          "
 
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
 msgid "In Process"
 msgstr "�ਾਰਵਾ� �ਧ�ਨ"
 
+#: ../calendar/gui/e-meeting-store.c:1760
+#, fuzzy, c-format
+#| msgid "Enter password for user %s on server %s"
+msgid "Enter password to access free/busy information on server %s as user %s"
+msgstr "%2$s ਸਰਵਰ �ੱਤ� %1$s ਯ��਼ਰ ਲ� ਪਾਸਵਰਡ ਦਿ�"
+
+#: ../calendar/gui/e-meeting-store.c:1767
+#, c-format
+#| msgid "Failed to create thread: %s"
+msgid "Failure reason: %s"
+msgstr "ਫ�ਲ�ਹ ਹ�ਣ ਦਾ �ਾਰਨ: %s"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2376
+#: ../calendar/gui/e-meeting-time-sel-item.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -5302,74 +4124,74 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2407
+#: ../calendar/gui/e-meeting-time-sel-item.c:438
+#: ../calendar/gui/e-meeting-time-sel.c:2428
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:466
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "Out of Office"
 msgstr "ਦਫਤਰ ਤ�� ਬਾਹਰ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "No Information"
 msgstr "��� �ਾਣ�ਾਰ� ਨਹ��"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:587
 msgid "O_ptions"
 msgstr "��ਣ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:605
 msgid "Show _only working hours"
 msgstr "ਸਿਰਫ �ੰਮ-�ੰ�� ਹ� ਵ��ਾ�(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:628
+#: ../calendar/gui/e-meeting-time-sel.c:616
 msgid "Show _zoomed out"
 msgstr "��ਾਰ ਵੱਡਾ ਵ��ਾ�(_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:644
+#: ../calendar/gui/e-meeting-time-sel.c:632
 msgid "_Update free/busy"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ੱਪਡ��(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:659
+#: ../calendar/gui/e-meeting-time-sel.c:647
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:677
+#: ../calendar/gui/e-meeting-time-sel.c:665
 msgid "_Autopick"
 msgstr "ਸਵ�-��ਣ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:680
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:710
+#: ../calendar/gui/e-meeting-time-sel.c:698
 msgid "_All people and resources"
 msgstr "ਸਭ ਵਿ��ਤ� ਤ� ਸਰ�ਤ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:720
+#: ../calendar/gui/e-meeting-time-sel.c:708
 msgid "All _people and one resource"
 msgstr "ਸਭ ਵਿ��ਤ� ਤ� �ੱ� ਸਰ�ਤ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:730
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr "ਲ���ਦ� ਵਿ��ਤ�(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:739
+#: ../calendar/gui/e-meeting-time-sel.c:727
 msgid "Required people and _one resource"
 msgstr "ਲ���ਦ� ਲ�� ਤ� �ੱ� ਸਰ�ਤ(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:785
+#: ../calendar/gui/e-meeting-time-sel.c:776
 msgid "_Start time:"
 msgstr "ਸ਼�ਰ��ਤ� ਸਮਾ�(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:822
+#: ../calendar/gui/e-meeting-time-sel.c:816
 msgid "_End time:"
 msgstr "ਸਮਾਪਤ� ਸਮਾ�(_E):"
 
@@ -5397,47 +4219,47 @@ msgstr "ਭਾਸ਼ਾ"
 msgid "Member"
 msgstr "ਮ��ਬਰ"
 
-#: ../calendar/gui/e-memo-table.c:414
+#: ../calendar/gui/e-memo-table.c:419
 #: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:431
+#: ../plugins/caldav/caldav-browse-server.c:439
 msgid "Memos"
 msgstr "ਮ�ਮ�"
 
-#: ../calendar/gui/e-memo-table.c:492 ../calendar/gui/e-task-table.c:709
+#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:717
 msgid "* No Summary *"
 msgstr "* ਸੰ��ਪ ਨਹ�� *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:577 ../calendar/gui/e-task-table.c:789
+#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:797
 msgid "Start: "
 msgstr "ਸ਼�ਰ�:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:596 ../calendar/gui/e-task-table.c:807
+#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:815
 msgid "Due: "
 msgstr "ਬਾ��:"
 
-#: ../calendar/gui/e-memo-table.c:712
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "��ਣ� ਮ�ਮ� ਨ�ੰ �ਲਿੱਪਬ�ਰਡ ਵਿੱ� ਭ���"
 
-#: ../calendar/gui/e-memo-table.c:718
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "��ਣ� ਮ�ਮ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../calendar/gui/e-memo-table.c:724
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "�ਲਿੱਪਬ�ਰਡ ਤ�� ਮ�ਮ� ��ਪ�"
 
-#: ../calendar/gui/e-memo-table.c:730
-#: ../modules/calendar/e-memo-shell-view-actions.c:566
+#: ../calendar/gui/e-memo-table.c:738
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "��ਣ� �ੰਮ ਹ�ਾ�"
 
-#: ../calendar/gui/e-memo-table.c:736
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "ਸਾਰ� ਦਿੱਸ ਰਹ� ਮ�ਮ� ��ਣ�"
 
@@ -5449,43 +4271,43 @@ msgstr "�ੱ� ਮ�ਮ� ਸ਼ਾਮਿਲ �ਰਨ ਲ� ਦਬਾ�"
 #. %d is the actual value, %% is replaced with a percent sign.
 #. Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:539
+#: ../calendar/gui/e-task-table.c:544
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2072
+#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2140
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../modules/calendar/e-task-shell-view.c:444
+#: ../plugins/caldav/caldav-browse-server.c:437
 #: ../plugins/groupwise-features/camel-gw-listener.c:422
 #: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "�ੰਮ"
 
-#: ../calendar/gui/e-task-table.c:935
+#: ../calendar/gui/e-task-table.c:943
 msgid "Cut selected tasks to the clipboard"
 msgstr "��ਣ� �ਾਸ� �ਲਿੱਪਬ�ਰਡ ਤ�� �ੱ��"
 
-#: ../calendar/gui/e-task-table.c:941
+#: ../calendar/gui/e-task-table.c:949
 msgid "Copy selected tasks to the clipboard"
 msgstr "��ਣ� �ਾਸ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../calendar/gui/e-task-table.c:947
+#: ../calendar/gui/e-task-table.c:955
 msgid "Paste tasks from the clipboard"
 msgstr "�ਲਿੱਪਬ�ਰਡ ਵਿੱ��� �ਾਸ� ��ਪ�"
 
-#: ../calendar/gui/e-task-table.c:953
-#: ../modules/calendar/e-task-shell-view-actions.c:690
+#: ../calendar/gui/e-task-table.c:961
+#: ../modules/calendar/e-task-shell-view-actions.c:696
 msgid "Delete selected tasks"
 msgstr "��ਣ� �ਾਸ� ਹ�ਾ�"
 
-#: ../calendar/gui/e-task-table.c:959
+#: ../calendar/gui/e-task-table.c:967
 msgid "Select all visible tasks"
 msgstr "ਸਭ ਦਿਸ ਰਹ��� �ਾਸ�ਾ� ��ਣ�"
 
@@ -5499,7 +4321,7 @@ msgstr "ਸਮਾ� ��ਤਰ ��ਣ�"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
+#: ../calendar/gui/e-week-view-main-item.c:231 ../calendar/gui/print.c:1828
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -5532,23 +4354,23 @@ msgstr "��ਲੰਡਰ ਵ��ਣ ��ਨਾ"
 msgid "Grab Focus"
 msgstr "ਫ��ਸ ਲਵ�"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Appointment"
 msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New All Day Event"
 msgstr "ਨਵ��� ਸਾਰਾ ਦਿਨ ��ਨਾਵਾ�"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "New Meeting"
 msgstr "ਨਵ�� ਮ��ਿੰ�"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Today"
 msgstr "�ੱ� 'ਤ� �ਾ�"
 
-#: ../calendar/gui/ea-cal-view.c:308
+#: ../calendar/gui/ea-cal-view.c:309
 msgid "Go to Date"
 msgstr "ਮਿਤ� 'ਤ� �ਾ�"
 
@@ -5557,7 +4379,7 @@ msgstr "ਮਿਤ� 'ਤ� �ਾ�"
 msgid "a table to view and select the current time range"
 msgstr "ਮ���ਦਾ ਸਮ�� ਸ�ਮਾ ਵ��ਣ �ਤ� ��ਣਨ ਲ� �ੱ� ��ਬਲ"
 
-#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5566,14 +4388,14 @@ msgstr[1] "�ਸ ਵਿੱ� %d ��ਨਾਵਾ� ਹਨ।"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:153
 msgid "It has no events."
 msgstr "�ਸ ਵਿੱ� ��� ��ਨਾ ਨਹ�� ਹ�।"
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:162
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "�ੰਮ ਹਫਤਾ �ਲ�: %s. %s"
@@ -5581,47 +4403,47 @@ msgstr "�ੰਮ ਹਫਤਾ �ਲ�: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:168
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "ਦਿਨ �ਲ�: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "�ੰਮ ਹਫਤ� ਲ� ��ਲੰਡਰ ਦਿੱ�"
 
-#: ../calendar/gui/ea-day-view.c:204
+#: ../calendar/gui/ea-day-view.c:205
 msgid "calendar view for one or more days"
 msgstr "�ੱ� �ਾ� ਵਧ�ਰ� ਦਿਨਾ� ਲ� ��ਲੰਡਰ ਦਿੱ�"
 
-#: ../calendar/gui/ea-gnome-calendar.c:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/gui/ea-gnome-calendar.c:49
+#: ../calendar/gui/ea-gnome-calendar.c:57
 #: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "�ਨ�ਮ ��ਲੰਡਰ"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1010
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:1001
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:205
+#: ../calendar/gui/ea-gnome-calendar.c:210
+#: ../calendar/gui/ea-gnome-calendar.c:212
+#: ../modules/calendar/e-cal-shell-view-private.c:1008
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 #: ../modules/calendar/e-cal-shell-view-private.c:1017
-#: ../modules/calendar/e-cal-shell-view-private.c:1023
-#: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:228
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1043
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
-#: ../modules/calendar/e-cal-shell-view-private.c:1061
-#: ../modules/calendar/e-cal-shell-view-private.c:1064
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../calendar/gui/ea-gnome-calendar.c:235
+#: ../calendar/gui/ea-gnome-calendar.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:243
+#: ../modules/calendar/e-cal-shell-view-private.c:1034
+#: ../modules/calendar/e-cal-shell-view-private.c:1045
+#: ../modules/calendar/e-cal-shell-view-private.c:1052
+#: ../modules/calendar/e-cal-shell-view-private.c:1055
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -5633,25 +4455,25 @@ msgstr "�ੰਪ ਬ�ਨ"
 msgid "Click here, you can find more events."
 msgstr "ਹ�ਰ ��ਨਾਵਾ� ਵ��ਣ ਲ� �ਸ ਨ�ੰ ਦਬਾ�।"
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "ਮਹ�ਨਾ �ਲ�: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "ਹਫਤਾ �ਲ�: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:196
 msgid "calendar view for a month"
 msgstr "ਮਹ�ਨ� ਦ� ��ਲੰਡਰ ਦਿੱ�"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:198
 msgid "calendar view for one or more weeks"
 msgstr "�ੱ� �ਾ� ਵਧ�ਰ� ਹਫਤਿ�� ਲ� ��ਲੰਡਰ �ਲ�"
 
-#: ../calendar/gui/gnome-cal.c:2306
+#: ../calendar/gui/gnome-cal.c:2201
 msgid "Purging"
 msgstr "ਸ�ਧਿ� �ਾ ਰਿਹਾ ਹ�"
 
@@ -5704,7 +4526,7 @@ msgid "Select Date"
 msgstr "ਮਿਤ� ��ਣ�"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1316
 msgid "Select _Today"
 msgstr "�ੱ� ��ਣ�(_T)"
 
@@ -5712,32 +4534,32 @@ msgstr "�ੱ� ��ਣ�(_T)"
 msgid "September"
 msgstr "ਸਤੰਬਰ"
 
-#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
-#: ../calendar/gui/itip-utils.c:551
+#: ../calendar/gui/itip-utils.c:407 ../calendar/gui/itip-utils.c:458
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "�ੱ� ਪ�ਰਬੰਧ� ਹ�ਣਾ ਲਾ�ਮ� ਹ�"
 
-#: ../calendar/gui/itip-utils.c:451
+#: ../calendar/gui/itip-utils.c:450
 msgid "At least one attendee is necessary"
 msgstr "�ੱ� ਦਰਸ਼� ਤਾ� ਲ���ਦਾ ਹ�"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "��ਨਾ �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "�ੰਮ �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "ਮ�ਮ� �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:644
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ�"
 
@@ -5745,7 +4567,7 @@ msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:678
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ਮਨ�਼�ਰ"
@@ -5754,7 +4576,7 @@ msgstr "ਮਨ�਼�ਰ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:685
+#: ../calendar/gui/itip-utils.c:684
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "�ਰ�� ਮਨ�਼�ਰ"
@@ -5766,7 +4588,7 @@ msgstr "�ਰ�� ਮਨ�਼�ਰ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "�ਨ�ਾਰ"
@@ -5775,7 +4597,7 @@ msgstr "�ਨ�ਾਰ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:699
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ਪ�ਰਤ�ਨਿਧ�"
@@ -5783,7 +4605,7 @@ msgstr "ਪ�ਰਤ�ਨਿਧ�"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:712
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ਨਵ�ਨ"
@@ -5791,7 +4613,7 @@ msgstr "ਨਵ�ਨ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:719
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ਰੱਦ �ਰ�"
@@ -5799,7 +4621,7 @@ msgstr "ਰੱਦ �ਰ�"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:726
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ਮ��-ਤਾ�ਾ"
@@ -5807,7 +4629,7 @@ msgstr "ਮ��-ਤਾ�ਾ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:733
+#: ../calendar/gui/itip-utils.c:732
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "�ਲ� ਸ��ਾ�"
@@ -5833,225 +4655,213 @@ msgstr "ਸਰ�ਤ ਬ�ੱ� �ਰਨ ਲ� �ਸਮਰੱਥ, �ਲਤ
 msgid "You must be an attendee of the event."
 msgstr "ਸਮਾ�ਮ ਲ� ਤ�ਸ�� ਦਰਸ਼� ਹ�ਣ� �ਾਹ�ਦ� ਹ�"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "1st"
 msgstr "੧ਲਾ�"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "2nd"
 msgstr "੨�ਾ"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "3rd"
 msgstr "੩�ਾ"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "4th"
 msgstr "੪ਵਾ�"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "5th"
 msgstr "੫ਵਾ�"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "6th"
 msgstr "੬ਵਾ�"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "7th"
 msgstr "੭ਵਾ�"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "8th"
 msgstr "੮ਵਾ�"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "9th"
 msgstr "੯ਵਾ�"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "10th"
 msgstr "੧੦ਵਾ�"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "11th"
 msgstr "੧੧ਵਾ�"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "12th"
 msgstr "੧੨ਵਾ�"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "13th"
 msgstr "੧੩ਵਾ�"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "14th"
 msgstr "੧੪ਵਾ�"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "15th"
 msgstr "੧੫ਵਾ�"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "16th"
 msgstr "੧੬ਵਾ�"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "17th"
 msgstr "੧੭ਵਾ�"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "18th"
 msgstr "੧੮ਵਾ�"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "19th"
 msgstr "੧੯ਵਾ�"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "20th"
 msgstr "੨੦ਵਾ�"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "21st"
 msgstr "੨੧ਵਾ�"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "22nd"
 msgstr "੨੨ਵਾ�"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "23rd"
 msgstr "੨੩ਵਾ�"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "24th"
 msgstr "੨੪ਵਾ�"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "25th"
 msgstr "੨੫ਵਾ�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "26th"
 msgstr "੨੬ਵਾ�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "27th"
 msgstr "੨੭ਵਾ�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "28th"
 msgstr "੨੮ਵਾ�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "29th"
 msgstr "੨੯ਵਾ�"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "30th"
 msgstr "੩੦ਵਾ�"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:548
 msgid "31st"
 msgstr "੩੧ਵਾ�"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Su"
 msgstr "�ਤ"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Mo"
 msgstr "ਸ�"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Tu"
 msgstr "ਮੰ"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "We"
 msgstr "ਬ�ੱ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Th"
 msgstr "ਵ�"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Fr"
 msgstr "ਸ਼�ੱ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Sa"
 msgstr "ਸ਼"
 
-#. Translators: This is part of "START to END" text,
-#. * where START and END are date/times.
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2969
 msgid " to "
 msgstr " ਵੱਲ "
 
-#. Translators: This is part of "START to END
-#. * (Completed COMPLETED)", where COMPLETED is a
-#. * completed date/time.
-#: ../calendar/gui/print.c:2457
+#: ../calendar/gui/print.c:2979
 msgid " (Completed "
 msgstr " (ਸਮਾਪਤ "
 
-#. Translators: This is part of "Completed COMPLETED",
-#. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:2461
+#: ../calendar/gui/print.c:2985
 msgid "Completed "
 msgstr "ਸਮਾਪਤ "
 
-#. Translators: This is part of "START (Due DUE)",
-#. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:2469
+#: ../calendar/gui/print.c:2995
 msgid " (Due "
 msgstr " (ਬਾ�� "
 
-#. Translators: This is part of "Due DUE",
-#. * where DUE is a date/time due the event
-#. * should be finished.
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:3002
 msgid "Due "
 msgstr "ਬਾ�� "
 
-#: ../calendar/gui/print.c:2637
+#: ../calendar/gui/print.c:3167
 #, c-format
 msgid "Summary: %s"
 msgstr "ਸੰ��ਪ: %s"
 
-#: ../calendar/gui/print.c:2661
+#: ../calendar/gui/print.c:3194
 msgid "Attendees: "
 msgstr "ਦਰਸ਼�:"
 
-#: ../calendar/gui/print.c:2704
+#: ../calendar/gui/print.c:3237
 #, c-format
 msgid "Status: %s"
 msgstr "ਹਾਲਤ: %s"
 
-#: ../calendar/gui/print.c:2719
+#: ../calendar/gui/print.c:3252
 #, c-format
 msgid "Priority: %s"
 msgstr "ਪਹਿਲ: %s"
 
-#: ../calendar/gui/print.c:2737
+#: ../calendar/gui/print.c:3270
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ਪ�ਰਤ�ਸ਼ਤ ਪ�ਰਾ: %i"
 
-#: ../calendar/gui/print.c:2748
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2761
+#: ../calendar/gui/print.c:3294
 #, c-format
 msgid "Categories: %s"
 msgstr "���ਾ�ਰ�: %s"
 
-#: ../calendar/gui/print.c:2772
+#: ../calendar/gui/print.c:3305
 msgid "Contacts: "
 msgstr "ਸੰਪਰ�: "
 
@@ -6078,7 +4888,7 @@ msgstr "ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ�"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1835
+#: ../plugins/itip-formatter/itip-formatter.c:1958
 msgid "Opening calendar"
 msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
@@ -7811,28 +6621,20 @@ msgstr "ਪ�ਰਸ਼ਾਤ/ਯਾਪ�"
 msgid "Save as..."
 msgstr "�ੰ� ਸੰਭਾਲ�..."
 
-#: ../composer/e-composer-actions.c:245
-#: ../widgets/misc/e-attachment-view.c:379
+#: ../composer/e-composer-actions.c:259
+#: ../widgets/misc/e-attachment-view.c:380
 msgid "Attach a file"
 msgstr "�ੱ� ਫਾ�ਲ ਸ਼ਾਮਿਲ �ਰ�"
 
-#: ../composer/e-composer-actions.c:250
-#: ../widgets/misc/e-signature-editor.c:206
+#: ../composer/e-composer-actions.c:264
+#: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "ਬੰਦ �ਰ�(_C)"
 
-#: ../composer/e-composer-actions.c:252
+#: ../composer/e-composer-actions.c:266
 msgid "Close the current file"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਬੰਦ �ਰ�"
 
-#: ../composer/e-composer-actions.c:257
-msgid "_Print..."
-msgstr "ਪਰਿੰ� �ਰ�(_P)..."
-
-#: ../composer/e-composer-actions.c:264
-msgid "Print Pre_view"
-msgstr "�ਪਾ� �ਲ�(_v)"
-
 #: ../composer/e-composer-actions.c:273
 msgid "Save the current file"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਸੰਭਾਲ�"
@@ -7846,118 +6648,126 @@ msgid "Save the current file with a different name"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਨ�ੰ ਵੱ�ਰ� ਨਾ� ਨਾਲ ਸੰਭਾਲ�"
 
 #: ../composer/e-composer-actions.c:285
+msgid "New _Message"
+msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ(_M)"
+
+#: ../composer/e-composer-actions.c:287
+msgid "Open New Message window"
+msgstr "ਨਵ�� ਸ�ਨ�ਹਾ ਵਿੰਡ� ��ਲ�ਹ�"
+
+#: ../composer/e-composer-actions.c:294
+msgid "Character _Encoding"
+msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�(_E)"
+
+#: ../composer/e-composer-actions.c:311
+msgid "_Print..."
+msgstr "ਪਰਿੰ� �ਰ�(_P)..."
+
+#: ../composer/e-composer-actions.c:318
+msgid "Print Pre_view"
+msgstr "�ਪਾ� �ਲ�(_v)"
+
+#: ../composer/e-composer-actions.c:325
 msgid "Save as _Draft"
 msgstr "ਡਰਾਫ� ਵਾ�� ਸੰਭਾਲ�(_D)"
 
-#: ../composer/e-composer-actions.c:287
+#: ../composer/e-composer-actions.c:327
 msgid "Save as draft"
 msgstr "ਡਰਾਫ� ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
+#: ../composer/e-composer-actions.c:332 ../composer/e-composer-private.c:318
 msgid "S_end"
 msgstr "ਭ���(_e)"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:334
 msgid "Send this message"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਭ���"
 
-#: ../composer/e-composer-actions.c:299
-msgid "New _Message"
-msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ(_M)"
-
-#: ../composer/e-composer-actions.c:301
-msgid "Open New Message window"
-msgstr "ਨਵ�� ਸ�ਨ�ਹਾ ਵਿੰਡ� ��ਲ�ਹ�"
-
-#: ../composer/e-composer-actions.c:308
-msgid "Character _Encoding"
-msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�(_E)"
-
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:342
 msgid "PGP _Encrypt"
 msgstr "PGP �ੰ��ਰਿਪ�(_E)"
 
-#: ../composer/e-composer-actions.c:327
+#: ../composer/e-composer-actions.c:344
 msgid "Encrypt this message with PGP"
 msgstr "�ਸ ਸ�ਨ�ਹ� ਨ�ੰ PGP ਨਾਲ �ੰ��ਰਿਪ� �ਰ�"
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:350
 msgid "PGP _Sign"
 msgstr "PGP ਦਸਤ�ਤ(_S)"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:352
 msgid "Sign this message with your PGP key"
 msgstr "�ਪਣ� PGP �� ਨਾਲ �ਸ ਸ�ਨ�ਹ� ਤ� ਦਸਤ�ਤ �ਰ�"
 
-#: ../composer/e-composer-actions.c:341
+#: ../composer/e-composer-actions.c:358
 msgid "_Prioritize Message"
 msgstr "ਦਰ�ਾ ਸ�ਨ�ਹਾ(_P)"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:360
 msgid "Set the message priority to high"
 msgstr "ਸ�ਨ�ਹ� ਦਾ ਦਰ�ਾ ਵਧਾ�"
 
-#: ../composer/e-composer-actions.c:349
+#: ../composer/e-composer-actions.c:366
 msgid "Re_quest Read Receipt"
 msgstr "ਪ��ਹਨ ਰਸ�ਦ ਦ� ਮੰ�(_q)"
 
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:368
 msgid "Get delivery notification when your message is read"
 msgstr "�ਦ�� ਤ�ਹਾਡਾ ਸ�ਨ�ਹਾ ਪ�ਿ� �ਾਵ� ਤਾ� ਪ�ਰਾਪਤ� ਸ��ਨਾ ਲਵ�"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:374
 msgid "S/MIME En_crypt"
 msgstr "S/MIME �ੰ��ਰਿਪ�(_C)"
 
-#: ../composer/e-composer-actions.c:359
+#: ../composer/e-composer-actions.c:376
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "�ਸ ਸ�ਨ�ਹ� ਨ�ੰ �ਪਣ� S/MIME ��ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਨਾਲ ��ਰਿਪ� �ਰ�"
 
-#: ../composer/e-composer-actions.c:365
+#: ../composer/e-composer-actions.c:382
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ਸਾ�ਨ(_n)"
 
-#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-actions.c:384
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "�ਪਣ� S/MIME ਦਸਤ�ਤ ਸਰ��ਫਿ��� ਨਾਲ �ਸ ਸ�ਨ�ਹ� ਤ� ਦਸਤ�ਤ �ਰ�"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:390
 msgid "_Bcc Field"
 msgstr "_Bcc ��ਤਰ"
 
-#: ../composer/e-composer-actions.c:375
+#: ../composer/e-composer-actions.c:392
 msgid "Toggles whether the BCC field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ BCC ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:398
 msgid "_Cc Field"
 msgstr "_Cc ��ਤਰ"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:400
 msgid "Toggles whether the CC field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ CC ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:406
 msgid "_Reply-To Field"
 msgstr "�ਵਾਬ ��ਤਰ(_R)"
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:408
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ �ਵਾਬ ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:434
+#: ../composer/e-composer-actions.c:464
 msgid "Save Draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "ਸ�ਨ�ਹ� ਦ� ਪ�ਰਾਪਤ �ਰਤਾ ਭਰ�"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�ਹ ਸਿਰਨਾਵ�� ਦਿ�, �� �ਿ ਸ�ਨ�ਹ� ਦ� �ਾਪ� ਪ�ਰਾਪਤ �ਰ�"
 
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:45
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -7966,36 +6776,36 @@ msgstr ""
 "�ਡਰ�ੱਸ।"
 
 #  * From
-#: ../composer/e-composer-header-table.c:1005
+#: ../composer/e-composer-header-table.c:1006
 msgid "Fr_om:"
 msgstr "ਵਲ��(_o):"
 
-#: ../composer/e-composer-header-table.c:1014
+#: ../composer/e-composer-header-table.c:1015
 msgid "_Reply-To:"
 msgstr "�ਵਾਬ(_R):"
 
-#: ../composer/e-composer-header-table.c:1018
+#: ../composer/e-composer-header-table.c:1019
 msgid "_To:"
 msgstr "ਵੱਲ(_T):"
 
-#: ../composer/e-composer-header-table.c:1023
+#: ../composer/e-composer-header-table.c:1024
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1028
+#: ../composer/e-composer-header-table.c:1029
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
 #  * Post-To
-#: ../composer/e-composer-header-table.c:1033
+#: ../composer/e-composer-header-table.c:1034
 msgid "_Post To:"
 msgstr "ਭ���(_P):"
 
-#: ../composer/e-composer-header-table.c:1037
+#: ../composer/e-composer-header-table.c:1038
 msgid "S_ubject:"
 msgstr "ਵਿਸ਼ਾ(_u):"
 
-#: ../composer/e-composer-header-table.c:1046
+#: ../composer/e-composer-header-table.c:1047
 msgid "Si_gnature:"
 msgstr "ਦਸਤ�ਤ(_g):"
 
@@ -8007,53 +6817,47 @@ msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਲ� �ੱਥ� �ਲਿੱ� �
 msgid "Click here to select folders to post to"
 msgstr "ਭ��ਣ ਲ� ਫ�ਲਡਰ ��ਣਨ ਲ� �ੱਥ� �ਲਿੱ� �ਰ�"
 
-#: ../composer/e-composer-private.c:215
+#: ../composer/e-composer-private.c:217
 msgid "Undo the last action"
 msgstr "ਪਿ�ਲ� �ਾਰਵਾ� ਵਾਪਸ ਲਵ�"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:221
 msgid "Redo the last undone action"
 msgstr "��ਰ� ਵਾਪਸ ��ਤ� �ਾਰਵਾ� ਨ�ੰ ਮ��-�ਰ�"
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:225
 msgid "Search for text"
 msgstr "���ਸ� ����"
 
-#: ../composer/e-composer-private.c:227
+#: ../composer/e-composer-private.c:229
 msgid "Search for and replace text"
 msgstr "���ਸ� ਦ� ��� �ਰ� �ਤ� ਬਦਲ�"
 
-#: ../composer/e-composer-private.c:317
+#: ../composer/e-composer-private.c:338
 msgid "Save draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�"
 
-#. Check buttons
-#: ../composer/e-msg-composer.c:197
-#: ../plugins/attachment-reminder/attachment-reminder.c:117
-msgid "_Do not show this message again."
-msgstr "�ਹ ਸ�ਨ�ਹਾ ਮ�� ਨਾ ਵ���(_D)।"
-
-#: ../composer/e-msg-composer.c:1030
+#: ../composer/e-msg-composer.c:784
 #, c-format
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ਬਾਹਰ� ਸ�ਨ�ਹ� ਲ� ਦਸਤ�ਤ ਨਹ� ��ਤ� �ਾ ਸ�ਦ�: �ਸ ��ਾ��� ਲ� ��� ਸਰ��ਫਿ��� ਨਹ�� ਹ�"
 
-#: ../composer/e-msg-composer.c:1042
+#: ../composer/e-msg-composer.c:793
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ਬਾਹਰ �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਨ�ੰ ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਸ ��ਾ��� ਲ� ��� ���ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਨਹ�� ਹ�"
 
-#: ../composer/e-msg-composer.c:1466 ../composer/e-msg-composer.c:1811
+#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2014
 msgid "Compose Message"
 msgstr "ਸ�ਨ�ਹਾ ਲਿ��"
 
-#: ../composer/e-msg-composer.c:3477
+#: ../composer/e-msg-composer.c:4085
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "ਲ��ਣ ਵਿੱ� ��� ਨਾ-���ਸ� ਭਾ� ਹ�, �ਿਸ ਨ�ੰ ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../composer/e-msg-composer.c:4085
+#: ../composer/e-msg-composer.c:4790
 msgid "Untitled Message"
 msgstr "�਼�ਰ-�ਾ��ਲ ਸ�ਨ�ਹਾ"
 
@@ -8070,12 +6874,34 @@ msgid "All accounts have been removed."
 msgstr "ਸਭ ��ਾ��� ਹ�ਾ� �ਾਣ।"
 
 #: ../composer/mail-composer.error.xml.h:3
+#| msgid "Error occurred while spawning %s: %s."
+msgid "An error occurred while saving to your Drafts folder."
+msgstr ""
+"ਤ�ਹਾਡ� ਡਰਾਫ� ਫ�ਲਡਰ ਨ�ੰ ਸੰਭਾਲਣ ਦ�ਰਾਨ �ਲਤ� ��।ਤ�ਹਾਡ� ਡਰਾਫ� ਫ�ਲਡਰ ਨ�ੰ ਸੰਭਾਲਣ ਦ�ਰਾਨ �ਲਤ� ��ਤ�ਹਾਡ� ਡਰਾਫ� "
+"ਫ�ਲਡਰ ਨ�ੰ ਸਭਤ�ਹਾਡ� ਡਾ"
+
+#: ../composer/mail-composer.error.xml.h:4
+#| msgid "An error occurred while printing"
+msgid "An error occurred while saving to your Outbox folder."
+msgstr ""
+"ਤ�ਹਾਡ� ���ਬਾ�ਸ ਫ�ਲਡਰ �ੱਤ� ਸੰਭਾਲਣ ਦ�ਰਾਨ �ਲਤ� �� ਹ�।ਤ�ਹਾਡ� ���ਬਾ�ਸ ਫ�ਲਡਰ �ੱਤ� ਸੰਭਾਲਣ ਦ�ਦਰਤ�ਹਾਡ� ���ਬਾ�ਸ "
+"ਫ�ਲਡਰ ਵਤ�ਹਾਡ� ���ਬਾ�ਸ ਫ�ਲਡਰ ਵਿਤ�ਹਾਡ� ���ਬਾ�ਸ ਫ�ਲਡਰ ਤ�ਹਾਡ� ���ਬਾ�ਸ ਫ�ਲਡਰ ਸਤ�ਹਾਡ� ���ਬਾ�ਸ ਫ�ਲਡਰ ਸੰਭਤ�ਹਾਡ� "
+"���ਬਾ�ਸ ਫ�ਲਡਰ '"
+
+#: ../composer/mail-composer.error.xml.h:5
+#| msgid "An error occurred while printing"
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr ""
+"ਭ��ਣ ਦ�ਰਾਨ �ਲਤ� �� ਹ�। �� ਤ�ਸ�� �ਾਰ� ਰੱ�ਣਾ �ਾਹ�ੰਦ� ਹ�?ਭ��ਣ ਦ�ਰਾਨ �ਲਤ� �� ਹ�। �� ਤ�ਸ�� �ਾਰ� ਰੱ�ਣਾ ਾਹਭ��ਣ "
+"ਦ�ਰਾਨ �ਲਤ� �� ਹ�। �� ਤ"
+
+#: ../composer/mail-composer.error.xml.h:6
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "�� ਤ�ਸ�� ਲਿ�� �ਾ ਰਹ� ਸ�ਨ�ਹ� �ਾ��ਲ '{0}' ਨਾਲ, ਨ�ੰ ਤ�ਸ�� ਨਿ�ਾਰ ਦ�ਣਾ �ਾਹ�ੰਦ� ਹ�? "
 
-#: ../composer/mail-composer.error.xml.h:4
+#: ../composer/mail-composer.error.xml.h:7
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "�ਿ��ਿ &quot;{0}&quot;, ਤ�ਹਾਨ�ੰ ਵੱ�ਰ��� ਪੱਤਰ ��ਣਾ� ਦ� ਵਰਤ�� �ਰਨ� ਪਵ���।"
 
@@ -8085,11 +6911,18 @@ msgstr "�ਿ��ਿ &quot;{0}&quot;, ਤ�ਹਾਨ�ੰ ਵੱ�ਰ�
 #  mail:no-delete-folder secondary
 #  system:no-save-file secondary
 #  system:no-load-file secondary
-#: ../composer/mail-composer.error.xml.h:5
+#: ../composer/mail-composer.error.xml.h:8
 msgid "Because &quot;{1}&quot;."
 msgstr "�ਿ��ਿ &quot; {1}&quot;।"
 
-#: ../composer/mail-composer.error.xml.h:6
+#: ../composer/mail-composer.error.xml.h:9
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:10
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -8099,188 +6932,196 @@ msgstr ""
 "�ਾਣ����, �ਦ�� ਤੱ� �ਿ ਤ�ਸ�� ਸ�ਨ�ਹ� ਨ�ੰ ਡਰਾਫ� ਫ�ਲਡਰ ਵਿੱ� ਸੰਭਾਲਦ� ਨਹ��। �ਹ ਫਿਰ �ਿਸ� ਦਿਨ ਸ�ਨ�ਹ� ਨ�ੰ ਮ�� "
 "ਲਿ�ਣ ਵਿੱ� ਸਹਾ� ਹ� ਸ�ਦਾ ਹ�।"
 
-#: ../composer/mail-composer.error.xml.h:7
-msgid "Could not create composer window."
-msgstr "�ੰਪ��਼ਰ ਵਿੰਡ� ਬਣਾ� ਨਹ�� �ਾ ਸ��।"
-
-#: ../composer/mail-composer.error.xml.h:8
+#: ../composer/mail-composer.error.xml.h:11
 msgid "Could not create message."
 msgstr "ਸ�ਨ�ਹਾ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../composer/mail-composer.error.xml.h:9
+#: ../composer/mail-composer.error.xml.h:12
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "ਦਸਤ�ਤ ਫਾ�ਲ਼ &quot;{0}&quot; ਨ�ੰ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../composer/mail-composer.error.xml.h:10
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "{0} ਨਾਲ ਨੱਥ� ਸ�ਨ�ਹ� ਪ�ਰਾਪਤ ਨਹ�� ��ਤ� ਸ�ਦ� ਹਨ।"
 
-#: ../composer/mail-composer.error.xml.h:11
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "���ਮ��ਿ� ਫਾ�ਲ &quot;{0}&quot; ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../composer/mail-composer.error.xml.h:12
+#: ../composer/mail-composer.error.xml.h:15
 msgid "Do you want to recover unfinished messages?"
 msgstr "�� ਤ�ਸ�� ਨਾ ਸਮਾਪਤ ਸ�ਨ�ਹ� ਪ�ਰਾਪਤ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../composer/mail-composer.error.xml.h:13
+#: ../composer/mail-composer.error.xml.h:16
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "ਡਾ�ਨਲ�ਡ �ਾਰ� ਹ�। �� ਤ�ਸ�� ਪੱਤਰ ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:17
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "���ਮ��ਿ� ਸੰਭਾਲਣ ਵਿੱ� �ਲਤ� �ਿ��ਿ &quot;{1}&quot;"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:18
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� ��ਾਨ� ਬੰਦ ਹ� �� ਸ�, �ਦ�� �ਿ ਤ�ਸ�� �ੱ� ਨਵਾ� ਸ�ਨ�ਹਾ ਲਿ� ਰਹ� ਸ�। ਪੱਤਰ "
-"ਮ��-ਪ�ਰਾਪਤ �ਰਨ ਨਾਲ ਤ�ਹਾਨ�ੰ �ਸ ��ਾ� ਤ�� ਮ�� �ਾਲ� �ਰਨ ਵਿੱ� ਸਹਾ� ਹ� ਸ�ਦਾ ਹ�, �ਿੱਥ� �ੱਡਿ� ਸ�।"
+"�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� ��ਾਨ� ਬੰਦ ਹ� �� ਸ�, �ਦ�� �ਿ ਤ�ਸ�� �ੱ� ਨਵਾ� ਸ�ਨ�ਹਾ ਲਿ� ਰਹ� ਸ�। ਪੱਤਰ ਮ��-ਪ�ਰਾਪਤ "
+"�ਰਨ ਨਾਲ ਤ�ਹਾਨ�ੰ �ਸ ��ਾ� ਤ�� ਮ�� �ਾਲ� �ਰਨ ਵਿੱ� ਸਹਾ� ਹ� ਸ�ਦਾ ਹ�, �ਿੱਥ� �ੱਡਿ� ਸ�।"
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:19
+#| msgid "Saving message to folder '%s'"
+msgid "Saving message to Outbox."
+msgstr ""
+"ਸ�ਨ�ਹਾ ���ਬਾ�ਸ '� ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�।ਸ�ਨ�ਹਾ ���ਬਾ�ਸ '� ਸੰਭਾਲਿ� �ਾ ਰਿਾਹ ਹਸ�ਨ�ਹਾ ���ਬਾ�ਸ '� ਸ'ਸ�ਨ�ਹਾ ���ਪ�"
+
+#: ../composer/mail-composer.error.xml.h:20
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "ਫਾ�ਲ `{0}' ਨਿਯਮਿਤ ਫਾ�ਲ ਨਹ�� ਹ� �ਤ� ਸ�ਨ�ਹ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../composer/mail-composer.error.xml.h:17
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:117
+#, fuzzy
+#| msgid "Bad regular expression &quot;{0}&quot;."
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "�ਲਤ ਨਿਯਮਿਤ ਸਮ��ਰਨ &quot;{0}&quot; ਹ�।"
+
+#: ../composer/mail-composer.error.xml.h:22
 msgid ""
-"Unable to activate the HTML editor control.\n"
-"\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
 msgstr ""
-"HTML ਸੰਪਾਦ� �ੰ�ਰ�ਲ ਨ�ੰ ਸਰ�ਰਮ �ਰਨ ਤ�� �ਸਫਲ\n"
-"\n"
-"�ਹ ਯ��ਨ ਬਣਾ ਲਵ�� �ਿ ਤ�ਹਾਡ� ��ਲ gtkhtml �ਤ� libgtkhtml ਦਾ ਸਹ�� ਵਰ�ਨ �ੰਸ�ਾਲ "
-"ਹ�।"
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid "Unable to activate the address selector control."
-msgstr "�ਡਰ�ੱਸ ��ਣ�ਾਰ �ੰ�ਰ�ਲ ਨ�ੰ ਸਰ�ਰਮ �ਰਨ ਤ�� �ਸਫਲ।"
+#: ../composer/mail-composer.error.xml.h:23
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:21
-#| msgid "You cannot attach the file n{0}' to this message."
+#: ../composer/mail-composer.error.xml.h:24
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgstr "ਤ�ਸ�� �ਸ ਸ�ਨ�ਹ� ਨਾਲ &quot;{0}&quot; ਫਾ�ਲ ਸ਼ਾਮਿਲ ਨਹ�� �ਰ ਸ�ਦ� ਹ�।"
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "ਪੱਤਰ ਲਿ�ਣ ਤ�� ਪਹਿਲਾ� ਤ�ਹਾਨ�ੰ ��ਾ��� ਸੰਰ�ਿਤ �ਰਨ ਦ� ਲ�� ਹ�।"
 
-#: ../composer/mail-composer.error.xml.h:23
+#. Response codes were chosen somewhat arbitrarily.
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Continue Editing"
 msgstr "�ਡ��ਿੰ� �ਾਰ� ਰੱ��(_C)"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Do not Recover"
 msgstr "ਮ��-ਪ�ਰਾਪਤ ਨਾ �ਰ�(_D)"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Recover"
 msgstr "ਮ��-ਪ�ਰਾਪਤ(_R)"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Save Draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�(_S)"
 
-#: ../capplet/anjal-settings-main.c:198
+#: ../composer/mail-composer.error.xml.h:32
+#| msgid "_Save as mbox..."
+msgid "_Save to Outbox"
+msgstr "���ਬਾ�ਸ '� ਸੰਭਾਲ�(_S)"
+
+#: ../composer/mail-composer.error.xml.h:34
+msgid "_Try Again"
+msgstr "ਮ�� ��ਸ਼ਿਸ਼ �ਰ�(_T)"
+
+#: ../capplet/anjal-settings-main.c:223
 msgid "Run Anjal in a window"
 msgstr "�ੰ�ਾਲ ਵਿੰਡ� ਵਿੱ� �ਲਾ�"
 
-#: ../capplet/anjal-settings-main.c:199
+#: ../capplet/anjal-settings-main.c:224
 msgid "Make Anjal the default email client"
 msgstr "�ੰ�ਾਲ ਨ�ੰ ਡਿਫਾਲ� �ਮ�ਲ �ਲਾ�� ਬਣਾ�"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:206
+#: ../capplet/anjal-settings-main.c:231
 msgid "ID of the socket to embed in"
 msgstr "ਵਿ�� ਸ਼ਾਮਲ �ਰਨ ਲ� ਸਾ�� ਦਾ ID"
 
-#: ../capplet/anjal-settings-main.c:207
+#: ../capplet/anjal-settings-main.c:232
 msgid "socket"
 msgstr "ਸਾ��"
 
-#: ../capplet/anjal-settings-main.c:220
+#: ../capplet/anjal-settings-main.c:245
 msgid "Anjal email client"
 msgstr "�ੰ�ਾਲ �ਮ�ਲ �ਲਾ��"
 
-#: ../capplet/settings/mail-account-view.c:74
+#: ../capplet/settings/mail-account-view.c:73
 msgid "Please enter your full name."
 msgstr "�ਪਣਾ ਪ�ਰਾ ਨਾ� ਦਿ�।"
 
-#: ../capplet/settings/mail-account-view.c:75
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your email address."
 msgstr "�ਪਣਾ �ਮ�ਲ �ਡਰ�ੱਸ ਦਿ� ��।"
 
-#: ../capplet/settings/mail-account-view.c:76
+#: ../capplet/settings/mail-account-view.c:75
 msgid "The email address you have entered is invalid."
 msgstr "ਤ�ਹਾਡ� ਵਲ�� ਦਿੱਤਾ �ਮ�ਲ �ਡਰ�ੱਸ ਢ�ੱ�ਵਾ� ਨਹ�� ਹ�।"
 
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:76
 msgid "Please enter your password."
 msgstr "�ਪਣਾ ਪਾਸਵਰਡ ਦਿ� ��।"
 
-#: ../capplet/settings/mail-account-view.c:256
+#: ../capplet/settings/mail-account-view.c:255
 #: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../capplet/settings/mail-account-view.c:360
-#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../capplet/settings/mail-account-view.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:56
 #: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "���ਲ"
 
-#: ../capplet/settings/mail-account-view.c:464
+#: ../capplet/settings/mail-account-view.c:463
 msgid "Personal details:"
 msgstr "ਨਿੱ�� ਵ�ਰਵਾ:"
 
-#: ../capplet/settings/mail-account-view.c:471
+#: ../capplet/settings/mail-account-view.c:470
 msgid "Name:"
 msgstr "ਨਾ�:"
 
-#: ../capplet/settings/mail-account-view.c:480
+#: ../capplet/settings/mail-account-view.c:479
 msgid "Email address:"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ:"
 
-#: ../capplet/settings/mail-account-view.c:490
-#| msgid "Details"
+#: ../capplet/settings/mail-account-view.c:489
 msgid "Details:"
 msgstr "ਵ�ਰਵਾ:"
 
-#: ../capplet/settings/mail-account-view.c:498
-#| msgid "Receiving mail"
+#: ../capplet/settings/mail-account-view.c:497
 msgid "Receiving"
 msgstr "ਪ�ਰਾਪਤ�"
 
-#: ../capplet/settings/mail-account-view.c:505
+#: ../capplet/settings/mail-account-view.c:504
 msgid "Server type:"
 msgstr "ਸਰਵਰ �ਿਸਮ:"
 
-#: ../capplet/settings/mail-account-view.c:514
+#: ../capplet/settings/mail-account-view.c:513
 msgid "Server address:"
 msgstr "ਸਰਵਰ �ਡਰ�ੱਸ:"
 
-#: ../capplet/settings/mail-account-view.c:523
+#: ../capplet/settings/mail-account-view.c:522
 msgid "Username:"
 msgstr "ਯ��਼ਰ ਨਾ�:"
 
-#: ../capplet/settings/mail-account-view.c:532
+#: ../capplet/settings/mail-account-view.c:531
 msgid "Use encryption:"
 msgstr "�ੰ��ਰਿਪਸ਼ਨ ਵਰਤ��:"
 
-#: ../capplet/settings/mail-account-view.c:537
-#: ../capplet/settings/mail-account-view.c:572
+#: ../capplet/settings/mail-account-view.c:536
+#: ../capplet/settings/mail-account-view.c:571
 msgid "never"
 msgstr "�ਦ� ਨਹ��"
 
-#: ../capplet/settings/mail-account-view.c:549
-#| msgid "Ascending"
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Sending"
 msgstr "ਭ��ਣਾ"
 
-#: ../capplet/settings/mail-account-view.c:591
+#: ../capplet/settings/mail-account-view.c:590
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -8290,7 +7131,7 @@ msgstr ""
 "ਪਾਸਵਰਡ ਹ�ਠਾ� ਭਰ� ��� �ਸ�� ਸਭ ਸ��ਿੰ� �ਪਣ� �ਪ ਲ�ਣ ਦ� ��ਸ਼ਿਸ਼ �ਰਾ���। �� �ਸ�� �ਹ ਸਭ ��� ���ਮ��ਿ� "
 "ਨਾ �ਰ ਸ�� ਤਾ� ਤ�ਹਾਨ�ੰ �ਪਣ� ਸਰਵਰ ਬਾਰ� �ਾਣ�ਾਰ� ਵ� ਦ�ਣ� ਪਵ���।"
 
-#: ../capplet/settings/mail-account-view.c:593
+#: ../capplet/settings/mail-account-view.c:592
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -8300,11 +7141,11 @@ msgstr ""
 "ਦਿੱਤ� �� �ਾਣ�ਾਰ� ਮ�ਤਾਬ� ਪ�ਰਾ ਵ�ਰਵਾ ਲ�ਣ ਦ� ��ਸ਼ਿਸ਼ ਤਾ� ��ਤ� ਹ�, ਪਰ ਤ�ਹਾਨ�ੰ �ਹਨਾ� ਨ�ੰ ਬਦਲਣਾ ਵ� "
 "ਪ� ਸ�ਦਾ ਹ�।"
 
-#: ../capplet/settings/mail-account-view.c:595
+#: ../capplet/settings/mail-account-view.c:594
 msgid "You can specify more options to configure the account."
 msgstr "ਤ�ਸ�� ��ਾ��� ਸੰਰ�ਨਾ ਲ� ਹ�ਰ ��ਣਾ� ਦ� ਸ�ਦ� ਹ�।"
 
-#: ../capplet/settings/mail-account-view.c:597
+#: ../capplet/settings/mail-account-view.c:596
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -8312,11 +7153,11 @@ msgstr ""
 "ਹ�ਣ ਤ�ਹਾਨ�ੰ ਮ�ਲ ਭ��ਣ ਲ� ਸ��ਿੰ� ਦ�ਣ ਦ� ਲ�� ਹ�। �ਸ�� ��� �ੰਦਾ�਼ਾ ਲ�ਾ�ਣ ਦ� ��ਸ਼ਿਸ਼ �ਰ ��ੱ�� ਹਾ�, ਪਰ "
 "ਤ�ਹਾਨ�ੰ �ਹ ��ੱ� �ਰ ਲ�ਣਾ �ਾਹ�ਦਾ ਹ� �ਿ �ਹ ਠ�� ਹਨ।"
 
-#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:597
 msgid "You can specify your default settings for your account."
 msgstr "ਤ�ਸ�� �ਪਣ� ��ਾ��� ਲ� �ਪਣ� ਡਿਫਾਲ� ਸ��ਿੰ� ਦ� ਸ�ਦ� ਹ�।"
 
-#: ../capplet/settings/mail-account-view.c:599
+#: ../capplet/settings/mail-account-view.c:598
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8324,102 +7165,100 @@ msgstr ""
 "ਸਮਾ� ਹ� ��ੱ� �ਰਨ ਦਾ, �ਸ ਤ�� ਪਹਿਲਾ� �ਿ �ਸ�� ਸਰਵਰ ਨਾਲ ��ਨ��� �ਰਨ ਦ� ��ਸ਼ਿਸ਼ �ਰ�� �ਤ� ਤ�ਹਾਡ��� "
 "ਮ�ਲਾ� ਲ�ਣ��� ਸ਼�ਰ� �ਰ��।"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2222
-#: ../mail/mail-config.ui.h:62
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2094 ../mail/em-account-editor.c:2215
 msgid "Identity"
 msgstr "ਪ�ਾਣ"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Receiving mail"
 msgstr "�ੱ�� - �ਮ�ਲ ਲ�ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Receiving mail"
 msgstr "�ਮ�ਲ ਲ�ਣ���"
 
+#: ../capplet/settings/mail-account-view.c:614
 #: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:616
 msgid "Next - Sending mail"
 msgstr "�ੱ�� - �ਮ�ਲ ਭ��ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Back - Identity"
 msgstr "ਪਿੱ�� - ਪ�ਾਣ"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving options"
 msgstr "�ੱ�� - ਪ�ਰਾਪਤ� ��ਣਾ�"
 
-#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving options"
 msgstr "ਪ�ਰਾਪਤ� ��ਣਾ�"
 
-#: ../capplet/settings/mail-account-view.c:616
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Back - Receiving mail"
 msgstr "ਪਿੱ�� - ਮ�ਲ ਲ�ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Sending mail"
 msgstr "ਮ�ਲ ਭ��ਣ���"
 
+#: ../capplet/settings/mail-account-view.c:617
 #: ../capplet/settings/mail-account-view.c:618
-#: ../capplet/settings/mail-account-view.c:619
 msgid "Next - Review account"
 msgstr "�ੱ�� - ��ਾ��� ਪ�ਤਾਲ"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Next - Defaults"
 msgstr "�ੱ�� - ਡਿਫਾਲ�"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Back - Receiving options"
 msgstr "ਪਿੱ�� - ਪ�ਰਾਪਤ� ��ਣਾ�"
 
-#: ../capplet/settings/mail-account-view.c:619
-#: ../mail/em-account-editor.c:2988 ../mail/mail-config.ui.h:34
+#: ../capplet/settings/mail-account-view.c:618
+#: ../mail/em-account-editor.c:3043
 msgid "Defaults"
 msgstr "ਮ�ਲ"
 
-#: ../capplet/settings/mail-account-view.c:619
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Sending mail"
 msgstr "ਪਿੱ�� - ਮ�ਲ ਭ��ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Review account"
 msgstr "��ਾ��� ਪ�ਤਾਲ"
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Finish"
 msgstr "ਮ��ੰਮਲ"
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Back - Sending"
 msgstr "ਪਿੱ�� - ਭ��ਣਾ"
 
-#: ../capplet/settings/mail-account-view.c:726
+#: ../capplet/settings/mail-account-view.c:725
 msgid "Setup Google contacts with Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨਾਲ ���ਲ ਸੰਪਰ� ਸ���ੱਪ"
 
-#: ../capplet/settings/mail-account-view.c:727
+#: ../capplet/settings/mail-account-view.c:726
 msgid "Setup Google calendar with Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨਾਲ ���ਲ ��ਲੰਡਰ ਸ���ੱਪ"
 
-#: ../capplet/settings/mail-account-view.c:732
+#: ../capplet/settings/mail-account-view.c:731
 msgid "You may need to enable IMAP access."
 msgstr "ਤ�ਹਾਨ�ੰ IMAP �ਸ�ੱਸ �ਾਲ� �ਰਨ ਦ� ਲ�� ਪ� ਸ�ਦ� ਹ�।"
 
-#: ../capplet/settings/mail-account-view.c:740
-#| msgid "Backing Evolution accounts and settings"
+#: ../capplet/settings/mail-account-view.c:739
 msgid "Google account settings:"
 msgstr "���ਲ ��ਾ��� ਸ��ਿੰ�:"
 
-#: ../capplet/settings/mail-account-view.c:767
+#: ../capplet/settings/mail-account-view.c:766
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨਾਲ ਯਾਹ� ��ਲੰਡਰ ਸ���ੱਪ"
 
-#: ../capplet/settings/mail-account-view.c:771
+#: ../capplet/settings/mail-account-view.c:770
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -8428,65 +7267,63 @@ msgstr ""
 "ਯਾਹ� ��ਲੰਡਰ ਪਹਿਲਾ� ਨਾ�_��ਰ� ਨਾ� ਰਾਹ�� ਰੱ�ਦ� ਹਨ। �ਸ�� ��ਲੰਡਰ ਨਾ� ਬਣਾ�ਣ ਦ� ��ਸ਼ਿਸ਼ ��ਤ� ਹ�। "
 "�ਸ�ਰ�� ��ਲੰਡਰ ਨਾ� ਦ� ਪ�ਸ਼�� �ਰ�, �� ਠ�� ਨਾ ਹ�ਵ� ਤਾ� ��ਲੰਡਰ ਨਾ� ਫ�ਰ ਲਿ��।"
 
-#: ../capplet/settings/mail-account-view.c:778
-#| msgid "Backing Evolution accounts and settings"
+#: ../capplet/settings/mail-account-view.c:777
 msgid "Yahoo account settings:"
 msgstr "ਯਾਹ� ��ਾ��� ਸ��ਿੰ�:"
 
-#: ../capplet/settings/mail-account-view.c:792
+#: ../capplet/settings/mail-account-view.c:791
 msgid "Yahoo Calendar name:"
 msgstr "ਯਾਹ� ��ਲੰਡਰ ਨਾ�:"
 
-#: ../capplet/settings/mail-account-view.c:1061
+#: ../capplet/settings/mail-account-view.c:1063
 msgid "Password:"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: ../capplet/settings/mail-account-view.c:1129
-#: ../capplet/settings/mail-settings-view.c:267
+#: ../capplet/settings/mail-account-view.c:1132
+#: ../capplet/settings/mail-settings-view.c:266
 msgid "Close Tab"
 msgstr "��ਬ ਬੰਦ �ਰ�"
 
-#: ../capplet/settings/mail-account-view.c:1139
+#: ../capplet/settings/mail-account-view.c:1142
 msgid "Account Wizard"
 msgstr "��ਾ��� ਸਹਾ��"
 
-#: ../capplet/settings/mail-capplet-shell.c:208
+#: ../capplet/settings/mail-capplet-shell.c:212
 msgid "Evolution account assistant"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਾ��� ਸਹਾ��"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
-#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../capplet/settings/mail-capplet-shell.c:358 ../mail/e-mail-migrate.c:677
+#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:148
 #: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
 #: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
-#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
-#: ../mail/message-list.c:1666
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:218
+#: ../mail/message-list.c:1709
 #: ../modules/addressbook/e-book-shell-backend.c:96
-#: ../modules/addressbook/e-book-shell-migrate.c:130
-#: ../modules/calendar/e-cal-shell-backend.c:102
-#: ../modules/calendar/e-cal-shell-migrate.c:146
-#: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:111
+#: ../modules/addressbook/e-book-shell-migrate.c:135
+#: ../modules/calendar/e-cal-shell-backend.c:107
+#: ../modules/calendar/e-cal-shell-migrate.c:148
+#: ../modules/calendar/e-memo-shell-backend.c:96
+#: ../modules/calendar/e-memo-shell-migrate.c:106
+#: ../modules/calendar/e-task-shell-backend.c:96
+#: ../modules/calendar/e-task-shell-migrate.c:115
 msgid "On This Computer"
 msgstr "�ਸ �ੰਪਿ��ਰ �ੱਤ�"
 
-#: ../capplet/settings/mail-settings-view.c:146
+#: ../capplet/settings/mail-settings-view.c:145
 #, c-format
-#| msgid "Modify"
 msgid "Modify %s..."
 msgstr "%s ਸ�ਧ..."
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:147
 msgid "Add a new account"
 msgstr "ਨਵਾ� ��ਾ��� ਸ਼ਾਮਲ"
 
-#: ../capplet/settings/mail-settings-view.c:184
+#: ../capplet/settings/mail-settings-view.c:183
 msgid "Account management"
 msgstr "��ਾ��� ਪਰਬੰਧ"
 
-#: ../capplet/settings/mail-settings-view.c:277
+#: ../capplet/settings/mail-settings-view.c:276
 msgid "Settings"
 msgstr "ਸ��ਿੰ�"
 
@@ -8498,7 +7335,8 @@ msgstr "��ਲੰਡਰ �ਵ��� ਨ���ਫਿ��ਸ਼ਨ"
 msgid "Evolution Alarm Notify"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਾਰਮ ਨ���ਫਿ��ਸ਼ਨ"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:959
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ"
@@ -8507,7 +7345,7 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ"
 msgid "Evolution Mail and Calendar"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਮ�ਲ �ਤ� ��ਲੰਡਰ"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
 msgid "Groupware Suite"
 msgstr "�ਰ�ੱਪਵ��ਰ ਸ��"
 
@@ -8524,42 +7362,40 @@ msgid "Email Settings"
 msgstr "�ਮ�ਲ ਸ��ਿੰ�"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:228
+#: ../e-util/e-activity.c:226
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (ਰੱਦ �ਰ�)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:229
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (ਸਮਾਪਤ)"
 
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../e-util/e-activity.c:235
+#. Translators: This is an activity waiting to run.
+#: ../e-util/e-activity.c:232
 #, c-format
-msgid "%s..."
-msgstr "%s..."
+msgid "%s (waiting)"
+msgstr "%s (�ਡ�� �ਾਰ�)"
 
-#: ../e-util/e-activity.c:240
+#. Translators: This is a running activity which
+#. *              the user has requested to cancel.
+#: ../e-util/e-activity.c:236
 #, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% ਸਮਾਪਤ)"
+#| msgid "%s (cancelled)"
+msgid "%s (cancelling)"
+msgstr "%s (ਰੱਦ ��ਤਾ �ਾ�ਦਾ ਹ�)"
 
-#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
-msgid "Evolution Error"
-msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਤ�"
-
-#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
-msgid "Evolution Warning"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਤਾਵਨ�"
+#: ../e-util/e-activity.c:238
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#  setup a dummy error
-#: ../e-util/e-alert.c:659
+#: ../e-util/e-activity.c:243
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "�ੰਦਰ�ਨ� �ਲਤ�, �ਣ�ਾਣ �ਲਤ� '%s' ਬ�ਨਤ�"
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% ਸਮਾਪਤ)"
 
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
@@ -8639,133 +7475,74 @@ msgid "Visual"
 msgstr "ਦਿੱ�"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../e-util/e-datetime-format.c:199
+#: ../modules/calendar/e-cal-shell-view-actions.c:1794
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "�ੱ�"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "ਭਲ��"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:212
 msgid "Yesterday"
 msgstr "�ੱਲ�ਹ"
 
-#. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:211
+#. Translators: %a is a strftime modifier, the abbreviated week day name, for example "Next Tue".
+#. ngettext is used to be able to define different translations for different days of week, where
+#. necessary. Index is between 1 and 7 inclusive, meaning 1 .. Monday, 2 .. Tuesday, ..., 7 .. Sunday
+#: ../e-util/e-datetime-format.c:218
 #, c-format
-msgid "%d day from now"
-msgid_plural "%d days from now"
-msgstr[0] "ਹ�ਣ ਤ�� %d ਦਿਨ"
-msgstr[1] "ਹ�ਣ ਤ�� %d ਦਿਨ"
+#| msgid "Next"
+msgid "Next %a"
+msgid_plural "Next %a"
+msgstr[0] "�ੱ�� %a"
+msgstr[1] "�ੱ�� %a"
 
-#. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:214
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d ਦਿਨ ਪਹਿਲਾ�"
-msgstr[1] "%d ਦਿਨ ਪਹਿਲਾ�"
-
-#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
-#: ../e-util/e-datetime-format.c:308
+#: ../e-util/e-datetime-format.c:295 ../e-util/e-datetime-format.c:305
+#: ../e-util/e-datetime-format.c:314
 msgid "Use locale default"
 msgstr "ਲ���ਲ ਡਿਫਾਲ� ਵਰਤ��"
 
-#: ../e-util/e-datetime-format.c:502
+#: ../e-util/e-datetime-format.c:510
 msgid "Format:"
 msgstr "ਫਾਰਮ��:"
 
-#: ../e-util/e-file-utils.c:136
+#: ../e-util/e-file-utils.c:152
 msgid "(Unknown Filename)"
 msgstr "(�ਣ�ਾਣ ਫਾ�ਲ ਨਾ�)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:140
+#: ../e-util/e-file-utils.c:156
 #, c-format
 msgid "Writing \"%s\""
 msgstr "\"%s\" ਲਿ�� �ਾ ਰਹ� ਹ�"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:145
+#: ../e-util/e-file-utils.c:161
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "\"%s\" ਨ�ੰ %s �ੱਤ� ਲਿ�ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:194
-msgid "Debug Logs"
-msgstr "ਡ�ਬੱ� ਲਾ�"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:208
-msgid "Show _errors in the status bar for"
-msgstr "ਹਾਲਤ ਪੱ�� ਵਿੱ� �ਲਤ��� ਵ���(_e)"
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:226
-msgid "second(s)."
-msgstr "ਸ�ਿੰ�।"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:232
-msgid "Log Messages:"
-msgstr "ਲਾ� ਸ�ਨ�ਹ�:"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:279
-msgid "Log Level"
-msgstr "ਲਾ� ਲ�ਵਲ"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "ਸ�ਨ�ਹ�"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1426
-#: ../shell/e-shell-window-actions.c:1433
-#: ../shell/e-shell-window-actions.c:1440
-msgid "Close this window"
-msgstr "�ਹ ਵਿੰਡ� ਬੰਦ �ਰ�"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:38
-msgid "Error"
-msgstr "�ਲਤ�"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:38
-msgid "Errors"
-msgstr "�ਲਤ���"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:39
-msgid "Warnings and Errors"
-msgstr "��ਤਾਵਨ��� �ਤ� �ਲਤ���"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Debug"
-msgstr "ਡ�ਬੱ�"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Error, Warnings and Debug messages"
-msgstr "�ਲਤ���, ��ਤਾਵਨ��� �ਤ� ਡ�ਬੱ� ਸ�ਨ�ਹ�"
-
-#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:377
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "ਹਫਤ�"
 
-#: ../e-util/e-print.c:161
+#: ../e-util/e-print.c:157
 msgid "An error occurred while printing"
 msgstr "ਪਰਿੰ�ਿੰ� ਦ� ਦ�ਰਾਨ �ੱ� �ਲਤ� �� ਹ�"
 
-#: ../e-util/e-print.c:168
+#: ../e-util/e-print.c:164
 msgid "The printing system reported the following details about the error:"
 msgstr "ਪਰਿੰ�ਿੰ� ਸਿਸ�ਮ ਨ� �ਲਤ� ਬਾਰ� ਹ�ਠ ਦਿੱਤ� �ਾਣ�ਾਰ� ਭ��� ਹ�:"
 
-#: ../e-util/e-print.c:174
+#: ../e-util/e-print.c:170
 msgid "The printing system did not report any additional details about the error."
 msgstr "ਪਰਿੰ�ਿੰ� ਸਿਸ�ਮ ਨ� �ਲਤ� ਬਾਰ� ਹ�ਰ �ਾਣ�ਾਰ� ਨਹ�� ਦਿੱਤ� ਹ�।"
 
@@ -8799,15 +7576,15 @@ msgstr "�� ਤ�ਸ�� �ੱਤ� ਲਿ�ਣਾ �ਾਹ�ੰਦ
 msgid "File exists \"{0}\"."
 msgstr "ਫਾ�ਲ ਮ���ਦ \"{0}\" ਹ�।"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:155
 msgid "_Overwrite"
 msgstr "�ੱਤ� ਲਿ��(_O)"
 
-#: ../e-util/e-util.c:146
+#: ../e-util/e-util.c:154
 msgid "Could not open the link."
 msgstr "ਲਿੰ� ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�।"
 
-#: ../e-util/e-util.c:193
+#: ../e-util/e-util.c:201
 msgid "Could not display help for Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਲ� ਮੱਦਦ ਵ��ਾ� ਨਹ�� �ਾ ਸ��।"
 
@@ -8820,153 +7597,157 @@ msgstr "GConf �ਲਤ�: %s"
 msgid "All further errors shown only on terminal."
 msgstr "ਹ�ਰ ਬਾ�� ਸਭ �ਲਤ��� ��ਵਲ �ਰਮ�ਨਲ �ੱਤ� ਹ� ਵ���।"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1038
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:72
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1050
+#: ../mail/e-mail-tag-editor.c:329 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "From"
 msgstr "ਵਲ��"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1039
-#: ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1051
+#: ../modules/mail/em-mailer-prefs.c:74
 msgid "Reply-To"
 msgstr "�ਸ ਨ�ੰ �ਵਾਬ"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
-#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
-#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:75
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1053
+#: ../mail/em-format-html.c:2402 ../mail/em-format-html.c:2464
+#: ../mail/em-format-html.c:2487 ../modules/mail/em-mailer-prefs.c:76
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
-#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
-#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:76
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2403 ../mail/em-format-html.c:2468
+#: ../mail/em-format-html.c:2490 ../modules/mail/em-mailer-prefs.c:77
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1043
-#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
-#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
+#: ../em-format/em-format-quote.c:426 ../em-format/em-format.c:1055
+#: ../mail/e-mail-tag-editor.c:334 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:78
+#: ../plugins/groupwise-features/notification.ui.h:2
+#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "ਵਿਸ਼ਾ"
 
 #  pseudo-header
 #. pseudo-header
-#: ../em-format/em-format-quote.c:421 ../mail/em-format-html.c:2472
-#: ../modules/mail/em-mailer-prefs.c:1120
+#: ../em-format/em-format-quote.c:437 ../mail/em-format-html.c:2584
+#: ../modules/mail/em-mailer-prefs.c:1117
 msgid "Mailer"
 msgstr "ਮ�ਲਰ"
 
-#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1296
+#: ../em-format/em-format-quote.c:518 ../mail/em-composer-utils.c:1141
 msgid "-------- Forwarded Message --------"
 msgstr "-------- �ੱ�� ਭ��ਿ� ਸ�ਨ�ਹਾ --------"
 
-#: ../em-format/em-format.c:1044 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:527
-#: ../widgets/misc/e-dateedit.c:549
+#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:79 ../widgets/misc/e-dateedit.c:529
+#: ../widgets/misc/e-dateedit.c:551
 msgid "Date"
 msgstr "ਮਿਤ�"
 
-#: ../em-format/em-format.c:1045 ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:80
 msgid "Newsgroups"
 msgstr "�ਬਰਸਾਰ ਸਮ�ਹ"
 
-#: ../em-format/em-format.c:1046 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:81
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "ਫ�ਸ"
 
-#: ../em-format/em-format.c:1431
+#: ../em-format/em-format.c:1455
 #, c-format
 msgid "%s attachment"
 msgstr "%s ਨੱਥ�"
 
-#: ../em-format/em-format.c:1503
+#: ../em-format/em-format.c:1547
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ਸ�ਨ�ਹਾ S/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../em-format/em-format.c:1662 ../em-format/em-format.c:1846
+#: ../em-format/em-format.c:1729 ../em-format/em-format.c:1926
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ਸ�ਨ�ਹਾ MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�, ਸਰ�ਤ ਦ� ਤ�ਰ ਤ� ਹ� ਵ��ਾ�� �ਾ ਰਿਹਾ ਹ�।"
 
-#: ../em-format/em-format.c:1672
+#: ../em-format/em-format.c:1739
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ਬਹ�ਭਾ�/���ਰਿਪਸ਼ਨ ਲ� ਨਾ-ਸਹਾ�� �ੰ��ਰਿਪਸ਼ਨ �ਿਸਮ"
 
-#: ../em-format/em-format.c:1688
+#: ../em-format/em-format.c:1759
 msgid "Could not parse PGP/MIME message"
 msgstr "ਸ�ਨ�ਹਾ PGP/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../em-format/em-format.c:1689
+#: ../em-format/em-format.c:1760
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ਸ�ਨ�ਹਾ PGP/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../em-format/em-format.c:1871
+#: ../em-format/em-format.c:1951
 msgid "Unsupported signature format"
 msgstr "ਨਾ-ਸਹਾ�� ਦਸਤ�ਤ ਫਾਰਮ��"
 
-#: ../em-format/em-format.c:1881 ../em-format/em-format.c:2041
+#: ../em-format/em-format.c:1964 ../em-format/em-format.c:2137
 msgid "Error verifying signature"
 msgstr "ਦਸਤ�ਤ �ਾ�� ਦ�ਰਾਨ �ਲਤ�"
 
-#: ../em-format/em-format.c:1882 ../em-format/em-format.c:2029
-#: ../em-format/em-format.c:2042
+#: ../em-format/em-format.c:1965 ../em-format/em-format.c:2124
+#: ../em-format/em-format.c:2138
 msgid "Unknown error verifying signature"
 msgstr "ਦਸਤ�ਤ �ਾ�� ਦ�ਰਾਨ �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../em-format/em-format.c:2129
+#: ../em-format/em-format.c:2229
 msgid "Could not parse PGP message: "
 msgstr "PGP ਸ�ਨ�ਹਾ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: "
 
-#: ../em-format/em-format.c:2135 ../plugins/caldav/caldav-browse-server.c:203
-#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../em-format/em-format.c:2235 ../mail/mail-ops.c:624
+#: ../plugins/caldav/caldav-browse-server.c:211
+#: ../plugins/caldav/caldav-browse-server.c:1408 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "�ਣ�ਾਣ� �ਲਤ�"
 
-#: ../filter/e-filter-datespec.c:74
+#. Don't delete this code, since it is needed so that xgettext can extract the translations.
+#. * Please, keep these strings in sync with the strings in the timespans array
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "੧ ਸ�ਿੰ� ਪਹਿਲਾ�"
 msgstr[1] "%d ਸ�ਿੰ� ਪਹਿਲਾ�"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "��ਣ ਵਾਲਾ ੧ ਸ�ਿੰ�"
 msgstr[1] "��ਣ ਵਾਲ� %d ਸ�ਿੰ�"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "੧ ਮਿੰ� ਪਹਿਲਾ�"
 msgstr[1] "%d ਮਿੰ� ਪਹਿਲਾ�"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "��ਣ ਵਾਲਾ ੧ ਮਿੰ�"
 msgstr[1] "��ਣ ਵਾਲ� %d ਮਿੰ�"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "੧ �ੰ�ਾ ਪਹਿਲਾ�"
 msgstr[1] "%d �ੰ�ਾ ਪਹਿਲਾ�"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "��ਣ ਵਾਲ� ਦਿਨ ਵਿੱ� ੧ �ੰ�ਾ"
 msgstr[1] "��ਣ ਵਾਲ� ਦਿਨ ਵਿੱ� %d �ੰ��"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -8987,56 +7768,56 @@ msgid_plural "%d weeks ago"
 msgstr[0] "੧ ਹਫਤਾ ਪਹਿਲਾ�"
 msgstr[1] "%d ਹਫਤਾ ਪਹਿਲਾ�"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "��ਣ ਵਾਲ� ਦਿਨਾ� ਵਿੱ� ੧ ਹਫ਼ਤਾ"
 msgstr[1] "��ਣ ਵਾਲ� ਦਿਨਾ� ਵਿੱ� %d ਹਫ਼ਤ�"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "੧ ਮਹ�ਨਾ ਪਹਿਲਾ�"
 msgstr[1] "%d ਮਹ�ਨ� ਪਹਿਲਾ�"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:81
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "��ਣ ਵਾਲਾ ੧ ਮਹ�ਨਾ"
 msgstr[1] "��ਣ ਵਾਲ� %d ਮਹ�ਨ�"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:82
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "੧ ਸਾਲ ਪਹਿਲਾ�"
 msgstr[1] "%d ਸਾਲ ਪਹਿਲਾ�"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:83
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "��ਣ ਵਾਲਾ ੧ ਸਾਲ"
 msgstr[1] "��ਣ ਵਾਲ� %d ਸਾਲ"
 
-#: ../filter/e-filter-datespec.c:122
+#: ../filter/e-filter-datespec.c:133
 msgid "<click here to select a date>"
 msgstr "<ਮਿਤ� ��ਣਨ ਲ� �ਥ� �ਲਿੱ� �ਰ�>"
 
-#: ../filter/e-filter-datespec.c:125 ../filter/e-filter-datespec.c:136
-#: ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:158
 msgid "now"
 msgstr "ਹ�ਣ"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:132
+#: ../filter/e-filter-datespec.c:143
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:275
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "ਮ�ਲ �ਰਨ ਲ� ਸਮਾ� ��ਣ�"
 
@@ -9044,70 +7825,70 @@ msgstr "ਮ�ਲ �ਰਨ ਲ� ਸਮਾ� ��ਣ�"
 msgid "Choose a File"
 msgstr "ਫਾ�ਲ ��ਣ�"
 
-#: ../filter/e-filter-rule.c:663
+#: ../filter/e-filter-rule.c:669
 msgid "R_ule name:"
 msgstr "ਨਿਯਮ ਨਾ�(_u):"
 
-#: ../filter/e-filter-rule.c:693
+#: ../filter/e-filter-rule.c:699
 msgid "Find items that meet the following conditions"
 msgstr "���ਮਾ� ਲੱਭ�, �� �ਿ ਹ�ਠ ਦਿੱਤ� ਸ�ਮਾਵਾ� ਨ�ੰ ਪ�ਰ� �ਰਦ� ਹ�ਵ�"
 
-#: ../filter/e-filter-rule.c:718
+#: ../filter/e-filter-rule.c:724
 msgid "If all conditions are met"
 msgstr "���ਰ ਸਭ ਸ�ਮਾ ਮ�ਲ �ਾਣ ਤਾ�"
 
-#: ../filter/e-filter-rule.c:719
+#: ../filter/e-filter-rule.c:725
 msgid "If any conditions are met"
 msgstr "���ਰ ��� ਵ� ਸ�ਮਾ ਮ�ਲ �ਾਵ�"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:728
 msgid "_Find items:"
 msgstr "���ਮ ���(_F):"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:749
+#: ../filter/e-filter-rule.c:757
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../filter/e-filter-rule.c:750
+#: ../filter/e-filter-rule.c:758
 msgid "All related"
 msgstr "ਸਭ ਸੰਬੰਧਿਤ"
 
-#: ../filter/e-filter-rule.c:751 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "�ਵਾਬ"
 
-#: ../filter/e-filter-rule.c:752
+#: ../filter/e-filter-rule.c:760
 msgid "Replies and parents"
 msgstr "�ਵਾਬ ਤ� ਮ�ੱਢਲ�"
 
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:761
 msgid "No reply or parent"
 msgstr "��� �ਵਾਬ �ਾ� ਮ�ੱਢਲਾ ਨਹ��"
 
-#: ../filter/e-filter-rule.c:756
+#: ../filter/e-filter-rule.c:764
 msgid "I_nclude threads"
 msgstr "ਸ਼ਾਮਲ ਥਰਿੱਡ(_n)"
 
-#: ../filter/e-filter-rule.c:779
+#: ../filter/e-filter-rule.c:789
 msgid "A_dd Condition"
 msgstr "ਸ਼ਰਤ ਸ਼ਾਮਲ(_d)"
 
-#: ../filter/e-filter-rule.c:1128 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:304
+#: ../filter/e-filter-rule.c:1136 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:317
 msgid "Incoming"
 msgstr "� ਰਹ�"
 
-#: ../filter/e-filter-rule.c:1128 ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1136 ../mail/em-utils.c:318
 msgid "Outgoing"
 msgstr "ਬਾਹਰ�"
 
-#: ../filter/e-rule-editor.c:268
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "ਨਿਯਮ ����ਹ�"
 
-#: ../filter/e-rule-editor.c:355
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "ਨਿਯਮ ਸ�ਧ"
 
@@ -9134,7 +7915,7 @@ msgstr "ਫਾ�ਲ ਨਾ� ��ੰਮ ਹ�।"
 
 #  filter:no-name primary
 #  mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
 msgid "Missing name."
 msgstr "ਨਾ� ��ੰਮ ਹ�।"
 
@@ -9191,7 +7972,7 @@ msgstr ""
 "ਫਿਲ�ਰ ਲ�ਾ�ਣ ਦ� ਦ�ਰਾਨ ਸ�ਨ�ਹ� ਦ� ਮਿਤ� ਨ�ੰ ਮ���ਦਾ ਮਿਤ�\n"
 " ਨਾਲ ਮਿਲਾ�� �ਾਵ��ਾ।"
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
 msgid "_Filter Rules"
 msgstr "ਫਿਲ�ਰ ਨਿਯਮ(_F)"
 
@@ -9212,7 +7993,7 @@ msgstr "ਭਵਿੱ� ਵਿੱ�"
 msgid "months"
 msgstr "ਮਹ�ਨ�"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
+#: ../filter/filter.ui.h:19
 msgid "seconds"
 msgstr "ਸ�ਿੰ�"
 
@@ -9228,26 +8009,32 @@ msgstr "ਸਮਾ� �� ਤ�ਸ�� ਦਿੱਤਾ ਹ�"
 msgid "years"
 msgstr "ਸਾਲ"
 
-#: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
-#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:129
-#: ../widgets/misc/e-attachment-paned.c:134
+#: ../mail/e-mail-attachment-bar.c:93 ../mail/e-mail-attachment-bar.c:98
+#: ../mail/em-format-html-display.c:1053 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:131
+#: ../widgets/misc/e-attachment-paned.c:136
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "����ਮ���"
 msgstr[1] "����ਮ���"
 
-#: ../mail/e-mail-attachment-bar.c:611
-#: ../widgets/misc/e-attachment-paned.c:599
+#: ../mail/e-mail-attachment-bar.c:633
+#: ../widgets/misc/e-attachment-paned.c:624
 msgid "Icon View"
 msgstr "���ਾਨ �ਲ�"
 
-#: ../mail/e-mail-attachment-bar.c:612
-#: ../widgets/misc/e-attachment-paned.c:600
+#: ../mail/e-mail-attachment-bar.c:635
+#: ../widgets/misc/e-attachment-paned.c:626
 msgid "List View"
 msgstr "ਲਿਸ� �ਲ�"
 
-#: ../mail/e-mail-browser.c:265
+#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1406
+#: ../shell/e-shell-window-actions.c:1413
+#: ../shell/e-shell-window-actions.c:1420
+msgid "Close this window"
+msgstr "�ਹ ਵਿੰਡ� ਬੰਦ �ਰ�"
+
+#: ../mail/e-mail-browser.c:289
 msgid "(No Subject)"
 msgstr "(��� ਵਿਸ਼ਾ ਨਹ��)"
 
@@ -9267,7 +8054,12 @@ msgstr "�ਹ �ਡਰ�ੱਸ ਤ��(_F)"
 msgid "Create Search _Folder"
 msgstr "��� ਫ�ਲਡਰ ਬਣਾ�(_F)"
 
-#: ../mail/e-mail-label-dialog.c:220
+#: ../mail/e-mail-folder-utils.c:88
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "ਸ�ਨ�ਹਾ '%s' ਫ�ਲਡਰ ਵਿੱ� ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
+
+#: ../mail/e-mail-label-dialog.c:225
 msgid "_Label name:"
 msgstr "ਲ�ਬਲ ਨਾ�(_L):"
 
@@ -9297,7 +8089,7 @@ msgid "_Later"
 msgstr "ਬਾ�ਦ '�(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:505
+#: ../modules/mail/e-mail-shell-view-actions.c:616
 msgid "Add Label"
 msgstr "ਲ�ਬਲ ਸ਼ਾਮਲ"
 
@@ -9318,35 +8110,42 @@ msgid "Color"
 msgstr "ਰੰ�"
 
 #: ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
+#: ../plugins/caldav/caldav-browse-server.c:1297
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
 #: ../widgets/menus/gal-define-views-dialog.c:334
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 msgid "Name"
 msgstr "ਨਾ�"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2761
-#: ../modules/mail/e-mail-shell-view-private.c:1062
+#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
+#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree.c:2986
+#: ../modules/mail/e-mail-shell-view-private.c:1099
+#: ../modules/mail/e-mail-shell-view-private.c:1110
 msgid "Inbox"
 msgstr "��ਣ-ਬ�ਸਾ"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:688
+#: ../mail/e-mail-local.c:36 ../mail/e-mail-migrate.c:1007
+#: ../mail/em-folder-tree-model.c:758
+#: ../modules/mail/e-mail-shell-view-private.c:1097
 msgid "Drafts"
 msgstr "ਡਰਾਫ�"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:700
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:770
+#: ../modules/mail/e-mail-shell-view-private.c:1101
 msgid "Outbox"
 msgstr "ਬਾਹਰ-ਬ�ਸਾ"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:702
+#: ../mail/e-mail-local.c:38 ../mail/e-mail-migrate.c:1000
+#: ../mail/em-folder-tree-model.c:772
+#: ../modules/mail/e-mail-shell-view-private.c:1103
 msgid "Sent"
 msgstr "ਭ���"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:761
+#: ../modules/mail/e-mail-shell-view-private.c:1105
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:578
+#: ../plugins/templates/templates.c:581
 msgid "Templates"
 msgstr "��ਪਲ��"
 
@@ -9363,11 +8162,11 @@ msgstr "ਮਾ��ਰ��"
 msgid "Migrating '%s':"
 msgstr "'%s' ਨ�ੰ ਮਾ��ਰ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�:"
 
-#: ../mail/e-mail-migrate.c:649
+#: ../mail/e-mail-migrate.c:657
 msgid "Migrating Folders"
 msgstr "ਫ�ਲਡਰ ਮਾ��ਰ�� ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/e-mail-migrate.c:650
+#: ../mail/e-mail-migrate.c:658
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9378,51 +8177,64 @@ msgstr ""
 "\n"
 "�ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਤ�ਹਾਡ� ਫ�ਲਡਰ ਮਾ��ਰ�� ਹ�ਣ ਤੱ� ਸਬਰ ਰੱ�� ��..."
 
-#: ../mail/e-mail-migrate.c:796
+#: ../mail/e-mail-migrate.c:1147
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "`%s' �ੱਤ� ਮ�ਲ ਲ��ਲ ਫ�ਲਡਰ ਬਣਾ�ਣ ਵਿੱ� �ਸਮਰੱਥ: %s"
 
 #  FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/e-mail-notebook-view.c:563
+#: ../mail/e-mail-notebook-view.c:565
 msgid "Please select a folder"
 msgstr "ਫ�ਲਡਰ ��ਣ� ��"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:109
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../mail/e-mail-reader-utils.c:111
+#: ../modules/calendar/e-task-shell-view-actions.c:576
 msgid "Do not ask me again"
 msgstr "ਮ�ਨ�ੰ ਮ�� ਨਾ ਪ�ੱ��।"
 
-#: ../mail/e-mail-reader.c:276 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../mail/e-mail-reader.c:276 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:421
 msgid "C_opy"
 msgstr "�ਾਪ� �ਰ�(_o)"
 
-#: ../mail/e-mail-reader.c:689 ../mail/em-filter-i18n.h:51
+#. Translators: %s is replaced with a folder name
+#. %d with count of duplicate messages.
+#: ../mail/e-mail-reader.c:510
+#, c-format
+msgid ""
+"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/e-mail-reader.c:969 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���"
 
-#: ../mail/e-mail-reader.c:689 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:969 ../mail/em-folder-utils.c:421
 msgid "_Move"
 msgstr "ਭ���(_M)"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:954 ../mail/e-mail-reader.c:1070
-#: ../mail/e-mail-reader.c:1111
+#: ../mail/e-mail-reader.c:1248 ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1446
 msgid "_Do not ask me again."
 msgstr "ਮ�ਨ�ੰ ਫ�ਰ ਨਾ ਪ�ੱ��(_D)।"
 
-#: ../mail/e-mail-reader.c:1116
+#: ../mail/e-mail-reader.c:1451
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਲ� �ਵਾਬ ਦਿ�: ਹਮ�ਸ਼ਾ �ਣਡਿੱਠਾ(_A)"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1558
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ਸ�ਨ�ਹਾ ਸੰਭਾਲ�"
@@ -9434,533 +8246,568 @@ msgstr[1] "ਸ�ਨ�ਹ� ਸੰਭਾਲ�"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:1227
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/e-mail-reader.c:1579
+#: ../plugins/groupwise-features/notification.ui.h:1
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "ਸ�ਨ�ਹਾ"
 msgstr[1] "ਸ�ਨ�ਹ�"
 
-#: ../mail/e-mail-reader.c:1492
+#: ../mail/e-mail-reader.c:1853
 msgid "A_dd Sender to Address Book"
 msgstr "ਭ��ਣ ਵਾਲਾ �ਡਰ�ੱਸ ਸ��� ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�(_d)"
 
-#: ../mail/e-mail-reader.c:1494
+#: ../mail/e-mail-reader.c:1855
 msgid "Add sender to address book"
 msgstr "ਭ��ਣ ਵਾਲਾ �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1499
+#: ../mail/e-mail-reader.c:1860
 msgid "Check for _Junk"
 msgstr "�ੰ� ਲ� �ਾ��(_J)"
 
-#: ../mail/e-mail-reader.c:1501
+#: ../mail/e-mail-reader.c:1862
 msgid "Filter the selected messages for junk status"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਬ��ਾਰ ਸਥਿਤ� ਲ� �ਾ���"
 
-#: ../mail/e-mail-reader.c:1506
+#: ../mail/e-mail-reader.c:1867
 msgid "_Copy to Folder..."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ�(_C)..."
 
-#: ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1869
 msgid "Copy selected messages to another folder"
 msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ �ੱ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../mail/e-mail-reader.c:1513
+#: ../mail/e-mail-reader.c:1874
 msgid "_Delete Message"
 msgstr "ਸ�ਨ�ਹਾ ਹ�ਾ�(_D)"
 
-#: ../mail/e-mail-reader.c:1515
+#: ../mail/e-mail-reader.c:1876
 msgid "Mark the selected messages for deletion"
 msgstr "��ਣ� ਸ�ਨਹਿ�� ਨ�ੰ ਹ�ਾ�ਣ ਲ� ��ਣ�"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1881
 msgid "Filter on Mailing _List..."
 msgstr "ਮ�ਲਿੰ� ਲਿਸ� �ੱਤ� ਫਿਲ�ਰ(_L)..."
 
-#: ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1883
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਨਾਲ ਸੰਬੰਧਿਤ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1527
+#: ../mail/e-mail-reader.c:1888
 msgid "Filter on _Recipients..."
 msgstr "ਸ�ਨ�ਹ��� ਤ� ਫਿਲ�ਰ(_R)..."
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1890
 msgid "Create a rule to filter messages to these recipients"
 msgstr "�ਹਨਾ� ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਨ�ੰ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1534
+#: ../mail/e-mail-reader.c:1895
 msgid "Filter on Se_nder..."
 msgstr "ਭ��ਣ ਵਾਲਿ�� ਤ� ਫਿਲ�ਰ(_n)..."
 
-#: ../mail/e-mail-reader.c:1536
+#: ../mail/e-mail-reader.c:1897
 msgid "Create a rule to filter messages from this sender"
 msgstr "�ਹਨਾ� ਭ��ਣ ਵਾਲ� ਦ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1902
 msgid "Filter on _Subject..."
 msgstr "ਵਿਸ਼� 'ਤ� ਫਿਲ�ਰ(_S)..."
 
-#: ../mail/e-mail-reader.c:1543
+#: ../mail/e-mail-reader.c:1904
 msgid "Create a rule to filter messages with this subject"
 msgstr "�ਸ ਵਿਸ਼� ਨਾਲ ਸੰਬੰਧਿਤ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1548
+#: ../mail/e-mail-reader.c:1909
 msgid "A_pply Filters"
 msgstr "ਫਿਲ�ਰ ਲ�ਾ�(_p)"
 
-#: ../mail/e-mail-reader.c:1550
+#: ../mail/e-mail-reader.c:1911
 msgid "Apply filter rules to the selected messages"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਤ� ਫਿਲ�ਰ ਨਿਯਮ ਲਾ�� �ਰ�"
 
-#: ../mail/e-mail-reader.c:1555
+#: ../mail/e-mail-reader.c:1916
 msgid "_Find in Message..."
 msgstr "ਸ�ਨ�ਹ� '� ���(_F)..."
 
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1918
 msgid "Search for text in the body of the displayed message"
 msgstr "ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ਵਿੱ� ���ਸ� ਦ� ���"
 
-#: ../mail/e-mail-reader.c:1562
+#: ../mail/e-mail-reader.c:1923
 msgid "_Clear Flag"
 msgstr "ਨਿਸ਼ਾਨ ਸਾਫ਼(_C)"
 
-#: ../mail/e-mail-reader.c:1564
+#: ../mail/e-mail-reader.c:1925
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਤ�� ਧਿ�ਨ-ਰੱ�� ਨਿਸ਼ਾਨ ਹ�ਾ�"
 
-#: ../mail/e-mail-reader.c:1569
+#: ../mail/e-mail-reader.c:1930
 msgid "_Flag Completed"
 msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_F)"
 
-#: ../mail/e-mail-reader.c:1571
+#: ../mail/e-mail-reader.c:1932
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਪ�ਰਾ ਹ�ਣ ਲ� ਧਿ�ਨ-ਰੱ�� ਨਿਸ਼ਾਨ ਸ�ੱ� �ਰ�"
 
-#: ../mail/e-mail-reader.c:1576
+#: ../mail/e-mail-reader.c:1937
 msgid "Follow _Up..."
 msgstr "�ੱ�� ��ਲ�ਹ�(_U)..."
 
-#: ../mail/e-mail-reader.c:1578
+#: ../mail/e-mail-reader.c:1939
 msgid "Flag the selected messages for follow-up"
 msgstr "ਧਿ�ਨ ਰੱ�ਣ ਲ� ��ਣ� ਸ�ਨ�ਹ� ਨਿਸ਼ਾਨਬੱਧ"
 
-#: ../mail/e-mail-reader.c:1583
+#: ../mail/e-mail-reader.c:1944
 msgid "_Attached"
 msgstr "����(_A)"
 
-#: ../mail/e-mail-reader.c:1585 ../mail/e-mail-reader.c:1592
+#: ../mail/e-mail-reader.c:1946 ../mail/e-mail-reader.c:1953
 msgid "Forward the selected message to someone as an attachment"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ ���� �ਰ�� �ਿਸ� ਨ�ੰ �ੱ�� ਭ���"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1951
 msgid "Forward As _Attached"
 msgstr "���� �ਰ�� �ੱ�� ਭ���(_A)"
 
-#: ../mail/e-mail-reader.c:1597
+#: ../mail/e-mail-reader.c:1958
 msgid "_Inline"
 msgstr "ਲਾ�ਨ ਵਿੱ�(_I)"
 
-#: ../mail/e-mail-reader.c:1599 ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1960 ../mail/e-mail-reader.c:1967
 msgid "Forward the selected message in the body of a new message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ ਨਵ�� ਸ�ਨ�ਹ� ਦ� ਵਿੱ� ਮ�ੱ� ਭਾ� ਵਾ�� �ੱ�� ਭ���"
 
-#: ../mail/e-mail-reader.c:1604
+#: ../mail/e-mail-reader.c:1965
 msgid "Forward As _Inline"
 msgstr "�ਨਲਾ�ਨ ਵਾ�� �ੱ�� ਭ���(_I)"
 
-#: ../mail/e-mail-reader.c:1611
+#: ../mail/e-mail-reader.c:1972
 msgid "_Quoted"
 msgstr "ਹਵਾਲਾ(_Q)"
 
-#: ../mail/e-mail-reader.c:1613 ../mail/e-mail-reader.c:1620
+#: ../mail/e-mail-reader.c:1974 ../mail/e-mail-reader.c:1981
 msgid "Forward the selected message quoted like a reply"
 msgstr "��ਣ� ਸ�ਨ�ਹ� �ਿਸ� ਵੱਲ ਹਵਾਲਾ �ੱ� �ਵਾਬ ਦ� ਤਰ�ਹਾ� �ਰ�� ਭ���"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1979
 msgid "Forward As _Quoted"
 msgstr "ਹਵਾਲ� ਵਾ�� ਭ���(_Q)"
 
-#: ../mail/e-mail-reader.c:1625
+#: ../mail/e-mail-reader.c:1986
 msgid "_Load Images"
 msgstr "�ਿੱਤਰ ਲ�ਡ(_L)"
 
-#: ../mail/e-mail-reader.c:1627
+#: ../mail/e-mail-reader.c:1988
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML ਮ�ਲ ਵਿੱ� ਸ�ਨ�ਹ� ਲ�ਡ �ਰਨ ਲ� ਮ�ਬ�ਰ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1993
 msgid "_Important"
 msgstr "�ਾਸ(_I)"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1995
 msgid "Mark the selected messages as important"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ �ਾਸ ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1639
+#: ../mail/e-mail-reader.c:2000
 msgid "_Junk"
 msgstr "�ੰ�(_J)"
 
-#: ../mail/e-mail-reader.c:1641
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark the selected messages as junk"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ �ੰ� ਵ��� ਨਿਸ਼ਾਨਬੱਧ"
 
-#: ../mail/e-mail-reader.c:1646
+#: ../mail/e-mail-reader.c:2007
 msgid "_Not Junk"
 msgstr "�ੰ� ਨਹ��(_N)"
 
-#: ../mail/e-mail-reader.c:1648
+#: ../mail/e-mail-reader.c:2009
 msgid "Mark the selected messages as not being junk"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ੰ�-ਨਹ�� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1653
+#: ../mail/e-mail-reader.c:2014
 msgid "_Read"
 msgstr "ਪ��ਹ�(_R)"
 
-#: ../mail/e-mail-reader.c:1655
+#: ../mail/e-mail-reader.c:2016
 msgid "Mark the selected messages as having been read"
 msgstr "��ਣ� ਸ�ਨਹਿ�� ਨ�ੰ ਪ��ਹ� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1660
+#: ../mail/e-mail-reader.c:2021
 msgid "Uni_mportant"
 msgstr "ਨਾ-�ਾਸ(_m)"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:2023
 msgid "Mark the selected messages as unimportant"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ ਨਾ-�਼ਰ�ਰ� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1667
+#: ../mail/e-mail-reader.c:2028
 msgid "_Unread"
 msgstr "ਨਾ-ਪ��ਹ�(_U)"
 
-#: ../mail/e-mail-reader.c:1669
+#: ../mail/e-mail-reader.c:2030
 msgid "Mark the selected messages as not having been read"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਨਾ-ਪ��ਹ� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1674
+#: ../mail/e-mail-reader.c:2035
 msgid "_Edit as New Message..."
 msgstr "ਨਵਾ� ਸ�ਨ�ਹ� ਵਿੱ� ਸ�ਧ(_E)..."
 
-#: ../mail/e-mail-reader.c:1676
+#: ../mail/e-mail-reader.c:2037
 msgid "Open the selected messages in the composer for editing"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਸ�ਧ ਲ� ਰ��ਤਾ (�ੰਪ��਼ਰ) ਵਿੱ� ��ਲ�ਹ�"
 
-#: ../mail/e-mail-reader.c:1681
+#: ../mail/e-mail-reader.c:2042
 msgid "Compose _New Message"
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ ਲਿ��(_N)"
 
-#: ../mail/e-mail-reader.c:1683
+#: ../mail/e-mail-reader.c:2044
 msgid "Open a window for composing a mail message"
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ ਲਿ�ਣ ਲ� ਵਿੰਡ� ��ਲ�ਹ�"
 
-#: ../mail/e-mail-reader.c:1688
+#: ../mail/e-mail-reader.c:2049
 msgid "_Open in New Window"
 msgstr "ਨਵ�� ਵਿੰਡ� '� ��ਲ�ਹ�(_O)"
 
-#: ../mail/e-mail-reader.c:1690
+#: ../mail/e-mail-reader.c:2051
 msgid "Open the selected messages in a new window"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਵ�� ਵਿੰਡ� ਵਿੱ� ��ਲ�ਹ�"
 
-#: ../mail/e-mail-reader.c:1695
+#: ../mail/e-mail-reader.c:2056
 msgid "_Move to Folder..."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)..."
 
-#: ../mail/e-mail-reader.c:1697
+#: ../mail/e-mail-reader.c:2058
 msgid "Move selected messages to another folder"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਭ���"
 
-#: ../mail/e-mail-reader.c:1702
+#: ../mail/e-mail-reader.c:2063
 msgid "_Switch to Folder"
 msgstr "ਫ�ਲਡਰ �ੱਤ� �ਾ�(_S)"
 
-#: ../mail/e-mail-reader.c:1704
+#: ../mail/e-mail-reader.c:2065
 msgid "Display the parent folder"
 msgstr "ਮ�ੱਢਲਾ ਫ�ਲਡਰ ਵ���"
 
-#: ../mail/e-mail-reader.c:1709
+#: ../mail/e-mail-reader.c:2070
 msgid "Switch to _next tab"
 msgstr "��ਲ� ��ਬ �ੱਤ� �ਾ�(_n)"
 
-#: ../mail/e-mail-reader.c:1711
+#: ../mail/e-mail-reader.c:2072
 msgid "Switch to the next tab"
 msgstr "��ਲ� ��ਬ �ੱਤ� �ਾ�"
 
-#: ../mail/e-mail-reader.c:1716
+#: ../mail/e-mail-reader.c:2077
 msgid "Switch to _previous tab"
 msgstr "ਪਿ�ਲ� ��ਬ �ੱਤ� �ਾ�(_p)"
 
-#: ../mail/e-mail-reader.c:1718
+#: ../mail/e-mail-reader.c:2079
 msgid "Switch to the previous tab"
 msgstr "ਪਿ�ਲ� ��ਬ �ੱਤ� �ਾ�"
 
-#: ../mail/e-mail-reader.c:1723
+#: ../mail/e-mail-reader.c:2084
 msgid "Cl_ose current tab"
 msgstr "ਮ���ਦਾ ��ਬ ਬੰਦ �ਰ�(_o)"
 
-#: ../mail/e-mail-reader.c:1725
+#: ../mail/e-mail-reader.c:2086
 msgid "Close current tab"
 msgstr "ਮ���ਦਾ ��ਬ ਬੰਦ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1730
+#: ../mail/e-mail-reader.c:2091
 msgid "_Next Message"
 msgstr "�ੱ�� ਸ�ਨ�ਹਾ(_N)"
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:2093
 msgid "Display the next message"
 msgstr "��ਲਾ ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1737
+#: ../mail/e-mail-reader.c:2098
 msgid "Next _Important Message"
 msgstr "ਨਵਾ� �ਾਸ ਸ�ਨ�ਹਾ(_I)"
 
-#: ../mail/e-mail-reader.c:1739
+#: ../mail/e-mail-reader.c:2100
 msgid "Display the next important message"
 msgstr "��ਲਾ �ਰ�ਰ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1744
+#: ../mail/e-mail-reader.c:2105
 msgid "Next _Thread"
 msgstr "�ੱ�� ਮਸਲਾ(_T)"
 
-#: ../mail/e-mail-reader.c:1746
+#: ../mail/e-mail-reader.c:2107
 msgid "Display the next thread"
 msgstr "�ੱ�� ਨਾ-ਪ��ਹਿ� ਮਸਲਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1751
+#: ../mail/e-mail-reader.c:2112
 msgid "Next _Unread Message"
 msgstr "�ੱ�� ਨਾ-ਪ��ਹਿ� ਸ�ਨ�ਹਾ(_U)"
 
-#: ../mail/e-mail-reader.c:1753
+#: ../mail/e-mail-reader.c:2114
 msgid "Display the next unread message"
 msgstr "��ਲਾ ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1758
+#: ../mail/e-mail-reader.c:2119
 msgid "_Previous Message"
 msgstr "ਪਿੱ�� ਸ�ਨ�ਹਾ(_P)"
 
-#: ../mail/e-mail-reader.c:1760
+#: ../mail/e-mail-reader.c:2121
 msgid "Display the previous message"
 msgstr "ਪਿ�ਲਾ ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1765
+#: ../mail/e-mail-reader.c:2126
 msgid "Pr_evious Important Message"
 msgstr "�ਾਸ ਸ�ਨ�ਹਾ ਵ��ਾ�(_e)"
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:2128
 msgid "Display the previous important message"
 msgstr "ਪਿ�ਲਾ �ਰ�ਰ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1772
+#: ../mail/e-mail-reader.c:2133
+#, fuzzy
+#| msgid "_Previous Message"
+msgid "Previous T_hread"
+msgstr "ਪਿੱ�� ਸ�ਨ�ਹਾ(_P)"
+
+#: ../mail/e-mail-reader.c:2135
+#| msgid "Display the previous message"
+msgid "Display the previous thread"
+msgstr "ਪਿ�ਲਾ ਮਾਮਲਾ ਵ��ਾ�ਪਿ�ਲਾ ਮਾਪਿ�ਲਾ ਥਰਿੱਡ ਵ"
+
+#: ../mail/e-mail-reader.c:2140
 msgid "P_revious Unread Message"
 msgstr "ਪਿੱ�� ਨਾ-ਪ��ਹਿ� ਸ�ਨ�ਹਾ(_r)"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:2142
 msgid "Display the previous unread message"
 msgstr "ਪਿ�ਲਾ ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:2149
 msgid "Print this message"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਪਰਿੰ� �ਰ�"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:2156
 msgid "Preview the message to be printed"
 msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਦ� �ਲ�"
 
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:2161
 msgid "Re_direct"
 msgstr "ਵਾਪਸ(_d)"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:2163
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "��ਣ� ਸ�ਨ�ਹ� �ਿਸ� ਵੱਲ ਰ�-ਡਿਰ��� �ਰ�"
 
-#: ../mail/e-mail-reader.c:1800 ../mail/mail.error.xml.h:91
-#: ../modules/calendar/e-cal-shell-view-actions.c:1459
-#: ../modules/mail/e-mail-attachment-handler.c:151
+#: ../mail/e-mail-reader.c:2168
+#| msgid "Save Attachment"
+#| msgid_plural "Save Attachments"
+msgid "Remo_ve Attachments"
+msgstr "����ਮ��� ਹ�ਾ�(_v)����ਮ��� ਹ�ਾ�(_ve Attachment"
+
+#: ../mail/e-mail-reader.c:2170
+#| msgid "Save all attachments"
+msgid "Remove attachments"
+msgstr "����ਮ��� ਹ�ਾ���"
+
+#: ../mail/e-mail-reader.c:2175
+#, fuzzy
+#| msgid "Hide S_elected Messages"
+msgid "Remove Du_plicate Messages"
+msgstr "��ਣ� ਸ�ਨ�ਹ� �ਹਲ�(_e)"
+
+#: ../mail/e-mail-reader.c:2177
+#, fuzzy
+#| msgid "Mark the selected messages for deletion"
+msgid "Checks selected messages for duplicates"
+msgstr "��ਣ� ਸ�ਨਹਿ�� ਨ�ੰ ਹ�ਾ�ਣ ਲ� ��ਣ�"
+
+#: ../mail/e-mail-reader.c:2182 ../mail/mail.error.xml.h:102
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "ਸਭ ਨ�ੰ �ਵਾਬ(_A)"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:2184
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਸਾਰ� ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਲ� �ਵਾਬ ਲਿ��"
 
-#: ../mail/e-mail-reader.c:1807 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:2189 ../mail/mail.error.xml.h:103
 msgid "Reply to _List"
 msgstr "ਲਿਸ� ਨ�ੰ �ਵਾਬ(_L)"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:2191
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਸ��� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
 
-#: ../mail/e-mail-reader.c:1814
-#: ../modules/mail/e-mail-attachment-handler.c:158
+#: ../mail/e-mail-reader.c:2196
+#: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "ਭ��ਣ ਵਾਲ� ਨ�ੰ �ਵਾਬ(_R)"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:2198
 msgid "Compose a reply to the sender of the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਭ��ਣ ਵਾਲ� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
 
-#: ../mail/e-mail-reader.c:1821
+#: ../mail/e-mail-reader.c:2203
 msgid "_Save as mbox..."
 msgstr "mbox ਵਾ�� ਸੰਭਾਲ�(_S)..."
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:2205
 msgid "Save selected messages as an mbox file"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ mbox ਫਾ�ਲ ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:2210
 msgid "Search Folder from Mailing _List..."
 msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਤ�� ��� ਫ�ਲਡਰ(_L)..."
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:2212
 msgid "Create a search folder for this mailing list"
 msgstr "�ਸ ਮ�ਲਿੰ� ਲਿਸ� ਤ�� �ੱ� ��� ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:2217
 msgid "Search Folder from Recipien_ts..."
 msgstr "ਪਰਾਪਤ �ਰਤਾ ਤ�� ��� ਫ�ਲਡਰ(_t)..."
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:2219
 msgid "Create a search folder for these recipients"
 msgstr "�ਹਨਾ� ਸ�ਨ�ਹ��� ਤ�� �ੱ� ��� ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:2224
 msgid "Search Folder from Sen_der..."
 msgstr "ਭ��ਣ ਵਾਲ� ਤ�� ��� ਫ�ਲਡਰ(_d)..."
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:2226
 msgid "Create a search folder for this sender"
 msgstr "�ਸ ਭ��ਣ ਵਾਲ� ਤ�� �ੱ� ��� ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:2231
 msgid "Search Folder from S_ubject..."
 msgstr "ਵਿਸ਼� ਤ�� ��� ਫ�ਲਡਰ(_u)..."
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:2233
 msgid "Create a search folder for this subject"
 msgstr "�ਸ ਵਿਸ਼� ਲ� �ੱ� ��� ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:2238
 msgid "_Message Source"
 msgstr "ਸ�ਨ�ਹਾ ਸਰ�ਤ(_M)"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:2240
 msgid "Show the raw email source of the message"
 msgstr "ਸ�ਨ�ਹ� ਦ� �ਣ-ਸ�ਧ� �-ਮ�ਲ ਸਰ�ਤ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:2252
 msgid "_Undelete Message"
 msgstr "ਨਾ-ਹ�ਾ�� ਸ�ਨ�ਹਾ(_U)"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:2254
 msgid "Undelete the selected messages"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਾ-ਹ�ਾ� ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:2259
 msgid "_Normal Size"
 msgstr "�ਮ ��ਾਰ(_N)"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:2261
 msgid "Reset the text to its original size"
 msgstr "���ਸ� ਨ�ੰ �ਸਲ� ��ਾਰ ਮ�ਤਾਬ� ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:2266
 msgid "_Zoom In"
 msgstr "�਼�ਮ �ੰਦਰ(_Z)"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:2268
 msgid "Increase the text size"
 msgstr "���ਸ� ��ਾਰ ਵਧਾ�"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:2273
 msgid "Zoom _Out"
 msgstr "�਼�ਮ ਬਾਹਰ(_O)"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:2275
 msgid "Decrease the text size"
 msgstr "���ਸ� ��ਾਰ ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2282
 msgid "Create R_ule"
 msgstr "ਨਿਯਮ ਬਣਾ�(_u)"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:2289
 msgid "Ch_aracter Encoding"
 msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�(_A)"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2296
 msgid "F_orward As"
 msgstr "�ੱ�� ਭ��� �ਸ ਵਾ��(_O)"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2303
 msgid "_Group Reply"
 msgstr "�ਰ�ੱਪ �ਵਾਬ(_G)"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2310
 msgid "_Go To"
 msgstr "�ਾ�(_G)"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2317
 msgid "Mar_k As"
 msgstr "ਨਿਸ਼ਾਨਬੱਧ(_k)"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2324
 msgid "_Message"
 msgstr "ਸ�ਨ�ਹਾ(_M)"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2331
 msgid "_Zoom"
 msgstr "�਼�ਮ(_Z)"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:2356
 msgid "Mark for Follo_w Up..."
 msgstr "ਪਿੱ�ਾ ��� ਲ� ਨਿਸ਼ਾਨਬੱਧ(_w)..."
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:2364
 msgid "Mark as _Important"
 msgstr "�ਾਸ ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_I)"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2368
 msgid "Mark as _Junk"
 msgstr "ਰੱਦ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_J)"
 
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:2372
 msgid "Mark as _Not Junk"
 msgstr "ਰੱਦ� ਨਹ�� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_N)"
 
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:2376
 msgid "Mar_k as Read"
 msgstr "ਪ��ਹ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_k)"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2380
 msgid "Mark as Uni_mportant"
 msgstr "ਨਾ-�ਾਸ ਨਿਸ਼ਾਨਬੱਧ ਬਣਾ�(_m)"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2384
 msgid "Mark as _Unread"
 msgstr "ਨਾ-ਪ��ਹ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_U)"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2428
 msgid "_Caret Mode"
 msgstr "��ਪਤ-ਲ��ਣ ਢੰ�(_C)"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2430
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ਵਿੱ� �ਰਸਰ �ਪ�ਦ� ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2436
 msgid "All Message _Headers"
 msgstr "ਸਭ ਸ�ਨ�ਹ� ਹ�ੱਡਰ(_H)"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2438
 msgid "Show messages with all email headers"
 msgstr "ਸ�ਨ�ਹ� ਸਭ �-ਮ�ਲ ਹ�ੱਡਰਾ� ਨਾਲ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2670
 msgid "Unable to retrieve message"
 msgstr "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਲ� �ਸਫਲ"
 
-#: ../mail/e-mail-reader.c:2329 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2731 ../mail/mail-ops.c:2044
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "ਸ�ਨ�ਹਾ '%s' ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
@@ -9968,64 +8815,149 @@ msgstr "ਸ�ਨ�ਹਾ '%s' ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹ
 #  default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2893 ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:537
-#: ../plugins/google-account-setup/google-source.c:659
-#: ../widgets/misc/e-account-tree-view.c:240
+#: ../mail/e-mail-reader.c:3344 ../mail/mail-config.ui.h:31
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:538
+#: ../plugins/google-account-setup/google-source.c:674
+#: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "ਡਿਫਾਲ�"
 
-#: ../mail/e-mail-reader.c:3041
-#: ../modules/mail/e-mail-attachment-handler.c:144
+#: ../mail/e-mail-reader.c:3524
+#: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "�ੱ�� ਭ���(_F)"
 
-#: ../mail/e-mail-reader.c:3042
+#: ../mail/e-mail-reader.c:3525
 msgid "Forward the selected message to someone"
 msgstr "��ਣ� ਸ�ਨ�ਹ� �ੱ�� ਭ���"
 
-#: ../mail/e-mail-reader.c:3061
+#: ../mail/e-mail-reader.c:3544
 msgid "Group Reply"
 msgstr "�ਰ�ੱਪ �ਵਾਬ"
 
-#: ../mail/e-mail-reader.c:3062
+#: ../mail/e-mail-reader.c:3545
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਨ�ੰ �ਵਾਬ �ਾ� ਸਭ ਪ�ਰਾਪਤ-�ਰਤਾਵਾ� ਨ�ੰ"
 
-#: ../mail/e-mail-reader.c:3107 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:743
+#: ../mail/e-mail-reader.c:3590 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:744
 msgid "Delete"
 msgstr "ਹ�ਾ�"
 
-#: ../mail/e-mail-reader.c:3140
-#: ../modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../mail/e-mail-reader.c:3623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1309
 #: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "�ੱ��"
 
-#: ../mail/e-mail-reader.c:3144
-#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../mail/e-mail-reader.c:3627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
 #: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "ਪਿੱ��"
 
-#: ../mail/e-mail-reader.c:3154 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:3637 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "�ਵਾਬ"
 
-#: ../mail/e-mail-reader.c:3722
+#: ../mail/e-mail-reader.c:4274
 #, c-format
 msgid "Folder '%s'"
 msgstr "'%s' ਫ�ਲਡਰ"
 
-#: ../mail/e-mail-tag-editor.c:292
+#: ../mail/e-mail-session.c:644
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "%s ਲ� ਭ�ਦ ਲਿ��"
+
+#: ../mail/e-mail-session.c:646
+msgid "Enter Passphrase"
+msgstr "ਭ�ਦ ਲਿ��"
+
+#: ../mail/e-mail-session.c:649
+#, c-format
+msgid "Enter Password for %s"
+msgstr "%s ਲ� ਪਾਸਵਰਡ ਭਰ�"
+
+#: ../mail/e-mail-session.c:651
+msgid "Enter Password"
+msgstr "ਪਾਸਵਰਡ ਭਰ�"
+
+#: ../mail/e-mail-session.c:696
+#, c-format
+msgid "User canceled operation."
+msgstr "ਯ��਼ਰ ਨ� �ਾਰਵਾ� ਰੱਦ ��ਤ�।"
+
+#: ../mail/e-mail-session.c:864
+#, c-format
+msgid "No destination address provided, forward of the message has been cancelled."
+msgstr "��� �ਿ�ਾਣਾ �ਡਰ�ੱਸ ਨਹ�� ਦਿੱਤਾ �ਿ�,  ਸ�ਨ�ਹ� ਲ� �ੱ�� ਭ��ਣਾ ਰੱਦ ��ਤਾ।"
+
+#: ../mail/e-mail-session.c:873
+#, c-format
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "ਵਰਤਣ ਲ� ��� ��ਾ��� ਨਹ�� ਲੱਭਿ�, ਸ�ਨ�ਹਾ �ੱ�� ਭ��ਣ ਨ�ੰ ਰੱਦ ��ਤਾ �ਿ�।"
+
+#: ../mail/e-mail-session.c:1262 ../mail/mail-ops.c:1220
+#, c-format
+msgid "Opening folder '%s'"
+msgstr "ਫ�ਲਡਰ '%s' ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
+
+#: ../mail/e-mail-session.c:1278
+#, c-format
+#| msgid "Invalid folder: '%s'"
+msgid "Invalid folder: %s"
+msgstr "�ਲਤ ਫ�ਲਡਰ: '%s'"
+
+#: ../mail/e-mail-session-utils.c:477 ../mail/mail-ops.c:605
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "ਬਾਹਰ� ਫਿਲ�ਰ ਲਾ�� �ਰਨ ਤ�� ਫ�ਲ�ਹ: %s"
+
+#: ../mail/e-mail-session-utils.c:501 ../mail/e-mail-session-utils.c:535
+#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"%s ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� ਫ�ਲ�ਹ: %s\n"
+"�ਸ ਦ� ਬ�ਾ� ਲ��ਲ`ਭ��� (Sent)' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ ��ਤ� �ਾ ਰਹ� ਹ�।"
+
+#: ../mail/e-mail-session-utils.c:555 ../mail/mail-ops.c:673
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "ਲ��ਲ `ਭ��� (Sent)' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� ਫ�ਲ�ਹ: %s"
+
+#: ../mail/e-mail-session-utils.c:761 ../mail/mail-ops.c:774
+#: ../mail/mail-ops.c:866
+msgid "Sending message"
+msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
+
+#: ../mail/e-mail-session-utils.c:832
+#, fuzzy, c-format
+#| msgid "Unsubscribing from folder \"%s\""
+msgid "Unsubscribing from folder '%s'"
+msgstr "ਫ�ਲਡਰ \"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ� �ਾ ਰਹ� ਹ�"
+
+#: ../mail/e-mail-store-utils.c:39
+#, c-format
+msgid "Disconnecting from '%s'"
+msgstr "'%s' ਨਾਲ�� ਡਿਸ-��ਨ��ਸ਼ਨ ��ਤਾ �ਾ�ਦਾ ਹ�"
+
+#: ../mail/e-mail-store-utils.c:130
+#, c-format
+msgid "Reconnecting to '%s'"
+msgstr "'%s' ਨਾਲ ਮ�� ��ਨ��� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#: ../mail/e-mail-tag-editor.c:295
 msgid "Flag to Follow Up"
 msgstr "ਨਿਸ਼ਾਨ ਦ� ਪਿੱ��"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:77
+#: ../mail/em-account-editor.c:566 ../mail/mail-config.ui.h:69
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "��� �ੰ��ਰਿਪਸ਼ਨ ਨਹ��"
@@ -10033,7 +8965,7 @@ msgstr "��� �ੰ��ਰਿਪਸ਼ਨ ਨਹ��"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:136
+#: ../mail/em-account-editor.c:570 ../mail/mail-config.ui.h:124
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS �ੰ��ਰਿਪਸ਼ਨ"
@@ -10041,58 +8973,40 @@ msgstr "TLS �ੰ��ਰਿਪਸ਼ਨ"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:520 ../mail/mail-config.ui.h:105
+#: ../mail/em-account-editor.c:574 ../mail/mail-config.ui.h:91
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL �ੰ��ਰਿਪਸ਼ਨ"
 
-#: ../mail/em-account-editor.c:607
-#, c-format
-msgid "%s License Agreement"
-msgstr "%s ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ�"
-
-#: ../mail/em-account-editor.c:614
-#, c-format
-msgid ""
-"\n"
-"Please read carefully the license agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-"ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਧਿ�ਨ ਨਾਲ ਪ��ਹ ਲਵ� ��,\n"
-"�� �ਿ %s ਲ� ਹ�ਠ ਦਿੱਤ��� ਹਨ,\n"
-"�ਤ� ਮਨ�਼�ਰ �ਰਨ ਲ� �ਾ�� ਬ�ਸ� ਤ� �ਲਿੱ� �ਰ�\n"
-
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:901 ../widgets/misc/e-signature-combo-box.c:79
+#: ../mail/em-account-editor.c:842 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../mail/em-account-editor.c:985
+#: ../mail/em-account-editor.c:923
 msgid "Never"
 msgstr "�ਦ� ਨਹ��"
 
-#: ../mail/em-account-editor.c:986
+#: ../mail/em-account-editor.c:924
 msgid "Always"
 msgstr "ਹਮ�ਸ਼ਾ"
 
-#: ../mail/em-account-editor.c:987
+#: ../mail/em-account-editor.c:925
 msgid "Ask for each message"
 msgstr "ਹਰ ਸ�ਨ�ਹ� ਲ� ਪ�ੱ��"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1723 ../widgets/misc/e-account-tree-view.c:128
+#: ../mail/em-account-editor.c:1707 ../widgets/misc/e-account-tree-view.c:131
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../mail/em-account-editor.c:2098
+#: ../mail/em-account-editor.c:2091
 msgid "Mail Configuration"
 msgstr "ਮ�ਲ ਸੰਰ�ਨਾ"
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2092
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10102,7 +9016,7 @@ msgstr ""
 "\n"
 "ਸ਼�ਰ� �ਰਨ ਲ� \"�ੱ��\" ਦਬਾ�।"
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2095
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -10111,20 +9025,19 @@ msgstr ""
 "ਹ�ਠਾ� �ਪਣਾ ਨਾ� �ਤ� �-ਮ�ਲ �ਡਰ�ੱਸ ਦਿ� ��। ਹ�ਠਾ� \"��ਣਵਾ�\" ��ਤਰ ਭਰਨ ਦ� ਲ�� ਨਹ�� ਹ�, �ਦ�� ਤੱ� �ਿ "
 "ਤ�ਸ�� �-ਮ�ਲ ਰਾਹ� ਭ��� �ਾਣ ਵਾਲ� �ਾਣ�ਾਰ� ਵਿੱ� ਸ਼ਾਮਿਲ ਨਾ �ਰ �ਾਹ�।"
 
-#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2261
-#: ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:2097 ../mail/em-account-editor.c:2259
 msgid "Receiving Email"
 msgstr "�ਮ�ਲ ਪ�ਰਾਪਤ�"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2098
 msgid "Please configure the following account settings."
 msgstr "ਹ�ਠ ਦਿੱਤ� ��ਾ��� ਸ��ਿੰ� ਦ� ਸੰਰ�ਨਾ �ਰ� ��।"
 
-#: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2743
+#: ../mail/em-account-editor.c:2100 ../mail/em-account-editor.c:2758
 msgid "Sending Email"
 msgstr "�ਮ�ਲ ਭ��ਣ�"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2101
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10132,11 +9045,11 @@ msgstr ""
 "�ਸ ਢੰ� ਦ� �ਾਣ�ਾਰ� ਦਿ� ��, �ਿਸ ਰਾਹ�� ਤ�ਸ�� ਪੱਤਰ ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�। ���ਰ ਤ�ਸ�� ਯ��ਨ� ਨਹ�� ਹ� "
 "ਤਾ� �ਪਣ� ਸਿਸ�ਮ ਪਰਸ਼ਾਸ਼� �ਾ� �ੰ�ਰਨ�ੱ� ਸਰਵਿਸ ਪ�ਰਬੰਧ� ਨਾਲ ਸੰਪਰ� �ਰ�।"
 
-#: ../mail/em-account-editor.c:2110
+#: ../mail/em-account-editor.c:2103
 msgid "Account Management"
 msgstr "��ਾ��� ਪਰਬੰਧ"
 
-#: ../mail/em-account-editor.c:2111
+#: ../mail/em-account-editor.c:2104
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10144,11 +9057,11 @@ msgstr ""
 "�ੱ�� ਦਿੱਤ� ਥਾ� ਵਿੱ� �ਸ ��ਾ��� ਬਾਰ� ਵਰਣਨ �ਰਦ� �ਾਣ�ਾਰ� ਦਿ� ��। �ਹ ਨਾ� ਸਿਰ� \n"
 "ਵ��ਾ�ਣ ਲ� ਹ� ਵਰਤ� �ਾਵ���।"
 
-#: ../mail/em-account-editor.c:2115
+#: ../mail/em-account-editor.c:2108
 msgid "Done"
 msgstr "ਸਮਾਪਤ"
 
-#: ../mail/em-account-editor.c:2116
+#: ../mail/em-account-editor.c:2109
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10162,72 +9075,72 @@ msgstr ""
 "\n"
 "�ਪਣਾ ਸ��ਿੰ� ਲਾ�� �ਰਨ ਲ� \"ਲਾ�� �ਰ�\" ਦਬਾ�।"
 
-#: ../mail/em-account-editor.c:2557
+#: ../mail/em-account-editor.c:2572
 msgid "Check for _new messages every"
 msgstr "�ੰਨ� �ੰਤਰਾਲ ਬਾ�ਦ ਪੱਤਰ ��ੱ� �ਰ�(_n)"
 
-#: ../mail/em-account-editor.c:2565
+#: ../mail/em-account-editor.c:2580
 msgid "minu_tes"
 msgstr "ਮਿੰ�(_t)"
 
-#: ../mail/em-account-editor.c:2841
+#: ../mail/em-account-editor.c:2862
 msgid "Please select a folder from the current account."
 msgstr "ਮ���ਦਾ ��ਾ��� ਤ�� ਫ�ਲਡਰ ��ਣ� ��।"
 
-#: ../mail/em-account-editor.c:3111 ../mail/mail-config.ui.h:112
+#: ../mail/em-account-editor.c:3171 ../mail/mail-config.ui.h:98
 msgid "Security"
 msgstr "ਸ�ਰੱ�ਿ�"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3156 ../mail/em-account-editor.c:3224
+#: ../mail/em-account-editor.c:3216 ../mail/em-account-editor.c:3284
 msgid "Receiving Options"
 msgstr "ਪ�ਰਾਪਤ� ��ਣ"
 
-#: ../mail/em-account-editor.c:3157 ../mail/em-account-editor.c:3225
+#: ../mail/em-account-editor.c:3217 ../mail/em-account-editor.c:3285
 msgid "Checking for New Messages"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� ��ੱ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see mail/em-composer-utils.c:attribvars array
+#: ../mail/em-composer-utils.c:1136
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"${AbbrevWeekdayName} , ${Day}-${Month}-${Year}, ${24Hour}:${Minute} ਵ�� "
+"${TimeZone}, ${Sender} ਨ� ਲਿ�ਿ�:"
+
+#: ../mail/em-composer-utils.c:1146
+msgid "-----Original Message-----"
+msgstr "--------�ਸਲ� ਸ�ਨ�ਹਾ--------"
+
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1729
+#: ../mail/em-composer-utils.c:1804
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "ਤ�ਹਾਡਾ %s ਵੱਲ ਸ�ਨ�ਹਾ \"%s\" ਬਾਰ�, �� %s ਨ�ੰ ਭ��ਿ� ਸ�, ਪ��ਹਿ� �ਾ ��ੱ�ਿ� ਹ�।"
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1777
+#: ../mail/em-composer-utils.c:1854
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ ਵਿਸ਼�ਸ਼ਤਾ: \"%s\""
 
-#: ../mail/em-composer-utils.c:2186
+#: ../mail/em-composer-utils.c:2272
 msgid "an unknown sender"
 msgstr "�ਣ�ਾਣ ਭ��ਣ ਵਾਲਾ"
 
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2233
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"${AbbrevWeekdayName} , ${Day}-${Month}-${Year}, ${24Hour}:${Minute} ਵ�� "
-"${TimeZone}, ${Sender} ਨ� ਲਿ�ਿ�:"
-
-#: ../mail/em-composer-utils.c:2377
-msgid "-----Original Message-----"
-msgstr "--------�ਸਲ� ਸ�ਨ�ਹਾ--------"
-
-#: ../mail/em-composer-utils.c:2589
+#: ../mail/em-composer-utils.c:2696
 msgid "Posting destination"
 msgstr "ਭ��ਣ �ਿ�ਾਣਾ"
 
-#: ../mail/em-composer-utils.c:2590
+#: ../mail/em-composer-utils.c:2697
 msgid "Choose folders to post the message to."
 msgstr "ਸ�ਨ�ਹ� ਭ��ਣ ਲ� ਫ�ਲਡਰ ��ਣ�"
 
-#: ../mail/em-filter-folder-element.c:260
+#: ../mail/em-filter-folder-element.c:337
 msgid "Select Folder"
 msgstr "ਫ�ਲਡਰ ��ਣ�"
 
@@ -10345,7 +9258,7 @@ msgstr "ਸ�ੱ� ਨਹ�� ਹ�"
 msgid "is set"
 msgstr "ਸ�ੱ� ਹ�"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
 msgid "Junk"
 msgstr "�ੰ�"
 
@@ -10394,7 +9307,7 @@ msgid "Play Sound"
 msgstr "�ਵਾ� �ਲਾ�"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "ਪ��ਹ�"
 
@@ -10475,16 +9388,16 @@ msgid "Unset Status"
 msgstr "ਹਾਲਤ �ਣ-ਸ�ੱ�"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:533
+#: ../mail/em-filter-rule.c:539
 msgid "Then"
 msgstr "ਤਦ"
 
-#: ../mail/em-filter-rule.c:564
+#: ../mail/em-filter-rule.c:570
 msgid "Add Ac_tion"
 msgstr "��ਸ਼ਨ ਸ਼ਾਮਲ(_t)"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:126
+#: ../mail/em-folder-properties.c:124
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "ਨਾ ਪ��ਹ� ਸ�ਨ�ਹ�:"
@@ -10492,36 +9405,35 @@ msgstr[1] "ਨਾ ਪ��ਹ� ਸ�ਨ�ਹ�:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:130
+#: ../mail/em-folder-properties.c:128
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "��ੱਲ ਸ�ਨ�ਹ�:"
 msgstr[1] "��ੱਲ ਸ�ਨ�ਹ�:"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:146
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "���ਾ (%s) ਵਰਤ� ��:"
 
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage"
 msgstr "���ਾ ਵਰਤ��"
 
-#: ../mail/em-folder-properties.c:288
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../mail/em-folder-properties.c:290
 msgid "Folder Properties"
 msgstr "ਫ�ਲਡਰ ਵਿਸ਼�ਸਤਾ"
 
-#: ../mail/em-folder-selection-button.c:75
+#: ../mail/em-folder-selection-button.c:81
 msgid "<click here to select a folder>"
 msgstr "<ਫ�ਲਡਰ ��ਣਨ ਲ� �ਥ� �ਲਿੱ� �ਰ�>"
 
-#: ../mail/em-folder-selector.c:264
+#: ../mail/em-folder-selector.c:262
 msgid "C_reate"
 msgstr "ਬਣਾ�(_r)"
 
-#: ../mail/em-folder-selector.c:268
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "ਫ�ਲਡਰ ਨਾ�(_n):"
 
@@ -10529,7 +9441,7 @@ msgstr "ਫ�ਲਡਰ ਨਾ�(_n):"
 #: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
 #: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
 #: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1067 ../mail/mail-vfolder.c:1132
+#: ../mail/mail-vfolder.c:1140 ../mail/mail-vfolder.c:1216
 msgid "Search Folders"
 msgstr "��� ਫ�ਲਡਰ"
 
@@ -10539,166 +9451,143 @@ msgstr "��� ਫ�ਲਡਰ"
 msgid "UNMATCHED"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:836 ../mail/em-folder-tree-model.c:1113
 msgid "Loading..."
 msgstr "ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�...."
 
-#: ../mail/em-folder-tree.c:184
+#: ../mail/em-folder-tree.c:201
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ਵਿੱ� ਫ�ਲਡਰ ਦ� �ਾ�� ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:629
 msgid "Folder names cannot contain '/'"
 msgstr "ਫ�ਲਡਰ ਨਾ� �ੱ�ਰ \"/\" ਨਹ�� ਰੱ� ਸ�ਦਾ"
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
-#. *
-#. * Most languages should translate this as "%s (%u%s)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:1084
+#: ../mail/em-folder-tree.c:1191
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%Iu%s)"
 
-#: ../mail/em-folder-tree.c:1318
+#: ../mail/em-folder-tree.c:1427
 msgid "Mail Folder Tree"
 msgstr "ਪੱਤਰ ਫ�ਲਡਰ ਲ��"
 
-#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1788 ../mail/em-folder-utils.c:90
 #, c-format
 msgid "Moving folder %s"
 msgstr "ਫ�ਲਡਰ %s ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1792 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Copying folder %s"
 msgstr "ਫ�ਲਡਰ %s �ਾਪ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
+#: ../mail/em-folder-tree.c:1801 ../mail/message-list.c:2214
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ਸ�ਨ�ਹਿ�� ਨ�ੰ %s ਫ�ਲਡਰ ਵਿੱ� ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
+#: ../mail/em-folder-tree.c:1805 ../mail/message-list.c:2216
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ %s ਵਿੱ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/em-folder-tree.c:1650
+#: ../mail/em-folder-tree.c:1824
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "�ੱਪਰ� ਸੰਭਾਲ ਤ�� ਸ�ਨ�ਹਾ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:422
 msgid "Move Folder To"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:422
 msgid "Copy Folder To"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../mail/em-folder-utils.c:533
-#: ../plugins/groupwise-features/share-folder-common.c:136
+#: ../mail/em-folder-utils.c:571
+#: ../plugins/groupwise-features/share-folder-common.c:138
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "'%s' ਫ�ਲਡਰ ਬਣਾ�� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-folder-utils.c:693
+#: ../mail/em-folder-utils.c:745
 msgid "Create Folder"
 msgstr "ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../mail/em-folder-utils.c:694
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../mail/em-folder-utils.c:746
+#: ../plugins/groupwise-features/install-shared.c:178
+#: ../plugins/groupwise-features/share-folder-common.c:353
 msgid "Specify where to create the folder:"
 msgstr "ਦੱਸ� �ਿ ਫ�ਲਡਰ �ਿੱਥ� ਬਣਾ�� �ਾਵ�:"
 
-#: ../mail/em-folder-utils.c:714
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "ਫ�ਲਡਰ \"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ� �ਾ ਰਹ� ਹ�"
-
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
+#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
 msgid "Unsigned"
 msgstr "ਨਾ-ਦਸਤ�ਤ"
 
-#: ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html-display.c:88
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਦਸਤ�ਤ ਨਾਲ ਨਹ�� ਹ�। �ਸ ਦ� ��� �ਾਰੰ�� ਨਹ�� �ਿ �ਹ ਸ�ਨ�ਹਾ ਸਹ�� ਹ�।"
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
+#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1605
 msgid "Valid signature"
 msgstr "�ਾ�� ਦਸਤ�ਤ"
 
-#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਦਸਤ�ਤ ਨਾਲ ਹ� �ਤ� �ਾ�� ਮਤਲਬ ਵ� ਹ�, ਪਰ �ਹ ਪ�ਰਮਾਣਿਤ ਨਹ�� ਲੱ�ਦਾ ਹ�।"
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1606
 msgid "Invalid signature"
 msgstr "�ਲਤ ਦਸਤ�ਤ"
 
-#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "�ਸ ਸ�ਨ�ਹ� ਦ� ਦਸਤ�ਤ �ਾ��� ਨਹ�� ਹਨ, ਪਰ ਸੰ�ਾਰ ਦ�ਰਾਨ �ਹ ਤਬਦ�ਲ ਹ� �� �ਾਪਦ� ਹਨ।"
 
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1607
 msgid "Valid signature, but cannot verify sender"
 msgstr "ਦਸਤ�ਤ ਠ�� ਹਨ, ਪਰ ਭ��ਣ ਵਾਲਾ ��ੱ� ਨਹ�� ��ਤਾ"
 
-#: ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "�ਸ ਸ�ਨ�ਹ� ਦ� ਦਸਤ�ਤ ਤਾ� �ਾ�� ਹਨ, ਪਰ �ਸ ਦ� ਭ��ਣ ਵਾਲ� ਨ�ੰ �ਾ��ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
 
-#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1608
 msgid "Signature exists, but need public key"
 msgstr "ਦਸਤ�ਤ ਮ���ਦ ਹਨ, ਪਰ ਪਬਲਿ� ��ੰ�� ਲ���ਦ� ਹ�"
 
-#: ../mail/em-format-html-display.c:94
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "�ਸ ਸ�ਨ�ਹ� ਦ� ਦਸਤ�ਤ ਤਾ� ਹਨ, ਪਰ ਸਬੰਧਿਤ ਪਬਲਿ� �� ਨਾਲ ਸਬੰਧਿਤ ਨਹ��।"
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
+#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1614
 msgid "Unencrypted"
 msgstr "�ਣ-�ੰ��ਰਿਪ�ਡ"
 
-#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html-display.c:99
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "�ਹ ਸ�ਨ�ਹਾ �ੰ��ਰਿਪ�ਡ ਨਹ�� ਹ� �ਸ ਦ� ��� ਭਾ� �ੰ�ਰਨ�ੱ� ਤ� ਸੰ�ਾਰ ਦ�ਰਾਨ ਵ��� �ਾ ਸ�ਦ� ਹਨ।"
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
+#: ../mail/em-format-html-display.c:100 ../mail/em-format-html.c:1615
 msgid "Encrypted, weak"
 msgstr "�ੰ��ਰਿਪ�ਡ, ਹਲ�ਾ"
 
-#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -10707,21 +9596,21 @@ msgstr ""
 "�ਹ ਸ�ਨ�ਹ� �ੰ��ਰਿਪ�ਡ ਹ� �ਤ� �ਸ ਲ� ਹਲ�ਾ �ਲ���ਰਿਥਮ ਵਰਤਿ� �ਿ� ਹ�। �ਸ ਸ�ਨ�ਹ� ਨ�ੰ �ੱ� ਸੰਭਵ ਸਮ�� ਵਿੱ� "
 "�ਿਸ� ਵ� ਬਾਹਰ� ਵਿ��ਤ� ਵਲ�� ��ਲਣ ��ਾ ਤਾ� ਹ�, ਪਰ �ਸੰਭਵ ਨਹ�� ਹ�।"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1616
 msgid "Encrypted"
 msgstr "�ੰ��ਰਿਪ�ਡ"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "�ਹ ਸ�ਨ�ਹਾ �ੰ��ਰਿਪ�ਡ ਹ�, �ਸ ਸ�ਨ�ਹ� ਦ� �ਿਸ� ਭਾ� ਨ�ੰ ਬਾਹਰ�� ਵ��ਣਾ ਸੰਭਵ ਨਹ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1617
 msgid "Encrypted, strong"
 msgstr "�ੰ��ਰਿਪ�, ਸ�ਤ"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -10730,15 +9619,15 @@ msgstr ""
 "�ਹ ਸ�ਨ�ਹ� �ੰ��ਰਿਪ�ਡ ਹ� �ਤ� �ਸ ਲ� ਸ�ਤ �ਲ���ਰਿਥਮ ਵਰਤਿ� �ਿ� ਹ�। �ਸ ਸ�ਨ�ਹ� ਦ� ਭਾ�ਾ� ਨ�ੰ �ੱ� ਸੰਭਵ ਸਮ�� "
 "ਵਿੱ� �ਿਸ� ਵ� ਬਾਹਰ� ਵਿ��ਤ� ਵਲ�� ਵ��ਣਾ ��ਾ ਹ�।"
 
-#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:238 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "ਸਰ��ਫਿ��� ਵ���(_V)"
 
-#: ../mail/em-format-html-display.c:248
+#: ../mail/em-format-html-display.c:251
 msgid "This certificate is not viewable"
 msgstr "�ਹ ਸਰ��ਫਿ��� ਵ��ਣਯ�� ਨਹ�� ਹ�"
 
-#: ../mail/em-format-html-display.c:497
+#: ../mail/em-format-html-display.c:506
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10746,28 +9635,28 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ �ਹ �-ਮ�ਲ ਨ�ੰ ਰ�ਡਰ ਨਹ�� �ਰ ਸ�ਦ�, �ਿ���ਿ �ਹ ਬਹ�ਤ ਵੱਡ� ਹ�। ਤ�ਸ�� �ਸ ਨ�ੰ ਬਿਨਾ� ਫਾਰਮ�� ਵ�� "
 "ਸ�ਦ� ਹ� �ਾ� ਬਾਹਰ� ���ਸ� �ਡ��ਰ ਨਾਲ ਵ�� ਸ�ਦ� ਹ�।"
 
-#: ../mail/em-format-html-display.c:725
+#: ../mail/em-format-html-display.c:749
 msgid "Completed on"
 msgstr "ਸਮਾਪਤ "
 
-#: ../mail/em-format-html-display.c:733
+#: ../mail/em-format-html-display.c:757
 msgid "Overdue:"
 msgstr "ਮਿ�ਦ ਪ�ੱ��:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:737
+#: ../mail/em-format-html-display.c:761
 msgid "by"
 msgstr "ਨ�ੰ"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:978 ../mail/em-format-html-display.c:1025
 msgid "View _Unformatted"
 msgstr "ਬਿਨ-ਫਾਰਮ�� ਵ���(_U)"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:980
 msgid "Hide _Unformatted"
 msgstr "ਬਿਨ-ਫਾਰਮ�� �ਹਲ�(_U)"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1045
 msgid "O_pen With"
 msgstr "�ਸ ਨਾਲ ��ਲ�ਹ�(_p)"
 
@@ -10776,55 +9665,55 @@ msgstr "�ਸ ਨਾਲ ��ਲ�ਹ�(_p)"
 msgid "Page %d of %d"
 msgstr "%2$d ਵਿੱ��� %1$d ਸਫ਼ਾ"
 
-#: ../mail/em-format-html.c:153
+#: ../mail/em-format-html.c:165
 msgid "Formatting message"
 msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਫਾਰਮ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-format-html.c:352
+#: ../mail/em-format-html.c:364
 msgid "Formatting Message..."
 msgstr "ਸ�ਨ�ਹਾ ਫਾਰਮ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
+#: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "'%s' ਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-format-html.c:1901
+#: ../mail/em-format-html.c:1979
 msgid "Unknown external-body part."
 msgstr "�ਣ�ਾਣ ਬਾਹਰ�-ਮ�ੱ� ਭਾ�।"
 
-#: ../mail/em-format-html.c:1909
+#: ../mail/em-format-html.c:1987
 msgid "Malformed external-body part."
 msgstr "ਨਿ�ਾਰਾ ਬਾਹਰ�-ਭਾ�"
 
-#: ../mail/em-format-html.c:1939
+#: ../mail/em-format-html.c:2017
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ਸਾ�� (%s) ਲ� ਪ���ੰ�ਰ"
 
-#: ../mail/em-format-html.c:1950
+#: ../mail/em-format-html.c:2028
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ਲ��ਲ ਫਾ�ਲ (%s) ਲ� ਸਾ�� %s ਦ� ਲ� ਪ���ੰ�ਰ"
 
-#: ../mail/em-format-html.c:1952
+#: ../mail/em-format-html.c:2030
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ਲ��ਲ ਫਾ�ਲ (%s) ਲ� ਪ���ੰ�ਰ"
 
-#: ../mail/em-format-html.c:1973
+#: ../mail/em-format-html.c:2051
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ਰਿਮ�� ਡਾ�� (%s) ਲ� ਪ���ੰ�ਰ"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:2062
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "�ਣ�ਾਣ� ਬਾਹਰ� ਡਾ�� (\"%s\" �ਿਸਮ) ਲ� ਪ���ੰ�ਰ"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2647
+#: ../mail/em-format-html.c:2762
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "�ਹ ਸ�ਨ�ਹਾ %s ਵਲ�� %s ਦ� ਤ�ਰ �ੱਤ� ਭ��ਿ� �ਿ� ਹ�"
@@ -10835,60 +9724,105 @@ msgstr "�ਹ ਸ�ਨ�ਹਾ %s ਵਲ�� %s ਦ� ਤ�ਰ �ੱਤ
 msgid "No HTML stream available"
 msgstr "��� HTML ਸ�ਰ�ਮ �ਪਲੱਬਧ ਨਹ��"
 
-#: ../mail/em-subscribe-editor.c:677
-msgid "This store does not support subscriptions, or they are not enabled."
-msgstr "�ਹ ਭੰਡਾਰ ਮ��ਬਰ ਲ� ਸਹਾ� ਨਹ�� �ਾ� �ਹ ਯ�� ਨਹ�� ਹ�।"
+#: ../mail/em-subscription-editor.c:1107
+msgid "Folder Subscriptions"
+msgstr "ਫ�ਲਡਰ ਮ��ਬਰ�"
 
-#: ../mail/em-subscribe-editor.c:728
-msgid "Subscribed"
-msgstr "ਮ��ਬਰ� ਹ�"
+#: ../mail/em-subscription-editor.c:1146
+msgid "_Account:"
+msgstr "��ਾ���(_A):"
 
-#: ../mail/em-subscribe-editor.c:732
-msgid "Folder"
-msgstr "ਫ�ਲਡਰ"
+#: ../mail/em-subscription-editor.c:1161
+#| msgid "Clear the search"
+msgid "Clear Search"
+msgstr "��� ਸਾਫ਼ �ਰ�"
 
-#  FIXME: This is just to get the shadow, is there a better way?
-#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:1120
-msgid "Please select a server."
-msgstr "ਸਰਵਰ ��ਣ� ��।"
+#: ../mail/em-subscription-editor.c:1179
+#, fuzzy
+#| msgid "S_how only items containing:"
+msgid "Sho_w items that contain:"
+msgstr "��ਵਲ ���ਮਾ� ਰੱ�ਣ ਵਾਲ� ਵ���(_h):"
+
+#: ../mail/em-subscription-editor.c:1218
+#| msgid "Unsubscribe from the selected folder"
+msgid "Subscribe to the selected folder"
+msgstr "��ਣ� ਫ�ਲਡਰ ਲ� ਮ��ਬਰ ਬਣ���ਣ� ਫ�ਲਡਰ ਲ� ਮ��ਬਰ ਬਣਾ��ਣ� ਫ�ਲਡਰ ��ਣ� ਫ�ਲਡਰ ਤ�� ਮ��ਬਰ� "
 
-#: ../mail/em-subscribe-editor.c:1166
-msgid "No server has been selected"
-msgstr "��� ਸਰਵਰ ��ਣਿ� ਨਹ�� �ਿ�"
+#: ../mail/em-subscription-editor.c:1219
+#| msgid "Subscribed"
+msgid "Su_bscribe"
+msgstr "ਮ��ਬਰ ਬਣ�(_b)"
+
+#: ../mail/em-subscription-editor.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
+msgid "Unsubscribe from the selected folder"
+msgstr "��ਣ� ਫ�ਲਡਰ ਤ�� ਮ��ਬਰ ਹ�ਾ�"
+
+#: ../mail/em-subscription-editor.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
+msgid "_Unsubscribe"
+msgstr "ਮ��ਬਰ� ਹ�ਾ�(_U)"
+
+#: ../mail/em-subscription-editor.c:1242
+#| msgid "Collapse _all"
+msgid "Collapse all folders"
+msgstr "ਸਭ ਫ�ਲਡਰ ਸਮ���"
+
+#: ../mail/em-subscription-editor.c:1243
+#| msgid "Collapse _all"
+msgid "C_ollapse All"
+msgstr "ਸਭ ਸਮ���(_o)"
+
+#: ../mail/em-subscription-editor.c:1253
+#| msgid "E_xpand all"
+msgid "Expand all folders"
+msgstr "ਸਭ ਫ�ਲਡਰ ਫ�ਲਾ�"
+
+#: ../mail/em-subscription-editor.c:1254
+#| msgid "E_xpand all"
+msgid "E_xpand All"
+msgstr "ਸਭ ਫ�ਲਾ�(_x)"
+
+#: ../mail/em-subscription-editor.c:1264
+#| msgid "Refresh the folder"
+msgid "Refresh the folder list"
+msgstr "ਫ�ਲਡਰ ਲਿਸ� ਤਾ�਼ਾ �ਰ��"
+
+#: ../mail/em-subscription-editor.c:1276
+#| msgid "Cancel the current mail operation"
+msgid "Stop the current operation"
+msgstr "ਮ���ਦਾ �ਾਰਵਾ� ਰ���ਮ���ਦਾ �ਾਰਵ"
 
 #. Translators: This message is shown only for ten or more
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:101
 #, c-format
-#| msgid "Are you sure you want to open %d messages at once?"
-#| msgid_plural "Are you sure you want to open %d messages at once?"
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "�� ਤ�ਸ�� %d ਸ�ਨ�ਹ� �ੱ� ਸਮ�� ਹ� ��ਲ�ਹਣ� �ਾਹ�ੰਦ� ਹ�?"
 msgstr[1] "�� ਤ�ਸ�� %d ਸ�ਨ�ਹ� �ੱ� ਸਮ�� ਹ� ��ਲ�ਹਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/em-utils.c:152
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../mail/em-utils.c:153
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਮ�� ਨਾ ਵ��ਾ�(_D)।"
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:327
 msgid "Message Filters"
 msgstr "ਸ�ਨ�ਹਾ ਫਿਲ�ਰ"
 
-#: ../mail/em-utils.c:848
+#: ../mail/em-utils.c:883
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ਤ�� ਸ�ਨ�ਹ�"
 
-#: ../mail/em-vfolder-editor.c:126
+#: ../mail/em-vfolder-editor.c:108
 msgid "Search _Folders"
 msgstr "��� ਫ�ਲਡਰ(_F)"
 
-#: ../mail/em-vfolder-rule.c:525
+#: ../mail/em-vfolder-rule.c:603
 msgid "Add Folder"
 msgstr "ਫ�ਲਡਰ ਸ਼ਾਮਲ"
 
@@ -10905,76 +9839,123 @@ msgid "\"Filter Editor\" window width"
 msgstr "\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ���ਾ�"
 
 #: ../mail/evolution-mail.schemas.in.h:4
+#, fuzzy
+#| msgid "\"Filter Editor\" window height"
+msgid "\"Folder Subscriptions\" window height"
+msgstr "\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ��ਾ�"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+#, fuzzy
+#| msgid "\"Filter Editor\" window maximize state"
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+#, fuzzy
+#| msgid "\"Filter Editor\" window width"
+msgid "\"Folder Subscriptions\" window width"
+msgstr "\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ���ਾ�"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Search Folder Editor\" window height"
 msgstr "\"��� ਫ�ਲਡਰ �ਡ��ਰ\" ਵਿੰਡ� ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Search Folder Editor\" window maximize state"
 msgstr "\"��� ਫ�ਲਡਰ �ਡ��ਰ\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Search Folder Editor\" window width"
 msgstr "\"��� ਫ�ਲਡਰ �ਡ��ਰ\" ਵਿੰਡ� ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "\"Send and Receive Mail\" window height"
 msgstr "\"ਭ��� �ਤ� ਪ�ਰਾਪਤ ਪੱਤਰ\" ਵਿੰਡ� ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "\"ਪੱਤਰ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "\"Send and Receive Mail\" window width"
 msgstr "\"ਭ��� �ਤ� ਪ�ਰਾਪਤ ਮ�ਲ\" ਵਿੰਡ� ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Always request read receipt"
 msgstr "ਪ��ਹਨ ਰਸ�ਦ ਦ� ਹਮ�ਸ਼ਾ ਮੰ� �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "ਹਾਲਤ ਪੱ�� ਵਿੱ� �ਲਤ� ਨ�ੰ ਵ��ਾ� �ਾਣ ਦਾ ਸਮਾ� ਸ�ਿੰ�ਾ� ਵਿੱ�।"
+
+#: ../mail/evolution-mail.schemas.in.h:15
+msgid ""
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:16
+#, fuzzy
+#| msgid "Attached message"
+msgid "Attribute message."
+msgstr "���� ��ਤਾ ਸ�ਨ�ਹਾ"
+
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Automatic emoticon recognition"
 msgstr "���ਮ��ਿ� �ਮ�ਸ਼ਨ ਪ�ਾਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Automatic link recognition"
 msgstr "���ਮ��ਿ� ਲਿੰ� ਪ�ਾਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:19
+#, fuzzy
+#| msgid "Check for _new messages every"
+msgid "Check for new messages in all active accounts"
+msgstr "�ੰਨ� �ੰਤਰਾਲ ਬਾ�ਦ ਪੱਤਰ ��ੱ� �ਰ�(_n)"
+
+#: ../mail/evolution-mail.schemas.in.h:20
+#, fuzzy
+#| msgid "Check for _new messages every"
+msgid "Check for new messages on start"
+msgstr "�ੰਨ� �ੰਤਰਾਲ ਬਾ�ਦ ਪੱਤਰ ��ੱ� �ਰ�(_n)"
+
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Check incoming mail being junk"
 msgstr "��ਣ ਵਾਲ� ਪੱਤਰਾ� ਲ� �ੰ� �ਾ��"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Citation highlight color"
 msgstr "���ਾ���ਨ �ਭਾਰਨ ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Citation highlight color."
 msgstr "���ਾ���ਨ �ਭਾਰਨ ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Composer Window default height"
 msgstr "�ੰਪ��਼ਰ ਵਿੰਡ� ਦ� ਮ�ਲ ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Composer Window default width"
 msgstr "�ੰਪ��਼ਰ ਵਿੰਡ� ਦ� ਮ�ਲ ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Composer load/attach directory"
 msgstr "�ੰਪ��਼ਰ ਲ�ਡ/����� ਡਾ�ਰ���ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "TO/CC/BCC ਵਿੱ� ���ਾ �ਡਰ�ੱਸ ਵ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "TO/CC/B_CC ਵਿੱ� �ਡਰ�ੱਸ �ਿਣਤ� ਵਿੱ� ਦਿੱਤ� ਨੰਬਰਾ� ਮ�ਤਾਬ� ���ਾ �ਡਰ�ੱਸ ਵ��ਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -10982,11 +9963,11 @@ msgstr ""
 "�ੰ�ਰ�ਲ, �ਿਸ ਤ��਼� ਨਾਲ ਸਥਾਨ� ਬਦਲਾ� ਰਿਮ�� ਮ�ਲ ਸਰਵਰ ਨਾਲ ਸਮ�ਾਲ� ��ਤ� �ਾਣ। �ੰਤਰਾਲ�ੱ��-�ੱ� 30 "
 "ਸ�ਿੰ� ਹ�ਣਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Custom headers to use while checking for junk."
 msgstr "�ੰ� ਵਾਸਤ� ��ੱ� �ਰਨ ਵਾਸਤ� �ਸ�ਮ ਹ�ੱਡਰ"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -10994,73 +9975,65 @@ msgstr ""
 "�ੰ� ਲ� ��ੱ� �ਰਨ ਦ� ਦ�ਰਾਨ ਵਰਤਣ ਵਾਸਤ� ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ। ਸ��� ��ਾ��� \"headername=value\" "
 "ਫਾਰਮ�� ਦ� ਲਾ�ਨ ਦ� ਰ�ਪ '� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages"
 msgstr "ਸ�ਨ�ਹਾ ਬਣਾ�ਣ ਲ� ਡਿਫਾਲ� �ੱ�ਰ ਸਮ�ਹ"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default charset in which to compose messages."
 msgstr "ਸ�ਨ�ਹਾ ਬਣਾ�ਣ ਲ� ਡਿਫਾਲ� �ੱ�ਰ ਸਮ�ਹ।"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default charset in which to display messages"
 msgstr "ਸ�ਨ�ਹਾ ਵ��ਾ�ਣ ਲ� ਡਿਫਾਲ� �ੱ�ਰ ਸਮ�ਹ"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default charset in which to display messages."
 msgstr "ਸ�ਨ�ਹਾ ਵ��ਾ�ਣ ਲ� ਡਿਫਾਲ� �ੱ�ਰ ���ਡਿੰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default forward style"
 msgstr "ਡਿਫਾਲ� �ੱ�� ਭ��ਣ ਦ� ਸ�ਾ�ਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default height of the Composer Window."
 msgstr "�ੰਪ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default height of the mail browser window."
 msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ��ਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default height of the subscribe dialog."
-msgstr "ਮ��ਬਰ� ਡਾ�ਲਾ� ਦ� ਡਿਫਾਲ� ��ਾ� ਹ�।"
-
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default maximized state of the mail browser window."
 msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ।"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Default reply style"
 msgstr "ਡਿਫਾਲ� �ਵਾਬ ਸ�ਾ�ਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Default value for thread expand state"
 msgstr "ਥਰਿੱਡ ਫ�ਲ� ਹਾਲਤ ਲ� ਡਿਫਾਲ� ਮ�ੱਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default width of the Composer Window."
 msgstr "�ੰਪ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ���ਾ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Default width of the mail browser window."
 msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ���ਾ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default width of the subscribe dialog."
-msgstr "ਮ��ਬਰ� ਡਾ�ਲਾ� ਦ� ਡਿਫਾਲ� ���ਾ� ਹ�।"
-
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "ਦੱਸ� �ਿ �� �ੰ� ਫਿਲ�ਰਿੰ� ਲ� �ਡਰ�ੱਸ ��ਵਲ ਲ��ਲ  �ਡਰ�ੱਸ-ਬ�ੱ� '� ਹ� ���� �ਾਣ।"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "ਦੱਸ� �ਿ �� ਭ��ਣ ਵਾਲਾ �ਮ�ਲ �ਡਰ�ੱਸ-ਬ�ੱ� '� ���ਿ� �ਾਵ�"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11071,11 +10044,11 @@ msgstr ""
 "ਹ�ਵ��ਾ। �ਹ ਬ�ੱ� ਵਿੱ� ਲੱਭਦਾ ਹ�, �� �ਿ ���-ਪ�ਰਨ ਲ� ਮਾਰ� ਹਨ। �ਸ ਹ�ਲ� ਹ� ਸ�ਦਾ ਹ�, �� ਰਿਮ�� �ਡਰ�ਸ "
 "ਬ�ੱ� (LDAP ਵਾ��) ਨ�ੰ ���-ਪ�ਰਨ ਲ� ਮਾਰ� ��ਤਾ �ਿ� ਹ�ਵ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "ਦੱਸ� �ਿ �ੰ� ਲ� ��ੱ� �ਰਨ ਸਮ�� ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ ਵਰਤ� �ਾਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11084,7 +10057,7 @@ msgstr ""
 "�� �ੰ� ��ੱ� �ਰਨ ਲ� �ਸ�ਮ ਹ�ੱਡਰ ਵਰਤਣ� �ਾਹ�ਦ� ਹਨ। �� �ਹ ��ਣ �ਾਲ� ਰਹ� �ਤ� ਹ�ੱਡਰ ਦ� ਨਿ�ਰਾਨ� "
 "��ਤ ਤਾ� �ਹ �ੰ� ��ੱ� �ਰਨ ਦ� �ਤ� ਵਧਾ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11092,47 +10065,47 @@ msgstr ""
 "�� ਵਰ���ਲ �ਲ� ਵਿੱ� \"ਸ�ਨ�ਹਾ\" �ਾਲਮ ਵਿੱ� \"ਵਲ��\" �ਤ� \"ਵਿਸ਼ਾ\" ਲਾ�ਨਾ� ਲ� �ੱ�� ਫ��� ਵਰਤਣ� "
 "ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Directory for loading/attaching files to composer."
 msgstr "�ੰਪ��਼ਰ ਵਿੱ� ਫਾ�ਲਾ� ਲ�ਡ �ਰਨ/����� �ਰਨ ਵਾਸਤ� ਡਾ�ਰ���ਰ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for saving mail component files."
 msgstr "ਮ�ਲ ਭਾ� ਫਾ�ਲਾ� ਸੰਭਾਲਣ ਵਾਸਤ� ਡਾ�ਰ��ਰ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "ਬਾਹ� ਵਿੱ� ਫ�ਲਡਰ ਨਾ� ਲ� �ੰਡਾ�ਾਰ-ਸਾ��਼ ਯ�� �ਾ� �ਯ��"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Display only message texts not exceeding certain size"
 msgstr "��ਵਲ �ਹ� ���ਸ� ਸ�ਨ�ਹ� ਵ���, �� �ਿ ��� ��ਾਰ ਤ�� ਵੱਧ ਨਹ�� ਹਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Do not add signature delimiter"
 msgstr "ਦਸਤ�ਤ ਡ�ਲਿਮ�ਰ ਸ਼ਾਮਲ ਨਾ �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Draw spelling error indicators on words as you type."
 msgstr "ਤ�ਹਾਡ� ਲਿ�ਣ ਦ�ਰਾਨ ਹ� ਸ਼ਬਦਾ� ਤ� ਸ਼ਬਦ-��� �ਲਤ�� �ੱਢ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Empty Junk folders on exit"
 msgstr "ਬੰਦ �ਰਨ ਸਮ�� �ੰ� ਫ�ਲਡਰ �ਾਲ� �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Trash folders on exit"
 msgstr "ਬੰਦ �ਰਨ ਤ� ਰੱਦ� ਸਾਫ �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਬੰਦ �ਰਨ ਸਮ�� ਸਭ �ੰ� ਫ�ਲਡਰ �ਾਲ� �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਬੰਦ �ਰਨ ਸਮ�� ਰੱਦ� �ਾਲ� �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -11140,43 +10113,43 @@ msgstr ""
 "HTML ਪੱਤਰ ਵਿੱ� �ਨ�ਮ�� �ਿੱਤਰ ਯ�� �ਰ�। �� ਯ��਼ਰ �ਨ�ਮ�� �ਿੱਤਰਾ� ਨ�ੰ ਪਸੰਦ ਨਹ�� ��ਤ� �ਤ� ਸਥਿਰ �ਿੱਤਰ "
 "ਹ� ਪਸੰਦ �ਰਦ� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "�ਾਰ�� ਮ�ਡ ਯ��, ਤਾ� �ਿ ਤ�ਸ�� ਪੱਤਰ ਪ�ਨ ਦ�ਰਾਨ �ਰਸਰ ਵ��ਾ ਸ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable or disable magic space bar"
 msgstr "ਮ��ਿ� ਸਪ�ਸ ਬਾਰ ਯ�� �ਾ� �ਯ�� �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "�ਦ�� �� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਨਿਸ਼ਾਨਬੱਧ ��ਤਾ �ਾਵ� ਤਾ� ਪ�ੱ�ਣ ਨ�ੰ ਯ��/�ਯ�� �ਰਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable type ahead search feature"
 msgstr "�ੱ�� ��� ਫ��ਰ �ਿਸਮ ਨ�ੰ ਯ�� �ਾ� �ਯ��"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable search folders"
 msgstr "��� ਫ�ਲਡਰ ਯ��"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders on startup."
 msgstr "ਸ਼�ਰ� ਸਮ�� ��� ਫ�ਲਡਰ ਯ�� �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "ਬਾਹਰ� ��� ਫ��ਰ ਨ�ੰ ਯ�� �ਰ�, �� �ਿ ਫ�ਲਡਰ ਨਾ� ਦ� ��� ਲ� ਸਹਾ�� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr "�ਸ ਨ�ੰ ਯ�� �ਰਨ ਨਾਲ ਸਪ�ਸ ਬਾਰ ਸਵਿੱ� ਸ�ਨ�ਹਾ �ਲ�, ਸ�ਨ�ਹਾ ਸ��� �ਤ� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਰ�ਲ �ਰ���। "
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -11184,23 +10157,23 @@ msgstr ""
 "��ਵਲ �ਹ� ਸ�ਨ�ਹ� ਵ��ਾ�ਣ ਲ� ਯ�� �ਰਦਾ ਹ�, �ਿੰਨ�ਹਾ� ਦ� ਲਿਮ� 'message_text_part_limit' ��ੰ�� "
 "'� ਸ�ੱ� ��ਤ� ਤ�� ਵੱਧ ਨਹ�� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "ਸਭ ਫ�ਲਡਰਾ� ਲ� ਰਲਦ� ਸ�ਨ�ਹਾ ਲਿਸ� �ਲ� ਸ��ਿੰ� ਵਰਤਣ ਲ� �ਾਲ� �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "ਸਭ ਫ�ਲਡਰਾ� ਲ� ਰਲਦ� ਸ�ਨ�ਹਾ ਲਿਸ� �ਲ� ਸ��ਿੰ� ਵਰਤਣ ਲ� �ਾਲ� �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable/disable caret mode"
 msgstr "�ਾਰ�� ਮ�ਡ ਯ��/�ਯ��"
 
-#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
+#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "���ਲ�ੱ�/��ਮ�ਲ ਢੰ� ਨਾਲ ਫਾ�ਲ ਨਾ� �ੰ��ਡ �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11211,27 +10184,33 @@ msgstr ""
 "UTF-8 �ੱ�ਰ ਨਾਲ ਭ��� ਫਾ�ਲ ਨਾ� ਵਿੱ� ਭ��ਿ� ਹ�, �ਿ���ਿ �ਹ RFC ੨੨੩੧ ਦ� ਮ�ਤਾਬ� ਨਹ��, ਬਲ�ਿ RFC "
 "੨੦੪੭ ਸ���ਡਰਡ ਨ�ੰ ਮੰਨਦ� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Flush Outbox after filtering"
 msgstr "ਫਿਲ�ਰ �ਰਨ ਦ� ਬਾ�ਦ ���ਬਾ�ਸ ਸਾਫ਼ �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:76
+#, fuzzy
+#| msgid "Forwarded message"
+msgid "Forward message."
+msgstr "�ੱ�� ਭ��ਿ� ਸ�ਨ�ਹਾ"
+
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Group Reply replies to list"
 msgstr "�ਰ�ੱਪ �ਵਾਬ ਲਿਸ� ਨ�ੰ �ਵਾਬ"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Height of the message-list pane"
 msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਪੱ�� ਦ� ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane."
 msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਪੱ�� ਦ� ��ਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ਪਰ-ਫ�ਲਡਰ �ਲ� �ਹਲ� �ਰ� �ਤ� ��ਣ ਹ�ਾ ਦਿ�"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -11239,7 +10218,7 @@ msgstr ""
 "���ਰ ਯ��਼ਰ ਨ� ੧੦ �ਾ� ਵਧ�ਰ� ਸ�ਨ�ਹ� �ੱ�� ਸਮ�� ��ਲਣ ਦ� ��ਸ਼ਿਸ ��ਤ� ਤਾ�, ਯ��਼ਰ ਨ�ੰ ਪ�ੱ�� �ਿ �� �ਹ �ੰ� �ਰਨਾ "
 "�ਾਹ�ੰਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -11248,11 +10227,11 @@ msgstr ""
 "�ੱ� �ਾਸ MIME �ਿਸਮ ਲ� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਦਰਸ਼� ਸ਼ਾਮਿਲ ਨਹ�� ਹ�, �ਿਸ� MIME �ਿਸਮ ਨ�ੰ �ਸ ਸ��� ਵਿੱ� "
 "�ਪਲੱਬਧ ਹ�ਣ ਲ� �ਸ ਨ�ੰ �ਨ�ਮ ਦ� MIME �ਿਸਮ ਡਾ�ਾਬ�ਸ ਦ� ਬ�ਨਬ�-ਭਾ� ਦਰਸ਼� ਵਿੱ� �ਪਲੱਬਧ ਹ�ਣਾ ਸਹਾ�� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Ignore list Reply-To:"
 msgstr "ਲਿਸ� ਨ�ੰ �ਵਾਬ ਦਿ� �ਣਡਿੱਠਾ:"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -11260,7 +10239,19 @@ msgstr ""
 "\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
 "ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:85
+#, fuzzy
+#| msgid ""
+#| "Initial height of the \"Filter Editor\" window. The value updates as the "
+#| "user resizes the window vertically."
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
+"ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
+
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11268,7 +10259,7 @@ msgstr ""
 "\"��� ਫ�ਲਡਰ �ਡ��ਰ ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
 "ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11276,7 +10267,7 @@ msgstr ""
 "\"ਮ�ਲ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
 "ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11287,7 +10278,24 @@ msgstr ""
 "ਨ�ੰ ਵੱਧ�-ਵੱਧ �ਾ� �ਣ-ਵੱਧ�-ਵੱਧ �ਰਦਾ ਹ�। ਯਾਦ ਰੱ�� �ਿ �ਹ �ਾਸ ਮ�ੱਲ �ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਨਹ�� ਵਰਤਿ� �ਾ�ਦਾ, �ਦ�� "
 "\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਨਾ ਹ�ਵ�। �ਹ ��ੰ�� ��ਵਲ ਸਥਾਪਨ ਵ�ਰਵਾ ਵ��� ਹ� ਮ���ਦ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:89
+#, fuzzy
+#| msgid ""
+#| "Initial maximize state of the \"Filter Editor\" window. The value updates "
+#| "when the user maximizes or unmaximizes the window. Note, this particular "
+#| "value is not used by Evolution since the \"Filter Editor\" window cannot "
+#| "be maximized. This key exists only as an implementation detail."
+msgid ""
+"Initial maximize state of the \"Folder Subscriptions\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Folder Subscriptions\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ ਹ�। ਮ�ੱਲ ਨ�ੰ �ੱਪਡ�� ��ਤਾ �ਾ�ਦਾ ਹ�, �ਦ�� ਯ��਼ਰ ਵਿੰਡ� "
+"ਨ�ੰ ਵੱਧ�-ਵੱਧ �ਾ� �ਣ-ਵੱਧ�-ਵੱਧ �ਰਦਾ ਹ�। ਯਾਦ ਰੱ�� �ਿ �ਹ �ਾਸ ਮ�ੱਲ �ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਨਹ�� ਵਰਤਿ� �ਾ�ਦਾ, �ਦ�� "
+"\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਨਾ ਹ�ਵ�। �ਹ ��ੰ�� ��ਵਲ ਸਥਾਪਨ ਵ�ਰਵਾ ਵ��� ਹ� ਮ���ਦ ਹ�।"
+
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11298,7 +10306,7 @@ msgstr ""
 "ਵਿੰਡ� ਨ�ੰ ਵੱਧ�-ਵੱਧ �ਾ� �ਣ-ਵੱਧ�-ਵੱਧ �ਰਦਾ ਹ�। ਯਾਦ ਰੱ�� �ਿ �ਹ �ਾਸ ਮ�ੱਲ �ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਨਹ�� ਵਰਤਿ� �ਾ�ਦਾ, "
 "�ਦ�� \"��� ਫ�ਲਡਰ �ਡ��ਰ\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਨਾ ਹ�ਵ�। �ਹ ��ੰ�� ��ਵਲ ਸਥਾਪਨ ਵ�ਰਵਾ ਵ��� ਹ� ਮ���ਦ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11310,7 +10318,7 @@ msgstr ""
 "ਨ�ੰ ਵੱਧ�-ਵੱਧ �ਾ� �ਣ-ਵੱਧ�-ਵੱਧ �ਰਦਾ ਹ�। ਯਾਦ ਰੱ�� �ਿ �ਹ �ਾਸ ਮ�ੱਲ �ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਨਹ�� ਵਰਤਿ� �ਾ�ਦਾ, �ਦ�� "
 "\"ਮ�ਲ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਨਾ ਹ�ਵ�। �ਹ ��ੰ�� ��ਵਲ ਸਥਾਪਨ ਵ�ਰਵਾ ਵ��� ਹ� ਮ���ਦ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -11318,7 +10326,19 @@ msgstr ""
 "\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ���ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਹਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
 "ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:93
+#, fuzzy
+#| msgid ""
+#| "Initial width of the \"Filter Editor\" window. The value updates as the "
+#| "user resizes the window horizontally."
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ���ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਹਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
+"ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
+
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11326,7 +10346,7 @@ msgstr ""
 "\"��� ਫ�ਲਡਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ���ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਹਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
 "ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11334,7 +10354,7 @@ msgstr ""
 "\"ਮ�ਲ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ���ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਹਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
 "ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -11345,7 +10365,7 @@ msgstr ""
 "��ਵਲ ਮ�ਲਿੰ� ਲਿਸ� ਰਾਹ�� �ਵਾਬ ਦ�ਣ ਦ� ��ਸ਼ਿਸ਼ �ਰ�, �ਿਸ ਤ�� ਤ�ਸ�� �ਵਾਬ ਦ� ਰਹ� ਸ�ਨ�ਹ� ਦ� �ਾਪ� ਨ�ੰ "
 "ਪ�ਰਾਪਤ ��ਤਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -11354,7 +10374,7 @@ msgstr ""
 "�ਹ ਲ�ਾਤਾਰ ਪ�ੱ�ਣ ਨ�ੰ �ਯ��/ਯ�� ਰਦ� ਹ�, �� �ਿ ��ਤਾਵਨ� ਦਿੰਦ� �ਿ ��� ਫ�ਲਡਰ ਤ�� ਸ�ਨ�ਹ� ਹ�ਾ�ਣ ਨਾਲ "
 "ਸ�ਨ�ਹ� ਨ�ੰ ਪੱ�� ਤ�ਰ �ੱਤ� ਹ�ਾ�� �ਾਵ��ਾ, ਨਾ �ਿ ��ਵਲ ��� ਨਤ��ਿ�� ਵਿੱ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -11362,13 +10382,13 @@ msgstr ""
 "�ਸ ਨਾਲ ਲ�ਾਤਾਰ ਪ�ੱ�ਣ ਨ�ੰ ਰ��ਿ� �ਾ� �ਾਲ� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�, �ਦ�� ਤ�ਸ�� ਮ�ਲਿੰ� ਲਿਸ� �ੱਤ� �� ਸ�ਨ�ਹਾ "
 "ਦਾ �ਵਾਬ ਪ�ਰਾ�ਵ�� ਭ�� ਰਹ� ਹ�ਵ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr "ਲ�ਾਤਾਰ ਪ�ੱ�ਣਾ �ਾਲ� /ਬੰਦ �ਰਦਾ ਹ�, �ਦ�� ਤ�ਸ�� �� ਲ��ਾ� ਨ�ੰ �ਵਾਬ ਭ�� ਰਹ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -11378,35 +10398,40 @@ msgstr ""
 "ਦਾ �ਵਾਬ ਪ�ਰਾ�ਵ�� ਭ�� ਰਹ� ਹ�ਵ�।, ਪਰ ਲਿਸ� ਨ� �ਵਾਬ-ਦਿ�: ਹ�ੱਡਰ ਸ�ੱ� ��ਤਾ ਹ�, �� �ਿ ਤ�ਹਾਡ� �ਵਾਬ "
 "ਨ�ੰ ਲਿਸ� �ੱਤ� ਵਾਪਸ ਭ��ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Last time Empty Junk was run"
 msgstr "��ਰ� ਵਾਰ �ੰ� ਨ�ੰ �ਾਲ� ��ਤਾ ਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Last time Empty Trash was run"
 msgstr "��ਰ� ਵਾਰ ਰੱਦ� �ਾਲ� �ਰਨ ਦਾ ਸਮਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Layout style"
 msgstr "ਲ���� ਸ�ਾ�ਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:104
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+msgid "Level beyond which the message should be logged."
+msgstr "ਲ�ਵਲ, �ਿਸ ਤ�� ਬਾ�ਦ ਸ�ਨ�ਹਾ ਲਾ� '� ਰੱ�ਿ� �ਾਵ��ਾ।"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "List of Labels and their associated colors"
 msgstr "ਲ�ਬਲ ਸ��� �ਤ� ਸੰਬੰਧਿਤ ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "ਬ�ਨਬ� ਭਾ� ਦਰਸ਼� ਦ� �ਾ�� ਲ� MIME �ਿਸਮ ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of accepted licenses"
 msgstr "ਮਨ�਼�ਰ ਲਾ�ਸ��ਸਾ� ਦ� ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of accounts"
 msgstr "��ਾ��� ਦ� ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11414,15 +10439,15 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਦ� ਪੱਤਰ ਭਾ� ��ਲ �ਪਲੱਬਧ ��ਾ���ਾ� ਦ� ਲਿਸ�। �ਸ ਸ��� ਵਿੱ� ਲਾ�ਨਾ� ਸਬ-ਡਾ�ਰ���ਰ��� /apps/"
 "evolution/mail/accounts ਦ� �ਨ�ਸਾਰ ਸ਼ਾਮਿਲ ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of custom headers and whether they are enabled."
 msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰਾ� ਦ� ਸ��� �ਤ� �� �ਹ ਵਰਤ� �ਾਣ।"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ਸ਼ਬਦ-��� ��ੱ� �ਰਨ ਲ� ਡਿ�ਸ਼ਨਰ� ਭਾਸ਼ਾ ��ਡ ਦ� ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -11430,15 +10455,15 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਦ� ਪੱਤਰ ਭਾ� ਲ� ਪ�ਾਣ ਦ� ਲ�ਬਲ ਸ��� ਹ�। �ਹ ਸ��� �ਹ ਸਾਰ� ਰੰ� ਰੱ�ਦ� ਹ�, �� �ਿ HTML "
 "ਹ��ਸਾ �ੰ��ਡਿੰ� ਲ� ਵਰਤ� �ਾਦ� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of protocol names whose license has been accepted."
 msgstr "ਪਰ�����ਲਾ� ਨਾ� ਦ� ਲਿਸ�, �ਿਹਨਾ� ਦਾ ਲਾ�ਸ��ਸ ਮਨ�਼�ਰ ��ਤਾ �ਿ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Load images for HTML messages over HTTP"
 msgstr "HTML ਸ�ਨ�ਹ� ਲ� HTTP ਤ�� �ਿੱਤਰ ਪ�ਰਾਪਤ �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -11448,119 +10473,130 @@ msgstr ""
 "�ਿੱਤਰ ਡਾ�ਨਲ�ਡ ਤਾ� ਹ� �ਰ�, ���ਰ ਭ��ਣ ਵਾਲਾ �ਡਰ�ੱਸ ਸ��� ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�ਵ� \"2\" -  ਨ�ੱ� ਤ�� ਹਮ�ਸ਼ਾ "
 "�ਿੱਤਰ ਡਾ�ਨਲ�ਡ �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Log filter actions"
 msgstr "ਲਾ� ਫਿਲ�ਰ ��ਸ਼ਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Log filter actions to the specified log file."
 msgstr "ਦਿੱਤ� ਲਾ� ਫਾ�ਲ ਲ� ਲਾ� ਫਿਲ�ਰ �ਾਰਵਾ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Logfile to log filter actions"
 msgstr "ਲਾ� ਫਿਲ�ਰ ��ਸ਼ਨਾ� ਲ� ਲਾ�-ਫਾ�ਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Logfile to log filter actions."
 msgstr "ਲਾ� ਫਿਲ�ਰ ��ਸ਼ਨਾ� ਲ� ਲਾ�-ਫਾ�ਲ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Mail browser height"
 msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mail browser maximized"
 msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ਵੱਧ�-ਵੱਧ"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser width"
 msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mark as Seen after specified timeout"
 msgstr "ਦਿੱਤ� ਸਮ�� ਬਾ�ਦ ਵ��ਿ� ਬਣਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mark as Seen after specified timeout."
 msgstr "ਦਿੱਤ� ਸਮ�� ਬਾ�ਦ ਵ��ਿ� ਬਣਾ ਦਿ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark citations in the message \"Preview\""
 msgstr "ਸ�ਨ�ਹਾ \"�ਲ�\" ਵਿੱ� ਨਿਸ਼ਾਨ ਦਿ�"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark citations in the message \"Preview\"."
 msgstr "ਸ�ਨ�ਹਾ \"�ਲ�\" ਵਿੱ� ਨਿਸ਼ਾਨ ਦਿ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Message text limit for display"
 msgstr "ਵ��ਾ�ਣ ਲ� ਸ�ਨ�ਹਾ ���ਸ� ਲਿਮ�"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "ਸ�ਨ�ਹਾ ਵ��ਾ�ਣ ਸ਼�ਲ� (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ਬੰਦ �ਰਨ ਸਮ�� �ੰ� ਨ�ੰ �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� ਦਿਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ਬੰਦ �ਰਨ ਤ� ਰੱਦ� �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� ਦਿਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "ਬੰਦ �ਰਨ �ੱਤ� ਰੱਦ� �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� ਸਮਾ� ਦਿਨਾ� ਵਿੱ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ਬੰਦ �ਰਨ ਤ� ਰੱਦ� �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� �ੰਤਰਾਲ ਦਿਨਾ� ਵਿੱ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "ਵੱਲ/CC/BCC ਵਿੱ� ਵ��ਾ�ਣ ਲ� ਸਿਰਨਾਵ��� ਦ� �ਿਣਤ�"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:134
+#| msgid "-----Original Message-----"
+msgid "Original message."
+msgstr "�ਸਲ� ਸ�ਨ�ਹਾ ਹ�।"
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid ""
+"Possible values are: never - to never close browser window always - to "
+"always close browser window ask - (or any other value) will ask user"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt on empty subject"
 msgstr "�ਾਲ� ਵਿਸ਼� ਤ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "�ਦ�� ਯ��਼ਰ ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�ਣ �ਾ ਰਿਹਾ ਹ�ਵ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "�ਦ�� ਯ��਼ਰ ਬਿਨਾ� ਵਿਸ਼� ਤ�� ਸ�ਨ�ਹਾ ਭ��ਣ �ਾ ਰਿਹਾ ਹ�ਵ� ਤਾ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt when deleting messages in search folder"
 msgstr "ਪ�ੱ��, �ਦ�� ��� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨ�ਹ� ਹ�ਾ�ਣ� ਹ�ਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "ਪ�ੱ��, �ਦ�� ਮ�ਲਿ� ਲਿਸ� ਹਾ���� ਪ�ਰਾ�ਵ�� �ਵਾਬ"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt when replying privately to list messages"
 msgstr "ਪ�ੱ��, �ਦ�� ਲਿਸ� ਸ�ਨ�ਹਿ�� ਲ� ਪ�ਰਾ�ਵ�� �ਵਾਬ ਦਿੱਤਾ �ਾ ਰਿਹਾ ਹ�ਵ�"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when replying to many recipients"
 msgstr "ਪ�ੱ��, �ਦ�� �� ਪ�ਰਾਪਤ-�ਰਤਾਵਾ� ਨ�ੰ �ਵਾਬ ਦਿੱਤਾ �ਾ ਰਿਹਾ ਹ�ਵ�"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when user expunges"
 msgstr "�ਦ�� ਯ��਼ਰ ਹ�ਾ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when user only fills Bcc"
 msgstr "���ਰ ਸਿਰਫ Bcc ��ਤਰ ਹ� ਭਰਿ� ਹ�ਵ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "�ਦ�� ਯ��਼ਰ �ੱ�� ਸਮ�� ੧੦ ਸ�ਨ�ਹ� ��ਲਣ ਦ� ��ਸ਼ਿਸ �ਰ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11568,63 +10604,63 @@ msgstr ""
 "�ਦ�� ਯ��਼ਰ HTML ਸ�ਨ�ਹ�, �ਹਨਾ� ਯ��਼ਰ ਨ�ੰ ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ�, �� �ਿ �ਹ ਪ�ਰਾਪਤ ਹ� ਨਹ�� �ਰਨਾ �ਾਹ�ੰਦ� "
 "ਹਨ, ਤਾ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "�ਦ�� ਯ��਼ਰ ਬਿਨਾ� ਵੱਲ �ਾ� Cc ਪ�ਰਾਪਤ�ਰਤਾ ਦ� ਸ�ਨ�ਹ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ� ਤਾ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "�ਦ�� ਯ��਼ਰ ਨਾ-�ਾਹਿ�� HTML ਸ�ਨ�ਹ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt while marking multiple messages"
 msgstr "�ਦ�� �� ਸ�ਨ�ਹ� ਨਿਸ਼ਾਨਬੱਧ �ਰਨ� ਹ�ਣ ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Put personalized signatures at the top of replies"
 msgstr "�ਵਾਬ ਦ� �ੱਤ� ਨਿੱ�� ਦਸਤ�ਤ ਦਿ�"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Put the cursor at the bottom of replies"
 msgstr "�ਵਾਬਾ� ਦ� ਹ�ਠਾ� �ਰਸਰ ਰੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "���ਸ� ਵਿੱ��� �ਮ�ਸ਼ਨ ਦ� ਪ�ਾਣ �ਰ�� �ਿੱਤਰਾ� ਨਾਲ ਬਦਲ ਦਿ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Recognize links in text and replace them."
 msgstr "���ਸ� ਵਿੱ� ਲਿੰ�ਾ� ਦ� �ਾ�� �ਰ� �ਤ� ਤਬਦ�ਲ �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Run junk test on incoming mail."
 msgstr "� ਰਹ��� ਮ�ਲਾ� ਲ� �ੰ� ��ਸ� �ਲਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Save directory"
 msgstr "ਡਾ�ਰ���ਰ� ਸੰਭਾਲ�"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Search for the sender photo in local address books"
 msgstr "ਲ��ਲ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਭ��ਣ ਵਾਲ� ਫ��� ਦ� ���"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Send HTML mail by default"
 msgstr "ਡਿਫਾਲ� HTML ਪੱਤਰ ਭ���"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Send HTML mail by default."
 msgstr "ਡਿਫਾਲ� HTML ਪੱਤਰ ਭ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Sender email-address column in the message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਵਿੱ� ਸ�ਨ�ਹਾ �ਾਲਮ ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� �-ਮ�ਲ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Server synchronization interval"
 msgstr "ਸਰਵਰ ਸ��ਰ�ਨਾ��਼ �ੰਤਰਾਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11632,63 +10668,63 @@ msgstr ""
 "ਸਹ�� ਸ�ੱ� �ਰ�, �� ਤ�ਸ�� ਮ�ਲ ਲਿ�ਣ ਦ� ਦ�ਰਾਨ, �ਪਣ� ਦਸਤ�ਤਾ� ਤ�� ਪਹਿਲਾ� ਦਸਤ�ਤ ਡ�ਲਿਮ�ਰ ਸ਼ਾਮਲ ਨਹ�� "
 "�ਰਨਾ �ਾਹ�ੰਦ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "�ਦ�� ਮ�ਲ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Bcc\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "�ਦ�� ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Cc\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "ਨਿ��਼�ਰ�ੱਪ ਵਿੱ� ਭ��ਣ ਦ�ਰਾਨ \"ਵਲ��\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "ਨਿ��਼�ਰ�ੱਪ ਨ�ੰ ਭ��ਣ ਦ�ਰਾਨ \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show Animations"
 msgstr "�ਨ�ਮ�ਸ਼ਨ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show all message headers"
 msgstr "ਸਭ ਸ�ਨ�ਹ� ਹ�ੱਡਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show all the headers when viewing a messages."
 msgstr "ਸ�ਨ�ਹਾ ਵ��ਣ ਦ�ਰਾਨ ਸਭ ਹ�ੱਡਰ ਵ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show animated images as animations."
 msgstr "�ਨ�ਮ�ਸ਼ਨ ਸ�ਨ�ਹ� �ਨ�ਮ�ਸ਼ਨ ਵ��� ਹ� ਵ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਵਿੱ� ਹ�ਾ� ਸ�ਨ�ਹ� ਵ��� (ਵਿੰਨ� ਹ��)।"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show deleted messages in the message-list"
 msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਵਿੱ� ਹ�ਾ� ਸ�ਨ�ਹ� ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show image animations"
 msgstr "�ਿੱਤਰ �ਨ�ਮ�ਸ਼ਨ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show original \"Date\" header value."
 msgstr "�ਸਲ� \"ਮਿਤ�\" ਹ�ੱਡਰ ਮ�ੱਲ ਵ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show photo of the sender"
 msgstr "ਭ��ਣ ਵਾਲ� ਦ� ਫ��� ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11696,7 +10732,7 @@ msgstr ""
 "�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Bcc\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� �ੰ�ਰ�ਲ "
 "��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11704,7 +10740,7 @@ msgstr ""
 "�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Cc\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� �ੰ�ਰ�ਲ "
 "��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11712,7 +10748,7 @@ msgstr ""
 "�ਦ�� ਨਿ��਼�ਰ�ੱਪ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"ਵਲ��\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� �ੰ�ਰ�ਲ "
 "��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11720,7 +10756,7 @@ msgstr ""
 "�ਦ�� ਨਿ��਼�ਰ�ੱਪ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
 "�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11728,13 +10764,13 @@ msgstr ""
 "�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
 "�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "ਸ�ਨ�ਹਾ ਲਿਸ� ਵਿੱ� ਵੱ�ਰ� �ਾਲਮ ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� �-ਮ�ਲ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -11743,11 +10779,11 @@ msgstr ""
 "�ਸਲ� \"ਮਿਤ�\" ਹ�ੱਡਰ ਵ��� (ਲ��ਲ ਸਮ�� ਨਾਲ, �� ਸਮਾ� ��ਤਰ ਵੱ�ਰਾ ਹ�ਵ�)। ਨਹ�� ਤਾ� ਹਮ�ਸ਼ਾ \"ਮਿਤ�\" "
 "ਹ�ੱਡਰ ਮ�ੱਲ ਯ��਼ਰ ਵਲ�� ਦੱਸ� ਫਾਰਮ�� ਨਾਲ �ਤ� ਲ��ਲ ਸਮਾ� ��ਤਰ ਵ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "ਸ�ਨ�ਹਾ ਪ��ਹਨ ਪ��ਨ ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� ਫ��� ਵ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -11764,43 +10800,35 @@ msgstr ""
 "ਤ�ਸ�� 'ਲਿਸ� ਨ�ੰ �ਵਾਬ' ��ਸ਼ਨ ��ਣਿ� ਤਾ� �ਹ ��� ਹ� �ਰ���। �ਹ �ਵਾਬ-ਦਿ�: ਹ�ੱਡਰ ਨ�ੰ ਲਿਸ�-ਪ�ਸ�: "
 "ਹ�ੱਡਰ ਨਾਲ ਤ�ਲਨਾ �ਰ�� �ੰਮ �ਰਦਾ ਹ�, �� ��� ਹ�ਵ� ਤਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Spell check inline"
 msgstr "ਲਾ�ਨ ਵਿੱ� ਸ਼ਬਦ-��� �ਾ��"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Spell checking color"
 msgstr "ਸ਼ਬਦ-��� �ਾ�� ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Spell checking languages"
 msgstr "ਸ਼ਬਦ-��� �ਾ�� ਭਾਸ਼ਾਵਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Subscribe dialog default height"
-msgstr "ਮ��ਬਰ ਬਣ� ਡਾ�ਲਾ� ਮ�ਲ ��ਾ�"
-
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Subscribe dialog default width"
-msgstr "ਮ��ਬਰ ਬਣ� ਡਾ�ਲਾ� ਮ�ਲ ���ਾ�"
-
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Terminal font"
 msgstr "�ਰਮ�ਨਲ ਫ���"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "The default plugin for Junk hook"
 msgstr "�ੰ� ਹ�ੱ� ਲ� ਡਿਫਾਲ� ਪਲੱ��ਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "��ਰ� ਵਾਰ �ੰ� �ਾਲ ��ਤਾ �ਿ� ਸ�, 1 �ਨਵਰ� 1970 ਤ�� ਲ� �� ਦਿਨਾ� '� (�ਪ��)"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "��ਰ� ਵਾਰ ਰੱਦ� �ਾਲ� �ਰਨ ਦ� �ਾਰਵਾ�, 1 �ਨਵਰ� 1970 ਤ�� ਲ� �� ਦਿਨਾ� �।"
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11811,21 +10839,39 @@ msgstr ""
 "\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ ਸ�ਨ�ਹਾ ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) �ਲ� "
 "ਬਾਹ� ਨ�ੰ ਸ�ਨ�ਹਾ ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "The terminal font for mail display."
 msgstr "ਮ�ਲ ਵ��ਾ�ਣ ਲ� �ਰਮ�ਨਲ ਫ��� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:195
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "The variable width font for mail display."
 msgstr "ਮ�ਲ ਵ��ਾ�ਣ ਲ� ਵ�ਰ�ਬਲ ���� ਫ��� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr "ਤਿੰਨ ਸੰਭਵ ਮ�ੱਲ ਹਨ। �ਲਤ��� ਲ� \"0\"। ��ਤਾਵਨ� ਲ� \"1\"। ਡ�ਬੱ� ਸ�ਨ�ਹਾ ਲ� \"2\"।"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
@@ -11835,7 +10881,7 @@ msgstr ""
 "ਹ�। ਡਿਫਾਲ� 4 (੪) MB / ੪੦੯੬ KB ਹ� �ਤ� KB ਦ� ਰ�ਪ ਵਿੱ� ਦਿੱਤਾ �ਾ ਸ�ਦਾ ਹ�। �ਹ ਮ�ੱਲ ਤਾ� ਹ� "
 "ਵਰਤਿ� �ਾ ਸ�ਦਾ ਹ�, �ਦ�� 'force_message_limit' ��ੰ�� ����ਵ�� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11844,7 +10890,7 @@ msgstr ""
 "�ਹ ਡਿਫਾਲ� �ੰ� ਪਲੱ��ਨ ਹ�, ਭਾਵ�� �ਿ �� ਪਲੱ��ਨ ਯ�� ਹਨ। �� ਡਿਫਾਲ� ਦਿੱਤ� ਪਲੱ��ਨ �ਯ�� ਹ� ਤਾ� �ਹ "
 "ਹ�ਰ �ਪਲੱਬਧ ਪਲੱ��ਨ �ਾਲ� ਨਹ�� �ਰ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11852,7 +10898,7 @@ msgstr ""
 "�ਹ �� ��ਵਲ ਪ��ਹਨ ਲ� ਹ� �ਤ� ਪ��ਹਨ ਬਾ�ਦ \"�ਲਤ\" ਲ� ਰ�-ਸ�ੱ� ��ਤਾ ਹ�। ਸ��� ਵਿੱ��ਹ ਮ�ਲ �ਣ-"
 "��ਣ� ਹ� �ਤ� �ਸ ਫ�ਲਡਰ ਲ� �ਲ� ਹ�ਾ�ਦ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11863,7 +10909,7 @@ msgstr ""
 "XML ਢਾ��� ਦਾ ਫਾਰਮ�� ਹ� &lt; �ਾ��ਲ ਯ��&gt; - ਸ�ੱ� �ਰ�, ���ਰ ਮ�ਲ �ਲ� ਵਿੱ� ਤ�ਸ�� ਹ�ੱਡਰ ਵ��ਣਾ "
 "�ਾਹ�ੰਦ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -11872,11 +10918,11 @@ msgstr ""
 "�ਹ ��ਣ lookup_addressbook ��ੰ�� ਨਾਲ ਸਬੰਧਿਤ ਹ� �ਤ� �ਸ ਨ�ੰ ਲ��ਲ �ਡਰ�ੱਸ ਵਿੱ� �ਡਰ�ੱਸ ਦ� ��� ਲ� "
 "ਵਰਤਿ� �ਾ�ਦਾ ਹ�, �ਦ�� �ਿ �ੰ� ਫਿਲ�ਰ ਤ�� �ਣ�ਾਣ ਸੰਪਰ� ਨ�ੰ �ੱਡ ��ਤਾ �ਾ ਸ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "This option would help in improving the speed of fetching."
 msgstr "�ਹ ��ਣ ਲ�ਣ ਦ� ਸਪ�ਡ ਸ�ਧਾਰਨ ਲ� ਮੱਦਦ �ਰ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11884,7 +10930,7 @@ msgstr ""
 "�ਹ ਡਿਫਾਲ� ਸ�ਨ�ਹਾ ਸ��� �ਲ� ਵਿੱ� �ਡਰ�ੱਸਾ� ਦ� �ਿਣਤ� ਸ�ੱ� �ਰਦ� ਹ�, �ਿਸ ਤ�� ਬਾ�ਦ �ੱ� '...' "
 "ਵ��ਾ�� �ਾ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -11892,7 +10938,7 @@ msgstr ""
 "�ਹ ਸ��ਿੰ� ਤਹਿ �ਰਦ� ਹ� �ਿ ਡਿਫਾਲ� ਰ�ਪ ਵਿੱ� ਥਰਿੱਡ ਫ�ਲਿ� ਹ�ਵ� �ਾ� ਸਮ��ਿ� ਹ���। �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ��-"
 "�ਾਲ� �ਰਨਾ ਪਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11901,51 +10947,51 @@ msgstr ""
 "�ਹ ਸ��ਿੰ� ਤਹਿ �ਰਦ� ਹ� �ਿ ਥਰਿੱਡਾ� ਨ�ੰ ਹਰ�� ਥਰਿੱਡ ਵਿੱ� ਤਾ�਼ਾ ਸ�ਨ�ਹਿ�� ਮ�ਤਾਬ� ਲ��ਬੱਧ ��ਤਾ �ਾਵ�, "
 "ਨਾ �ਿ ਸ�ਨ�ਹ� ਦ� ਮਿਤ� ਮ�ਤਾਬ�। �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ��-ਸ�ਾਰ� �ਰਨਾ ਪਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid "Thread the message-list based on Subject"
 msgstr "ਵਿਸ਼� ਤ� �ਧਾਰਿਤ ਸ�ਨ�ਹਾ-ਸ��� ਦਾ ਥਰਿੱਡ ਬਣਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Timeout for marking message as seen"
 msgstr "ਸ�ਨ�ਹ� ਵ��ਿ� ਬਣਾ�ਣ ਲ� �ਾ�ਮ-���"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Timeout for marking message as seen."
 msgstr "ਸ�ਨ�ਹ� ਵ��ਿ� ਬਣਾ�ਣ ਲ� �ਾ�ਮ-��� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "UID string of the default account."
 msgstr "ਮ�ਲ ��ਾ��� ਲ਼� UID ਲਾ�ਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "�ਦ�� �ਨ-ਲਾ�ਨ ਸਪ�ਲਿੰ� ਦ� ਵਰਤ�� ਹ�ਵ� ਤਾ� �ਲਤ ਸ਼ਬਦ ਲ� ਹ�ਠਾ� ਲਾ�ਨ ਲ� ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Use SpamAssassin daemon and client"
 msgstr "Spamasssassin ਡ�ਮਨ �ਤ� �ਲਾ�� ਵਰਤ��"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAsssassin ਡ�ਮਨ �ਤ� �ਲਾ�� ਵਰਤ�� (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Use custom fonts"
 msgstr "ਪਸੰਦ�ਦਾ ਫ��� ਵਰਤ��"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Use custom fonts for displaying mail."
 msgstr "ਮ�ਲ ਵ��ਾ�ਣ ਲ� �ਸ�ਮ ਫ��� ਵਰਤ�� ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Use only local spam tests."
 msgstr "ਸਿਰਫ ਲ��ਲ ਸਪ�ਮ �ਾ�� ਹ� ਵਰਤ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ਸਿਰਫ ਲ��ਲ ਸਪ�ਮ �ਾ�� ਹ� ਵਰਤ�� (DNS ਨਹ��)।"
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -11954,7 +11000,7 @@ msgstr ""
 "ਯ��਼ਰ ਨ�ੰ ਸ�ਨ�ਹਾ ਦਾ �ਵਾਬ ਦ�ਣ ਸਮ�� �ਰਸਰ �ਿੱਥ� ਰੱ� �� ਦ�ਣ� ਹ�। �ਹ ਤਹਿ �ਰਦਾ ਹ� �ਿ �ਰਸਰ ਨ�ੰ ਸ�ਨ�ਹ� ਦ� "
 "�ੱਤ� ਰੱ�ਿ� �ਾਵ��ਾ �ਾ� ਹ�ਠਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -11963,19 +11009,32 @@ msgstr ""
 "ਯ��਼ਰ ਸ�ਨ�ਹ� ਦਾ �ਵਾਬ ਦ�ਣ ਸਮ�� �ਪਣ� ਦਸਤ�ਤ �ਿੱਥ� ਲ� ਸ���ਾ। �ਹ ਤਹਿ �ਰਦਾ ਹ� �ਿ ਦਸਤ�ਤਾ� ਨ�ੰ ਸ�ਨ�ਹ� ਦ� "
 "�ੱਤ� ਰੱ�ਿ� �ਾਵ��ਾ �ਿ ਹ�ਠਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Variable width font"
 msgstr "�ਸਥਿਰ ���ਾ� ਫ���"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "�� ਮ�ਲ ਰ�ਪ ਵਿੱ� ਹਰ�� ਸ�ਨ�ਹ� ਨਾਲ �ਵਾਬ� ਰਸ�ਦ ਦ� ਮੰ� ��ਤ� �ਾਵ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:223
+msgid ""
+"Whether check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:224
+msgid ""
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "�� ਬਾਹ�  ਵਿੱ� �ੰਡਾ�ਾਰ ਫ�ਲਡਰ ਨਾ� ਫ��ਰ �ਯ�� �ਰਨਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11983,11 +11042,11 @@ msgstr ""
 "�� ਮਾਮਲਿ�� ਨ�ੰ ਵਿਸ਼� ਮ�ਤਾਬ� ��ਤਾ �ਾਵ� �ਾ� ਨਾ, �ਦ�� �ਿ ਸ�ਨ�ਹਿ�� ਵਿੱ� �ਵਾਬ �ਾ� ਹਵਾਲਾ ��ਤਰ "
 "ਸ਼ਾਮਿਲ ਨਾ ਹ�ਵ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "�� ਮਾਮਲ� ਨ�ੰ �ਸ ਮਾਮਲ� ਵਿੱ� ਤਾ�਼ਾ ਸ�ਨ�ਹਾ ਮ�ਤਾਬ� ਲ��ਬੱਧ �ਰਨਾ ਹ�"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -11996,100 +11055,100 @@ msgstr ""
 "ਫਿਲ�ਰ �ਰਨ ਦ� ਬਾ�ਦ �� ���ਬਾ�ਸ ਨ�ੰ ਸਾਫ਼ �ਰਨਾ ਹ�। ���ਬਾ�ਸ ਸਾਫ਼ �ਰਨਾ ਤਾ� ਹ� ਵਾਪਰਦਾ ਹ�, "
 "�ਦ�� ��� '�ੱ�� ਭ���' ਫਿਲ�ਰ �ਾਰਵਾ� ��ਤ� ਹ�ਵ� ਤ� ��ਰ� �ਾਰਵਾ� ਦ� ਲ�ਭ� �ੱ� ਮਿੰ� ਬਾ�ਦ।"
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Width of the message-list pane"
 msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਬਾਹ� ਦ� ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid "Width of the message-list pane."
 msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਬਾਹ� ਦ� ���ਾ� ਹ�।"
 
-#: ../mail/importers/elm-importer.c:176
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "�ਲਮ ਡਾ�ਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:964
+#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
+#: ../modules/mail/e-mail-shell-view.c:1045
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
 msgstr "ਪੱਤਰ"
 
-#: ../mail/importers/elm-importer.c:366
+#: ../mail/importers/elm-importer.c:380
 msgid "Evolution Elm importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਮ �ੰਪ�ਰ�ਰ"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:381
 msgid "Import mail from Elm."
 msgstr "Elm ਤ�� ਪੱਤਰ �ੰਪ�ਰ� ਹ�।"
 
-#: ../mail/importers/evolution-mbox-importer.c:116
-#: ../plugins/dbx-import/dbx-importer.c:226
+#: ../mail/importers/evolution-mbox-importer.c:127
+#: ../plugins/dbx-import/dbx-importer.c:227
 msgid "_Destination folder:"
 msgstr "�ਿ�ਾਣਾ ਫ�ਲਡਰ(_D):"
 
-#: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/dbx-import/dbx-importer.c:232
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../mail/importers/evolution-mbox-importer.c:133
+#: ../plugins/dbx-import/dbx-importer.c:233
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "Select folder"
 msgstr "ਫ�ਲਡਰ ��ਣ�"
 
-#: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../mail/importers/evolution-mbox-importer.c:134
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "Select folder to import into"
 msgstr "�ੰਪ�ਰ� �ਰਨ ਲ� ਫ�ਲਡਰ ��ਣ�"
 
-#: ../mail/importers/evolution-mbox-importer.c:382
+#: ../mail/importers/evolution-mbox-importer.c:403
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "ਵਿਸ਼ਾ"
 
-#: ../mail/importers/evolution-mbox-importer.c:387
+#: ../mail/importers/evolution-mbox-importer.c:408
 msgctxt "mboxImp"
 msgid "From"
 msgstr "ਵਲ��"
 
-#: ../mail/importers/evolution-mbox-importer.c:431
-#: ../shell/e-shell-utils.c:251
+#: ../mail/importers/evolution-mbox-importer.c:452
+#: ../shell/e-shell-utils.c:253
 msgid "Berkeley Mailbox (mbox)"
 msgstr "ਬਰ�ਸ�ਲ� ਪੱਤਰ-ਬ�ਸਾ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:432
+#: ../mail/importers/evolution-mbox-importer.c:453
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "ਬਰ�ਸ�ਲ� ਪੱਤਰ-ਬ�ਸਾ ਫਾਰਮ�� ਫ�ਲਡਰ �ੰਪ�ਰ�ਰ"
 
-#: ../mail/importers/mail-importer.c:64
+#: ../mail/importers/mail-importer.c:65
 msgid "Importing mailbox"
 msgstr "ਪੱਤਰ-ਬ�ਸਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:554
-#: ../plugins/pst-import/pst-importer.c:452
-#: ../plugins/pst-import/pst-importer.c:558
+#: ../mail/importers/mail-importer.c:149
+#: ../plugins/dbx-import/dbx-importer.c:568
+#: ../plugins/pst-import/pst-importer.c:478
+#: ../plugins/pst-import/pst-importer.c:587
 #, c-format
 msgid "Importing '%s'"
 msgstr "`%s' �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/importers/mail-importer.c:295
+#: ../mail/importers/mail-importer.c:308
 #, c-format
 msgid "Scanning %s"
 msgstr "�ਾ�� �ਾਰ� ਹ� %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:223
 msgid "Importing Pine data"
 msgstr "ਪਾ�ਨ ਡਾ�ਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/importers/pine-importer.c:405
-#: ../modules/addressbook/addressbook-config.c:1006
+#: ../mail/importers/pine-importer.c:420
+#: ../modules/addressbook/addressbook-config.c:1016
 msgid "Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ�"
 
-#: ../mail/importers/pine-importer.c:447
+#: ../mail/importers/pine-importer.c:462
 msgid "Evolution Pine importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਾ�ਨ �ੰਪ��ਰ"
 
-#: ../mail/importers/pine-importer.c:448
+#: ../mail/importers/pine-importer.c:463
 msgid "Import mail from Pine."
 msgstr "Pine ਤ�� ਪੱਤਰ �ੰਪ�ਰ� ਹ�।"
 
@@ -12113,7 +11172,7 @@ msgstr "ਵਿਸ਼ਾ ਹ� %s"
 msgid "%s mailing list"
 msgstr "%s ਮ�ਲਿੰ� ਲਿਸ�"
 
-#: ../mail/mail-autofilter.c:363
+#: ../mail/mail-autofilter.c:382
 msgid "Add Filter Rule"
 msgstr "ਫਿਲ�ਰ ਨਿਯਮ ����"
 
@@ -12122,16 +11181,8 @@ msgstr "ਫਿਲ�ਰ ਨਿਯਮ ����"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:451
+#: ../mail/mail-autofilter.c:480
 #, c-format
-#| msgid ""
-#| "The filter rule \"%s\" has been updated, because it used just removed "
-#| "folder\n"
-#| "\"%s\"."
-#| msgid_plural ""
-#| "The following filter rules\n"
-#| "%s have been updated, because they used just removed folder\n"
-#| "\"%s\"."
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
@@ -12147,76 +11198,86 @@ msgstr[1] ""
 "%s ��ਾ��� ਲ� ਸ�ਧ� �� ਹ�, �ਹ ਹ�ਾ� �� ਫ�ਲਡਰ\n"
 "\"%s\" ਲ� ਸਨ।"
 
-#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
-#: ../mail/mail-config.ui.h:2
-msgid "(Not Recommended)"
-msgstr "(ਸਿਫਾਰਸ਼� ਨਹ��)"
-
-#: ../mail/mail-config.ui.h:3
-msgid "(Note: Requires restart of the application)"
-msgstr "(ਨ��: �ਪਲ���ਸ਼ਨ ਮ��-ਸ�ਾਰ� �ਰਨ ਦ� ਲ�� ਹ�)"
-
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "��ਾ��� �ਾਣ�ਾਰ�"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
 msgstr "ਨਵ�� ਦਸਤ�ਤ ਸ਼ਾਮਿਲ �ਰ�(_w)..."
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:3
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "�ਸ ��ਾ��� ਵਿੱ��� ਭ��ਣ ਵਾਲ� ਸ�ਨਹਿ�� ਤ� ਹਮ�ਸ਼ਾ ਦਸਤ�ਤ �ਰ�(_w)"
 
-#: ../mail/mail-config.ui.h:8
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:5
+#, fuzzy
+#| msgid "Prompt when mailing list redirects private reply back to list"
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr "�ਦ�� ਮ�ਲਿੰ� ਲਿਸ� ਪ�ਰਾ�ਵ�� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਲਿਸ� �ੱਤ� ਭ��� ਤਾ� ਪ�ੱ��"
+
+#: ../mail/mail-config.ui.h:6
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "���ਰਿਪਸ਼ਨ ਸ�ਨ�ਹ� ਭ��ਣ ਸਮ�� ��ਦ �ੰ��ਰਿਪ� �ਰ�(_f)"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:7
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "�ਸ ਨ�ੰ ਹਮ�ਸ਼ਾ �ਾਰਬਨ �ਾਪ� ਭ��� �ਾਵ�(CC):"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:8
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "�ਸ ਨ�ੰ ਹਮ�ਸ਼ਾ ਲ��ਵ�� �ਾਪ� ਭ��� �ਾਵ�(_BCC):"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:9
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "���ਰਿਪਸ਼ਨ �ਰਨ ਸਮ�� ਮ�ਰ� ��-ਰਿੰ� �ੱਤ� ਭਰ�ਸਾ ਰੱ��(_t)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:10
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "���ਰਿਪ�ਡ ਸ�ਨ�ਹ� ਭ��ਣ ਸਮ�� ਮ�ਨ�ੰ ਹਮ�ਸ਼ਾ �ੰ��ਰਿਪ� �ਰ�(_m)"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:11
 msgid "Always request rea_d receipt"
 msgstr "ਪ��ਹਨ ਰਸ�ਦ ਹਮ�ਸ਼ਾ ਮੰ��(_d)"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:12
 msgid "Apply the same _view settings to all folders"
 msgstr "ਸਭ ਫ�ਲਡਰਾ� ਲ� �ਹ� �ਲ� ਸ��ਿੰ� ਲਾ�� �ਰ�(_v)"
 
-#: ../mail/mail-config.ui.h:16
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../mail/mail-config.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1023
 msgid "Authentication"
 msgstr "ਪ�ਰਮਾਣਿ�ਤਾ"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "�ਮ�ਸ਼ਨ �ਿੱਤਰ ���ਮ��ਿ� ਸ਼ਾਮਿਲ �ਰ�(_e)"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "�ੱ�ਰ ਸਮ�ਹ(_h):"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "ਸਹਾ�� �ਿਸਮ ਲ� �ਾ��(_e)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "�ੰ� ਲ� �ਸ�ਮ ਹ�ੱਡਰ ��ੱ� �ਰ�(_s)"
 
+#: ../mail/mail-config.ui.h:19
+#, fuzzy
+#| msgid "Check for _new messages every"
+msgid "Check for new _messages on start"
+msgstr "�ੰਨ� �ੰਤਰਾਲ ਬਾ�ਦ ਪੱਤਰ ��ੱ� �ਰ�(_n)"
+
+#: ../mail/mail-config.ui.h:20
+#, fuzzy
+#| msgid "Check for _new messages every"
+msgid "Check for new messa_ges in all active accounts"
+msgstr "�ੰਨ� �ੰਤਰਾਲ ਬਾ�ਦ ਪੱਤਰ ��ੱ� �ਰ�(_n)"
+
 #: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "�ੰ� ਲ� � ਰਹ� ਸ�ਨ�ਹ� ��ੱ� �ਰ�(_m)"
@@ -12226,33 +11287,41 @@ msgid "Check spelling while I _type"
 msgstr "�ਿਵ�� ਮ�� ਲਿ�ਾ�, ਨਾਲ ਦ� ਨਾਲ ਹ� ਸਪ�ੱਲ ��ੱ� �ਰ�"
 
 #: ../mail/mail-config.ui.h:23
-msgid "Checks incoming mail messages to be Junk"
-msgstr "��ਣ ਵਾਲ� ਪੱਤਰਾ� ਵਿੱ� �ੰ� ਦ� �ਾ�� �ਰ�"
-
-#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "ਸਾ� �ਰ�(_a)"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "ਸਾ� �ਰ�(_r)"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "�ਲਤ ਸ਼ਬਦ-��� �ੱ�ਰਾ� ਦਾ ਰੰ�(_m):"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "ਸ�ਨ�ਹ� ਲਿ�ਣ�"
 
-#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27
+#: ../modules/plugin-manager/evolution-plugin-manager.c:157
 msgid "Configuration"
 msgstr "ਸੰਰ�ਨਾ"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "ਫ�ਲਡਰ ਦ� ਤੱਥ �ੱਢਣ ਸਮ�� ਪ�ਸ਼�� �ਰ�(_w)"
 
+#: ../mail/mail-config.ui.h:29
+#| msgid "Configuration"
+msgid "Confirmations"
+msgstr "ਪ�ਸ਼��"
+
+#: ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:155
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgid "Date/Time Format"
+msgstr "ਮਿਤ�/ਸਮਾ� ਫਾਰਮ��"
+
 #: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "ਡਿਫਾਲ� ਰਵੱ��"
@@ -12261,376 +11330,344 @@ msgstr "ਡਿਫਾਲ� ਰਵੱ��"
 msgid "Default character e_ncoding:"
 msgstr "ਮ�ਲ �ੱ�ਰ ���ਡਿੰ�(_n):"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:34
 msgid "Delete Mail"
 msgstr "ਮ�ਲ ਹ�ਾ�"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:35
 msgid "Delete junk messages on e_xit"
 msgstr "ਬੰਦ �ਰਨ ਸਮ�� �ੰ� ਮ�ਲ ਹ�ਾ�(_x)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:37
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ਬਾਹਰ �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਡਿ���ਲ ਸਾ�ਨ �ਰ� (ਡਿਫਾਲ�)(_s)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:38
 msgid "Displayed Message Headers"
 msgstr "ਸ�ਨ�ਹਾ ਹ�ੱਡਰ ਵ��ਾ�� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-config.ui.h:40
-msgid "Do not display messages when text si_ze exceeds"
-msgstr "ਮ�ਲ ਵਿੱ� ���ਸ� ਸਮੱ�ਰ� ਫਾਰਮ�� ਨਾ �ਰ�, �� ���ਸ� ਸਾ��਼ ਵੱਧ �ਾਵ�(_z)"
-
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "�� ਭ��ਣ ਵਾਲਾ ਮ�ਰ� �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਹ�ਵ� ਤਾ� ਸ�ਨ�ਹਾ �ੰ� ਨਾ ਬਣਾ�(_k)"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:40
 msgid "Do not quote"
 msgstr "��� ਨਾ �ਰ�"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "ਡਰਾਫ� ਫ�ਲਡਰ(_F):"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ(_A):"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "ਬੰਦ �ਰਨ ਤ� ਰੱਦ� ਫ�ਲਡਰ ਬੰਦ �ਰ ਦਿ�(_x)"
 
-#: ../mail/mail-config.ui.h:46
-msgid "Enable Magic S_pacebar"
-msgstr "ਮ��ਿ� ਸਪ�ਸਬਾਰ ਯ��(_p)"
-
-#: ../mail/mail-config.ui.h:47
-msgid "Enable Sea_rch Folders"
-msgstr "��� ਫ�ਲਡਰ ਯ��(_r)"
-
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:45
 msgid "Encry_ption certificate:"
 msgstr "���ਰਿਪਸ਼ਨ ਸਰ��ਫਿ���(_p):"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:46
 msgid "Encrypt out_going messages (by default)"
 msgstr "ਬਾਹਰ� �ਾਣ ਵਾਲ� ਪੱਤਰਾ� ਨ�ੰ ���ਰਿਪਸ਼ਨ (ਮ�ਲ ਹ�)(_g)"
 
-#: ../mail/mail-config.ui.h:51
-msgid "Fi_xed-width:"
-msgstr "ਸਥਿਰ ���ਾ�(_x):"
+#: ../mail/mail-config.ui.h:47
+msgid "F_all back to threading messages by subject"
+msgstr "ਥਰਿੱਡ ਸ�ਨ�ਹਿ�� ਵਾਸਤ� ਫਾਲਬ�� ਲ� ਵਿਸ਼ਾ(_a)"
 
-#: ../mail/mail-config.ui.h:52
-msgid "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:48
+#, fuzzy
+#| msgid "Fix_ed width Font:"
+msgid "Fix_ed Width Font:"
 msgstr "ਸਥਿਰ ���ਾ� ਫ���(_e):"
 
-#: ../mail/mail-config.ui.h:53
-msgid "Font Properties"
-msgstr "ਫ��� ਵਿਸ਼�ਸ਼ਤਾ"
-
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:49
 msgid "Format messages in _HTML"
 msgstr "_HTML ਵਿੱ� ਫਾਰਮ�� ਸ�ਨ�ਹਾ"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:50
 msgid "Full Nam_e:"
 msgstr "ਪ�ਰਾ ਨਾ�(_E):"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:52
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "�ਰ�ੱਪ �ਵਾਬ ��ਵਲ ਮ�ਲਿੰ� ਲਿਸ� ਨ�ੰ �ਵਾਬ ਦਿ�, �� ਸੰਭਵ ਹ�ਵ�"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:53
 msgid "HTML Messages"
 msgstr "HTML ਸ�ਨ�ਹ�"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:54
 msgid "H_TTP Proxy:"
 msgstr "H_TTP ਪਰਾ�ਸ�:"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:55
 msgid "Headers"
 msgstr "ਹ�ੱਡਰ"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:56
 msgid "Highlight _quotations with"
 msgstr "ਹਵਾਲ� ਨ�ੰ �ਭਾਰ�(_q)"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:57
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "ਮ�ਲਿੰ� ਲਿਸ�ਾ� ਲ� �ਵਾਬ-ਦਿ�: �ਣਡਿੱਠਾ"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:58
 msgid "Inline"
 msgstr "ਲਾ�ਨ '�"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:59
 msgid "Inline (Outlook style)"
 msgstr "�ਨਲਾ�ਨ (���ਲ�ੱ� ਸ�ਾ�ਲ)"
 
-#: ../mail/mail-config.ui.h:67
-msgid "KB"
-msgstr "KB"
-
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "ਲ�ਬਲ"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:62
 msgid "Languages Table"
 msgstr "ਭਾਸ਼ਾ ��ਬਲ"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:63
 msgid "Loading Images"
 msgstr "�ਿੱਤਰ ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:64
 msgid "Mail Headers Table"
 msgstr "ਮ�ਲ ਹ�ੱਡਰ ��ਬਲ"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:65
 msgid "Mailbox location"
 msgstr "ਮ�ਲ-ਬਾ�ਸ �ਿ�ਾਣਾ"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:66
 msgid "Message Display"
 msgstr "ਸ�ਨ�ਹਾ �ਲ�"
 
-#: ../mail/mail-config.ui.h:74
-msgid "Message Fonts"
-msgstr "ਸ�ਨ�ਹਾ ਫ���"
-
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:67
 msgid "Message Receipts"
 msgstr "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ�ਰਤਾ"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:68
 msgid "No _Proxy for:"
 msgstr "��� ਪਰਾ�ਸ� ਨਹ��(_P):"
 
-#: ../mail/mail-config.ui.h:78
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr "ਸ��ਨਾ: �ਦ�� ਤੱ� �ਿ ਤ�ਸ�� ਪਹਿਲ�� ਵਾਰ ਲਾ��ਨ ਨਹ�� �ਰਦ�, ਤ�ਹਾਡ� ��ਲ�� ਪਾਸਵਰਡ ਪ��ਿ� ਨਹ�� �ਾਵ��ਾ"
-
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:70
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "��ਣ ਨ�ੰ �ਣਡਿੱਠਾ ��ਤਾ �ਾਵ��ਾ, �� ਰਲਦਾ �ਸ�ਮ �ੰ� ਹ�ੱਡਰ ���ਿ� �ਾਵ�।"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:71
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "��ਣਵ�� �ਾਣ�ਾਰ�"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:73
 msgid "Or_ganization:"
 msgstr "ਸੰ�ਠਨ(_g):"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:74
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:75
 msgid "Pass_word:"
 msgstr "ਪਾਸਵਰਡ(_w):"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "Pick a color"
+msgstr "ਰੰ� ��ਣ�"
+
+#: ../mail/mail-config.ui.h:77
 msgid "Port:"
 msgstr "ਪ�ਰ�:"
 
-#: ../mail/mail-config.ui.h:87
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "ਸ��ਿਤ �ਰ�, �ਦ�� ਵ� ਸ�ਨ�ਹ� ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�ਵ�, �� �ਿ Bcc ਪ�ਰਾਪਤ�ਰਨ ਵਾਲਿ�� ਲ� ਹ�ਵ�(_o)"
-
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:78
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "ਪ�ਰਿੱ�� ��ੱਡ ਪਰਾ�ਵ�ਸ� (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:90
-msgid "Printed Fonts"
-msgstr "ਪਰਿੰ� ��ਤ� ਫ���"
-
-#: ../mail/mail-config.ui.h:91
-msgid "Prompt when mailing list redirects private reply back to list"
-msgstr "�ਦ�� ਮ�ਲਿੰ� ਲਿਸ� ਪ�ਰਾ�ਵ�� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਲਿਸ� �ੱਤ� ਭ��� ਤਾ� ਪ�ੱ��"
-
-#: ../mail/mail-config.ui.h:92
-msgid "Prompt when sending private replies to mailing _list messages"
-msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਸ�ਨ�ਹਿ�� ਲ� ਪ�ਰਾ�ਵ�ਤ �ਵਾਬ ਭ��ਣ ਦ�ਰਾਨ ਪ�ੱ��"
-
-#: ../mail/mail-config.ui.h:93
-msgid "Prompt when sending replies to _many recipients"
-msgstr "ਸ��ਿਤ �ਰ�, �ਦ�� �� ਪ�ਰਾਪਤ-�ਰਨ ਵਾਲਿ�� ਨ�ੰ �ਵਾਬ ਭ��� �ਾ ਰਹ� ਹ�(_m)"
-
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:80
 msgid "Proxy Settings"
 msgstr "ਪਰਾ�ਸ� ਸ��ਿੰ�"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:81
 msgid "Quoted"
 msgstr "ਹਵਾਲਾ"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:82
 msgid "Re_member password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_m)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:83
 msgid "Re_ply-To:"
 msgstr "�ਸ ਨ�ੰ �ਵਾਬ(_p):"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:84
 msgid "Remember _password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_p)"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:85
+#| msgid "Replies and parents"
+msgid "Replies and Forwards"
+msgstr "�ਵਾਬ �ਤ� �ੱ�� ਭ����ਵਾਬ �ਤ� �ੱ�� ਭ���ਵਾਬ �ਤ� �ੱ�"
+
+#: ../mail/mail-config.ui.h:86
 msgid "Required Information"
 msgstr "ਲ���ਦ� �ਾਣ�ਾਰ�"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:87
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:88
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:89
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:90
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:92
 msgid "SSL is not supported in this build of Evolution"
 msgstr " SSL ਸਹਿਯ�� �ਵ�ਲ�ਸ਼ਨ ਦ� �ਸ ਵਰ�ਨ ਲ� ਸਹਿਯ�� ਨਹ��"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:93
 msgid "S_earch for sender photograph only in local address books"
 msgstr "ਭ��ਣ ਵਾਲ� ਦ� ਤਸਵ�ਰ ਦ� ��� ਸਿਰਫ਼ ਲ��ਲ �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਹ� �ਰ�(_e)"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:94
 msgid "S_elect..."
 msgstr "��ਣ�(_e)..."
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:95
 msgid "S_end message receipts:"
 msgstr "ਸ�ਨ�ਹਾ ਰਸ�ਦ ਭ���(_e):"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:96
 msgid "S_tandard Font:"
 msgstr "ਸ���ਡਰਡ ਫ���(_t):"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:97
 msgid "Secure MIME (S/MIME)"
 msgstr "ਸ�ਰੱ�ਿ�ਤ MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:113
-msgid "Select Drafts Folder"
-msgstr "ਡਰਾਫ� ਫ�ਲਡਰ ��ਣ�"
-
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:99
 msgid "Select HTML fixed width font"
 msgstr "HTML ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 
-#: ../mail/mail-config.ui.h:115
-msgid "Select HTML fixed width font for printing"
-msgstr "ਪਰਿੰ� ਲ� HTML ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
-
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:100
 msgid "Select HTML variable width font"
 msgstr "HTML �ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 
-#: ../mail/mail-config.ui.h:117
-msgid "Select HTML variable width font for printing"
-msgstr "ਪਰਿ�ਿੰ� ਲ� HTML �ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
-
-#: ../mail/mail-config.ui.h:118
-msgid "Select Junk Folder"
-msgstr "�ੰ� ਫ�ਲਡਰ ��ਣ�"
+#: ../mail/mail-config.ui.h:101
+msgid "Sender Photograph"
+msgstr "ਭ��ਣ ਵਾਲ� ਦ� ਫ���"
 
-#: ../mail/mail-config.ui.h:119
-msgid "Select Sent Folder"
-msgstr "ਭ��� ਫ�ਲਡਰ ��ਣ�"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:103
+#, fuzzy
+#| msgid "Prompt when sending private replies to mailing _list messages"
+msgid "Sending a _private reply to a mailing list message"
+msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਸ�ਨ�ਹਿ�� ਲ� ਪ�ਰਾ�ਵ�ਤ �ਵਾਬ ਭ��ਣ ਦ�ਰਾਨ ਪ�ੱ��"
 
-#: ../mail/mail-config.ui.h:120
-msgid "Select Trash Folder"
-msgstr "ਰੱਦ� ਫ�ਲਡਰ ��ਣ�"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:105
+#, fuzzy
+#| msgid "_Prompt when sending messages with an empty subject line"
+msgid "Sending a message with an _empty subject line"
+msgstr "�ਾਲ� ਵਿਸ਼ਾ ਲਾ�ਨ ਨਾਲ ਸ�ਨ�ਹਾ ਭ��ਣ ਸਮ�� ਪ�ੱ��(_P)"
 
-#: ../mail/mail-config.ui.h:121
-msgid "Sender Photograph"
-msgstr "ਭ��ਣ ਵਾਲ� ਦ� ਫ���"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:107
+#, fuzzy
+#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "ਸ��ਿਤ �ਰ�, �ਦ�� ਵ� ਸ�ਨ�ਹ� ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�ਵ�, �� �ਿ Bcc ਪ�ਰਾਪਤ�ਰਨ ਵਾਲਿ�� ਲ� ਹ�ਵ�(_o)"
 
-#: ../mail/mail-config.ui.h:122
-msgid "Sending Mail"
-msgstr "ਪੱਤਰ ਭ��ਣ�"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:109
+#, fuzzy
+#| msgid "Send reply to all recipients?"
+msgid "Sending a reply to a large _number of recipients"
+msgstr "ਸਭ ਪ�ਰਾਪਤ-�ਰਤਾਵਾ� ਨ�ੰ �ਵਾਬ ਭ��ਣਾ ਹ�?"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "ਭ��� ਸ�ਨ�ਹ� ਫ�ਲਡਰ(_M):"
 
-#: ../mail/mail-config.ui.h:124
-msgid "Sent and Draft Messages"
-msgstr "ਭ��� �ਤ� ਡਰਾਫ� ਸ�ਨ�ਹ�"
-
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "ਸਰਵਰ ਲ� ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:112
 msgid "Server Configuration"
 msgstr "ਸਰਵਰ ਸੰਰ�ਨਾ"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:113
 msgid "Server _Type:"
 msgstr "ਸਰਵਰ �ਾ�ਪ(_T): "
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:114
 msgid "Si_gning algorithm:"
 msgstr "ਸਾ�ਨਿੰ� �ਲ��ਰਿਥਮ(_g):"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_natures"
 msgstr "ਦਸਤ�ਤ(_n)"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ(_n):"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "ਦਸਤ�ਤ(_u):"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "ਦਸਤ�ਤ"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:119
 msgid "Signing _algorithm:"
 msgstr "ਸਾ�ਨਿੰ� �ਲ��ਰਿਥਮ(_a):"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:120
+#| msgid "Local Folders"
+msgid "Special Folders"
+msgstr "�ਾਸ ਫ�ਲਡਰ�ਾਲਸ"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Spell Checking"
 msgstr "ਸ਼ਬਦ-��� �ਾ��"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:122
 msgid "Start _typing at the bottom on replying"
 msgstr "�ਦ�� �ਵਾਬ ਦ�ਣਾ ਹ�ਵ� ਤਾ� ਹ�ਠਾ� ਲਿ�ਣਾ �ਾਹ�ੰਦ� ਹ�(_t)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:123
+#| msgid "Start: "
+msgid "Start up"
+msgstr "ਸ਼�ਰ�"
+
+#: ../mail/mail-config.ui.h:125
 msgid "T_ype:"
 msgstr "�ਿਸਮ(_y):"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "ਭਾਸ਼ਾਵਾ� ਦ� ਲਿਸ�, ਸਿਰਫ �ਹਨਾ� ਨ�ੰ ਵ��ਾ�ਦ� ਹ�, �ਿਨਾ� ਲ� ਸ਼ਬਦ-��ਸ਼ �ੰਸ�ਾਲ ਹ�।"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:127
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12640,12 +11677,13 @@ msgstr ""
 "�ਾਵ���।ਨਾ�, �� ਵ� ਤ�ਸ�� ਦਿ���, ਸਿਰਫ ਵ��ਾ�ਣ ਦ� �ੰਮ\n"
 " �ਵ���।"
 
-#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
-#: ../mail/mail-config.ui.h:143
-msgid "Top Posting Option"
-msgstr "�ੱਤ� �ਵਾਬ ਦ�ਣ ��ਣ"
+#: ../mail/mail-config.ui.h:130
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr ""
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12653,166 +11691,148 @@ msgstr ""
 "ਨਾ� ਲਿ��, �ਿਸ ਨਾਲ ਤ�ਸ�� �ਸ ��ਾ��� ਨ�ੰ ਸੰਬ�ਧਨ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�।\n"
 "�ਦਾਹਰਨ ਲ�: \"�ੰਮ�ਾਰ�\" �ਾ� \"ਨਿੱ��\""
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:133
 msgid "Us_ername:"
 msgstr "ਯ��਼ਰ ਨਾ�(_e):"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:134
 msgid "Use Authe_ntication"
 msgstr "ਪ�ਰਮਾਣਿ�ਤਾ ਵਰਤ��(_n)"
 
-#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
-#: ../plugins/google-account-setup/google-contacts-source.c:286
-#: ../plugins/google-account-setup/google-source.c:623
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
-msgid "User_name:"
-msgstr "ਯ��਼ਰ ਨਾ�(_n):"
-
-#: ../mail/mail-config.ui.h:149
-msgid "V_ariable-width:"
-msgstr "�ਸਥਿਰ-���ਾ�(_a):"
+#: ../mail/mail-config.ui.h:135
+#| msgid "User_name:"
+msgid "User _Name:"
+msgstr "ਯ��਼ਰ ਨਾ�(_N):"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:136
 msgid "_Add Signature"
 msgstr "ਦਸਤ�ਤ ਸ਼ਾਮਿਲ(_A)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:137
 msgid "_Always load images from the Internet"
 msgstr "�ੰ�ਰਨ�ੱ� ਤ�� �ਿੱਤਰ ਹਮ�ਸ਼ਾ ਪ�ਰਾਪਤ �ਰ�(_A)"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:138
 msgid "_Authentication Type"
 msgstr "ਪਰਮਾਣਿ�ਤਾ �ਾ�ਪ(_A)"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:139
 msgid "_Default junk plugin:"
 msgstr "ਡਿਫਾਲ� �ੰ� ਪਲੱ��ਨ(_D):"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:140
 msgid "_Direct connection to the Internet"
 msgstr "�ੰ�ਰਨ�ੱ� ਲ� ਸਿੱਧਾ ��ਨ��ਸ਼ਨ(_D)"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:141
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ਮ��ਿੰ� ਬ�ਨਤ� �ੱਤ� ਦਸਤ�਼ਤ ਨਾ �ਰ� (���ਲ�ੱ� �ਨ���ਲਤਾ ਲ�) (_D)"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:142
 msgid "_Forward style:"
 msgstr "�ੱ�� ਭ��ਣ ਸ�ਾ�ਲ(_F):"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:143
 msgid "_Junk Folder:"
 msgstr "�ੰ� ਫ�ਲਡਰ(_J):"
 
-#: ../mail/mail-config.ui.h:158
-msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:144
+#, fuzzy
+#| msgid "_Keep Signature above the original message on replying"
+msgid "_Keep signature above the original message on replying"
 msgstr "�ਵਾਬ ਦ�ਣ ਸਮ�� ਦਸਤ�ਤ �ਸਲ� ਸ�ਨ�ਹ� ਦ� �ੱਤ� ਰੱ��(_K)"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:145
 msgid "_Languages"
 msgstr "ਭਾਸ਼ਾ(_L)"
 
-#: ../mail/mail-config.ui.h:160
-msgid "_Load images in messages from contacts"
+#: ../mail/mail-config.ui.h:146
+#, fuzzy
+#| msgid "_Load images in messages from contacts"
+msgid "_Load images only in messages from contacts"
 msgstr "ਸੰਪਰ�ਾ� ਤ�� �� ਸ�ਨ�ਹਿ�� '� �ਿੱਤਰ ਲ�ਡ �ਰ�(_L)"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:147
 msgid "_Lookup in local address book only"
 msgstr "ਲ��ਲ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਹ� ਵ���(_L)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:148
 msgid "_Make this my default account"
 msgstr "ਮ�ਰ� �ਸ ��ਾ��� ਨ�ੰ ਮ�ਲ ਬਣਾ�(_M)"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:149
 msgid "_Manual proxy configuration:"
 msgstr "ਦਸਤ� ਪਰਾ�ਸ� ਸੰਰ�ਨਾ(_M):"
 
-#: ../mail/mail-config.ui.h:164
-msgid "_Mark messages as read after"
-msgstr "�ਸ ਦ� ਬਾ�ਦ ਵਿੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਪ��ਹਿ� ਬਣਾ�(_M)"
-
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:151
 msgid "_Never load images from the Internet"
 msgstr "�ੰ�ਰਨ�ੱ� ਤ�� �ਿੱਤਰ �ਦ� ਵ� ਲ�ਡ ਨਾ �ਰ�(_N)"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:152
 msgid "_Path:"
 msgstr "ਮਾਰ�(_P):"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:153
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML ਸ�ਨ�ਹਾ ਸੰਪਰ�ਾ� ਨ�ੰ ਭ��ਣ ਸਮ�� ਪ�ੱ��, �� �ਿ ਨਹ�� �ਾਹ�ੰਦ� ਹਨ (_P)"
 
-#: ../mail/mail-config.ui.h:169
-msgid "_Prompt when sending messages with an empty subject line"
-msgstr "�ਾਲ� ਵਿਸ਼ਾ ਲਾ�ਨ ਨਾਲ ਸ�ਨ�ਹਾ ਭ��ਣ ਸਮ�� ਪ�ੱ��(_P)"
-
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:154
 msgid "_Reply style:"
 msgstr "�ਵਾਬ ਸ�ਾ�ਲ(_R):"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:155
 msgid "_Script:"
 msgstr "ਸ��ਰਿਪ�(_S):"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:156
 msgid "_Secure HTTP Proxy:"
 msgstr "ਸ�ਰੱ�ਿ�ਤ HTTP ਪਰਾ�ਸ�(_S):"
 
-#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "ਸਰਵਰ(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:176
-msgid "_Show image animations"
-msgstr "�ਿੱਤਰ �ਨ�ਮ�ਸ਼ਨ ਵ��ਾ�(_S)"
+#: ../mail/mail-config.ui.h:160
+#, fuzzy
+#| msgid "Show animated images as animations."
+msgid "_Show animated images"
+msgstr "�ਨ�ਮ�ਸ਼ਨ ਸ�ਨ�ਹ� �ਨ�ਮ�ਸ਼ਨ ਵ��� ਹ� ਵ���।"
 
-#: ../mail/mail-config.ui.h:177
+#: ../mail/mail-config.ui.h:161
 msgid "_Show the photograph of sender in the message preview"
 msgstr "�ਮ�ਲ �ਲ� ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� ਫ��� ਵ���(_S)"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:179
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "ਵੱਲ / Cc / Bcc ਹ�ੱਡਰ ਨ�ੰ ਸ�ੰ���(_S) "
-
-#: ../mail/mail-config.ui.h:180
+#: ../mail/mail-config.ui.h:162
 msgid "_Trash Folder:"
 msgstr "ਰੱਦ� ਫ�ਲਡਰ(_T):"
 
-#: ../mail/mail-config.ui.h:181
+#: ../mail/mail-config.ui.h:163
 msgid "_Use Secure Connection:"
 msgstr "ਸ�ਰੱ�ਿ�ਤ ��ਨ��ਸ਼ਨ ਵਰਤ��(_U):"
 
-#: ../mail/mail-config.ui.h:182
+#: ../mail/mail-config.ui.h:164
 msgid "_Use system defaults"
 msgstr "ਸਿਸ�ਮ ਡਿਫਾਲ� ਵਰਤ��(_U)"
 
-#: ../mail/mail-config.ui.h:183
+#: ../mail/mail-config.ui.h:165
 msgid "_Use the same fonts as other applications"
 msgstr "ਹ�ਰ �ਪਲ���ਸ਼ਨ ਵਾ�� �ਹ� ਫ��� ਵਰਤ��(_U)"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:166 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:186
-msgid "addresses"
-msgstr "�ਡਰ�ੱਸ"
-
-#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:188
+#: ../mail/mail-config.ui.h:168
 msgid "color"
 msgstr "ਰੰ�"
 
-#: ../mail/mail-config.ui.h:189
+#: ../mail/mail-config.ui.h:169
 msgid "description"
 msgstr "ਵ�ਰਵਾ"
 
@@ -12837,78 +11857,58 @@ msgid "Co_mpleted"
 msgstr "ਮ��ੰਮਲ(_m)"
 
 #: ../mail/mail-dialogs.ui.h:6
-msgid "Collapse _all"
-msgstr "ਸਭ ਸਮ���(_a)"
-
-#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "ਡਿ�਼�ਲ ਦਸਤ�ਤ"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "�ੱ�� ਨਾ ਭ���"
 
-#: ../mail/mail-dialogs.ui.h:9
-msgid "E_xpand all"
-msgstr "ਸਭ ਫ�ਲਾ�(_x)"
-
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "�ੰ��ਰਿਪਸ਼ਨ"
 
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Folder Subscriptions"
-msgstr "ਫ�ਲਡਰ ਮ��ਬਰ�"
-
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Follow-Up"
 msgstr "ਸਹਾ��"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "ਤ�ਹਾਡ� �ਾਣ�ਾਰ� ਲ�"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "�ੱ��"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:12
 msgid "License Agreement"
 msgstr "ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ�"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "��� �ਵਾਬ ਲ���ਦਾ ਨਹ�� ਹ�"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "ਸਭ ਨ�ੰ �ਵਾਬ"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "ਮ��-�ਾ��"
 
-#: ../mail/mail-dialogs.ui.h:22
-msgid "S_erver:"
-msgstr "ਸਰਵਰ(_e):"
-
-#: ../mail/mail-dialogs.ui.h:23
-msgid "S_how only items containing:"
-msgstr "��ਵਲ ���ਮਾ� ਰੱ�ਣ ਵਾਲ� ਵ���(_h):"
-
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Search Folder Sources"
 msgstr "��� ਫ�ਲਡਰ ਸਰ�ਤ"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Security Information"
 msgstr "ਸ�ਰੱ�ਿ� �ਾਣ�ਾਰ�"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Specific folders"
 msgstr "�ਾਸ ਫ�ਲਡਰ"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12916,218 +11916,176 @@ msgstr ""
 "ਸ�ਨ�ਹ�, �� �ਿ ਤ�ਸ�� ਪਿੱ�ਾ �ਰਨ ਲ� ��ਣ� ਸਨ, ਹ�ਠਾ� ਦਿੱਤ� �ਾ ਰਹ� ਹਨ।\n"
 "\"ਫਲ��\" ਮ�ਨ�ੰ ਵਿੱ��� �ਾਰਵਾ� �ਰਨ ਲ� ��ਣ।"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:24
 msgid "_Accept License"
 msgstr "ਲਾ�ਸ��ਸ ਮਨ�਼�ਰ(_A)"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Due By:"
 msgstr "ਦ�ਣਯ��(_D):"
 
-#: ../mail/mail-dialogs.ui.h:31
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Flag:"
 msgstr "ਨਿਸ਼ਾਨ(_F):"
 
-#: ../mail/mail-dialogs.ui.h:32
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Tick this to accept the license agreement"
 msgstr "ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਮਨ�਼�ਰ �ਰਨ ਲ� �ਸ ਨ�ੰ ��ਣ�(_T)"
 
-#: ../mail/mail-folder-cache.c:783
+#: ../mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "%s ਪਿੰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:84
+#: ../mail/mail-ops.c:85
 msgid "Filtering Selected Messages"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ"
 
-#: ../mail/mail-ops.c:245
+#: ../mail/mail-ops.c:226
 msgid "Fetching Mail"
 msgstr "ਪੱਤਰ ਲ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:592
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "ਬਾਹਰ� ਫਿਲ�ਰ ਲਾ�� �ਰਨ ਤ�� ਫ�ਲ�ਹ: %s"
-
-#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"%s ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� ਫ�ਲ�ਹ: %s\n"
-"�ਸ ਦ� ਬ�ਾ� ਲ��ਲ`ਭ��� (Sent)' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ ��ਤ� �ਾ ਰਹ� ਹ�।"
-
-#: ../mail/mail-ops.c:654
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "ਲ��ਲ `ਭ��� (Sent)' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� ਫ�ਲ�ਹ: %s"
-
-#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
-msgid "Sending message"
-msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
-
-#: ../mail/mail-ops.c:782
+#: ../mail/mail-ops.c:785
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d ਵਿੱ��� %1$d ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:826
+#: ../mail/mail-ops.c:831
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%2$d ਵਿੱ��� %1$d ਸ�ਨ�ਹ� ਭ��ਣ ਵਿੱ� ਫ�ਲ�ਹ"
 
-#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:783
+#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:788
 msgid "Canceled."
 msgstr "ਰੱਦ ��ਤਾ।"
 
-#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:785
+#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:790
 msgid "Complete."
 msgstr "ਸਮਾਪਤ"
 
-#: ../mail/mail-ops.c:938
-#, c-format
-msgid "Saving message to folder '%s'"
-msgstr "ਸ�ਨ�ਹਾ '%s' ਫ�ਲਡਰ ਵਿੱ� ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
-
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:941
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "ਸ�ਨ�ਹ� '%s' ਵਿੱ� ਭ��� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:941
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "ਸ�ਨ�ਹ� '%s' ਵਿੱ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:1127
+#: ../mail/mail-ops.c:1062
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "'%s' ਵਿੱ� ਫ�ਲਡਰ �ਾ��� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:1235
+#: ../mail/mail-ops.c:1178
 msgid "Forwarded messages"
 msgstr "�ੱ�� ਭ��� ਸ�ਨ�ਹ�"
 
-#: ../mail/mail-ops.c:1276
-#, c-format
-msgid "Opening folder '%s'"
-msgstr "ਫ�ਲਡਰ '%s' ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
-
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1295
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "'%s' ਫ�ਲਡਰ ਲ� ���ਾ �ਾਣ�ਾਰ� ਲ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/mail-ops.c:1414
+#: ../mail/mail-ops.c:1370
 #, c-format
 msgid "Opening store '%s'"
 msgstr "ਸ��ਰ '%s' ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1485
+#: ../mail/mail-ops.c:1446
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "ਫ�ਲਡਰ '%s' ਹ�ਾ�� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1585
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ਫ�ਲਡਰ '%s' ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1672
+#: ../mail/mail-ops.c:1654
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "��ਾ��� '%s' ਸ�ੰ��ਿ� �ਾ ਰਿਹਾ ਹ� �ਤ� ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1673
+#: ../mail/mail-ops.c:1655
 #, c-format
 msgid "Storing account '%s'"
 msgstr "��ਾ��� '%s' ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1727
+#: ../mail/mail-ops.c:1713
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "'%s' ਫ�ਲਡਰ ਤਾ�਼ਾ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1767
+#: ../mail/mail-ops.c:1877
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "'%s' ਨਿ�ਾਲਾ ਫ�ਲਡਰ"
 
-#: ../mail/mail-ops.c:1812
+#: ../mail/mail-ops.c:1949
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ਵਿੱ� ਰੱਦ� �ਾਲ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1813
+#: ../mail/mail-ops.c:1950
 msgid "Local Folders"
 msgstr "ਲ��ਲ ਫ�ਲਡਰ"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2123
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ਸ�ਨ�ਹਾ %d ਲਿ� �ਾ ਰਿਹਾ ਹ�"
 msgstr[1] "ਸ�ਨ�ਹ� %d ਲ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:2105
+#: ../mail/mail-ops.c:2216
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d ਸ�ਨ�ਹਾ ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 msgstr[1] "%d ਸ�ਨ�ਹ� ਸੰਭਾਲ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:2192
+#: ../mail/mail-ops.c:2312
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "ਸ�ਨ�ਹ� ਸੰਭਾਲਣ ਵਿੱ� �ਲਤ�: %s:\n"
 
-#: ../mail/mail-ops.c:2265
-msgid "Saving attachment"
-msgstr "����ਮ��� ਸੰਭਾਲ� �ਾ ਰਹ� ਹ�"
-
-#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
+#: ../mail/mail-ops.c:2387
 #, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"���ਪ�ੱ� ਫਾ�ਲ ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�: %s:\n"
-" %s"
-
-#: ../mail/mail-ops.c:2310
-msgid "Could not write data: "
-msgstr "ਡਾ�ਾ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�: "
+msgid "Preparing account '%s' for offline"
+msgstr "�ਫਲਾ�ਨ ਲ� ��ਾ��� '%s' ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:2454
-#, c-format
-msgid "Disconnecting from '%s'"
-msgstr "'%s' ਨਾਲ�� ਡਿਸ-��ਨ��ਸ਼ਨ ��ਤਾ �ਾ�ਦਾ ਹ�"
+#: ../mail/mail-ops.c:2478
+msgid "Checking Service"
+msgstr "ਸਰਵਿਸ �ਾ��� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2558
 #, c-format
-msgid "Reconnecting to '%s'"
-msgstr "'%s' ਨਾਲ ਮ�� ��ਨ��� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+#| msgid "Disconnecting from '%s'"
+msgid "Disconnecting %s"
+msgstr "%s ਨਾਲ�� ਡਿਸ-��ਨ��ਸ਼ਨ ��ਤਾ �ਾ�ਦਾ ਹ�"
 
-#: ../mail/mail-ops.c:2550
+#: ../mail/mail-ops.c:2615
 #, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "�ਫਲਾ�ਨ ਲ� ��ਾ��� '%s' ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+#| msgid "Saving attachment"
+msgid "Removing attachments"
+msgstr "����ਮ��� ਹ�ਾ��� �ਾ ਰਹ��� ਹਨ����ਮ��� hਸੰਭਾਲ� �ਾ ਰਹ� ਹ"
 
-#: ../mail/mail-ops.c:2636
-msgid "Checking Service"
-msgstr "ਸਰਵਿਸ �ਾ��� �ਾ ਰਹ� ਹ�"
+#: ../mail/mail-ops.c:2662
+#, fuzzy, c-format
+#| msgid "All accounts have been removed."
+msgid "File \"%s\" has been removed."
+msgstr "ਸਭ ��ਾ��� ਹ�ਾ� �ਾਣ।"
 
-#: ../mail/mail-send-recv.c:188
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
 msgstr "ਰੱਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../mail/mail-send-recv.c:440
+#: ../mail/mail-send-recv.c:435
 msgid "Send & Receive Mail"
 msgstr "ਪੱਤਰ ਭ��ਣ� �ਤ� ਲ�ਣ�"
 
-#: ../mail/mail-send-recv.c:457
+#: ../mail/mail-send-recv.c:452
 msgid "Cancel _All"
 msgstr "ਸਭ ਰੱਦ �ਰ�(_A)"
 
@@ -13135,83 +12093,45 @@ msgstr "ਸਭ ਰੱਦ �ਰ�(_A)"
 msgid "Updating..."
 msgstr "�ੱਪਡ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:649
+#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
 msgid "Waiting..."
 msgstr "�ਡ�� ��ਤ� �ਾ ਰਹ� ਹ�..."
 
-#: ../mail/mail-send-recv.c:896
+#: ../mail/mail-send-recv.c:903
 #, c-format
 msgid "Checking for new mail"
 msgstr "ਨਵਾ� ਪੱਤਰ ਲ� �ਾ�� ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/mail-session.c:225
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "%s ਲ� ਭ�ਦ ਲਿ��"
-
-#: ../mail/mail-session.c:227
-msgid "Enter Passphrase"
-msgstr "ਭ�ਦ ਲਿ��"
-
-#: ../mail/mail-session.c:230
-#, c-format
-msgid "Enter Password for %s"
-msgstr "%s ਲ� ਪਾਸਵਰਡ ਭਰ�"
-
-#: ../mail/mail-session.c:232
-msgid "Enter Password"
-msgstr "ਪਾਸਵਰਡ ਭਰ�"
-
-#: ../mail/mail-session.c:277
-#, c-format
-msgid "User canceled operation."
-msgstr "ਯ��਼ਰ ਨ� �ਾਰਵਾ� ਰੱਦ ��ਤ�।"
-
-#: ../mail/mail-session.c:724
-#, c-format
-msgid "No destination address provided, forward of the message has been cancelled."
-msgstr "��� �ਿ�ਾਣਾ �ਡਰ�ੱਸ ਨਹ�� ਦਿੱਤਾ �ਿ�,  ਸ�ਨ�ਹ� ਲ� �ੱ�� ਭ��ਣਾ ਰੱਦ ��ਤਾ।"
-
-#: ../mail/mail-session.c:733
-#, c-format
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "ਵਰਤਣ ਲ� ��� ��ਾ��� ਨਹ�� ਲੱਭਿ�, ਸ�ਨ�ਹਾ �ੱ�� ਭ��ਣ ਨ�ੰ ਰੱਦ ��ਤਾ �ਿ�।"
-
-#: ../mail/mail-tools.c:128
+#: ../mail/mail-tools.c:69
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "ਸਪ�ਲ ਡਾ�ਰ���ਰ� '%s' ਬਣਾ� ਨਹ�� �ਾ ਸ�� ਹ�: %s"
 
-#: ../mail/mail-tools.c:161
+#: ../mail/mail-tools.c:102
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "�ੱ� non-mbox ਸਰ�ਤ `%s' ਤ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਾਰ�"
 
-#: ../mail/mail-tools.c:273
+#: ../mail/mail-tools.c:214
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "�ੱ�� ਭ��ਿ� ਸ�ਨ�ਹਾ - %s"
 
-#: ../mail/mail-tools.c:275
+#: ../mail/mail-tools.c:216
 msgid "Forwarded message"
 msgstr "�ੱ�� ਭ��ਿ� ਸ�ਨ�ਹਾ"
 
-#: ../mail/mail-tools.c:318
-#, c-format
-msgid "Invalid folder: '%s'"
-msgstr "�ਲਤ ਫ�ਲਡਰ: '%s'"
-
-#: ../mail/mail-vfolder.c:85
+#: ../mail/mail-vfolder.c:86
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "��� ਫ�ਲਡਰ ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�: %s"
 
-#: ../mail/mail-vfolder.c:224
+#: ../mail/mail-vfolder.c:235
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s:%s' ਲ� ��� ਫ�ਲਡਰ �ੱਪਡ�� �ਰਨਾ �ਾਰ�"
 
-#: ../mail/mail-vfolder.c:231
+#: ../mail/mail-vfolder.c:242
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' ਲ� ��� ਫ�ਲਡਰ �ੱਪਡ�� �ਰਨਾ �ਾਰ�"
@@ -13221,16 +12141,8 @@ msgstr "'%s' ਲ� ��� ਫ�ਲਡਰ �ੱਪਡ�� �ਰਨਾ 
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:675
+#: ../mail/mail-vfolder.c:709
 #, c-format
-#| msgid ""
-#| "The Search Folder \"%s\" has been updated, because it used just removed "
-#| "folder\n"
-#| "\"%s\"."
-#| msgid_plural ""
-#| "The following Search Folders\n"
-#| "%s have been updated, because they used just removed folder\n"
-#| "\"%s\"."
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
 "folder\n"
@@ -13247,11 +12159,11 @@ msgstr[1] ""
 "ਲ� ��ਾ��� ਦ� �ੱ�� ਦਿੱਤ� ��� ਫ�ਲਡਰਾ� ਨ�ੰ ਸ�ਧਿ� �ਿ� ਹ�\n"
 "%1$s"
 
-#: ../mail/mail-vfolder.c:1185
+#: ../mail/mail-vfolder.c:1273
 msgid "Edit Search Folder"
 msgstr "��� ਫ�ਲਡਰ ਸ�ਧ"
 
-#: ../mail/mail-vfolder.c:1290
+#: ../mail/mail-vfolder.c:1380
 msgid "New Search Folder"
 msgstr "ਨਵਾ� ��� ਫ�ਲਡਰ"
 
@@ -13452,89 +12364,117 @@ msgstr ""
 "ਹ�, ਤ�ਸ�� ਸ਼ਾ�ਦ �ਪਣਾ ��ਪਸ ਲਾੱ� �ਾਲ� ��ਤਾ ਹ�।"
 
 #: ../mail/mail.error.xml.h:43
+#| msgid "Close this window"
+msgid "Close message window."
+msgstr "ਸ�ਨ�ਹਾ ਵਿੰਡ� ਬੰਦ �ਰ�।"
+
+#: ../mail/mail.error.xml.h:44
 msgid "Could not save signature file."
 msgstr "ਦਸਤ�ਤ� ਫਾ�ਲ ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
+msgid ""
+"Default local store has been changed from mbox to maildir format. Do you "
+"want to migrate now ?\n"
+"\n"
+"A mbox account will be created to preserve the old mbox folders. You can "
+"delete it after ensuring the data is safely migrated. Please make sure there "
+"is enough space if you choose to migrate."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:48
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "\"{0}\" ��� ਫ�ਲਡਰ ਵਿੱ��� ਸ�ਨ�ਹ� ਹ�ਾ�"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:50
 msgid "Do _Not Disable"
 msgstr "ਬੰਦ ਨਾ �ਰ�(_N)"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:51
 msgid "Do _Not Send"
 msgstr "ਨਾ ਭ���(_N)"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:52
 msgid "Do _Not Synchronize"
 msgstr "ਸਿੰ�ਰ�ਨਾ��਼ ਨਾ �ਰ�(_N)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:53
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "�� ਤ�ਸ�� ਫ�ਲਡਰਾ� ਨ�ੰ ਲ��ਲ ਸਿੰ�ਰ�ਨਾ��਼ �ਰਨ� �ਾਹ�ੰਦ� ਹ�, �� �ਿ �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਹਨ?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:54
 msgid "Do you want to mark all messages as read?"
 msgstr "�� ਤ�ਸ�� ਸਭ ਸ�ਨ�ਹਿ�� ਨ�ੰ ਪ��ਹਿ� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:55
 msgid "Do you wish to save your changes?"
 msgstr "�� ਤ�ਸ�� ਤਬਦ�ਲ��� ਸੰਭਾਲਣ��� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:56
 msgid "Enter password."
 msgstr "ਪਾਸਵਰਡ ਭਰ�।"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:57
 msgid "Error loading filter definitions."
 msgstr "ਫਿਲ�ਰ ਲ�ਡ �ਰਨ ਵਿੱ� �ਲਤ�।"
 
 #  mail:async-error-nodescribe primary
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:58
 msgid "Error while performing operation."
 msgstr "�ਾਰਵਾ� �ਰਨ ਦ�ਰਾਨ �ਲਤ�।"
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:62
 msgid "Error while {0}."
 msgstr "{0} ਦ�ਰਾਨ �ਲਤ�।"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:63
+#, fuzzy
+#| msgid "Really unsubscribe from folder \"%s\"?"
+msgid "Failed to unsubscribe from folder."
+msgstr "�� ਫ�ਲਡਰ \"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ�ਣ� ਹ�?"
+
+#: ../mail/mail.error.xml.h:64
 msgid "File exists but cannot overwrite it."
 msgstr "ਫਾ�ਲ ਮ���ਦ ਤਾ� ਹ�, ਪਰ �ਸ �ੱਤ� ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
 #  mail:no-write-path-notfile secondary
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:65
 msgid "File exists but is not a regular file."
 msgstr "ਫਾ�ਲ ਮ���ਦ ਤਾ� ਹ�, ਪਰ �ਹ ਨਿਯਮਿਤ ਫਾ�ਲ ਨਹ�� ਹ�"
 
+#. Translators: {0} is replaced with a folder name
+#: ../mail/mail.error.xml.h:67
+#, fuzzy
+#| msgid "The attachment does not contain a valid calendar message"
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "ਨੱਥ� ਵਿੱ� �ੱ� �ਾ�� ��ਲੰਡਰ ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
+
 #  mail:ask-expunge secondary
 #  mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:68
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "���ਰ ਤ�ਸ�� �ਾਰ� ਰੱ�ਿ� ਤਾ� ਤ�ਸ�� �ਹਨਾ� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਮ��-ਪ�ਰਾਪਤ ਨਹ�� �ਰ ਸ�ਦ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:69
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr "���ਰ ਤ�ਸ�� ਫ�ਲਡਰ ਹ�ਾ ਦਿੱਤਾ ਤਾ�, �ਸ �ਤ� �ਸ ਦ� ਸਬ-ਫ�ਲਡਰਾ� ਦ� ਸਾਰ� ਭਾ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਣ��।"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:70
 msgid "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "���ਰ ਤ�ਸ�� ਫ�ਲਡਰ ਹ�ਾ ਦਿੱਤਾ ਤਾ�, �ਸ ਦ� ਸਾਰ� ਸਮੱ�ਰ� ਪੱ�� ਤ�ਰ �ੱਤ� ਹ�ਾ�� �ਾਵ��ਾ।"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:71
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "���ਰ ਤ�ਸ�� �ੱ�� ��, ਸਭ ਪਰਾ�ਸ� ��ਾ��� �ਾਣ�ਾਰ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਵ���।"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13542,11 +12482,11 @@ msgstr ""
 "���ਰ ਤ�ਸ�� �ੱ�� ��, ��ਾ��� �ਾਣ�ਾਰ� �ਤ� ਸਭ ਪਰਾ�ਸ� �ਾਣ�ਾਰ� ਨ�ੰ\n"
 "ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦਿੱਤਾ �ਾਵ��ਾ।"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:74
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "���ਰ ਤ�ਸ�� �ੱ�� ��, ��ਾ��� �ਾਣ�ਾਰ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਵ���।"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13554,23 +12494,23 @@ msgstr ""
 "���ਰ ਤ�ਸ�� ਬੰਦ �ਰ ਦਿੱਤਾ, ਤਾ� �ਹ ਸ�ਨ�ਹ� �ਦ�� ਤੱ� ਭ��� ਨਹ�� �ਾਣ��, �ਦ�� ਤੱ� �� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ�� �ਾਲ� ਨਹ�� "
 "��ਤਾ �ਾਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:76
 msgid "Ignore"
 msgstr "�ਣਡਿੱਠਾ"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:77
 msgid "Invalid authentication"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ �ਲਤ"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:78
 msgid "Mail Deletion Failed"
 msgstr "ਮ�ਲ ਹ�ਾ�ਣਾ ਫ�ਲ�ਹ"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:79
 msgid "Mail filters automatically updated."
 msgstr "ਪੱਤਰ-ਫਿਲ�ਰ ���ਮ��ਿ� ਹ� �ੱਪਡ�� ��ਤ� �� ਹਨ।"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13581,35 +12521,51 @@ msgstr ""
 "���ਰ ਸ਼ਾਮਿਲ ��ਤਾ ਹ�, ਤਾ� ਸਾਰ� ਪ�ਰਾਪਤ �ਰਤਾ �ਾਹਿਰ ਹ� �ਾਣ��। �ਸ ਤ�� ਬੱ�ਣ ਲ� ਤ�ਹਾਨ�ੰ �ੱ��-�ੱ� �ੱ� "
 "ਪ�ਰਾਪਤ �ਰਤਾ ਨ�ੰ To: �ਾ� CC: ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�।"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:81
+#, fuzzy
+#| msgid "Create a new folder for storing mail"
+msgid "Migrate local mbox folders to maildir"
+msgstr "ਸੰਭਾਲ� ਪੱਤਰਾ� ਤ�� ਨਵਾ� ਫ�ਲਡਰ ਬਣਾ�"
+
+#: ../mail/mail.error.xml.h:82
 msgid "Missing folder."
 msgstr "ਫ�ਲਡਰ ��ੰਮ ਹ�।"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:84
+#| msgid "Never"
+msgid "N_ever"
+msgstr "�ਦ� ਨਹ��(_e)"
+
+#  mail-composer:recover-autosave title
+#: ../mail/mail.error.xml.h:85
+#, fuzzy
+#| msgid "Unfinished messages found"
+msgid "No duplicate messages found."
+msgstr "ਨਾ-ਸਮਾਪਤ ਸ�ਨ�ਹ� ਲੱਭ� ਹਨ"
+
+#: ../mail/mail.error.xml.h:86
 msgid "No sources selected."
 msgstr "��� ਸਰ�ਤ ਨਹ�� ��ਣਿ�।"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:87
 msgid "Opening too many messages at once may take a long time."
 msgstr "�ੱ�� ਸਮ�� �ੰਨ� ਸ�ਨ�ਹ� ��ਲਣ ਲ� ਲੰਮਾ ਸਮਾ� ਲੱ� ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:88
 msgid "Please check your account settings and try again."
 msgstr "�ਪਣ� ��ਾ��� ਸ��ਿੰ� ਵ��� �ਤ� ਮ�� ��ਸ਼ਿਸ �ਰ� ��।"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:89
 msgid "Please enable the account or send using another account."
 msgstr "��ਾ��� �ਾਲ� �ਰ� �ਾ� ਹ�ਰ ਵੱ�ਰ� ��ਾ��� ਨਾਲ ਭ��� ��।"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
-msgstr ""
-"ਵੱਲ: ��ਤਰ ਲ� �ਾ�� �-ਮ�ਲ �ਡਰ�ੱਸ ਦਿ�। ਤ�ਸ�� ਵੱਲਥ ਬ�ਨ �ੱਤ� �ਲਿੱ� �ਰ�� �-ਮ�ਲ "
-"�ਡਰ�ੱਸ ��� ਸ�ਦ� ਹ�।"
+msgstr "ਵੱਲ: ��ਤਰ ਲ� �ਾ�� �-ਮ�ਲ �ਡਰ�ੱਸ ਦਿ�। ਤ�ਸ�� ਵੱਲਥ ਬ�ਨ �ੱਤ� �ਲਿੱ� �ਰ�� �-ਮ�ਲ �ਡਰ�ੱਸ ��� ਸ�ਦ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13619,60 +12575,66 @@ msgstr ""
 "ਲ� ਸੰਭਵ ਵ� ਹ�:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:93
 msgid "Please provide an unique name to identify this signature."
 msgstr "�ਸ ਦਸਤ�ਤ ਲ� ਵਿਲੱ�ਣ ਨਾ� ਦਿ� ��।"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:94
 msgid "Please wait."
 msgstr "�ਡ��� ��।"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:95
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "ਪ�ਰਾਣ� ਪੱਤਰ ਫ�ਲਡਰ \"{0}\" ਨ�ੰ ਤਬਦ�ਲ �ਰਨ ਵਿੱ� ਸਮੱਸਿ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:96
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ�ਾ� ਦ� ਸ��� ਲ� ਸਰਵਰ ਨ�ੰ ਬ�ਨਤ� ��ਤ� �� ਹ�।"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:97
 msgid "Read receipt requested."
 msgstr "ਪ��ਹਨ ਰਸ�ਦ ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:98
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "�� ਤ�ਸ�� ਫ�ਲਡਰ \"{0}\" �ਤ� �ਸ ਦ� ਸਬ-ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�ਣ ਦ� ਪ�ਸ਼�� �ਰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:99
 msgid "Really delete folder \"{0}\"?"
 msgstr "\"{0}\" ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�ਣਾ ਹ�?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:100
+#, fuzzy
+#| msgid "Remove the delegate %s?"
+msgid "Remove duplicate messages?"
+msgstr "�� ਪ�ਰਤ�ਨਿਧ %s ਨ�ੰ ਹ�ਾ�ਣਾ ਹ�?"
+
+#: ../mail/mail.error.xml.h:101
 msgid "Reply _Privately"
 msgstr "ਨਿੱ�� �ਵਾਬ(_P)"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:104
 msgid "Search Folders automatically updated."
 msgstr "��� ਫ�ਲਡਰਾ� ਨ�ੰ ���ਮ��ਿ� ਹ� �ੱਪਡ�� �ਰ ਦਿੱਤਾ �ਾਵ��ਾ।"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:105
 msgid "Send private reply?"
 msgstr "ਪ�ਰਾ�ਵ�� �ਵਾਬ ਭ��ਣਾ ਹ�?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:106
 msgid "Send reply to all recipients?"
 msgstr "ਸਭ ਪ�ਰਾਪਤ-�ਰਤਾਵਾ� ਨ�ੰ �ਵਾਬ ਭ��ਣਾ ਹ�?"
 
 #  XXX we shouldn't be popping up dialogs in this code.
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:107
 msgid "Signature Already Exists"
 msgstr "ਦਸਤ�ਤ ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹਨ"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:108
 msgid "Synchronize folders locally for offline usage?"
 msgstr "�� �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਫ�ਲਡਰ ਲ��ਲ� ਸ��ਰ�ਨਾ��਼ �ਰਨ� ਹਨ?"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13680,7 +12642,7 @@ msgstr ""
 "ਸਿਸ�ਮ ਫ�ਲਡਰ �ਵ�ਲ�ਸ਼ਨ ਦ� �ੰਮ �ਰਨ ਲ� ਲਾ�ਮ� ਹਨ �ਤ� �ਹਨਾ� ਨ�ੰ ਤਬਦ�ਲ, ਨਾ�-ਤਬਦ�ਲ �ਾ� ਹ�ਾ�ਣਾ "
 "ਸੰਭਵ ਨਹ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13695,7 +12657,7 @@ msgstr ""
 "���ਰ ਸ਼ਾਮਿਲ ��ਤਾ ਹ�, ਤਾ� ਸਾਰ� ਪ�ਰਾਪਤ �ਰਤਾ �ਾਹਿਰ ਹ� �ਾਣ��। �ਸ ਤ�� ਬੱ�ਣ ਲ� ਤ�ਹਾਨ�ੰ �ੱ��-�ੱ� �ੱ� "
 "ਪ�ਰਾਪਤ �ਰਤਾ ਨ�ੰ To: �ਾ� CC: ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�।"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13703,7 +12665,7 @@ msgstr ""
 "�ੱ�� ਦਿੱਤ� ਪ�ਰਾਪਤ �ਰਤਾ ਨ�ੰ ਢ�ੱ�ਵ�� ਮ�ਲ �ਡਰ�ੱਸ ਵ��� ਪ�ਾਣਿ� ਨਹ�� �ਾ ਸ�ਿ�:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13712,11 +12674,11 @@ msgstr ""
 "{0}"
 
 #  mail:signature-notscript secondary
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:118
 msgid "The script file must exist and be executable."
 msgstr "ਸ��ਰਿਪ� ਫਾ�ਲ ਮ���ਦ �ਤ� �ੱਲਣਯ�� ਹ�ਣ� �ਾਹ�ਦ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13724,7 +12686,7 @@ msgstr ""
 "�ਹ ਫ�ਲਡਰ ਲ�ਪਤ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�, ���\n"
 "ਫ�ਲਡਰ ਸੰਪਾਦ� ਵਿੱ� �ਾ �� �ਸ ਨ�ੰ ਪਰਤੱ� ਸ਼ਾਮਿਲ �ਰ�, �� ਲ�� ਹ� ਤਾ�।"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13732,35 +12694,35 @@ msgstr ""
 "�ਹ ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�, �ਿ��ਿ �ਿਸ ��ਾ��� ਨਾਲ ਤ�ਸ�� ਭ��ਣ ਦ� ��ਣ ��ਤ� ਹ�, �ਹ ਤਾ� "
 "�ਯ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:122
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�, �ਿ��ਿ ਤ�ਸ�� ��� ਸ�ਨ�ਹ� ਨਹ�� ਦਿੱਤਾ ਹ�"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "ਸਰਵਰ �ਸ ਤਰਾ� ਦ� ਪ�ਰਮਾਣਿਤ ਲ� ਸਹਾ�� ਨਹ�� ਹ� �ਤ� ਸਭ ਪ�ਰਮਾਣ�ਿਤਾ ਲ� ਸਹਾ� ਵ� ਨਹ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:124
 msgid "This signature has been changed, but has not been saved."
 msgstr "�ਹ ਦਸਤ�ਤ ਤਬਦ�ਲ ਹ� �� ਹਨ, ਪਰ ਸੰਭਾਲ� ਨਹ�� �� ਹਨ।"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:125
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "�ਸ ਨਾਲ ��ਣ� ਫ�ਲਡਰ �ਤ� �ਸ ਦ� �ਧ�ਨ-ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਬਣਾ ਦਿੱਤ� �ਾਣ��।"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:126
 msgid "This will mark all messages as read in the selected folder."
 msgstr "�ਸ ਨਾਲ ��ਣ� ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਬਣਾ ਦਿੱਤ� �ਾਣ��।"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:127
 msgid "Unable to connect to the GroupWise server."
 msgstr "�ਰ�ੱਪਵਾ�ਸ ਸਰਵਰ ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ ਹ�।"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:128
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13768,19 +12730,19 @@ msgstr ""
 "�ਸ ��ਾ��� ਲ� ਡਰਾਫ� ਫ�ਲਡਰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�। �� �ਸ ਦ� ਬ�ਾ� ਸਿਸ�ਮ ਡਰਾਫ� ਫ�ਲਡਰ "
 "ਵਰਤਿ� �ਾਵ�?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:129
 msgid "Unable to read license file."
 msgstr "ਲਾ�ਸ��ਸ ਫਾ�ਲ ਪ��ਹਨ ਵਿੱ� �ਯ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:130
 msgid "Use _Default"
 msgstr "ਮ�ਲ ਵਰਤ��(_D)"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:131
 msgid "Use default drafts folder?"
 msgstr "ਮ�ਲ ਡਰਾਫ� ਫ�ਲਡਰ ਵਰਤਿ� �ਾਵ�?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13790,7 +12752,13 @@ msgstr ""
 "�ਾਵ��ਾ।\n"
 "�� ਤ�ਸ�� �ਾਰ� ਰੱ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:134
+#, fuzzy
+#| msgid "Would you like to accept it?"
+msgid "Would you like to close the message window?"
+msgstr "�� ਤ�ਸ�� �ਹ ਮਨ�਼�ਰ �ਰਦ� ਹ�?"
+
+#: ../mail/mail.error.xml.h:135
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -13799,7 +12767,7 @@ msgstr ""
 "ਤ�ਸ�� ਸ�ਨ�ਹ� ਦਾ ਪ�ਰਾ�ਵ�� �ਵਾਬ ਦ� ਰਹ� ਹ�, �� �ਿ ਮ�ਲਿੰ� ਲਿਸ� ਰਾਹ�� ਪ�ੱ�ਾ ਹ�, ਪਰ ਲਿਸ� ਤ�ਹਾਡ� �ਵਾਬ "
 "ਨ�ੰ ਵਾਪਸ ਲਿਸ� �ੱਤ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ਼ �ਰ ਰਹ� ਹ�। �� ਤ�ਸ�� �ਾਰ� ਰੱ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -13808,7 +12776,7 @@ msgstr ""
 "ਤ�ਸ�� ਸ�ਨ�ਹ� ਦਾ �ਵਾਬ ਦ� ਰਹ� ਹ�, �� �ਿ ਮ�ਲਿੰ� ਲਿਸ� ਰਾਹ�� ਪ�ੱ�ਾ ਹ�, ਪਰ ਤ�ਸ�� ਭ��ਣ ਵਾਲ� ਨ�ੰ ਪ�ਰਾ�ਵ�� "
 "�ਵਾਬ ਦ� ਰਹ� ਹ�, ਨਾ �ਿ ਲਿਸ� ਨ�ੰ, �� ਤ�ਸ�� �ਾਰ� ਰੱ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:137
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -13816,32 +12784,32 @@ msgstr ""
 "ਤ�ਸ�� ਸ�ਨ�ਹ� ਦਾ �ਵਾਬ ਦ� ਰਹ� ਹ�, �� �ਿ �� ਪ�ਰਾਪਤ-�ਰਨ ਵਾਲਿ�� ਨ�ੰ ਭ��ਿ� �ਿ� ਸ�। �� ਤ�ਸ�� �ਨ�ਹਾ� "
 "ਸਭ ਨ�ੰ �ਵਾਬ ਦ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:138
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "�ਹ ਪੱਤਰ ਹ�ਾ�ਣ ਲ� ਤ�ਹਾਨ�ੰ ਲ���ਦ� �ਧਿ�ਾਰ ਨਹ�� ਹਨ।"
 
 #  mail:account-incomplete secondary
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:139
 msgid "You have not filled in all of the required information."
 msgstr "ਤ�ਸ�� ਸਾਰ� ਲਾ�ਮ� �ਾਣ�ਾਰ� ਭਰ� ਨਹ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:140
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "ਤ�ਹਾਡ� ��ਲ �� ਨਾ-ਭ��� ਸ�ਨ�ਹ� ਹਨ, �� ਤ�ਸ�� �ਿਸ� ਤਰਾ� ਵ� ਬਾਹਰ ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:141
 msgid "You may not create two accounts with the same name."
 msgstr "ਤ�ਸ�� �ੱ� ਸਮ�� ਦ� ��ਾ��� ਨਹ�� ਬਣਾ ਸ�ਦ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:142
 msgid "You must name this Search Folder."
 msgstr "ਤ�ਹਾਨ�ੰ �ਸ ��� ਫ�ਲਡਰ ਦਾ ਨਾ� ਦ�ਣਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:143
 msgid "You must specify a folder."
 msgstr "ਤ�ਹਾਨ�ੰ ਫ�ਲਡਰ ਦ�ਣਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13850,127 +12818,146 @@ msgstr ""
 "ਤ�ਹਾਨ�ੰ �ੱ��-�ੱ� �ੱ� ਸਰ�ਤ ਨਿਰਧਾਰਿਤ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।\n"
 "�ਾ� �ੱ�ਲਾ-�ੱ�ਲਾ ਫ�ਲਡਰ ��ਣ �� �ਤ�/�ਾ� ਸਾਰ� ਲ��ਲ, ਸਾਰ� ਰਿਮ�� ਫ�ਲਡਰ �ਾ� ਦ�ਵ�� ��ਣ ��।"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:146
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "ਤ�ਹਾਡਾ ਸਰਵਰ \"{0}\" �ੱਤ� \"{0}\" ਵ��� ਲਾ��ਨ ਫ�ਲ�ਹ ਹ�।"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:147
+#| msgid "Always"
+msgid "_Always"
+msgstr "ਹਮ�ਸ਼ਾ(_A)"
+
+#: ../mail/mail.error.xml.h:148
 msgid "_Append"
 msgstr "ਨਾਲ ����ਹ�(_A)"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:149
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "�ਯ��(_D)"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:150
 msgid "_Discard changes"
 msgstr "ਤਬਦ�ਲ��� ਰੱਦ(_D)"
 
-#: ../mail/mail.error.xml.h:137
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../mail/mail.error.xml.h:151
+#: ../modules/mail/e-mail-shell-view-actions.c:1054
 msgid "_Empty Trash"
 msgstr "ਰੱਦ� �ਾਲ� �ਰ�(_E)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:152
 msgid "_Expunge"
 msgstr "ਸ�ੰ���(_E)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:153
+#| msgid "No"
+msgid "_No"
+msgstr "ਨਹ��(_N) "
+
+#: ../mail/mail.error.xml.h:154
 msgid "_Open Messages"
 msgstr "ਸ�ਨ�ਹ� ��ਲ�ਹ�(_O)"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:157
 msgid "_Send Receipt"
 msgstr "ਰਸ�ਦ ਭ���(_S)"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:158
 msgid "_Synchronize"
 msgstr "ਸਿੰ�ਰ�ਨਾ��਼(_S)"
 
-#: ../mail/message-list.c:1170
+#: ../mail/mail.error.xml.h:159
+#| msgid "Yes"
+msgid "_Yes"
+msgstr "ਹਾ�(_Y)"
+
+#: ../mail/message-list.c:1213
 msgid "Unseen"
 msgstr "ਨਾ-ਵ���"
 
-#: ../mail/message-list.c:1171
+#: ../mail/message-list.c:1214
 msgid "Seen"
 msgstr "ਵ���"
 
-#: ../mail/message-list.c:1172
+#: ../mail/message-list.c:1215
 msgid "Answered"
 msgstr "�ਵਾਬ ਦਿੱਤ�"
 
-#: ../mail/message-list.c:1173
+#: ../mail/message-list.c:1216
 msgid "Forwarded"
 msgstr "�ੱ�� ਭ���"
 
-#: ../mail/message-list.c:1174
+#: ../mail/message-list.c:1217
 msgid "Multiple Unseen Messages"
 msgstr "ਬਹ� ਨਾ-ਵ��� ਸ�ਨ�ਹ�"
 
-#: ../mail/message-list.c:1175
+#: ../mail/message-list.c:1218
 msgid "Multiple Messages"
 msgstr "ਬਹ�-ਸ�ਨ�ਹ�"
 
-#: ../mail/message-list.c:1179
+#: ../mail/message-list.c:1222
 msgid "Lowest"
 msgstr "ਸਭ ਤ�� �ੱ�"
 
-#: ../mail/message-list.c:1180
+#: ../mail/message-list.c:1223
 msgid "Lower"
 msgstr "�ੱ�"
 
-#: ../mail/message-list.c:1184
+#: ../mail/message-list.c:1227
 msgid "Higher"
 msgstr "ਵੱਧ"
 
-#: ../mail/message-list.c:1185
+#: ../mail/message-list.c:1228
 msgid "Highest"
 msgstr "ਸਭ ਤ�� ਵੱਧ"
 
-#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1837 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1844 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "�ੱ� %l:%M %p"
 
-#: ../mail/message-list.c:1811
+#: ../mail/message-list.c:1853
 msgid "Yesterday %l:%M %p"
 msgstr "�ੱਲ�ਹ %l:%M %p"
 
-#: ../mail/message-list.c:1823
+#: ../mail/message-list.c:1865
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1831
+#: ../mail/message-list.c:1873
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1833
+#: ../mail/message-list.c:1875
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2598
+#: ../mail/message-list.c:2642
 msgid "Select all visible messages"
 msgstr "ਸਾਰ� ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ��ਣ�"
 
+#: ../mail/message-list.c:2800 ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "ਸ�ਨ�ਹ�"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4412 ../mail/message-list.c:4820
+#: ../mail/message-list.c:4468 ../mail/message-list.c:4892
 msgid "Generating message list"
 msgstr "ਸ�ਨ�ਹਾ ਲਿਸ� ਬਣਾ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/message-list.c:4643
+#: ../mail/message-list.c:4707
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "��� ਸ�ਨ�ਹਾ ਤ�ਹਾਡ� ��� ਮ�ਤਾਬ� ਨਹ�� ਹ�। �ਾ� ਤਾ� ��� -> ��� ਮ�ਨ� ���ਮ ਰਾਹ�� ਸਾਫ਼ �ਰ� �ਾ� ਬਦਲ� ��।"
 
-#: ../mail/message-list.c:4645
+#: ../mail/message-list.c:4709
 msgid "There are no messages in this folder."
 msgstr "�ਸ ਫ�ਲਡਰ ਵਿੱ� ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�।"
 
@@ -14008,27 +12995,27 @@ msgid "Subject - Trimmed"
 msgstr "ਵਿਸ਼ਾ - ���ਾ ��ਤਾ"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1491
 msgid "Body contains"
 msgstr "ਪੱਤਰ '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1498
 msgid "Message contains"
 msgstr "ਸ�ਨ�ਹ� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../modules/mail/e-mail-shell-view-actions.c:1505
 msgid "Recipients contain"
 msgstr "ਸ�ਨ�ਹ��� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "Sender contains"
 msgstr "ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Subject contains"
 msgstr "ਵਿਸ਼� '� ਹ�"
 
@@ -14036,7 +13023,7 @@ msgstr "ਵਿਸ਼� '� ਹ�"
 msgid "Subject or Addresses contains"
 msgstr "ਵਿਸ਼ਾ �ਾ� ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
 
-#: ../modules/addressbook/addressbook-config.c:206
+#: ../modules/addressbook/addressbook-config.c:209
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -14044,7 +13031,7 @@ msgstr ""
 "�ਹ ��ਣ �ਰਨ ਦਾ �ਰਥ ਹ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� LDAP ਸਰਵਰ ਨਾਲ ਤਾ� �����ਾ, ���ਰ ਤ�ਹਾਡਾ LDAP ਸਰਵਰ "
 "SSL ਲ� ਸਹਾ�� ਹ���।"
 
-#: ../modules/addressbook/addressbook-config.c:208
+#: ../modules/addressbook/addressbook-config.c:211
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -14052,7 +13039,7 @@ msgstr ""
 "�ਹ ��ਣ �ਰਨ ਦਾ �ਰਥ ਹ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� LDAP ਸਰਵਰ ਨਾਲ ਤਾ� �����ਾ, ���ਰ ਤ�ਹਾਡਾ LDAP ਸਰਵਰ "
 "TLS ਲ� ਸਹਾ�� ਹ���।"
 
-#: ../modules/addressbook/addressbook-config.c:210
+#: ../modules/addressbook/addressbook-config.c:213
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -14061,15 +13048,15 @@ msgstr ""
 "�ਹ ��ਣ �ਰਨ ਦਾ �ਰਥ ਹ� �ਿ ਤ�ਹਾਡਾ ਸਰਵਰ SSL �ਾ� TLS ਲ� ਸਹਾ�� ਨਹ�� ਹ�। �ਸਦਾ �ਰਥ ਹ� ਤ�ਹਾਡਾ "
 "��ਨ��ਸ਼ਨ �ਣ-ਸ�ਰੱ�ਿ�ਤ ਵ� ਹ� ਸ�ਦਾ ਹ� �ਤ� ਤ�ਸ�� ਸ�ਰੱ�ਿ� ਲ� �ਤਰਾ ਬਣ ਸ�ਦ� ਹ�।"
 
-#: ../modules/addressbook/addressbook-config.c:602
+#: ../modules/addressbook/addressbook-config.c:612
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "�ਨਮਦਿਨ ਤ� ਵਰ�ਹ�-�ੰਢ ��ਲੰਡਰ '� ਵਰਤ��(_s)"
 
-#: ../modules/addressbook/addressbook-config.c:638
+#: ../modules/addressbook/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr "�ਫਲਾ�ਨ �ਪਰ�ਸ਼ਨ ਲ� ਬ�ੱ� ਸਮੱ�ਰ� �ਾਪ� �ਰ�(_b)"
 
-#: ../modules/addressbook/addressbook-config.c:746
+#: ../modules/addressbook/addressbook-config.c:756
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -14078,7 +13065,7 @@ msgstr ""
 "�ਹ LDAP ਸਰਵਰ ਦ� �ਹ ਪ�ਰ� ਹ�, �ਿਸ ਤ� �ਵ�ਲ�ਸ਼ਨ ���ਨ ਦ� ��ਸ਼ਿਸ �ਰ ਰਿਹਾ ਹ�। �ੱ� ਸ���ਡਰਡ ਪ�ਰ�ਾ� "
 "ਦ� ਸ��� �ਪਲੱਬਧ ਹ�। �ਪਣ� ਸਿਸ�ਮ ਪ�ਰਬੰਧ� ਨ�ੰ ਪ�ੱ�� �ਿ �ਿਹ�� ਪ�ਰ� ਨਿਰਧਾਰਿਤ �ਰਨ� ਹ�।"
 
-#: ../modules/addressbook/addressbook-config.c:820
+#: ../modules/addressbook/addressbook-config.c:830
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14087,7 +13074,7 @@ msgstr ""
 "�ਹ ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� �� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� ਲ� �ਸਤ�ਮਾਲ �ਰ���। �ਸ ਨ�ੰ \"�ਮ�ਲ �ਡਰ�ੱਸ\" ਨਿਰਧਾਰਿਤ "
 "�ਰਨ ਨਾਲ ਤ�ਹਾਡ� ldap ਸਰਵਰ ਲ� ਬ�ਪ�ਾਣ ਪਹ�ੰ� ਲ���ਦ� ਹ�ਵ���।"
 
-#: ../modules/addressbook/addressbook-config.c:895
+#: ../modules/addressbook/addressbook-config.c:905
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -14098,29 +13085,29 @@ msgstr ""
 "\"sub\" ਸ�ਮਾ ਨਾਲ ��� �ਧਾਰ ਦ� ਹ�ਠਾ� ਸਭ ���ਮਾ� ਦ� �ਾ�� �ਰ���। ��� ਸ�ਮਾ� \"one\" ਨਾਲ "
 "ਤ�ਹਾਡ� �ਧਾਰ ਤ�� �ੱ� ਪੱਧਰ ਤੱ� �ਾ�� ��ਤ� �ਾਵ���।"
 
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../modules/addressbook/addressbook-config.c:1021
 msgid "Server Information"
 msgstr "ਸਰਵਰ �ਾਣ�ਾਰ�"
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1026
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "ਵ�ਰਵਾ"
 
-#: ../modules/addressbook/addressbook-config.c:1017
+#: ../modules/addressbook/addressbook-config.c:1027
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "��� �ਾਰ� ਹ�"
 
-#: ../modules/addressbook/addressbook-config.c:1019
+#: ../modules/addressbook/addressbook-config.c:1029
 msgid "Downloading"
 msgstr "ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../modules/addressbook/addressbook-config.c:1225
+#: ../modules/addressbook/addressbook-config.c:1235
 msgid "Address Book Properties"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿਸ਼�ਸ਼ਤਾ"
 
-#: ../modules/addressbook/addressbook-config.c:1227
+#: ../modules/addressbook/addressbook-config.c:1237
 msgid "New Address Book"
 msgstr "ਨਵ�� �ਡਰ�ੱਸ-ਬ�ੱ�"
 
@@ -14157,14 +13144,26 @@ msgid "Position of the contact preview pane when oriented vertically."
 msgstr "ਸੰਪਰ� �ਲ� ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਵਰ���ਲ ਹ�ਵ�।"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+#, fuzzy
+#| msgid "The registry of address books"
+msgid "Primary address book"
+msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਰ�ਿਸ�ਰ�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show autocompleted name with an address"
 msgstr "�ਡਰ�ੱਸ ਨਾਲ ���-ਪ�ਰਾ ਨਾ� ਵ���"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "Show preview pane"
 msgstr "�ਲ� ਪ�ਨ ਵ���"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -14175,47 +13174,47 @@ msgstr ""
 "\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ ਸੰਪਰ� ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) �ਲ� "
 "ਬਾਹ� ਨ�ੰ ਸੰਪਰ� ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr "�ਸ ਤ�� ਪਹਿਲਾ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਸਵ� ਪ�ਰਨ �ਾਰਵਾ� ਨ�ੰ ਸ਼�ਰ� �ਰ�, �ੱ�ਰਾ� ਦ� �ਿਣਤ� ਹ�।"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid "URI for the folder last used in the select names dialog"
 msgstr "ਨਾ� ਡਾ�ਲਾ� ਵਿੱ� ��ਣ� ���ਰ� ਫ�ਲਡਰ ਦਾ URI"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog."
 msgstr "��ਣ� ਨਾ� ਡਾ�ਲਾ� ਵਿੱ� ��ਣ� ���ਰ� ਫ�ਲਡਰ ਦਾ URI ਹ�।"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
 msgstr "�� ���ਰ� ਵਿੱ� ���-ਪ�ਰਨ ਸੰਪਰ� ਦ� ਨਾ� ਨਾਲ ਮ�ਲ �ਡਰ�ੱਸ ਵ��ਾ�ਣ ਲ� ਮ�ਬ�ਰ �ਰਨਾ ਹ�।"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "Whether to show the preview pane."
 msgstr "�� �ਲ� ਪ�ਨ ਵ��ਾ�ਣ� ਹ�"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:162
-#: ../modules/mail/em-mailer-prefs.c:1141
+#: ../modules/addressbook/autocompletion-config.c:161
+#: ../modules/mail/em-mailer-prefs.c:1138
 msgid "_Table column:"
 msgstr "��ਬਲ �ਾਲਮ(_ T):"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:164
 msgid "Autocompletion"
 msgstr "ਸਵ�-ਪ�ਰਤ�"
 
-#: ../modules/addressbook/autocompletion-config.c:168
+#: ../modules/addressbook/autocompletion-config.c:167
 msgid "Always _show address of the autocompleted contact"
 msgstr "���-ਪ�ਰਾ ��ਤ� ਸੰਪਰ� ਦਾ �ਡਰ�ੱਸ ਹਮ�ਸ਼ਾ ਵ���"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:98
-#: ../modules/addressbook/e-book-shell-migrate.c:148
+#: ../modules/addressbook/e-book-shell-migrate.c:153
 msgid "On LDAP Servers"
 msgstr "LDAP ਸਰਵਰਾ� �ੱਤ�"
 
@@ -14252,8 +13251,8 @@ msgstr "�ੱ� ਸ�ਨ�ਹਾ �ਿਤਾਬ ਬਣਾ�"
 #. Create the contacts group
 #: ../modules/addressbook/e-book-shell-backend.c:316
 #: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:104
-#: ../modules/calendar/e-cal-shell-migrate.c:57
+#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-migrate.c:59
 msgid "Contacts"
 msgstr "ਸੰਪਰ�"
 
@@ -14304,10 +13303,10 @@ msgid "Show properties of the selected address book"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਵਿਸ਼�ਸ਼ਤਾ ਵ���"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:715
-#: ../modules/calendar/e-cal-shell-view-actions.c:1354
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
-#: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/mail/e-mail-shell-view-actions.c:1138
 msgid "_Rename..."
 msgstr "ਨਾ� ਬਦਲ�(_R)..."
 
@@ -14388,22 +13387,22 @@ msgid "Send a message to the selected contacts"
 msgstr "ਸ�ਨ�ਹਾ ��ਣ� ਸੰਪਰ�ਾ� ਵਿੱ� ਭ���"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-cal-shell-view-actions.c:1500
+#: ../modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Actions"
 msgstr "�ਾਰਵਾ�(_A)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
-#: ../modules/calendar/e-task-shell-view-actions.c:809
-#: ../modules/mail/e-mail-shell-view-actions.c:1094
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "_Preview"
 msgstr "�ਲ�(_P)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
-#: ../modules/calendar/e-memo-shell-view-actions.c:670
-#: ../modules/calendar/e-task-shell-view-actions.c:822
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-memo-shell-view-actions.c:676
+#: ../modules/calendar/e-task-shell-view-actions.c:828
 msgid "_Delete"
 msgstr "ਹ�ਾ�(_D)"
 
@@ -14426,9 +13425,9 @@ msgid "Show contact preview window"
 msgstr "ਸੰਪਰ� �ਲ� ਵਿੰਡ� ਵ���"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:879
-#: ../modules/calendar/e-memo-shell-view-actions.c:727
-#: ../modules/calendar/e-task-shell-view-actions.c:891
-#: ../modules/mail/e-mail-shell-view-actions.c:1188
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:897
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
 msgid "_Classic View"
 msgstr "��ਸਾਲ� �ਲ�(_C)"
 
@@ -14437,9 +13436,9 @@ msgid "Show contact preview below the contact list"
 msgstr "ਸ�ਨ�ਹਾ ਲਿਸ� ਦ� ਹ�ਠਾ� ਸੰਪਰ� �ਲ� ਵ���"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:886
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:898
-#: ../modules/mail/e-mail-shell-view-actions.c:1195
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 msgid "_Vertical View"
 msgstr "ਲੰਬ�ਾਰ� �ਲ�(_V)"
 
@@ -14448,25 +13447,25 @@ msgid "Show contact preview alongside the contact list"
 msgstr "ਸੰਪਰ� ਲਿਸ� ਦ� ਨਾਲ ਸੰਪਰ� �ਲ� ਵ���"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1656
-#: ../modules/calendar/e-memo-shell-view-actions.c:744
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Any Category"
 msgstr "��� ���ਾ�ਰ�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1670
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Unmatched"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1680
-#: ../modules/calendar/e-memo-shell-view-actions.c:761
-#: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
-#: ../shell/e-shell-content.c:467
+#: ../modules/calendar/e-cal-shell-view-actions.c:1684
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../shell/e-shell-content.c:613
 msgid "Advanced Search"
 msgstr "ਤ�ਨ��� ���"
 
@@ -14623,115 +13622,878 @@ msgstr "ਸ�ਰੱ�ਿ�ਤ ��ਨ��ਸ਼ਨ ਵਰਤ��(_U):"
 msgid "cards"
 msgstr "�ਾਰਡ"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "%u �ਤ� %d ਨ�ੰ �-ਮ�ਲ �ਡਰ�ੱਸ ਵਿੱ��� ਯ��਼ਰ �ਤ� ਡ�ਮ�ਨ ਨਾਲ ਤਬਦ�ਲ ��ਤਾ �ਾਵ��ਾ।"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(ਦਿਨ �ਲ� ਵਿੱ� ਵ���)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
+msgid "05 minutes"
+msgstr "੦੫ ਮਿੰ�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
+msgid "10 minutes"
+msgstr "੧੦ ਮਿੰ�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
+msgid "15 minutes"
+msgstr "੧੫ ਮਿੰ�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
+msgid "30 minutes"
+msgstr "੩੦ ਮਿੰ�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
+msgid "60 minutes"
+msgstr "੬੦ ਮਿੰ�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Alerts"
+msgstr "��ਤਾਵਨ�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+msgid "Day _ends:"
+msgstr "ਦਿਨ ਸਮਾਪਤ(_e):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Days"
+msgstr "ਦਿਨ"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr "ਡਿਫਾਲ� ਵ�ਹਲਾ/ਰ��ਿ� ਸਰਵਰ"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "Display"
+msgstr "ਡਿਸਪਲ��"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "Display alarms in _notification area only"
+msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ� ਵਿੱ� �ਲਾਰਮ ਵ���(_n)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Hours"
+msgstr "�ੰ��"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Minutes"
+msgstr "ਮਿੰ�"
+
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "S_un"
+msgstr "�ਤ(_u)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "Sc_roll Month View by a week"
+msgstr "ਮਹ�ਨ� ਨ�ੰ ਹਫ਼ਤ� ਨਾਲ ਹਿਲਾ�(_r)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Se_cond zone:"
+msgstr "ਦ��ਾ ��ਤਰ(_c):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "Select the calendars for alarm notification"
+msgstr "�ਲਾਰਮ ਸ��ਨਾ ਲ� �ਲੰਡਰ ��ਣ�"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Sh_ow a reminder"
+msgstr "ਯਾਦਪੱਤਰ ਵ��ਾ�(_o)"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "Show a _reminder"
+msgstr "ਯਾਦਪੱਤਰ ਵ��ਾ�(_r)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
+msgid "Show week _numbers"
+msgstr "ਹਫ਼ਤਾ ਨੰਬਰ ਵ���(_n)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "T_asks due today:"
+msgstr "�ੱ� ਦ� �ੰਮ(_a):"
+
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "T_hu"
+msgstr "ਵ�ਰ(_h)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+msgid "Template:"
+msgstr "��ਪਲ��:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../widgets/misc/e-dateedit.c:606
+msgid "Time"
+msgstr "ਸਮਾ�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Time format:"
+msgstr "ਸਮਾ�-ਫਾਰਮ��:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Use s_ystem time zone"
+msgstr "ਸਿਸ�ਮ ਸਮਾ� ��ਤਰ ਵਰਤ��(_y)"
+
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
+msgid "Wee_k starts on:"
+msgstr "ਹਫਤਾ ਸ਼�ਰ�(_k):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1643
+msgid "Work Week"
+msgstr "�ੰਮ ਹਫਤਾ"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+msgid "Work days:"
+msgstr "�ਾਰ�� ਦਿਨ:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
+msgid "_12 hour (AM/PM)"
+msgstr "_੧੨ �ੰ�� (ਸਵ�ਰ/ ਸ਼ਾਮ)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "_24 hour"
+msgstr "_੨੪ �ੰ��"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "���ਮਾ� ਹ�ਾ�ਣ ਸਮ�� ਪ�ਸ਼�� �ਰਵਾ�(_A)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "_Compress weekends in month view"
+msgstr "ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਹਫਤਾ-�ੰਤ ਸਮ���(_C)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "_Day begins:"
+msgstr "ਦਿਨ ਸ਼�ਰ�(_D):"
+
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "_Fri"
+msgstr "ਸ਼�ੱ�ਰ(_F)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "_Hide completed tasks after"
+msgstr "ਸੰਪ�ਰਨ �ੰਮ �ਸ ਬਾ�ਦ �ਹਲ� �ਰ�(_H)"
+
+#. Monday
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+msgid "_Mon"
+msgstr "ਸ�ਮ(_M)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "_Overdue tasks:"
+msgstr "ਮਿ�ਦ ਪ�ੱ�� �ੰਮ(_O):"
+
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+msgid "_Sat"
+msgstr "ਸ਼ਨਿੱ(_S)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "_Show appointment end times in week and month view"
+msgstr "ਹਫਤ� �ਤ� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਮ�ਲ�ਾਤ ਵ��ਾ�(_S)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
+msgid "_Time divisions:"
+msgstr "ਸਮਾ� ਵੰਡ(_T):"
+
+#. Tuesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
+msgid "_Tue"
+msgstr "ਮੰ�ਲ(_T)"
+
+#. Wednesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
+msgid "_Wed"
+msgstr "ਬ�ੱਧ(_W)"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "before every anniversary/birthday"
+msgstr "ਹਰ�� ਵਰ�ਹ�-�ੰਢ/�ਨਮਦਿਨ ਤ�� ਪਹਿਲਾ�"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
+msgid "before every appointment"
+msgstr "ਹਰ ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Alarm programs"
+msgstr "�ਲਾਰਮ �ਾਰ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Ask for confirmation when deleting items"
+msgstr "���ਮਾ� ਹ�ਾ�ਣ ਸਮ�� ਪ�ਸ਼�� �ਰਵਾ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "�ੱ� ਦ� �ੰਮਾ� ਲ� ਬ���ਰਾ��ਡ ਰੰ�, \"#rrggbb\" ਫਾਰਮ�� ਵਿੱ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr "�ੰਮ ਦਾ ਰੰ�, �ਿਨਾ� ਦ� ਮਿ�ਦ ਲੰ� ��ੱ�� ਹ�, \"#rrggbb\" ਫਾਰਮ�� ਵਿੱ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#, fuzzy
+#| msgid "Birthdays & Anniversaries"
+msgid "Birthday and anniversary reminder"
+msgstr "�ਨਮ-ਦਿਨ ਤ� ਵਰ�-�ੰਢ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#, fuzzy
+#| msgid "Birthdays & Anniversaries"
+msgid "Birthday and anniversary reminder units"
+msgstr "�ਨਮ-ਦਿਨ ਤ� ਵਰ�-�ੰਢ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#, fuzzy
+#| msgid "Birthdays & Anniversaries"
+msgid "Birthday and anniversary reminder value"
+msgstr "�ਨਮ-ਦਿਨ ਤ� ਵਰ�-�ੰਢ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid "Calendars to run alarms for"
+msgstr "�ਲਾਰਮ �ਲਾ�ਣ ਲ� ��ਲੰਡਰ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "ਸਮਾ� ਰ��ਾ ਵਿੱ� ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ �ਿੱ�ਣ ਲ� ਰੰ� (ਮ�ਲ �ਾਲ� ਹ�)।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਲ� ਰੰ� ਹ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+msgid "Compress weekends in month view"
+msgstr "ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਹਫਤ� ਸਮ���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Confirm expunge"
+msgstr "ਤੱਥ �ੱਢਣ ਸਮ�� ਪ�ਸ਼��"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr "ਦਿਨ, �ਿੰਨਾ ਤ�� �ਾਰ��ਾਰ� �ੰ�� ਸ਼�ਰ� �ਤ� �ੰਤ ਹ�ੰਦ� ਹਨ, ਵ��ਾ�ਣ ਲ਼�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Default appointment reminder"
+msgstr "ਮ�ਲ ਮ�ਲਾ�ਾਤ ਯਾਦ-ਪੱਤਰ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Default reminder units"
+msgstr "ਡਿਫਾਲ� ਰ�ਮਾ�ਡਰ ਯ�ਨਿ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Default reminder value"
+msgstr "ਮ�ਲ ਯਾਦਪੱਤਰ ਮ�ੱਲ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Directory for saving alarm audio files"
+msgstr "�ਲਾਰਮ �ਡ�� ਫਾ�ਲਾ� ਨ�ੰ ਸੰਭਾਲਣ ਲ� ਡਾ�ਰ���ਰ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Free/busy server URLs"
+msgstr "ਵ�ਹਲਾ/ਰ��ਿ� ਸਰਵਰ URL"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Free/busy template URL"
+msgstr "ਵ�ਹਲਾ/ਰ��ਿ�� ��ਪਲ�� URL"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Hide completed tasks"
+msgstr "ਮ��ੰਮਲ �ੰਮ �ਹਲ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Hide task units"
+msgstr "�ੰਮ ���ਮਾ� �ਹਲ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Hide task value"
+msgstr "�ੰਮ ਮ�ੱਲ �ਹਲ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Horizontal pane position"
+msgstr "�ਿਤਿ�� ਪੱ�� ਸਥਿਤ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr "�ਾਰ��ਾਰ� ਦਿਨ �ੰਤ ਹ�ਣ ਤ�� �ੰ��, ��ਵ�� �ੰ�ਾ ਫਾਰਮ�� ਵਿੱ� ੦ ਤ�� ੨੩"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr "�ਾਰ��ਾਰ� ਦਿਨ ਸ਼�ਰ� ਹ�ਣ ਤ�� �ੰ��, ��ਵ�� �ੰ�ਾ ਫਾਰਮ�� ਵਿੱ� ੦ ਤ�� ੨੩"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr "�� ਸਹ�� ਸ�ੱ� ��ਤਾ ਤਾ�, ਮ�ੱ� ਵਿੰਡ� ਵਿੱ� ਮ�ਮ� �ਲ� ਬਾਹ� ਵ��ਾ� �ਾਵ���।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr "�� ਸਹ�� ਸ�ੱ� ��ਤਾ ਤਾ�, ਮ�ੱ� ਵਿੰਡ� ਵਿੱ� �ਾਸ� �ਲ� ਬਾਹ� ਵ��ਾ� �ਾਵ���।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr "ਦਿਨ �ਤ� �ੰਮ ਦ� ਹਫਤਾ �ਲ� ਵਿੱ� �ੰਤਰਾਲ, ਮਿੰ� ਵਿੱ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Last alarm time"
+msgstr "��ਰ� �ਲਾਰਮ ਸਮਾ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+msgid "List of recently used second time zones in a Day View."
+msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਤਾ�਼ਾ ਵਰਤ� ਦ��� ਸਮਾ�-��ਤਰ ਦ� ਲਿਸ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "List of server URLs for free/busy publishing."
+msgstr "ਵ�ਹਲਾ/ਰ��ਿ� ਪਬਲ���ਸ਼ਨ ਲ� ਸਰਵਰ URL ਦ� ਸ��� ਹ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+msgid "Marcus Bains Line"
+msgstr "ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਰੰ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Marcus Bains Line Color - Day View"
+msgstr "ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਰੰ� - ਦਿਨ �ਲ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਰੰ� - ਸਮਾ� ਰ��ਾ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr "'day_second_zones' ਵਿੱ� ਯਾਦ ਰੱ�ਣ ਲ� ਤਾ�਼ਾ ਵਰਤ� ਸਮਾ�-��ਤਰਾ� ਦ� ਵੱਧ�-ਵੱਧ �ਿਣਤ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+msgid "Maximum number of recently used timezones to remember."
+msgstr "ਯਾਦ ਰੱ�ਣ ਲ� ਤਾ�਼ਾ ਵਰਤ� ਸਮਾ�-��ਤਰਾ� ਦ� ਵੱਧ�-ਵੱਧ �ਿਣਤ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Memo layout style"
+msgstr "ਮ�ਮ� ਲ���� ਸ�ਾ�ਲ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+msgid "Memo preview pane position (horizontal)"
+msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਸਥਿਤ� (ਹਰ��ੱ�ਲ)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+msgid "Memo preview pane position (vertical)"
+msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਸਥਿਤ� (ਵਰ���ਲ)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "�ੰਮ ਦਿਨ ਦ� ਮਿੰ� �ਤਮ ਹ�ਣ, ੦ ਤ�� ੫੯"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "�ੰਮ ਦਿਨ ਦ� ਮਿੰ� ਸ਼�ਰ� ਹ�ਣ, ੦ ਤ�� ੫੯"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+msgid "Month view horizontal pane position"
+msgstr "�ਿਤਿ�� ਪਾਸ� ਦ� ਸਥਿਤ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+msgid "Month view vertical pane position"
+msgstr "ਮਹ�ਨਾ ਦਿੱ� ਲੰਬ�ਾਰ� ਪੱ�� ਸਥਿਤ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#, fuzzy
+#| msgid "Number of units for determining a default reminder."
+msgid "Number of units for determining a birthday or anniversary reminder."
+msgstr "ਮ�ਲ ਯਾਦ-ਪੱਤਰ �ਾਣਨ ਲ� ���ਮਾ� ਦ� �ਿਣਤ� ਹ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+msgid "Number of units for determining a default reminder."
+msgstr "ਮ�ਲ ਯਾਦ-ਪੱਤਰ �ਾਣਨ ਲ� ���ਮਾ� ਦ� �ਿਣਤ� ਹ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Number of units for determining when to hide tasks."
+msgstr "�ੰਮ �ਹਲ� �ਰਨ ਦਾ ਪਤਾ �ਰਨ ਲ� ���ਮਾ� ਦ� �ਿਣਤ� ਹ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+msgid "Overdue tasks color"
+msgstr "ਮਿ�ਦ ਪ�ੱ�� �ੰਮ ਦਾ ਰੰ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+"�ਿਤਿ�� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, �� "
+"�ਿ ਮਹ�ਨਾ ਨਾ ਦਿੱ� ਹ�ਵ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"�ਿਤਿ�� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, �� "
+"�ਿ ਮਹ�ਨਾ ਦਿੱ� ਹ�ਵ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਵਰ���ਲ ਹ�ਵ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr "�ਾਸ� �ਲ� ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਹਰ��ੱ�ਲ ਹ�ਵ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the task preview pane when oriented vertically."
+msgstr "�ਾਸ� �ਲ� ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਵਰ���ਲ ਹ�ਵ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr "ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ�, �� �ਿ ��ਲੰਡਰ ਸ��� �ਤ� ਮਿਤ� ਨ�ਵ����ਰ ��ਲੰਡਰ ਬਾਹ� ਵਿੱ� ਵਿੱ� ਹ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲਾ� ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ� ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, "
+"�ਦ�� �ਿ ਮਹ�ਨਾ ਦਿੱ� ਹ�ਵ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲਾ� ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ� ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, "
+"�ਦ�� �ਿ ਮਹ�ਨਾ ਦਿੱ� ਨਾ ਹ�ਵ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Primary calendar"
+msgstr "ਪ�ਰਾ�ਮਰ� ��ਲੰਡਰ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "Primary memo list"
+msgstr "ਪ�ਰਾ�ਮਰ� ਮ�ਮ� ਲਿਸ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Primary task list"
+msgstr "ਪ�ਰਾ�ਮਰ� �ਾਸ� ਲਿਸ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Programs that are allowed to be run by alarms."
+msgstr "�ਲਾਰਮ ਵਲ�� �ੱਲਣ ਵਾਲ� �ਾਰ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+msgid "Recently used second time zones in a Day View"
+msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਵਰਤ� ਤਾ�਼ਾ ਦ��� ਸਮਾ� �਼�ਨ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#, fuzzy
+#| msgid "Recurrence date is invalid"
+msgid "Recurrent Events in Italic"
+msgstr "�ਵਰਤ� ਮਿਤ� �ਲਤ ਹ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
+msgid "Save directory for alarm audio"
+msgstr "�ਲਾਰਮ �ਡ�� ਲ� ਡਾ�ਰ���ਰ� ਸੰਭਾਲ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Scroll Month View by a week"
+msgstr "ਮਹ�ਨਾ �ਲ� ਨ�ੰ ਹਫ਼ਤ� ਰਾਹ�� �ੱ�� ਪਿੱ�� �ਰ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� RSVP ��ਤਰ ਵ��ਾ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਰ�ਲ ��ਤਰ ਵ���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
+msgid "Show appointment end times in week and month views"
+msgstr "ਹਫਤਾ ਤ� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਮ�ਲਾ�ਾਤ �ੰਤ ਸਮਾ� ਵ���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ���ਾ�ਰ� ��ਤਰ ਵ���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
+msgid "Show days with recurrent events in italic font in bottom left calendar."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+msgid "Show display alarms in notification tray"
+msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ� ਵਿੱ� �ਲਾਰਮ ਵ���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
+msgid "Show status field in the event/task/meeting editor"
+msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਹਾਲਤ ��ਤਰ ਵ���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+msgid "Show the memo preview pane"
+msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਵ���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
+msgid "Show the task preview pane"
+msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਵ���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Show timezone field in the event/meeting editor"
+msgstr "��ਨਾ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਸਮਾ� ��ਤਰ ਵ���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
+msgid "Show type field in the event/task/meeting editor"
+msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਲਿ�ਣ ��ਤਰ ਵ���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "ਦਿਨ �ਲ�, �ੰਮ ਹਫ਼ਤਾ �ਲ� �ਤ� ਮਿਤ� ਨ�ਵ����ਰ ਵਿੱ� ਹਫ਼ਤਾ �ਿਣਤ� ਵ���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਦ��ਾ ਸਮਾ�-��ਤਰ ਵ��ਣਾ �� ਸ�ੱ� ��ਤਾ ਤਾ�। ਮ�ੱਲ 'timezone' ��ੰ�� ਵਿੱ� ਵਰਤ� ਵਾ�� ਹ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Task layout style"
+msgstr "�ਾਸ� ਲ���� ਸ�ਾ�ਲ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
+msgid "Task preview pane position (horizontal)"
+msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਸਥਿਤ� (ਹਰ��ੱ�ਲ)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+msgid "Task preview pane position (vertical)"
+msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਸਥਿਤ� (ਵਰ���ਲ)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Tasks due today color"
+msgstr "�ੱ� ਦ� �ੰਮ ਦਾ ਰੰ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"ਵ�ਹਲਾ/ਰ��ਿ� ਵਾ�� ਵਰਤਣ ਲ਼� URL ��ਪਲ�� ਡਾ�ਾ, %u ਨ�ੰ ਪੱਤਰ �ਡਰ�ੱਸ ਦ� ਯ��਼ਰ ��ਤਰ �ਤ� %d ਨ�ੰ ਡ�ਮ�ਨ ਨਾਲ "
+"ਤਬਦ�ਲ �ਰ ਦਿੱਤਾ �ਾਵ��ਾ।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"��ਲੰਡਰ ਵਿੱ� ਵਰਤਣ ਲ� ਮਿਤ� ਤ� ਸਮਾ� ਲ� ਮ�ਲ ਸਮਾ�-��ਤਰ, �ੱ� ਨਾ-�ਨ�ਵਾਦ �ਲਸ�ਨ ਸਮਾ�-��ਤਰ ਡਾ�ਾਬ�ਸ "
+"��ਤਰ, �ਿਵ�� �ਿ \"America/New York\" �ਦਿ।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+"ਲ���� ਸ�ਾ�ਲ ਤਹਿ �ਰਦਾ ਹ� �ਿ ਮ�ਮ� ਲਿਸ� ਨਾਲ ਸਬੰਧਿਤ �ਲ� ਬਾਹ� �ਿੱਥ� ਵ��ਾ� �ਾਵ�। \"0"
+"\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ ਮ�ਮ� ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) �ਲ� "
+"ਬਾਹ� ਨ�ੰ ਮ�ਮ� ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+"ਲ���� ਸ�ਾ�ਲ ਤਹਿ �ਰਦਾ ਹ� �ਿ �ਾਸ� ਲਿਸ� ਨਾਲ ਸਬੰਧਿਤ �ਲ� ਬਾਹ� �ਿੱਥ� ਵ��ਾ� �ਾਵ�। \"0"
+"\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ �ਾਸ� ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) �ਲ� "
+"ਬਾਹ� ਨ�ੰ �ਾਸ� ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "The second timezone for a Day View"
+msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਦ��ਾ ਸਮਾ�-��ਤਰ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr "ਤਿੰਨ ਸੰਭਵ ਮ�ੱਲ ਹਨ। �ਲਤ��� ਲ� 0। ��ਤਾਵਨ� ਲ� 1। ਡ�ਬੱ� ਸ�ਨ�ਹਾ ਲ� 2।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Time divisions"
+msgstr "ਸਮਾ� ਵੰਡ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
+msgid "Time the last alarm ran, in time_t."
+msgstr "ਸਮਾ� �ਦ�� �ਲਾਰਮ �ੱਲਿ�, ਸਮ�� ਵਿੱ�(_t)।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Timezone"
+msgstr "ਸਮਾ�-��ਤਰ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Twenty four hour time format"
+msgstr "��ਵ�� �ੰ�ਾ ਸਮਾ� ਫਾਰਮ��"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+#, fuzzy
+#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
+msgstr "ਮ�ਲ ਰ�ਮਾ�ਡਰ ਲ� ���ਮਾ� ਹਨ, \"ਮਿੰ�\", \"�ੰ��\" or \"ਦਿਨ\""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr "ਮ�ਲ ਰ�ਮਾ�ਡਰ ਲ� ���ਮਾ� ਹਨ, \"ਮਿੰ�\", \"�ੰ��\" or \"ਦਿਨ\""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "�ਾਸ� �ਹਲ� �ਰਨ ਲ� �ਾਣਨ ਲ� ���ਮਾ�, \"ਮਿੰ�\", \"�ੰ��\" �ਾ� \"ਦਿਨ\""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
+msgid "Use system timezone"
+msgstr "ਸਿਸ�ਮ �ਾ�ਮ-�਼�ਨ ਵਰਤ��"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ��ਣ� ਸਮਾ�-��ਤਰ ਦ� ਬ�ਾ� ਸਿਸ�ਮ ਸਮਾ�-��ਤਰ ਵਰਤ��"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
+msgid "Vertical pane position"
+msgstr "ਲੰਬ�ਾਰ� ਬਾਹ� ਸਥਿਤ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Week start"
+msgstr "ਹਫਤਾ ਸ਼�ਰ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr "ਹਫਤਾ ਸ਼�ਰ� ਹ�ਣ ਦਾ ਦਿਨ, �ਤਵਾਰ (੦) ਤ�� ਸ਼ਨਿ�ੱਰਵਾਰ (੬)।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
+msgid "Whether or not to use the notification tray for display alarms."
+msgstr "�ਲਾਰਮ ਵ��ਾ�ਣ ਲ� ਸ��ਨਾ ਪੱ�� ਵਿੱ� ਵਰਤਿ� �ਾਵ� �ਾ� ਨਾ।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr "�� ਮ�ਲਾ�ਾਤ �ਾ� �ੰਮ ਹ�ਾ�ਣ ਤ� ਪ�ਸ਼�� �ਰਵਾ� �ਾਵ� �ਾ� ਨਾ।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "�� ਮ�ਲ�ਾਤ �ਾ� �ੰਮ ਹ�ਾ�ਣ ਤ� ਪ�ਸ਼�� �ਰਵਾ� �ਾਵ� �ਾ� ਨਾ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"�� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਹਫਤਿ�� ਨ�ੰ �ੱ�ਠਾ �ਰਨਾ ਹ� ਤਾ� �ਿ ਸ਼ਨਿ�ੱਰਵਾਰ �ਤ� �ਤਵਾਰ ਨ�ੰ �ੱ� ਦਿਨ ਦ� ਤ�ਰ ਤ� "
+"ਵ��ਾ�� �ਾਵ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
+msgid "Whether to display the end time of events in the week and month views."
+msgstr "�� ਹਫਤਾ ਤ� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ��ਨਾ ਦਾ ਸਮਾ� �ੰਤ ਵ��ਾ�ਣਾ ਹ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr "�� ��ਲੰਡਰ ਵਿੱ� ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ (ਮ���ਦਾ ਸਮ�� ਦ� ਰ��ਾ) �ਿੱ�ਣ� ਹ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "�� ਮ��ੰਮਲ �ੰਮਾ� ਨ�ੰ �ੰਮ ਦਿੱ� ਵਿੱ� �ਹਲ� ��ਤ� �ਾਵ� �ਾ� ਨਾ।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "�� ਮਹ�ਨਾ �ਲ� ਨ�ੰ ਹਫ਼ਤ� ਰਾਹ�� ਹਿਲਾ�ਣਾ ਹ� ਨਾ �ਿ ਮਹ�ਨ� ਨਾਲ।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
+msgid "Whether to set a default reminder for appointments."
+msgstr "�� ਮ�ਲਾ�ਾਤ ਲ� ਮ�ਲ ਰ�ਮਾ�ਡਰ ਲ�ਾ�� �ਾਵ� �ਾ� ਨਾ।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+#, fuzzy
+#| msgid "Whether to set a default reminder for appointments."
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr "�� ਮ�ਲਾ�ਾਤ ਲ� ਮ�ਲ ਰ�ਮਾ�ਡਰ ਲ�ਾ�� �ਾਵ� �ਾ� ਨਾ।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� RSVP ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "�� ��ਨਾ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ���ਾ�ਰ� ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਰ�ਲ ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਹਾਲਤ ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "�� ਸਮਾ� ਸਵ�ਰ�/ਸ਼ਾਮ ਦ� ਬ�ਾ� ੪ �ੰ�ਿ�� ਵਿੱ� ਵ��ਾ�� �ਾਵ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਸਮਾ� ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� �ਿਸਮ ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "�� ��ਲੰਡਰ '� �� ਥਾਵਾ� ਵਿੱ� ਹਫ਼ਤਾ ਨੰਬਰ ਵ��ਾ�ਣਾ ਹ�।"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Work days"
+msgstr "�ਾਰ�� ਦਿਨ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Workday end hour"
+msgstr "�ਾਰ��ਾਰ� �ੰਤ �ੰ�ਾ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Workday end minute"
+msgstr "�ਾਰ��ਾਰ� �ੰਤ ਮਿੰ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Workday start hour"
+msgstr "�ਾਰ�ਾ�ਰ� ਸ਼�ਰ� �ੰ�ਾ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid "Workday start minute"
+msgstr "�ਾਰ��ਾਰ� ਸ਼�ਰ� ਮਿੰ�"
+
 #: ../modules/calendar/e-cal-attachment-handler.c:259
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "�ੰਪ�ਰ�(_m)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
+#: ../modules/calendar/e-cal-attachment-handler.c:343
 msgid "Select a Calendar"
 msgstr "��ਲੰਡਰ ��ਣ�"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:368
+#: ../modules/calendar/e-cal-attachment-handler.c:370
 msgid "Select a Task List"
 msgstr "�ੰਮ ਲਿਸ� ��ਣ�"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:378
+#: ../modules/calendar/e-cal-attachment-handler.c:380
 msgid "I_mport to Calendar"
 msgstr "��ਲੰਡਰ ਵਿੱ� �ੰਪ�ਰ� �ਰ�(_m)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:387
 msgid "I_mport to Tasks"
 msgstr "�ੰਮ �ੰਪ�ਰ�(_m)"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:106
-#: ../modules/calendar/e-cal-shell-migrate.c:181
-#: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:145
+#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-migrate.c:192
+#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-migrate.c:149
+#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-migrate.c:158
 msgid "On The Web"
 msgstr "ਵ�ੱਬ ਤ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:108
-#: ../plugins/calendar-weather/calendar-weather.c:117
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../plugins/calendar-weather/calendar-weather.c:120
 msgid "Weather"
 msgstr "ਮ�ਸਮ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:193
-#: ../modules/calendar/e-cal-shell-migrate.c:60
+#: ../modules/calendar/e-cal-shell-backend.c:200
+#: ../modules/calendar/e-cal-shell-migrate.c:62
 msgid "Birthdays & Anniversaries"
 msgstr "�ਨਮ-ਦਿਨ ਤ� ਵਰ�-�ੰਢ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:406
+#: ../modules/calendar/e-cal-shell-backend.c:425
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:408
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-backend.c:427
+#: ../modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Create a new appointment"
 msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:413
+#: ../modules/calendar/e-cal-shell-backend.c:432
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "ਸਾਰ� ਦਿਨ ਦ� ਮ�ਲਾ�ਾਤ(_p)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:415
+#: ../modules/calendar/e-cal-shell-backend.c:434
 msgid "Create a new all-day appointment"
 msgstr "ਨਵ�� ਸਾਰਾ-ਦਿਨ ਮ�ਲਾ�ਾਤ ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:420
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "M_eeting"
 msgstr "ਮ��ਿੰ�(_e)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:422
+#: ../modules/calendar/e-cal-shell-backend.c:441
 msgid "Create a new meeting request"
 msgstr "ਨਵ�� ਮ��ਿੰ� ਲ� ਬ�ਨਤ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:449
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "��ਲੰਡਰ(_n)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-backend.c:451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Create a new calendar"
 msgstr "ਨਵਾ� ��ਲੰਡਰ ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:717
-#: ../plugins/itip-formatter/itip-formatter.c:2669
+#: ../modules/calendar/e-cal-shell-backend.c:754
+#: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "Calendar and Tasks"
 msgstr "��ਲੰਡਰ ਤ� �ੰਮ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:171
-#: ../modules/calendar/e-memo-shell-sidebar.c:165
-#: ../modules/calendar/e-task-shell-sidebar.c:165
-#, c-format
-msgid ""
-"Error on %s\n"
-"%s"
-msgstr ""
-"%s �ੱਤ� �ਲਤ�\n"
-" %s"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:239
+#: ../modules/calendar/e-cal-shell-sidebar.c:217
 msgid "Loading calendars"
 msgstr "��ਲੰਡਰ ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:674
+#: ../modules/calendar/e-cal-shell-sidebar.c:641
 msgid "_New Calendar..."
 msgstr "ਨਵਾ� ��ਲੰਡਰ(_N)..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:691
+#: ../modules/calendar/e-cal-shell-sidebar.c:658
 msgid "Calendar Selector"
 msgstr "��ਲੰਡਰ ��ਣ�ਾਰ "
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1032
+#: ../modules/calendar/e-cal-shell-sidebar.c:1001
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s ਤ�� ��ਲੰਡਰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
@@ -14766,292 +14528,292 @@ msgstr "���ਮਾ� ਭ����� �ਾ ਰਹ��� ਹਨ"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1126
+#: ../modules/calendar/e-cal-shell-view-actions.c:1131
 msgid "event"
 msgstr "�ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1128
-#: ../modules/calendar/e-cal-shell-view-memopad.c:210
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:504
-#: ../modules/calendar/e-task-shell-view-actions.c:621
+#: ../modules/calendar/e-cal-shell-view-actions.c:1133
+#: ../modules/calendar/e-cal-shell-view-memopad.c:216
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:510
+#: ../modules/calendar/e-task-shell-view-actions.c:627
 msgid "Save as iCalendar"
 msgstr "iCalendar ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Copy..."
 msgstr "�ਾਪ� �ਰ�(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../modules/calendar/e-cal-shell-view-actions.c:1295
 msgid "D_elete Calendar"
 msgstr "��ਲੰਡਰ ਹ�ਾ�(_e)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1297
 msgid "Delete the selected calendar"
 msgstr "��ਣਿ� ��ਲੰਡਰ ਹ�ਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1304
 msgid "Go Back"
 msgstr "ਪਿੱ�� �ਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Go Forward"
 msgstr "�ੱ�� �ਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1318
 msgid "Select today"
 msgstr "�ੱ� ��ਣ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1323
 msgid "Select _Date"
 msgstr "ਮਿਤ� ��ਣ�(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Select a specific date"
 msgstr "�ਾਸ ਮਿਤ� ��ਣ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1330
 msgid "_New Calendar"
 msgstr "ਨਵਾ� ��ਲੰਡਰ(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1340
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "Purg_e"
 msgstr "ਨਿ���(_e)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1346
 msgid "Purge old appointments and meetings"
 msgstr "ਪ�ਰਾਣ� ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ�ਾ� ਵਿੱ� ਸ�ਧ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
-#: ../modules/calendar/e-memo-shell-view-actions.c:613
-#: ../modules/calendar/e-task-shell-view-actions.c:737
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "Re_fresh"
 msgstr "ਮ��-ਤਾ�ਾ(_f)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1353
 msgid "Refresh the selected calendar"
 msgstr "��ਣ� ��ਲੰਡਰ ਤਾ�਼ਾ �ਰ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Rename the selected calendar"
 msgstr "��ਣ� ��ਲੰਡਰ ਦਾ ਨਾ� ਬਦਲ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Show _Only This Calendar"
 msgstr "ਸਿਰਫ਼ �ਹ ��ਲੰਡਰ ਹ� ਵ���(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1368
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Cop_y to Calendar..."
 msgstr "��ਲੰਡਰ ਵਿੱ� �ਾਪ� �ਰ�(_y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "_Delegate Meeting..."
 msgstr "ਡ�ਲ���� ਮ��ਿੰ�(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "_Delete Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਹ�ਾ�(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1388
 msgid "Delete selected appointments"
 msgstr "��ਣ� ਮ�ਲਾ�ਾਤ ਹ�ਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Delete This _Occurrence"
 msgstr "�ਹ ਮ���ਦ�� ਹ�ਾ�(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Delete this occurrence"
 msgstr "�ਹ ਮ���ਦ�� ਹ�ਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Delete All Occ_urrences"
 msgstr "ਸਾਰ��� ਮ���ਦ���� ਹ�ਾ�(_u)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Delete all occurrences"
 msgstr "ਸਭ ਮ���ਦ���� ਹ�ਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "New All Day _Event..."
 msgstr "ਨਵਾ� ਸਾਰ� ਦਿਨ ਦਾ �ਵ���(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Create a new all day event"
 msgstr "ਨਵਾ� ਸਾਰ� ਦਿਨ ਦਾ �ਵ��� ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1410
-#: ../modules/calendar/e-cal-shell-view-memopad.c:244
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar ਵਾ�� �ੱ�� ਭ���(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "New _Meeting..."
 msgstr "ਨਵ�� ਮ��ਿੰ�(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Create a new meeting"
 msgstr "ਨਵ�� ਮ��ਿੰ� ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1424
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
 msgid "Mo_ve to Calendar..."
 msgstr "��ਲੰਡਰ ਵਿੱ� ਭ���(_v)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1431
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "New _Appointment..."
 msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Make this Occurrence _Movable"
 msgstr "�ਹ ਮ���ਦ�� ਨ�ੰ �ੱਲ ਬਣਾ�(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1445
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "_Open Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ��ਲ�ਹ�(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "View the current appointment"
 msgstr "ਮ���ਦਾ ਮ�ਲਾ�ਾਤ ਦ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "_Reply"
 msgstr "�ਵਾਬ(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1466
-#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-memopad.c:278
 msgid "Save as iCalendar..."
 msgstr "iCalendar ਵਾ�� ਸੰਭਾਲ�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
 msgid "_Schedule Meeting..."
 msgstr "ਮ��ਿੰ� ਨਿਯਤ ਸਮਾ�(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "Converts an appointment to a meeting"
 msgstr "ਮ�ਲਾ�ਾਤ ਨ�ੰ ਮ��ਿੰ� ਵਿੱ� ਬਦਲ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Conv_ert to Appointment..."
 msgstr "ਮ�ਲਾ�ਤ '� ਬਦਲ�(_e)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Converts a meeting to an appointment"
 msgstr "ਮ��ਿੰ� ਨ�ੰ ਮ�ਲਾ�ਾਤ ਵਿੱ� ਬਦਲ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "Quit"
 msgstr "ਬਾਹਰ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Day"
 msgstr "ਦਿਨ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1613
+#: ../modules/calendar/e-cal-shell-view-actions.c:1617
 msgid "Show one day"
 msgstr "�ੱ� ਦਿਨ ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 msgid "List"
 msgstr "ਲਿਸ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-cal-shell-view-actions.c:1624
 msgid "Show as list"
 msgstr "ਲਿਸ� ਦ� ਤਰਾ� ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Month"
 msgstr "ਮਹ�ਨਾ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1631
 msgid "Show one month"
 msgstr "�ੱ� ਮਹ�ਨਾ ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 msgid "Week"
 msgstr "ਹਫਤਾ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1638
 msgid "Show one week"
 msgstr "�ੱ� ਹ�ਤਾ ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1645
 msgid "Show one work week"
 msgstr "�ੱ� �ੰਮ ਹਫ਼ਤਾ ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Active Appointments"
 msgstr "���ਿਵ ਮ�ਲਾ�ਾਤ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1663
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 msgid "Next 7 Days' Appointments"
 msgstr "��ਲ� ੭ ਦਿਨ ਦ��� ਮ�ਲਾ�ਾਤਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
-#: ../modules/calendar/e-memo-shell-view-actions.c:775
-#: ../modules/calendar/e-task-shell-view-actions.c:974
+#: ../modules/calendar/e-cal-shell-view-actions.c:1698
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:980
 msgid "Description contains"
 msgstr "ਵ�ਰਵ� ਵਿੱ� ਸ਼ਾਮਿਲ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
-#: ../modules/calendar/e-memo-shell-view-actions.c:782
-#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/calendar/e-cal-shell-view-actions.c:1705
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Summary contains"
 msgstr "ਸੰ��ਪ ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1713
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 msgid "Print this calendar"
 msgstr "�ਹ ��ਲੰਡਰ ਪਰਿੰ� �ਰ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1724
 msgid "Preview the calendar to be printed"
 msgstr "ਪਰਿੰ� ਹ�ਣ ਵਾਲ� ��ਲੰਡਰ ਦ� �ਲ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1797
 msgid "Go To"
 msgstr "�ਾ�"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:502
+#: ../modules/calendar/e-cal-shell-view-memopad.c:214
+#: ../modules/calendar/e-memo-shell-view-actions.c:508
 msgid "memo"
 msgstr "ਮ�ਮ�"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
 msgid "New _Memo"
 msgstr "ਨਵਾ� ਮ�ਮ�(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-memo-shell-backend.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-backend.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Create a new memo"
 msgstr "�ੱ� ਨਵਾ� ਮ�ਮ� ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:258
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "_Open Memo"
 msgstr "ਮ�ਮ� ��ਲ�ਹ�(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-memopad.c:266
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "View the selected memo"
 msgstr "��ਣਿ� ਮ�ਮ� ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:265
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "Open _Web Page"
 msgstr "ਵ�ੱਬ ਸਫ਼ਾ ��ਲ�ਹ�(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:284
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:290
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the selected memo"
 msgstr "��ਣਿ� ਮ�ਮ� ਪਰਿੰ� �ਰ�"
 
@@ -15059,101 +14821,113 @@ msgstr "��ਣਿ� ਮ�ਮ� ਪਰਿੰ� �ਰ�"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:619
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
+#: ../modules/calendar/e-task-shell-view-actions.c:625
 msgid "task"
 msgstr "�ਾਸ�"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:681
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:687
 msgid "_Assign Task"
 msgstr "�ੰਮ �ਾਰ� �ਰ�(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-task-shell-view-actions.c:764
 msgid "_Mark as Complete"
 msgstr "ਨਿਸ਼ਾਨਾ ਪ�ਰਾ(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "Mark selected tasks as complete"
 msgstr "��ਣ� �ੰਮ ਨ�ੰ ਲਿ�� �ਿ ਸਮਾਪਤ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
 msgid "_Mark as Incomplete"
 msgstr "ਨਾ-ਪ�ਰਾ ਬਣਾ�(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-view-actions.c:773
 msgid "Mark selected tasks as incomplete"
 msgstr "��ਣ� �ੰਮ ਨ�ੰ ਲਿ�� �ਿ ਸਮਾਪਤ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "New _Task"
 msgstr "ਨਵਾ� �ੰਮ(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:280
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-backend.c:286
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Create a new task"
 msgstr "ਨਵਾ� �ੰਮ ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "_Open Task"
 msgstr "�ੰਮ ��ਲ�ਹ�(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "View the selected task"
 msgstr "��ਣ� �ਾਸ� ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
+#: ../modules/calendar/e-task-shell-view-actions.c:1028
 msgid "_Save as iCalendar..."
 msgstr "iCalendar ਵ��� ਸੰਭਾਲ�(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:1007
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the selected task"
 msgstr "��ਣ� �ਾਸ� ਪਰਿੰ� �ਰ�"
 
-#: ../modules/calendar/e-memo-shell-backend.c:279
+#: ../modules/calendar/e-calendar-preferences.c:437
+msgid "Selected Calendars for Alarms"
+msgstr "�ਲਾਰਮ ਲ� ��ਣ� ��ਲੰਡਰ"
+
+#: ../modules/calendar/e-calendar-preferences.c:836
+msgid "Ti_me and date:"
+msgstr "ਸਮਾ� ਤ� ਮਿਤ�(_m):"
+
+#: ../modules/calendar/e-calendar-preferences.c:837
+msgid "_Date only:"
+msgstr "��ਵਲ ਮਿਤ�(_D):"
+
+#: ../modules/calendar/e-memo-shell-backend.c:285
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ਮ�ਮ�(_o)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:286
+#: ../modules/calendar/e-memo-shell-backend.c:292
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "ਸਾ��ਾ ਮ�ਮ�(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:288
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgid "Create a new shared memo"
 msgstr "ਨਵਾ� ਸਾ��ਾ ਮ�ਮ� ਬਣਾ�"
 
-#: ../modules/calendar/e-memo-shell-backend.c:296
+#: ../modules/calendar/e-memo-shell-backend.c:302
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "ਮ�ਮ� ਲਿਸ�(_s)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-backend.c:304
+#: ../modules/calendar/e-memo-shell-view-actions.c:607
 msgid "Create a new memo list"
 msgstr "ਨਵ�� ਮ�ਮ� ਸ��� ਬਣਾ�"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:233
+#: ../modules/calendar/e-memo-shell-sidebar.c:225
 msgid "Loading memos"
 msgstr "ਮ�ਮ� ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:613
+#: ../modules/calendar/e-memo-shell-sidebar.c:594
 msgid "Memo List Selector"
 msgstr "ਮ�ਮ� ਲਿਸ� ��ਣ�ਾਰ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:918
+#: ../modules/calendar/e-memo-shell-sidebar.c:899
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s �ੱਤ� ਮ�ਮ� ��ਲ ਰਿਹਾ ਹ�"
@@ -15163,75 +14937,75 @@ msgstr "%s �ੱਤ� ਮ�ਮ� ��ਲ ਰਿਹਾ ਹ�"
 msgid "Print Memos"
 msgstr "ਮ�ਮ� ਪਰਿੰ� �ਰ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:564
+#: ../modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Delete Memo"
 msgstr "ਮ�ਮ� ਹ�ਾ�(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
 msgid "_Find in Memo..."
 msgstr "ਮ�ਮ� '� ���(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:573
+#: ../modules/calendar/e-memo-shell-view-actions.c:579
 msgid "Search for text in the displayed memo"
 msgstr "ਦਿੱਸ ਰਹ� ਮ�ਮ� ਵਿੱ� ���ਸ� ਦ� ���"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
 msgid "D_elete Memo List"
 msgstr "ਮ�ਮ� ਲਿਸ� ਹ�ਾ�(_e)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Delete the selected memo list"
 msgstr "��ਣ� ਮ�ਮ� ਲਿਸ� ਹ�ਾ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_New Memo List"
 msgstr "ਨਵ�� ਮ�ਮ� ਲਿਸ�(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Refresh the selected memo list"
 msgstr "��ਣ� ਮ�ਮ� ਲਿਸ� ਤਾ�਼ਾ �ਰ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Rename the selected memo list"
 msgstr "��ਣ� ਮ�ਮ� ਲਿਸ� ਦਾ ਨਾ� ਬਦਲ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "Show _Only This Memo List"
 msgstr "��ਵਲ �ਹ ਮ�ਮ� ਲਿਸ� ਵ���(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:706
+#: ../modules/calendar/e-memo-shell-view-actions.c:712
 msgid "Memo _Preview"
 msgstr "ਮ�ਮ� �ਲ�(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:708
+#: ../modules/calendar/e-memo-shell-view-actions.c:714
 msgid "Show memo preview pane"
 msgstr "ਮ�ਮ� �ਲ� ਪ�ਨ ਵ���"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:735
 msgid "Show memo preview below the memo list"
 msgstr "ਮ�ਮ� ਲਿਸ� ਦ� ਹ�ਠਾ� ਮ�ਮ� �ਲ� ਵ���"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:736
+#: ../modules/calendar/e-memo-shell-view-actions.c:742
 msgid "Show memo preview alongside the memo list"
 msgstr "ਮ�ਮ� ਲਿਸ� ਦ� ਨਾਲ ਮ�ਮ� �ਲ� ਵ���"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:794
+#: ../modules/calendar/e-memo-shell-view-actions.c:800
 msgid "Print the list of memos"
 msgstr "ਮ�ਮ� ਦ� ਸ��� ਪਰਿੰ� �ਰ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:801
+#: ../modules/calendar/e-memo-shell-view-actions.c:807
 msgid "Preview the list of memos to be printed"
 msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� ਮ�ਮ� ਦ� ਸ��� ਦ� �ਲ�"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:416
+#: ../modules/calendar/e-memo-shell-view-private.c:420
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d ਮ�ਮ�"
 msgstr[1] "%d ਮ�ਮ�"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-memo-shell-view-private.c:424
+#: ../modules/calendar/e-task-shell-view-private.c:575
 #, c-format
 msgid "%d selected"
 msgstr "%d ��ਣਿ�"
@@ -15244,40 +15018,40 @@ msgstr "ਮ�ਮ� ਹ�ਾ�"
 msgid "Delete Memo"
 msgstr "ਮ�ਮ� ਹ�ਾ�"
 
-#: ../modules/calendar/e-task-shell-backend.c:278
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgctxt "New"
 msgid "_Task"
 msgstr "�ੰਮ(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:285
+#: ../modules/calendar/e-task-shell-backend.c:291
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "ਦਿੱਤਾ �ੰਮ(_d)"
 
-#: ../modules/calendar/e-task-shell-backend.c:287
+#: ../modules/calendar/e-task-shell-backend.c:293
 msgid "Create a new assigned task"
 msgstr "ਨਵਾ� �ੰਮ ਬਣਾ�"
 
-#: ../modules/calendar/e-task-shell-backend.c:295
+#: ../modules/calendar/e-task-shell-backend.c:301
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "�ਾਸ� ਲਿਸ�(_k)"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Create a new task list"
 msgstr "ਨਵ�� �ਾਸ� ਸ��� ਬਣਾ�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:233
+#: ../modules/calendar/e-task-shell-sidebar.c:225
 msgid "Loading tasks"
 msgstr "�ਾਸ� ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:613
+#: ../modules/calendar/e-task-shell-sidebar.c:594
 msgid "Task List Selector"
 msgstr "�ਾਸ� ਲਿਸ� ��ਣ�ਾਰ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:918
+#: ../modules/calendar/e-task-shell-sidebar.c:899
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s ਤ� �ਾਸ� ��ਲ�ਹ� �ਾ ਰਹ� ਹਨ"
@@ -15287,7 +15061,7 @@ msgstr "%s ਤ� �ਾਸ� ��ਲ�ਹ� �ਾ ਰਹ� ਹਨ"
 msgid "Print Tasks"
 msgstr "�ਾਸ� ਪਰਿੰ� �ਰ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:563
+#: ../modules/calendar/e-task-shell-view-actions.c:569
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15299,145 +15073,145 @@ msgstr ""
 "\n"
 "�� ਤ�ਸ�� �ਹਨਾ� �ਾਸ�ਾ� ਨ�ੰ ਹ�ਾ�ਣ ਲ� ਸਹਿਮਤ ਹ�?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-task-shell-view-actions.c:694
 msgid "_Delete Task"
 msgstr "�ਾਸ� ਹ�ਾ�(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Find in Task..."
 msgstr "�ਾਸ� '� ���(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:697
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Search for text in the displayed task"
 msgstr "ਦਿੱਸ ਰਹ� �ਾਸ� ਵਿੱ� ���ਸ� ਦ� ���"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "Copy..."
 msgstr "�ਾਪ�..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:722
 msgid "D_elete Task List"
 msgstr "�ੰਮ ਲਿਸ� ਹ�ਾ�(_e)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "Delete the selected task list"
 msgstr "��ਣ� �ੰਮ ਲਿਸ� ਹ�ਾ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "_New Task List"
 msgstr "ਨਵ�� �ਾਸ� ਲਿਸ�(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Refresh the selected task list"
 msgstr "��ਣ� �ਾਸ� ਲਿਸ� ਤਾ�਼ਾ �ਰ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Rename the selected task list"
 msgstr "��ਣ� �ਾਸ� ਲਿਸ� ਦਾ ਨਾ� ਬਦਲ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Show _Only This Task List"
 msgstr "�ਹ �ਾਸ� ਲਿਸ� ਹ� ਵ���(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Mar_k as Incomplete"
 msgstr "�ਧ�ਰ� ਵ��� ਨਿਸ਼ਾਨਬੱਧ(_k)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "Delete completed tasks"
 msgstr "ਸਮਾਪਤ �ਾਸ� ਹ�ਾ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:870
+#: ../modules/calendar/e-task-shell-view-actions.c:876
 msgid "Task _Preview"
 msgstr "�ਾਸ� �ਲ�(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:872
+#: ../modules/calendar/e-task-shell-view-actions.c:878
 msgid "Show task preview pane"
 msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਵ���"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 msgid "Show task preview below the task list"
 msgstr "�ਾਸ� ਲਿਸ� ਹ�ਠਾ� �ਾਸ� �ਲ� ਵ���"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:900
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 msgid "Show task preview alongside the task list"
 msgstr "�ਾਸ� ਲਿਸ� ਨਾਲ �ਾਸ� �ਲ� ਵ���"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:908
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Active Tasks"
 msgstr "���ਿਵ �ਾਸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Completed Tasks"
 msgstr "ਸਮਾਪਤ �ਾਸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Next 7 Days' Tasks"
 msgstr "�ੱ�� ੭ ਦਿਨ ਦ��� �ਾਸ�ਾ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Overdue Tasks"
 msgstr "ਮਿ�ਦ ਪ�ੱ���� �ਾਸ�ਾ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Tasks with Attachments"
 msgstr "����ਮ��� ਨਾਲ �ਾਸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:993
+#: ../modules/calendar/e-task-shell-view-actions.c:999
 msgid "Print the list of tasks"
 msgstr "�ਾਸ� ਲਿਸ� ਪਰਿੰ� �ਰ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1000
+#: ../modules/calendar/e-task-shell-view-actions.c:1006
 msgid "Preview the list of tasks to be printed"
 msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� �ਾਸ� ਲਿਸ� ਦ� �ਲ�"
 
-#: ../modules/calendar/e-task-shell-view-private.c:463
+#: ../modules/calendar/e-task-shell-view-private.c:468
 msgid "Expunging"
 msgstr "ਨਿ�ਾਲਾ"
 
-#: ../modules/calendar/e-task-shell-view-private.c:565
+#: ../modules/calendar/e-task-shell-view-private.c:571
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d �ਾਸ�"
 msgstr[1] "%d �ਾਸ�"
 
-#: ../modules/calendar/e-task-shell-view.c:351
+#: ../modules/calendar/e-task-shell-view.c:358
 msgid "Delete Tasks"
 msgstr "�ਾਸ� ਹ�ਾ�"
 
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:360
 msgid "Delete Task"
 msgstr "�ਾਸ� ਹ�ਾ�"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:345
+#: ../modules/mail/e-mail-attachment-handler.c:380
 #, c-format
 msgid "%d attached messages"
 msgstr "%d ਸ�ਨ�ਹ� ���� ��ਤ�"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:89
+#: ../modules/mail/e-mail-junk-hook.c:94
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../modules/mail/e-mail-shell-backend.c:171
+#: ../modules/mail/e-mail-shell-backend.c:170
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:173
+#: ../modules/mail/e-mail-shell-backend.c:172
 msgid "Compose a new mail message"
 msgstr "�ੱ� ਨਵਾ� ਡਾ� ਸ�ਨ�ਹਾ ਲਿ��"
 
-#: ../modules/mail/e-mail-shell-backend.c:181
+#: ../modules/mail/e-mail-shell-backend.c:180
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "ਪੱਤਰ ਫ�ਲਡਰ(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:183
+#: ../modules/mail/e-mail-shell-backend.c:182
 msgid "Create a new mail folder"
 msgstr "ਨਵਾ� ਪੱਤਰ ਫ�ਲਡਰ ਬਣਾ�"
 
@@ -15457,417 +15231,462 @@ msgstr "�ੰਪ��਼ਰ ਪਸੰਦ"
 msgid "Network Preferences"
 msgstr "ਨ�ੱ�ਵਰ� ਪਸੰਦ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:880
-#: ../modules/mail/e-mail-shell-view.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:1047
+#: ../modules/mail/e-mail-shell-view.c:954
 msgid "_Disable Account"
 msgstr "��ਾ��� �ਯ��(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1049
 msgid "Disable this account"
 msgstr "�ਹ ��ਾ��� �ਯ��"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1056
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "ਸਭ ਫ�ਲਡਰਾ� ਤ�� ਸਭ ਹ�ਾ� ਸ�ਨ�ਹ� ਪੱ�� ਤ�ਰ �ੱਤ� ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "C_reate Search Folder From Search..."
 msgstr "��� ਤ�� ��� ਫ�ਲਡਰ ਬਣਾ�(_r)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:901
+#: ../modules/mail/e-mail-shell-view-actions.c:1068
 msgid "_Download Messages for Offline Usage"
 msgstr "�ਫਲਾ�ਨ ਲ� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ �ਰ�(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:1070
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "�ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਮਾਰ� ��ਤ� ��ਾ��� �ਤ� ਫ�ਲਡਰ ਲ� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:908
+#: ../modules/mail/e-mail-shell-view-actions.c:1075
 msgid "Fl_ush Outbox"
 msgstr "���ਬਾ�ਸ ਫਲੱਸ਼(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:1082
 msgid "_Copy Folder To..."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:1084
 msgid "Copy the selected folder into another folder"
 msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ �ੱ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Permanently remove this folder"
 msgstr "�ਹ ਫ�ਲਡਰ ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:1096
 msgid "E_xpunge"
 msgstr "ਮਿ�ਾ�(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:1098
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ਸਭ ਹ�ਾ� ਸ�ਨ�ਹ� �ਸ ਫ�ਲਡਰ ਵਿੱ��� ਹ�ਾ ਦਿ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:936
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Mar_k All Messages as Read"
 msgstr "ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਬਣਾ�(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
 msgid "Mark all messages in the folder as read"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਮਾਰ� �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:943
+#: ../modules/mail/e-mail-shell-view-actions.c:1110
 msgid "_Move Folder To..."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
 msgid "Move the selected folder into another folder"
 msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਭ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
 msgid "_New..."
 msgstr "ਨਵਾ�(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
 msgid "Create a new folder for storing mail"
 msgstr "ਸੰਭਾਲ� ਪੱਤਰਾ� ਤ�� ਨਵਾ� ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 msgid "Change the properties of this folder"
 msgstr "�ਸ ਫ�ਲਡਰ ਦ��� ਵਿਸ਼�ਸਤਾਵਾ� ਬਦਲ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 msgid "Refresh the folder"
 msgstr "ਫ�ਲਡਰ ਤਾ�਼ਾ �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:1140
 msgid "Change the name of this folder"
 msgstr "�ਸ ਫ�ਲਡਰ ਦਾ ਨਾ� ਬਦਲ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Select Message _Thread"
 msgstr "ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਵ���(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 msgid "Select all messages in the same thread as the selected message"
 msgstr "�ੱ�� ਮਸਲ� ਦ� ਸਾਰ� ਸ�ਨ�ਹ� ��ਣ� ਸ�ਨ�ਹ� ਬਣਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Select Message S_ubthread"
 msgstr "ਸ�ਨ�ਹਾ ਸਬ-ਥਰਿੱਡ ��ਣ�(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:987
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
 msgid "Select all replies to the currently selected message"
 msgstr "ਮ���ਦਾ ਸ�ਨ�ਹ� ਲ� ਸਭ �ਵਾਬ ��ਣ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:992
-msgid "_Unsubscribe"
-msgstr "ਮ��ਬਰ� ਹ�ਾ�(_U)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:994
-msgid "Unsubscribe from the selected folder"
-msgstr "��ਣ� ਫ�ਲਡਰ ਤ�� ਮ��ਬਰ ਹ�ਾ�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Empty _Trash"
 msgstr "ਰੱਦ� �ਾਲ�(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ਸਭ ��ਾ��� ਤ�� ਹ�ਾ� ਸ�ਨ�ਹ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "_New Label"
 msgstr "ਨਵਾ� ਲ�ਬਲ(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 msgid "N_one"
 msgstr "��� ਨਹ��(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#, fuzzy
+#| msgid "_Subscriptions..."
+msgid "_Manage Subscriptions"
+msgstr "ਮ��ਬਰ�(_S)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "ਰਿਮ�� ਸਰਵਰ �ੱਤ� ਫ�ਲਡਰਾ� ਲ� ਮ��ਬਰ ਬਣ� �ਾ� ਹ�ਾ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
+msgid "Send / _Receive"
+msgstr "ਭ��� / ਲਵ�(_R)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+msgid "Send queued items and retrieve new items"
+msgstr "�ਤਾਰਬੱਧ ���ਮਾ� ਭ��� �ਤ� ਨਵ�� ���ਮਾ� ਪ�ਰਾਪਤ �ਰ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#, fuzzy
+#| msgid "_Decline all"
+msgid "R_eceive all"
+msgstr "ਸਭ ਨਾ-ਮਨ�਼�ਰ(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#, fuzzy
+#| msgid "Permanently remove all the deleted messages from all accounts"
+msgid "Receive new items from all accounts"
+msgstr "ਸਭ ��ਾ��� ਤ�� ਹ�ਾ� ਸ�ਨ�ਹ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#| msgid "_Send"
+msgid "_Send all"
+msgstr "ਸਭ ਭ���(_S)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#, fuzzy
+#| msgid "Send queued items and retrieve new items"
+msgid "Send queued items in all accounts"
+msgstr "�ਤਾਰਬੱਧ ���ਮਾ� ਭ��� �ਤ� ਨਵ�� ���ਮਾ� ਪ�ਰਾਪਤ �ਰ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../widgets/misc/e-activity-proxy.c:314
+msgid "Cancel"
+msgstr "ਰੱਦ �ਰ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Cancel the current mail operation"
 msgstr "ਮ���ਦਾ ਮ�ਲ �ਾਰਵਾ� ਰੱਦ �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Collapse All _Threads"
 msgstr "ਸਭ ਥਰਿੱਡ ਸਮ���(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Collapse all message threads"
 msgstr "ਸਭ ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਸਮ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "E_xpand All Threads"
 msgstr "ਸਭ ਥਰਿੱਡ ਫ�ਲਾ�(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Expand all message threads"
 msgstr "ਸਭ ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਫ�ਲਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "_Message Filters"
 msgstr "ਸ�ਨ�ਹਾ ਫਿਲ�ਰ(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "Create or edit rules for filtering new mail"
 msgstr "ਨਵ�� ਮ�ਲ ਨ�ੰ ਫਿਲ�ਰ �ਰਨ ਲ� ਨਿਯਮ ਬਣਾ� �ਾ� ਸ�ਧ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Search F_olders"
 msgstr "ਫ�ਲਡਰ ���(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Create or edit search folder definitions"
 msgstr "��� ਫ�ਲਡਰ ਪਰਿਭਾਸ਼ਾ ਨ�ੰ ਬਣਾ� �ਾ� ਸ�ਧ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "_Subscriptions..."
 msgstr "ਮ��ਬਰ�(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "ਰਿਮ�� ਸਰਵਰ �ੱਤ� ਫ�ਲਡਰਾ� ਲ� ਮ��ਬਰ ਬਣ� �ਾ� ਹ�ਾ�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1080
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "F_older"
 msgstr "ਫ�ਲਡਰ(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 msgid "_Label"
 msgstr "ਲ�ਬਲ(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "_New Folder..."
 msgstr "ਨਵਾ� ਫ�ਲਡਰ(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1364
 msgid "Show Message _Preview"
 msgstr "ਸ�ਨ�ਹਾ �ਲ� ਵ���(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
 msgid "Show message preview pane"
 msgstr "ਸ�ਨ�ਹਾ �ਲ� ਵਿੰਡ� ਵ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
 msgid "Show _Deleted Messages"
 msgstr "ਹ�ਾ� �� ਸ�ਨ�ਹ� ਵ���(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
 msgid "Show deleted messages with a line through them"
 msgstr "ਹ�ਾ� �� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ਨ�ਹਾ� '� ਲਾ�ਨ ਲਾ �� ਵ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1167
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
 msgid "_Group By Threads"
 msgstr "ਥਰਿੱਡ ਨਾਲ �ਰ�ੱਪ(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
 msgid "Threaded message list"
 msgstr "ਮਸਲਾ ਸ�ਨ�ਹਾ ਲਿਸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1403
 msgid "Show message preview below the message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਹ�ਠਾ� ਸ�ਨ�ਹਾ �ਲ� ਵ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1197
+#: ../modules/mail/e-mail-shell-view-actions.c:1410
 msgid "Show message preview alongside the message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਨਾਲ ਸ�ਨ�ਹਾ �ਲ� ਵ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1418
 msgid "All Messages"
 msgstr "ਸਭ ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1425
 msgid "Important Messages"
 msgstr "�ਾਸ ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1432
 msgid "Last 5 Days' Messages"
 msgstr "��ਰ� ੫ ਦਿਨਾ� ਦ� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "Messages Not Junk"
 msgstr "ਨਾ-�ੰ� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1446
 msgid "Messages with Attachments"
 msgstr "����ਮ��� ਸਮ�ਤ ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 msgid "No Label"
 msgstr "ਬਿਨ-ਲ�ਬਲ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1460
 msgid "Read Messages"
 msgstr "ਪ��ਹ� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1467
 msgid "Recent Messages"
 msgstr "ਤਾ�਼� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Unread Messages"
 msgstr "ਨਾ-ਪ��ਹ� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1526
 msgid "Subject or Addresses contain"
 msgstr "ਵਿਸ਼ਾ �ਾ� ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1536
 msgid "All Accounts"
 msgstr "ਸਭ ��ਾ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1543
 msgid "Current Account"
 msgstr "ਮ���ਦਾ ��ਾ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Current Folder"
 msgstr "ਮ���ਦਾ ਫ�ਲਡਰ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:990
+#: ../modules/mail/e-mail-shell-view-private.c:1030
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " %d ��ਣਿ�, "
 msgstr[1] " %d ��ਣ�, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1001
+#: ../modules/mail/e-mail-shell-view-private.c:1041
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d ਹ�ਾ��"
 msgstr[1] "%d ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1007
-#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d �ੰ�"
 msgstr[1] "%d �ੰ�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ਡਰਾਫ�"
 msgstr[1] "%d ਡਰਾਫ�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1066
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d ਨਾ-ਭ��ਿ�"
 msgstr[1] "%d ਨਾ-ਭ���"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d ਭ��ਿ�"
 msgstr[1] "%d ਭ���"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1084
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ਨਾ-ਪ��ਹ�, "
 msgstr[1] "%d ਨਾ-ਪ��ਹ�, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1087
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d ��ੱਲ"
 msgstr[1] "%d ��ੱਲ"
 
-#: ../modules/mail/e-mail-shell-view.c:559
+#: ../modules/mail/e-mail-shell-view-private.c:1107
+#| msgid "Task"
+msgid "Trash"
+msgstr "ਰੱਦ�"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1461
+msgid "Send / Receive"
+msgstr "ਭ��� / ਲਵ�"
+
+#: ../modules/mail/e-mail-shell-view.c:564
 msgid "All Account Search"
 msgstr "ਸਭ ��ਾ��� ���"
 
-#: ../modules/mail/e-mail-shell-view.c:686
+#: ../modules/mail/e-mail-shell-view.c:747
 msgid "Account Search"
 msgstr "��ਾ��� ���"
 
-#: ../modules/mail/e-mail-shell-view.c:881
+#: ../modules/mail/e-mail-shell-view.c:952
 msgid "Proxy _Logout"
 msgstr "ਪਰਾ�ਸ� ਲਾ����(_L)"
 
-#: ../modules/mail/em-account-prefs.c:133
+#: ../modules/mail/em-account-prefs.c:219
 msgid "Evolution Account Assistant"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਾ��� ਸਹਾ��"
 
-#: ../modules/mail/em-account-prefs.c:182
+#: ../modules/mail/em-account-prefs.c:268
 msgid "Account Editor"
 msgstr "��ਾ��� ਸੰਪਾਦ�"
 
-#: ../modules/mail/em-composer-prefs.c:505
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:211
+#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "ਯ�� ��ਤਾ"
 
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:499
 msgid "Language(s)"
 msgstr "ਭਾਸ਼ਾ"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Every time"
 msgstr "ਹਰ ਸਮ��"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per day"
 msgstr "ਦਿਨ ਵਿੱ� ��ਵਾਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:93
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per week"
 msgstr "ਹ�ਤ� ਵਿੱ� ��ਵਾਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:94
+#: ../modules/mail/em-mailer-prefs.c:95
 msgid "Once per month"
 msgstr "ਮਹ�ਨ� ਵਿੱ� ��ਵਾਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:201
+#: ../modules/mail/em-mailer-prefs.c:177
 msgid "Add Custom Junk Header"
 msgstr "�ਸ�ਮ �ੰ� ਹ�ੱਡਰ ਸ਼ਾਮਲ"
 
-#: ../modules/mail/em-mailer-prefs.c:209
+#: ../modules/mail/em-mailer-prefs.c:185
 msgid "Header Name:"
 msgstr "ਹ�ੱਡਰ ਨਾ�:"
 
-#: ../modules/mail/em-mailer-prefs.c:210
+#: ../modules/mail/em-mailer-prefs.c:186
 msgid "Header Value Contains:"
 msgstr "ਹ�ੱਡਰ ਮ�ੱਲ ਰੱ�ਦਾ ਹ�:"
 
-#: ../modules/mail/em-mailer-prefs.c:310
+#: ../modules/mail/em-mailer-prefs.c:286
 msgid "Header"
 msgstr "ਹ�ੱਡਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:314
+#: ../modules/mail/em-mailer-prefs.c:290
 msgid "Contains Value"
 msgstr "ਮ�ੱਲ ਰੱ�ਦਾ ਹ�"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:707 ../modules/mail/em-mailer-prefs.c:778
+#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:764
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s ਪਲੱ��ਨ �ਪਲੱਬਧ ਹ� �ਤ� ਬਾ�ਨਰ� �ੰਸ�ਾਲ ਹ�।"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:715 ../modules/mail/em-mailer-prefs.c:787
+#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:773
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s ਪਲੱ��ਨ �ਪਲੱਬਧ ਨਹ�� ਹ�। ��ੱ� �ਰ� �� �ਿ ਪ���� �ੰਸ�ਾਲ ਹ�।"
 
-#: ../modules/mail/em-mailer-prefs.c:751
+#: ../modules/mail/em-mailer-prefs.c:737
 msgid "No junk plugin available"
 msgstr "��� �ੰ� ਪਲੱ��ਨ ਨਹ�� ਹ�"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1143
+#: ../modules/mail/em-mailer-prefs.c:1140
 msgid "_Date header:"
 msgstr "ਮਿਤ� ਹ�ੱਡਰ(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../modules/mail/em-mailer-prefs.c:1141
 msgid "Show _original header value"
 msgstr "�ਸਲ� ਹ�ੱਡਰ ਮ�ੱਲ ਵ���(_o)"
 
@@ -15879,10 +15698,62 @@ msgstr "�ਾ�� �ਰ� �ਿ �� �ਵ�ਲ�ਸ਼ਨ ਡਿਫ
 msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "ਹਰ ਵਾਰ �ਦ�� ਵ� �ਵ�ਲ�ਸ਼ਨ �ੱਲ ਤਾ� �ਾ�� �ਰ� �ਿ �ਹ ਡਿਫਾਲ� ਮ�ਲਰ ਹ� �ਾ� ਨਹ��।"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
 msgstr "�� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਪਣਾ ਡਿਫਾਲ� �-ਮ�ਲ �ਲਾ�� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Click 'Work Online' to return to online mode."
+msgstr ""
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+#, fuzzy
+#| msgid "Evolution is currently offline because the network is unavailable."
+msgid "Evolution is currently offline due to a network outage."
+msgstr "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�। �ਸ ਬ�ਨ ਨ�ੰ �ਨਲਾ�ਨ �ਾਣ ਲ� ਵਰਤ��।"
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+#| msgid "Put Evolution into offline mode"
+msgid "Evolution is currently offline."
+msgstr "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�।"
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+#, fuzzy
+#| msgid "Evolution is currently offline because the network is unavailable."
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
+msgstr "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�। �ਸ ਬ�ਨ ਨ�ੰ �ਨਲਾ�ਨ �ਾਣ ਲ� ਵਰਤ��।"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+msgid "Author(s)"
+msgstr "ਲ���"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+msgid "Plugin Manager"
+msgstr "ਪਲੱ�-�ਨ ਮ�ਨ��ਰ"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:267
+msgid "Note: Some changes will not take effect until restart"
+msgstr "ਨ��: ��� ਤਬਦ�ਲ��� ਮ�� �ਾਲ� ਹ�ਣ ਤੱ� ਪ�ਰਭਾਵ� ਨਹ�� ਹ� ਸ�ਦ��� ਹਨ"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
+msgid "Overview"
+msgstr "ਸੰ��ਪ"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+msgid "Plugin"
+msgstr "ਪਲੱ�-�ਨ"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+msgid "_Plugins"
+msgstr "ਪਲੱ�-�ਨ(_P)"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+msgid "Enable and disable plugins"
+msgstr "ਪਲੱ�-�ਨ �ਯ�� ਤ� �ਾਲ�"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "ਹ�ਲ� ਪਾ�ਥਨ"
@@ -15899,39 +15770,39 @@ msgstr "ਪਾ�ਥਨ ��ਸ� ਪਲੱ��ਨ"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "ਪਾ�ਥਨ �-ਪਲੱ��ਨ ਲ�ਡਰ ਲ� ��ਸ� ਪਲੱ��ਨ।"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:275
-#: ../widgets/misc/e-import-assistant.c:396
+#: ../modules/startup-wizard/evolution-startup-wizard.c:276
+#: ../widgets/misc/e-import-assistant.c:399
 msgid "Please select the information that you would like to import:"
 msgstr "�ਾਣ�ਾਰ�, �� ਵ� ਤ�ਸ�� �ੰਪ�ਰ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�, ਨ�ੰ ��ਣ� ��:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:307
-#: ../widgets/misc/e-import-assistant.c:552
+#: ../modules/startup-wizard/evolution-startup-wizard.c:308
+#: ../widgets/misc/e-import-assistant.c:555
 #, c-format
 msgid "From %s:"
 msgstr "%s ਤ��:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:318
-#: ../modules/startup-wizard/evolution-startup-wizard.c:415
+#: ../modules/startup-wizard/evolution-startup-wizard.c:319
+#: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Importing Files"
 msgstr "ਫਾ�ਲਾ� �ੰਪ�ਰ� ��ਤ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:393
+#: ../modules/startup-wizard/evolution-startup-wizard.c:394
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "�ੰਪ�ਰ� �ਰਨਾ ਰੱਦ ��ਤਾ। �ਾਰ� ਰੱ�ਣ ਲ� \"�ੱ��\" �ਲਿੱ� �ਰ�।"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:411
+#: ../modules/startup-wizard/evolution-startup-wizard.c:412
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "�ੰਪ�ਰ� ਪ�ਰਾ ਹ���। �ਾਰ� ਰੱ�ਣ ਲ� \"�ੱ��\" �ਲਿੱ� �ਰ�।"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:471
+#: ../modules/startup-wizard/evolution-startup-wizard.c:482
 msgid "Evolution Setup Assistant"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ�ੱ��ੱਪ ਸਹਾ�� "
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+#: ../modules/startup-wizard/evolution-startup-wizard.c:488
 msgid "Welcome"
 msgstr "�� ��� ਨ�ੰ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:482
+#: ../modules/startup-wizard/evolution-startup-wizard.c:493
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -15957,8 +15828,13 @@ msgid ""
 "body"
 msgstr "����ਮ��� ਰ�ਮਾ�ਡਰ ਪਲੱ��ਨ ਵਲ�� ਸ�ਨ�ਹਾ ਮ�ੱ� ਭਾ� ਵਿੱ� ��� ਲ� ਸ�ਹਾ� ਦ� ਲਿਸ�"
 
+#. Check buttons
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
+msgid "_Do not show this message again."
+msgstr "�ਹ ਸ�ਨ�ਹਾ ਮ�� ਨਾ ਵ���(_D)।"
+
 #: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:410
+#: ../plugins/templates/templates.c:411
 msgid "Keywords"
 msgstr "ਸ਼ਬਦ"
 
@@ -15998,172 +15874,205 @@ msgstr "ਲਾ�ਨ '� �ਡ��"
 msgid "Play audio attachments directly in mail messages."
 msgstr "ਮ�ਲ ਸ�ਨ�ਹਿ�� ਤ�� �ਡ�� ����ਮ��� ਸਿੱਧ��� �ਲਾ�।"
 
-#: ../plugins/backup-restore/backup-restore.c:160
-msgid "Select name of the Evolution backup file"
+#: ../plugins/backup-restore/backup-restore.c:183
+#, fuzzy
+#| msgid "Select name of the Evolution backup file"
+msgid "Select name of the Evolution back up file"
 msgstr "�ਵ�ਲ�ਸਨ ਬ���ੱਪ ਫਾ�ਲ ਦਾ ਨਾ� ��ਣ�"
 
-#: ../plugins/backup-restore/backup-restore.c:191
-msgid "_Restart Evolution after backup"
+#: ../plugins/backup-restore/backup-restore.c:216
+#, fuzzy
+#| msgid "_Restart Evolution after backup"
+msgid "_Restart Evolution after back up"
 msgstr "ਬ���ੱਪ �ਪਰੰਤ �ਵ�ਲ�ਸ਼ਨ ਮ��-�ਾਲ�(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:217
-msgid "Select name of the Evolution backup file to restore"
+#: ../plugins/backup-restore/backup-restore.c:242
+#, fuzzy
+#| msgid "Select name of the Evolution backup file to restore"
+msgid "Select name of the Evolution back up file to restore"
 msgstr "ਰ�ਸ��ਰ �ਰਨ ਲ� �ਵ�ਲ�ਸ਼ਨ ਬ���ੱਪ ਫਾ�ਲ ਦਾ ਨਾ� ��ਣ�"
 
-#: ../plugins/backup-restore/backup-restore.c:230
+#: ../plugins/backup-restore/backup-restore.c:255
 msgid "_Restart Evolution after restore"
 msgstr "ਮ��-ਪ�ਰਾਪਤ �ਰਨ �ਪਰੰਤ �ਵ�ਲ�ਸ਼ਨ ਮ�� �ਾਲ�(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:298
+#: ../plugins/backup-restore/backup-restore.c:323
+#, fuzzy
+#| msgid ""
+#| "You can restore Evolution from your backup. It can restore all the Mails, "
+#| "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+#| "settings, mail filters etc."
 msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
+"You can restore Evolution from your back up. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
 "ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਪਣ� ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�। �ਹ ਸਭ ਮ�ਲਾ�, ��ਲੰਡਰ, �ਾਸ�, ਮ�ਮ�, ਸੰਪਰ� �ਦਿ "
 "ਨ�ੰ ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�। �ਹ ਤ�ਹਾਡ� ਨਿੱ�� ਸ��ਿੰ�, ਮ�ਲ ਫਿਲ�ਰ �ਦਿ ਵ� ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�।"
 
-#: ../plugins/backup-restore/backup-restore.c:305
-msgid "_Restore Evolution from the backup file"
+#: ../plugins/backup-restore/backup-restore.c:330
+#, fuzzy
+#| msgid "_Restore Evolution from the backup file"
+msgid "_Restore Evolution from the back up file"
 msgstr "ਬ���ੱਪ ਫਾ�ਲ ਤ� �ਵ�ਲ�ਸ਼ਨ ਰ�ਸ��ਰ �ਰ�(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:312
+#: ../plugins/backup-restore/backup-restore.c:337
 msgid "Please select an Evolution Archive to restore:"
 msgstr "ਰ�ਸ��ਰ �ਰਨ ਲ� �ਵ�ਲ�ਸ਼ਨ ��ਾ�ਵ ��ਣ� ��:"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:340
 msgid "Choose a file to restore"
 msgstr "ਰ�ਸ��ਰ �ਰਨ ਲ� �ੱ� ਫਾ�ਲ ��ਣ�"
 
-#: ../plugins/backup-restore/backup-restore.c:323
-msgid "Restore from backup"
+#: ../plugins/backup-restore/backup-restore.c:348
+#, fuzzy
+#| msgid "Restore from backup"
+msgid "Restore from back up"
 msgstr "ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ�"
 
-#: ../plugins/backup-restore/backup-restore.c:361
-msgid "_Backup Evolution Settings..."
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ��ਿੰ� ਬ���ੱਪ(_B)..."
+#: ../plugins/backup-restore/backup-restore.c:386
+#, fuzzy
+#| msgid "Backing up Evolution Data"
+msgid "_Back up Evolution Data..."
+msgstr "ਮ���ਦਾ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਬ���ੱਪ"
 
-#: ../plugins/backup-restore/backup-restore.c:363
-msgid "Backup Evolution data and settings to an archive file"
+#: ../plugins/backup-restore/backup-restore.c:388
+#, fuzzy
+#| msgid "Backup Evolution data and settings to an archive file"
+msgid "Back up Evolution data and settings to an archive file"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ��ਾ�ਵ ਫਾ�ਲ ਵਿੱ� ਬ���ੱਪ ਲਵ�"
 
-#: ../plugins/backup-restore/backup-restore.c:368
-msgid "R_estore Evolution Settings..."
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ��ਿੰ� ਰ�ਸ��ਰ(_e)..."
+#: ../plugins/backup-restore/backup-restore.c:393
+#, fuzzy
+#| msgid "Restoring Evolution Data"
+msgid "R_estore Evolution Data..."
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਰ�ਸ��ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/backup-restore/backup-restore.c:370
+#: ../plugins/backup-restore/backup-restore.c:395
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ��ਾ�ਵ ਫਾ�ਲ ਤ�� ਰ�ਸ��ਰ �ਰ�"
 
-#: ../plugins/backup-restore/backup.c:63
-msgid "Backup Evolution directory"
+#: ../plugins/backup-restore/backup.c:79
+#, fuzzy
+#| msgid "Backup Evolution directory"
+msgid "Back up Evolution directory"
 msgstr "ਬ���ੱਪ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਰ���ਰ�"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:81
 msgid "Restore Evolution directory"
 msgstr "ਰ�-ਸ��ਰ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਰ���ਰ�"
 
-#: ../plugins/backup-restore/backup.c:67
-msgid "Check Evolution Backup"
+#: ../plugins/backup-restore/backup.c:83
+#, fuzzy
+#| msgid "Check Evolution Backup"
+msgid "Check Evolution Back up"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਬ���ੱਪ ��ੱ� �ਰ�"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:85
 msgid "Restart Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਮ��-�ਾਲ�"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:87
 msgid "With Graphical User Interface"
 msgstr "�ਰਾਫਿ�ਲ ਯ��਼ਰ �ੰ�ਰਫ�ਸ ਨਾਲ"
 
-#: ../plugins/backup-restore/backup.c:189
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:289
+#: ../plugins/backup-restore/backup.c:399
 msgid "Shutting down Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਬੰਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/backup-restore/backup.c:196
+#: ../plugins/backup-restore/backup.c:296
 msgid "Backing Evolution accounts and settings"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਾ��� �ਤ� ਸ��ਿੰ� ਬ���ੱਪ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/backup-restore/backup.c:202
+#: ../plugins/backup-restore/backup.c:304
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਬ���ੱਪ ��ਤਾ �ਾ ਰਿਹਾ ਹ� (ਮ�ਲ, ਸੰਪਰ�, ��ਲੰਡਰ, �ਾਸ�, ਮ�ਮ�)"
 
-#: ../plugins/backup-restore/backup.c:213
-msgid "Backup complete"
+#: ../plugins/backup-restore/backup.c:317
+#| msgid "Backup complete"
+msgid "Back up complete"
 msgstr "ਬ���ੱਪ ਪ�ਰਾ ਹ���"
 
-#: ../plugins/backup-restore/backup.c:218
-#: ../plugins/backup-restore/backup.c:239
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:322
+#: ../plugins/backup-restore/backup.c:496
 msgid "Restarting Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਮ��-�ਾਲ� ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../plugins/backup-restore/backup.c:255
+#: ../plugins/backup-restore/backup.c:403
 msgid "Back up current Evolution data"
 msgstr "ਮ���ਦਾ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਬ���ੱਪ �ਰ�"
 
-#: ../plugins/backup-restore/backup.c:260
-msgid "Extracting files from backup"
+#: ../plugins/backup-restore/backup.c:409
+#, fuzzy
+#| msgid "Extracting files from backup"
+msgid "Extracting files from back up"
 msgstr "ਬ���ੱਪ ਤ�� ਫਾ�ਲਾ� ��ਲ�ਹ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:466
 msgid "Loading Evolution settings"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ��ਿੰ� ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../plugins/backup-restore/backup.c:274
-msgid "Removing temporary backup files"
+#: ../plugins/backup-restore/backup.c:481
+#, fuzzy
+#| msgid "Removing temporary backup files"
+msgid "Removing temporary back up files"
 msgstr "�ਰ�਼� ਬ���ੱਪ ਫਾ�ਲਾ� ਹ�ਾ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:491
 msgid "Ensuring local sources"
 msgstr "ਲ��ਲ ਸਰ�ਤ ਯ��ਨ� ਬਣਾ� �ਾ ਰਹ� ਹਨ"
 
-#: ../plugins/backup-restore/backup.c:428
+#: ../plugins/backup-restore/backup.c:678
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "ਫ�ਲਡਰ %s ਲ� ਬ���ੱਪ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/backup-restore/backup.c:433
+#: ../plugins/backup-restore/backup.c:683
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "ਫ�ਲਡਰ %s ਤ�� ਰ�ਸ��ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:455
-msgid "Evolution Backup"
+#: ../plugins/backup-restore/backup.c:705
+#| msgid "Evolution Backup"
+msgid "Evolution Back up"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਬ���ੱਪ"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:705
 msgid "Evolution Restore"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਰ�ਸ��ਰ"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:746
 msgid "Backing up Evolution Data"
 msgstr "ਮ���ਦਾ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਬ���ੱਪ"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:747
 msgid "Please wait while Evolution is backing up your data."
 msgstr "�ਦ�� �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� ਡਾ�� ਦਾ ਬ���ੱਪ ਲ� ਰਹ� ਹ� ਤਾ� �ਦ�� ਤੱ� �ਡ��� ��।"
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:749
 msgid "Restoring Evolution Data"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਰ�ਸ��ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:750
 msgid "Please wait while Evolution is restoring your data."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਦ�� ਤੱ� ਤ�ਹਾਡ� ਡਾ�� ਨ�ੰ ਰ�-ਸ��ਰ �ਰਦ� ਹ�, �ਦ�� ਤੱ� �ਡ��� ��।"
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:768
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "�ਹ ਤ�ਹਾਡ� ��ਾ��� ਦ� ਡਾ�� ਦ� ਮਾਤਰਾ ਮ�ਤਾਬ� ��� ਸਮਾ� ਲ� ਸ�ਦਾ ਹ�।"
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Backup and Restore"
+#| msgid "Backup and Restore"
+msgid "Back up and Restore"
 msgstr "ਬ���ੱਪ �ਤ� ਰ�ਸ��ਰ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore your Evolution data and settings."
+#, fuzzy
+#| msgid "Backup and restore your Evolution data and settings."
+msgid "Back up and restore your Evolution data and settings."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ਬ���ੱਪ �ਤ� ਰ�ਸ��ਰ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
@@ -16171,11 +16080,15 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "�� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਬੰਦ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected backup file?"
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to restore Evolution from the selected backup file?"
+msgid "Are you sure you want to restore Evolution from the selected back up file?"
 msgstr "�� ਤ�ਸ�� ��ਣ� ਬ���ੱਪ ਫਾ�ਲ ਤ�� �ਵ�ਲ�ਸ਼ਨ ਰ�-ਸ��ਰ �ਰਨ� �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Close and Backup Evolution"
+#| msgid "Close and Backup Evolution"
+msgid "Close and Back up Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਬੰਦ �ਰ� ਤ� ਬ���ੱਪ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
@@ -16187,11 +16100,15 @@ msgid "Insufficient Permissions"
 msgstr "�ਧ�ਰ� �ਧਿ�ਾਰ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution backup file"
+#, fuzzy
+#| msgid "Invalid Evolution backup file"
+msgid "Invalid Evolution back up file"
 msgstr "�ਲਤ �ਵ�ਲ�ਸ਼ਨ ਬ���ੱਪ ਫਾ�ਲ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid backup file to restore."
+#, fuzzy
+#| msgid "Please select a valid backup file to restore."
+msgid "Please select a valid back up file to restore."
 msgstr "ਰ�ਸ��ਰ �ਰਨ ਲ� �ੱ� ਠ�� ਬ���ੱਪ ਫਾ�ਲ ��ਣ� ��।"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
@@ -16199,19 +16116,29 @@ msgid "The selected folder is not writable."
 msgstr "��ਣਿ� ਫ�ਲਡਰ ਲਿ�ਣਯ�� ਨਹ�� ਹ�।"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+#, fuzzy
+#| msgid ""
+#| "To backup your data and settings, you must first close Evolution. Please "
+#| "make sure that you save any unsaved data before proceeding."
 msgid ""
-"To backup your data and settings, you must first close Evolution. Please "
+"To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
 msgstr ""
 "�ਪਣ� ਡਾ�� ਤ� ਸ��ਿੰ� ਦਾ ਬ���ੱਪ ਲ�ਣ ਲ�, ਤ�ਹਾਨ�ੰ ਪਹਿਲਾ� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਬੰਦ �ਰਨਾ ਪਵ��ਾ। ਯ��ਨ� ਬਣਾ� �ਿ "
 "ਤ�ਸ�� �ਾਰ� ਰੱ�ਣ ਤ�� ਪਹਿਲਾ� ਨਾ-ਸੰਭਾਲ� ਡਾ�� ਨ�ੰ ਸੰਭਾਲ ਲਿ� ਹ�।"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+#, fuzzy
+#| msgid ""
+#| "To restore your data and settings, you must first close Evolution. Please "
+#| "make sure that you save any unsaved data before proceeding. This will "
+#| "delete all your current Evolution data and settings and restore them from "
+#| "your backup."
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your "
-"backup."
+"all your current Evolution data and settings and restore them from your back "
+"up."
 msgstr ""
 "�ਪਣ� ਡਾ�� �ਾ� ਸ��ਿੰ� ਨ�ੰ ਰ�ਸ��ਰ �ਰਨ ਲ�, ਤ�ਹਾਨ�ੰ ਪਹਿਲਾ� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਬੰਦ �ਰਨ� ਪਵ���। ਯ��ਨ� ਬਣਾ� "
 "�ਿ ਤ�ਸ�� �ਾਰ� ਰੱ�ਣ ਤ�� ਪਹਿਲਾ� ਨਾ-ਸੰਭਾਲਿ� ਡਾ�ਾ ਸੰਭਾਲ ��ੱ�� ਹ�। �ਸ ਨਾਲ ਤ�ਹਾਡਾ ਮ���ਦਾ ਸਭ �ਵ�ਲ�ਸ਼ਨ "
@@ -16267,33 +16194,33 @@ msgstr ""
 "�ਾਣ�ਾਰ� �ਪਣ� �ਪ ਹ� ਭਰ ਦਿੱਤ� �ਾਵ���। ਤ�ਹਾਡ� ਬੱਡ� ਸ��� ਤ�� IM ਸੰਪਰ� �ਾਣ�ਾਰ� ਭਰ ਦਿੱਤ� "
 "�ਾਵ���।"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter �ਪਲੱਬਧ ਨਹ�� ਹ�। ਪਹਿਲਾ� �ਹ �ੰਸ�ਾਲ �ਰ�।"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "%s ਸਵ�ਪ �ਰਨ ਦ�ਰਾਨ �ਲਤ�: %s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "ਬ���ਫਿਲ�ਰ �ਲਾ�ਡ ਪਰ�ਸ�ਸ �ਵਾਬ ਨਹ�� ਦ� ਰਿਹਾ, �ਿਲ (kill) ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "ਬ���ਫਿਲ�ਰ �ਲਾ�ਡ ਪਰ�ਸ�ਸ ਦ�ਲ ਦ� �ਡ�� �ਾਰ�, �ਤਮ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "ਬ���ਫਿਲ�ਰ ਲ� ਪਾ�ਪ ਫ�ਲ�ਹ ਹ�, �ਲਤ� ��ਡ: %d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
 msgid "Convert message text to _Unicode"
 msgstr "ਮ�ਲ ���ਸ� ਨ�ੰ ਯ�ਨ���ਡ '� ਬਦਲ�(_U)"
 
@@ -16320,15 +16247,15 @@ msgstr "Bogofilter ��ਣਾ�"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Bogfilter ਨਾਲ �ੰ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ �ਰ�।"
 
-#: ../plugins/caldav/caldav-browse-server.c:197
+#: ../plugins/caldav/caldav-browse-server.c:205
 msgid "Authentication failed. Server requires correct login."
 msgstr "ਪਰਮਾਣ�ਿਤਾ ਫ�ਲ�ਹ ਹ��। ਸਰਵਰ ਲ� ਢ�ੱ�ਵਾ� ਲਾ��ਨ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../plugins/caldav/caldav-browse-server.c:199
+#: ../plugins/caldav/caldav-browse-server.c:207
 msgid "Given URL cannot be found."
 msgstr "ਦਿੱਤਾ URL ਲੱਭਿ� ਨਹ�� �ਾ ਸ�ਦਾ।"
 
-#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:211
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16338,102 +16265,121 @@ msgstr ""
 "%d - %s"
 
 #  FIXME: domain/code
-#: ../plugins/caldav/caldav-browse-server.c:333
-#: ../plugins/caldav/caldav-browse-server.c:584
+#: ../plugins/caldav/caldav-browse-server.c:341
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Failed to parse server response."
 msgstr "ਸਰਵਰ �ਵਾਬ ਪਾਰਸ �ਰਨ ਲ� ਫ�ਲ�ਹ ਹ�।"
 
-#: ../plugins/caldav/caldav-browse-server.c:427
+#: ../plugins/caldav/caldav-browse-server.c:435
 msgid "Events"
 msgstr "�ਵ���"
 
-#: ../plugins/caldav/caldav-browse-server.c:449
+#: ../plugins/caldav/caldav-browse-server.c:457
 msgid "User's calendars"
 msgstr "ਯ��਼ਰ ਦਾ ��ਲੰਡਰ"
 
-#: ../plugins/caldav/caldav-browse-server.c:557
-#: ../plugins/caldav/caldav-browse-server.c:628
+#: ../plugins/caldav/caldav-browse-server.c:566
+#: ../plugins/caldav/caldav-browse-server.c:734
 msgid "Failed to get server URL."
 msgstr "ਸਰਵਰ URL ਲ�ਣ ਲ� ਫ�ਲ�ਹ ਹ�।"
 
-#: ../plugins/caldav/caldav-browse-server.c:626
-#: ../plugins/caldav/caldav-browse-server.c:667
-#: ../plugins/caldav/caldav-browse-server.c:1277
+#: ../plugins/caldav/caldav-browse-server.c:732
+#: ../plugins/caldav/caldav-browse-server.c:773
+#: ../plugins/caldav/caldav-browse-server.c:1432
 msgid "Searching for user's calendars..."
 msgstr "ਯ��਼ਰ ਦਾ ��ਲੰਡਰ ���ਿ� �ਾ ਰਿਹਾ ਹ�..."
 
 #  FIXME: domain/code
-#: ../plugins/caldav/caldav-browse-server.c:665
+#: ../plugins/caldav/caldav-browse-server.c:771
 msgid "Could not find any user calendar."
 msgstr "ਯ��਼ਰ ��ਲੰਡਰ ਨਹ�� ਲੱਭਿ� �ਾ ਸ�ਿ�।"
 
-#: ../plugins/caldav/caldav-browse-server.c:794
+#: ../plugins/caldav/caldav-browse-server.c:903
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "ਪਿ�ਲ� ��ਸ਼ਿਸ਼ ਫ�ਲ�ਹ ਹ�: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:796
+#: ../plugins/caldav/caldav-browse-server.c:905
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "ਪਿ�ਲ� ��ਸ਼ਿਸ਼ ��ਡ %d ਨਾਲ ਫ�ਲ�ਹ ਹ��"
 
-#: ../plugins/caldav/caldav-browse-server.c:801
+#: ../plugins/caldav/caldav-browse-server.c:910
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "%2$s ਸਰਵਰ �ੱਤ� %1$s ਯ��਼ਰ ਲ� ਪਾਸਵਰਡ ਦਿ�"
 
-#: ../plugins/caldav/caldav-browse-server.c:860
+#: ../plugins/caldav/caldav-browse-server.c:969
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "URL '%s' ਲ� soup ਸ�ਨ�ਹਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1095
+#: ../plugins/caldav/caldav-browse-server.c:1215
 msgid "Searching folder content..."
 msgstr "ਫ�ਲਡਰ ਸਮੱ�ਰ� ���� �ਾ ਰਹ� ਹ�..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1138
+#: ../plugins/caldav/caldav-browse-server.c:1264
+#: ../plugins/caldav/caldav-source.c:255
+msgid "Server _handles meeting invitations"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1271
 msgid "List of available calendars:"
 msgstr "�ਪਲੱਬਧ ��ਲੰਡਰਾ� ਦ� ਲਿਸ�:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1175
+#: ../plugins/caldav/caldav-browse-server.c:1309
 msgid "Supports"
 msgstr "ਸਹਿਯ��"
 
-#: ../plugins/caldav/caldav-browse-server.c:1254
+#: ../plugins/caldav/caldav-browse-server.c:1336
+#: ../plugins/caldav/caldav-source.c:254
+#, fuzzy
+#| msgid "New email"
+msgid "User e-_mail:"
+msgstr "ਨਵ�� �ਮ�ਲ"
+
+#: ../plugins/caldav/caldav-browse-server.c:1408
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "ਥਰਿੱਡ ਬਣਾ�ਣ ਲ� ਫ�ਲ�ਹ: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1362
+#: ../plugins/caldav/caldav-browse-server.c:1517
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "ਸਰਵਰ URL '%s' ਢ�ੱ�ਵਾ� URL ਨਹ�� ਹ�"
 
-#: ../plugins/caldav/caldav-browse-server.c:1368
+#: ../plugins/caldav/caldav-browse-server.c:1523
 msgid "Browse for a CalDAV calendar"
 msgstr "CalDAV ��ਲੰਡਰ ਲ� �ਲ�"
 
-#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/caldav/caldav-source.c:235
 #: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:223
-#: ../plugins/google-account-setup/google-contacts-source.c:308
+#: ../plugins/caldav/caldav-source.c:242
+#: ../plugins/google-account-setup/google-contacts-source.c:348
 msgid "Use _SSL"
 msgstr "_SSL ਵਰਤ��"
 
-#: ../plugins/caldav/caldav-source.c:235
+#: ../plugins/caldav/caldav-source.c:244
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:638
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
+msgid "User_name:"
+msgstr "ਯ��਼ਰ ਨਾ�(_n):"
+
+#: ../plugins/caldav/caldav-source.c:257
 msgid "Brows_e server for a calendar"
 msgstr "��ਲੰਡਰ ਲ� ਸਰਵਰ ਦ� �ਲ�(_e)"
 
-#: ../plugins/caldav/caldav-source.c:251
-#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/caldav/caldav-source.c:275
+#: ../plugins/calendar-file/calendar-file.c:194
 #: ../plugins/calendar-http/calendar-http.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:395
-#: ../plugins/google-account-setup/google-contacts-source.c:326
-#: ../plugins/google-account-setup/google-source.c:630
+#: ../plugins/calendar-weather/calendar-weather.c:398
+#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../plugins/google-account-setup/google-source.c:645
 msgid "Re_fresh:"
 msgstr "ਮ��-ਤਾ�ਾ(_f):"
 
@@ -16445,31 +16391,31 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� CalDAV ਸਹਿਯ�� ਸ਼
 msgid "CalDAV Support"
 msgstr "CalDAV ਸਹਿਯ��"
 
-#: ../plugins/calendar-file/calendar-file.c:125
+#: ../plugins/calendar-file/calendar-file.c:128
 msgid "_Customize options"
 msgstr "��ਣਾ� ਲ� ਪਸੰਦ(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:144
+#: ../plugins/calendar-file/calendar-file.c:147
 msgid "File _name:"
 msgstr "ਫਾ�ਲ ਨਾ�(_n):"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:151
 msgid "Choose calendar file"
 msgstr "��ਲੰਡਰ ਫਾ�ਲ ��ਣ�"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:199
 msgid "On open"
 msgstr "��ਲ�ਹਣ ਸਮ��"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "On file change"
 msgstr "ਫਾ�ਲ ਬਦਲਣ ਸਮ��"
 
-#: ../plugins/calendar-file/calendar-file.c:198
+#: ../plugins/calendar-file/calendar-file.c:201
 msgid "Periodically"
 msgstr "ਨਿਯਮਤ"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#: ../plugins/calendar-file/calendar-file.c:216
 msgid "Force read _only"
 msgstr "��ਵਲ ਪ��ਹਨ ਲ� ਮ�ਬ�ਰ(_o)"
 
@@ -16497,62 +16443,62 @@ msgstr "ਵ�ੱਬ ��ਲੰਡਰ �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� 
 msgid "Web Calendars"
 msgstr "ਵ�ੱਬ ��ਲੰਡਰ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Fog"
 msgstr "ਮ�ਸਮ: ਧ�ੰਦ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Cloudy"
 msgstr "ਮ�ਸਮ: ਬੱਦਲਵਾ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Cloudy Night"
 msgstr "ਮ�ਸਮ: ਬੱਦਲਵਾ� ਵਾਲ� ਰਾਤ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Overcast"
 msgstr "ਮ�ਸਮ: ਮ��ਹ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Showers"
 msgstr "ਮ�ਸਮ: ਫ�ਹਾਰ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Snow"
 msgstr "ਮ�ਸਮ: ਬਰ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Sunny"
 msgstr "ਮ�ਸਮ: ��ਿ� ਦਿਨ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Clear Night"
 msgstr "ਮ�ਸਮ: ਸਾਫ਼ ਰਾਤ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Thunderstorms"
 msgstr "ਮ�ਸਮ: ਬਰ��ਲਾ ਤ�ਫਾਨ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:222
+#: ../plugins/calendar-weather/calendar-weather.c:225
 msgid "Select a location"
 msgstr "�ੱ� �ਿ�ਾਣਾ ��ਣ�"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:328
-#: ../plugins/calendar-weather/calendar-weather.c:373
+#: ../plugins/calendar-weather/calendar-weather.c:331
+#: ../plugins/calendar-weather/calendar-weather.c:376
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../plugins/calendar-weather/calendar-weather.c:448
+#: ../plugins/calendar-weather/calendar-weather.c:451
 msgid "_Units:"
 msgstr "��ਾ�(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:455
+#: ../plugins/calendar-weather/calendar-weather.c:460
 msgid "Metric (Celsius, cm, etc)"
 msgstr "ਮ��ਰਿ� (ਸ��ਲਸ��ਸ, ਸ��ਮ�, �ਦਿ)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:456
+#: ../plugins/calendar-weather/calendar-weather.c:463
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "�ੰਪ�ਰਿਲ (ਫਾਰਨਹ���, �ੰ� �ਦਿ)"
 
@@ -16581,11 +16527,11 @@ msgstr "�ਦ�� ਵ� ਸੰਭਵ ਹ�ਵ� ਤਾ� ਸੰਪਰ�
 msgid "Map for contacts"
 msgstr "ਸੰਪਰ�ਾ� ਲ� ਮ�ਪ"
 
-#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/dbx-import/dbx-importer.c:233
 msgid "Select folder to import OE folder into"
 msgstr "OE ਫ�ਲਡਰ ਨ�ੰ �ੰਪ�ਰ� �ਰਨ ਲ� ਫ�ਲਡਰ ��ਣ�"
 
-#: ../plugins/dbx-import/dbx-importer.c:251
+#: ../plugins/dbx-import/dbx-importer.c:252
 msgid "Importing Outlook Express data"
 msgstr "���ਲ�ੱ� ��ਸਪਰ�ਸ ਡਾ�ਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
@@ -16642,40 +16588,59 @@ msgstr ""
 "��ੰ�� �ਸ�ਮ ਹ�ੱਡਰਾ� ਦ� ਲਿਸ� ਦਿੰਦ� ਹ�, �� �ਿ ਤ�ਸ�� ਬਾਹਰ ਭ�� ਰਹ� ਸ�ਨ�ਹਿ�� ਵਿੱ� ਸ਼ਾਮਲ �ਰ ਸ�ਦ� ਹ�। "
 "�ੱ� ਹ�ੱਡਰ �ਾ� ਹ�ੱਡਰ ਮ�ੱਲ ਦ�ਣ ਲ� ਫਾਰਮ��: \"=\" ਦ� ਬਾ�ਦ �ਸ�ਮ ਹ�ੱਡਰ ਦਾ ਨਾ� �ਤ� ਮ�ੱਲ \";\" ਨਾਲ ਵੱ�।"
 
-#: ../plugins/email-custom-header/email-custom-header.c:316
+#: ../plugins/email-custom-header/email-custom-header.c:319
+#| msgid "Security:"
+msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "ਸ�ਰੱ�ਿ�:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:321
+#: ../plugins/email-custom-header/email-custom-header.c:323
+#| msgid "Personal"
+msgctxt "email-custom-header-Security"
+msgid "Personal"
+msgstr "ਨਿੱ��"
+
+#: ../plugins/email-custom-header/email-custom-header.c:324
+#| msgid "Unclassified"
+msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "ਬਿਨਾ�-ਵਰ�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:325
+#| msgid "Protected"
+msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "ਸ�ਰੱ�ਿ�ਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../plugins/email-custom-header/email-custom-header.c:326
+#| msgid "Confidential"
+msgctxt "email-custom-header-Security"
+msgid "Confidential"
+msgstr "��ਪਤ"
+
+#: ../plugins/email-custom-header/email-custom-header.c:327
+#| msgid "Secret"
+msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "��ਪਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:328
+#| msgid "Top secret"
+msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "ਬਹ�ਤ ��ਪਤ"
 
-#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
-#. indicating the header will not be added to a mail message
-#: ../plugins/email-custom-header/email-custom-header.c:379
+#: ../plugins/email-custom-header/email-custom-header.c:394
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../plugins/email-custom-header/email-custom-header.c:571
+#: ../plugins/email-custom-header/email-custom-header.c:586
 msgid "_Custom Header"
 msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ(_C)"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:830
+#: ../plugins/email-custom-header/email-custom-header.c:845
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16683,12 +16648,12 @@ msgstr ""
 "�ੱ� �ਸ�ਮ ਹ�ੱਡਰ ��ੰ�� ਲ� ਮ�ੱਲ ਦ�ਣ ਲ� ਫਾਰਮ�� ਦਿ�:\n"
 "�ਸ�ਮ ਹ�ੱਡਰ ��ੰ�� ਮ�ੱਲਾ� ਲ� ਨਾ� \";\" ਨਾਲ ਵੱ� �ਰ�� ਦਿ�।"
 
-#: ../plugins/email-custom-header/email-custom-header.c:884
+#: ../plugins/email-custom-header/email-custom-header.c:899
 msgid "Key"
 msgstr "��"
 
-#: ../plugins/email-custom-header/email-custom-header.c:900
-#: ../plugins/templates/templates.c:416
+#: ../plugins/email-custom-header/email-custom-header.c:915
+#: ../plugins/templates/templates.c:417
 msgid "Values"
 msgstr "ਮ�ੱਲ"
 
@@ -16710,7 +16675,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "�ਦ�� ਮ�ਲ �ੰਪ��਼ਰ ਵਿੱ� ਸਵਿੱ� ਦੱਬ� �ਾਵ� ਤਾ� ���ਮ��ਿ� ਹ� �ਡ��ਰ �ਲਾ�"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:126
+#: ../plugins/external-editor/external-editor.c:128
 msgid "Automatically launch when a new mail is edited"
 msgstr "�ਦ��  ਵ� ਨਵ�� ਮ�ਲ ਲਿ�ਣ� ਸ਼�ਰ� ਹ�ਵ� ਤਾ� ���ਮ��ਿ� ਹ� �ਲਾ�"
 
@@ -16722,11 +16687,11 @@ msgstr "ਡਿਫਾਲ� ਬਾਹਰ� �ਡ��ਰ"
 msgid "The default command that must be used as the editor."
 msgstr "ਮ�ਲ �ਮਾ�ਡ, �� �ਿ �ਡ��ਰ ਵ��� ਵਰਤ� �ਾਣ� ਲਾ�਼ਮ� ਹ�।"
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:117
 msgid "Command to be executed to launch the editor: "
 msgstr "�ਡ��ਰ �ਾਲ� �ਰਨ ਲ� �ਲਾ�ਣ ਵਾਸਤ� �ਮਾ�ਡ:"
 
-#: ../plugins/external-editor/external-editor.c:116
+#: ../plugins/external-editor/external-editor.c:118
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16734,8 +16699,8 @@ msgstr ""
 "Emacs ਲ� \"xemacs\" ਵਰਤ��\n"
 "VI ਲ� \"gvim -f\" ਵਰਤ��"
 
-#: ../plugins/external-editor/external-editor.c:382
 #: ../plugins/external-editor/external-editor.c:384
+#: ../plugins/external-editor/external-editor.c:386
 msgid "Compose in External Editor"
 msgstr "ਬਾਹਰ� ਸੰਪਾਦ� ਵਿੱ� ਲਿ��"
 
@@ -16841,17 +16806,17 @@ msgstr "ਫਾ�ਲ ਪ��ਹ� ਨਹ�� �ਾ ਸ�ਦ�"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "ਫਾ�ਲ, �� ਤ�ਸ�� ��ਣ� ਹ�, ਢ�ੱ�ਵ�� .png �ਿੱਤਰ ਨਹ�� ਹ�। �ਲਤ�: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/google-account-setup/google-contacts-source.c:314
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
 msgid "Server"
 msgstr "ਸਰਵਰ"
 
-#: ../plugins/google-account-setup/google-source.c:437
+#: ../plugins/google-account-setup/google-source.c:438
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "ਯ��਼ਰ %s ਨ�ੰ ਮ��ਬਰ� ਵਾਲ� ��ਲੰਡਰ ਦ� �ਸ�ਸ ਲਿਸ� ਲ� ਪਾਸਵਰਡ ਦਿ�।"
 
-#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/google-account-setup/google-source.c:549
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16860,17 +16825,17 @@ msgstr ""
 "���ਲ ਸਰਵਰ ਤ�� ਡਾ�ਾ ਪ��ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/google-account-setup/google-source.c:549
 #: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:955
 msgid "Unknown error."
 msgstr "�ਣ�ਾਣ� �ਲਤ� ਹ�।"
 
-#: ../plugins/google-account-setup/google-source.c:634
+#: ../plugins/google-account-setup/google-source.c:649
 msgid "Cal_endar:"
 msgstr "��ਲੰਡਰ(_e):"
 
-#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/google-account-setup/google-source.c:684
 msgid "Retrieve _List"
 msgstr "ਲਿਸ� ਲ� �ਾ ਰਹ� ਹ�(_L)"
 
@@ -16906,20 +16871,28 @@ msgstr "ਸ�ਨ�ਹਾ ਹਾਲਤ �ਰ��..."
 msgid "Retract Mail"
 msgstr "ਪੱਤਰ ਮ��-�ਾ��"
 
+#: ../plugins/groupwise-features/gw-ui.c:331
+msgid "Accept"
+msgstr "ਮਨ�਼�ਰ"
+
 #: ../plugins/groupwise-features/gw-ui.c:338
 msgid "Accept Tentatively"
 msgstr "��਼ਮਾ�ਸ� �ਰ��"
 
+#: ../plugins/groupwise-features/gw-ui.c:345
+msgid "Decline"
+msgstr "�ਨ�ਾਰ"
+
 #: ../plugins/groupwise-features/gw-ui.c:352
 msgid "Rese_nd Meeting..."
 msgstr "ਮ��ਿੰ� ਮ��-ਭ���(_n)..."
 
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../plugins/groupwise-features/install-shared.c:178
+#: ../plugins/groupwise-features/share-folder-common.c:353
 msgid "Create folder"
 msgstr "ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../plugins/groupwise-features/install-shared.c:217
+#: ../plugins/groupwise-features/install-shared.c:230
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16944,11 +16917,11 @@ msgstr ""
 "ਸਾ��ਾ ਫ�ਲਡਰ �ੰਸ�ਾਲ �ਰਨ ਲ� 'ਲਾ�� �ਰ�' ਦਬਾ�\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:229
+#: ../plugins/groupwise-features/install-shared.c:242
 msgid "Install the shared folder"
 msgstr "ਸਾ��ਾ ਫ�ਲਡਰ �ੰਸ�ਾਲ �ਰ�"
 
-#: ../plugins/groupwise-features/install-shared.c:233
+#: ../plugins/groupwise-features/install-shared.c:246
 msgid "Shared Folder Installation"
 msgstr "ਸਾ��ਾ ਫ�ਲਡਰ �ੰਸ�ਾਲ�ਸ਼ਨ"
 
@@ -16978,7 +16951,7 @@ msgid "_Junk List"
 msgstr "�ੰ� ਲਿਸ�(_J)"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../plugins/groupwise-features/properties.ui.h:12
 #: ../widgets/table/e-table-config.ui.h:21
 msgid "_Remove"
 msgstr "ਹ�ਾ�(_R)"
@@ -17003,6 +16976,11 @@ msgstr "ਸ�ਨ�ਹਾ ਸਫ਼ਲਤਾ ਨਾਲ ਮ��-���ਿ
 msgid "Insert Send options"
 msgstr "ਭ��ਣ ��ਣਾ� ਸ਼ਾਮਲ"
 
+#: ../plugins/groupwise-features/notification.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:6
+msgid "The participants will receive the following notification.\n"
+msgstr "ਦਰਸ਼�ਾ� ਹ�ਠ ਦਿੱਤ� ਸ��ਨਾ ਪ�ਰਾਪਤ �ਰਨ��।\n"
+
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
 msgstr "�ਰ�ੱਪਵਾ��਼ ਸ�ਨ�ਹਿ�� ਲ� ਭ��ਣ ��ਣਾ� ਸ਼ਾਮਲ"
@@ -17126,30 +17104,22 @@ msgstr "�ਸ�ਮਾ��਼ ਨ���ਫਿ��ਸ਼ਨ ਸ�ਨ�
 msgid "Con_tacts..."
 msgstr "ਸੰਪਰ�(_t)..."
 
-#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Shared Folder Notification"
 msgstr "ਸਾ�� ਫ�ਲਡਰ ਸ��ਨਾ"
 
-#: ../plugins/groupwise-features/properties.ui.h:7
-msgid "The participants will receive the following notification.\n"
-msgstr "ਦਰਸ਼�ਾ� ਹ�ਠ ਦਿੱਤ� ਸ��ਨਾ ਪ�ਰਾਪਤ �ਰਨ��।\n"
-
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "Users:"
 msgstr "ਯ��਼ਰ:"
 
-#: ../plugins/groupwise-features/properties.ui.h:12
+#: ../plugins/groupwise-features/properties.ui.h:11
 msgid "_Not Shared"
 msgstr "ਸਾ�� ਨਹ��(_N)"
 
-#: ../plugins/groupwise-features/properties.ui.h:14
+#: ../plugins/groupwise-features/properties.ui.h:13
 msgid "_Shared With..."
 msgstr "ਸਾ��ਾ(_S)..."
 
-#: ../plugins/groupwise-features/properties.ui.h:15
-msgid "_Sharing"
-msgstr "ਸਾ��(_S)"
-
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "ਪਹ�ੰ� �ਧਿ�ਾਰ"
@@ -17195,7 +17165,7 @@ msgid "Proxy"
 msgstr "ਪਰਾ�ਸ�"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:230
+#: ../widgets/misc/e-account-tree-view.c:243
 msgid "Account Name"
 msgstr "��ਾ��� ਨਾ�"
 
@@ -17205,109 +17175,109 @@ msgstr "ਪਰਾ�ਸ� ਲਾ��ਨ"
 
 #: ../plugins/groupwise-features/proxy-login.c:208
 #: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/proxy.c:494
 #: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%1$s %2$s (ਯ��਼ਰ %3$s) ਲ� ਪਾਸਵਰਡ ਦਿ�"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:689
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "���ਰ ��ਾ��� �ਨਲਾ�ਨ ਹ��� ਤਾ� ਹ� ਪਰਾ�ਸ� ��ਬ �ਪਲੱਬਧ ਹ�ਵ���।"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:704
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "���ਰ ��ਾ��� ਯ�� ਹ��� ਤਾ� ਹ� ਪਰਾ�ਸ� ��ਬ �ਪਲੱਬਧ ਹ�ਵ���।"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:700
+#: ../plugins/groupwise-features/proxy.c:709
 msgctxt "GW"
 msgid "Proxy"
 msgstr "ਪਰਾ�ਸ�"
 
-#: ../plugins/groupwise-features/proxy.c:926
-#: ../plugins/groupwise-features/share-folder.c:691
+#: ../plugins/groupwise-features/proxy.c:935
+#: ../plugins/groupwise-features/share-folder.c:692
 msgid "Add User"
 msgstr "ਯ��਼ਰ ਸ਼ਾਮਲ"
 
-#: ../plugins/groupwise-features/send-options.c:212
+#: ../plugins/groupwise-features/send-options.c:214
 msgid "Advanced send options"
 msgstr "ਤ�ਨ��� ਭ��ਣ ��ਣਾ�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:309
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../plugins/groupwise-features/share-folder-common.c:316
+#: ../plugins/groupwise-features/share-folder.c:727
 msgid "Users"
 msgstr "ਯ��਼ਰ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:310
+#: ../plugins/groupwise-features/share-folder-common.c:317
 msgid "Enter the users and set permissions"
 msgstr "ਯ��਼ਰ ਦਿ� �ਤ� �ਧਿ�ਾਰ ਨਿਰਧਾਨ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:410
+#: ../plugins/groupwise-features/share-folder-common.c:418
 msgid "Sharing"
 msgstr "ਸਾ��"
 
-#: ../plugins/groupwise-features/share-folder.c:529
+#: ../plugins/groupwise-features/share-folder.c:530
 msgid "Custom Notification"
 msgstr "�ਸ�ਮ ਨ���ਫਿ��ਸ਼ਨ"
 
-#: ../plugins/groupwise-features/share-folder.c:731
+#: ../plugins/groupwise-features/share-folder.c:732
 msgid "Add   "
 msgstr "ਸ਼ਾਮਲ   "
 
-#: ../plugins/groupwise-features/share-folder.c:737
+#: ../plugins/groupwise-features/share-folder.c:738
 msgid "Modify"
 msgstr "ਸ�ਧ"
 
-#: ../plugins/groupwise-features/status-track.c:123
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "Message Status"
 msgstr "ਸ�ਨ�ਹਾ ਹਾਲਤ"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:139
 msgid "Subject:"
 msgstr "ਵਿਸ਼ਾ:"
 
 #  * From
-#: ../plugins/groupwise-features/status-track.c:151
+#: ../plugins/groupwise-features/status-track.c:153
 msgid "From:"
 msgstr "ਵਲ��:"
 
-#: ../plugins/groupwise-features/status-track.c:166
+#: ../plugins/groupwise-features/status-track.c:168
 msgid "Creation date:"
 msgstr "ਲਿ�ਣ ਮਿਤ�:"
 
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:208
 msgid "Recipient: "
 msgstr "ਪ�ਰਾਪਤ �ਰਤਾ: "
 
-#: ../plugins/groupwise-features/status-track.c:213
+#: ../plugins/groupwise-features/status-track.c:215
 msgid "Delivered: "
 msgstr "ਡਿਲਵਰ ��ਤ�: "
 
-#: ../plugins/groupwise-features/status-track.c:219
+#: ../plugins/groupwise-features/status-track.c:221
 msgid "Opened: "
 msgstr "��ਲ�ਹ�: "
 
-#: ../plugins/groupwise-features/status-track.c:224
+#: ../plugins/groupwise-features/status-track.c:226
 msgid "Accepted: "
 msgstr "ਮਨ�਼�ਰ ��ਤ�: "
 
-#: ../plugins/groupwise-features/status-track.c:229
+#: ../plugins/groupwise-features/status-track.c:231
 msgid "Deleted: "
 msgstr "ਹ�ਾ�: "
 
-#: ../plugins/groupwise-features/status-track.c:234
+#: ../plugins/groupwise-features/status-track.c:236
 msgid "Declined: "
 msgstr "�ਨ�ਾਰ: "
 
-#: ../plugins/groupwise-features/status-track.c:239
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Completed: "
 msgstr "ਪ�ਰਾ: "
 
-#: ../plugins/groupwise-features/status-track.c:244
+#: ../plugins/groupwise-features/status-track.c:246
 msgid "Undelivered: "
 msgstr "�ਣ-ਡਿਲਵਰ: "
 
@@ -17319,12 +17289,12 @@ msgstr "�ਨਲਾ�ਨ �ਿੱਤਰ"
 msgid "View image attachments directly in mail messages."
 msgstr "ਮ�ਲ ਸ�ਨ�ਹਿ�� ਵਿੱ� ਸਿੱਧ� �ਿੱਤਰ ����ਮ��� ਵ���।"
 
-#: ../plugins/imap-features/imap-headers.c:330
+#: ../plugins/imap-features/imap-headers.c:329
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ"
 
-#: ../plugins/imap-features/imap-headers.c:343
+#: ../plugins/imap-features/imap-headers.c:342
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP ਹ�ੱਡਰ"
@@ -17377,191 +17347,204 @@ msgstr "IMAP ਫ��ਰ"
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "��ਲੰਡਰ '%s' (%s) ਲ�ਡ �ਰਨ ਲ� ਫ�ਲ�ਹ ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:649
+#: ../plugins/itip-formatter/itip-formatter.c:654
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "��ਲੰਡਰ '%s' ਵਿੱ� �ੱ� ਮ�ਲਾ�ਾਤ �ਸ ਮ��ਿੰ� ਨਾਲ ��ਰਾ ਰਹ� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:685
+#: ../plugins/itip-formatter/itip-formatter.c:690
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' ��ਲੰਡਰ ਵਿੱ� ਮ�ਲਾ�ਾਤ ਮਿਲ� ਹ�"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:784
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find any calendars"
 msgstr "��� ਵ� ��ਲੰਡਰ ਲੱਭਣ ਲ� �ਸਫ਼ਲ ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to find this meeting in any calendar"
 msgstr "�ਿਸ� ਵ� ��ਲੰਡਰ ਵਿੱ� �ਹ ਮ��ਿੰ� ਲੱਭਣ ਲ� �ਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:800
 msgid "Unable to find this task in any task list"
 msgstr "�ਿਸ� �ੰਮ ਸ��� ਵਿੱ� �ਹ �ੰਮ ਲੱਭਣ ਲ� �ਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:799
+#: ../plugins/itip-formatter/itip-formatter.c:804
 msgid "Unable to find this memo in any memo list"
 msgstr "�ਿਸ� ਮ�ਮ� ਸ��� ਵਿੱ� �ਹ �ੰਮ ਲੱਭਣ ਲ� �ਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:880
 msgid "Opening the calendar. Please wait.."
 msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�। �ਡ��� ��..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:883
 msgid "Searching for an existing version of this appointment"
 msgstr "�ਹ ਮ�ਲਾ�ਾਤ ਲ� �ੱ� ਮ���ਦਾ ਵਰ�ਨ ਦ� ��� �ਾਰ� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1166
 msgid "Unable to parse item"
 msgstr "��ਾ� ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1255
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "'%s' ��ਲੰਡਰ ਤ�� ��ਾ� ਭ��ਣ ਵਿੱ� �ਸਫਲ।  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1267
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ਮਨ�਼�ਰ ਦ� ਭ��ਿ� ��ਲੰਡਰ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1271
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "�ੰਤਰਮ ਦ� ਤ�ਰ ਤ� ��ਲੰਡਰ '%s' ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "�ਨ�ਾਰ ਵਾ�� ਭ��ਿ� ��ਲੰਡਰ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "��ਲੰਡਰ '%s' ਭ��ਿ� ਰੱਦ ਵਾ��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ਸੰ�ਠ� ਨ� ਪ�ਰਤ�ਨਿਧ %s ਨ�ੰ ਹ�ਾ ਦਿੱਤਾ ਹ� "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1382
 msgid "Sent a cancelation notice to the delegate"
 msgstr "�ੱ� ਪ�ਰਤ�ਨਿਧ ਨ�ੰ ਰੱਦ ਹ�ਣ ਦ� ਸ��ਨਾ ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ਪ�ਰਤ�ਨਿਧ ਨ�ੰ ਰੱਦ �ਰਨਾ ਬਾਰ� �ਾਣ�ਾਰ� ਭ��� ਨਹ�� �ਾ ਸ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1495
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ਹਾਲਤ �ਲਤ ਹ�ਣ �ਰ�� ਦਰਸ਼� �ਾਣ�ਾਰ� ਦਾ �ੱਪਡ�� ਨਹ�� ��ਤ� �ਾ ਸ��"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1524
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "��ਲੰਡਰ %s ਨ�ੰ ਤਬਦ�ਲ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 msgid "Attendee status updated"
 msgstr "ਦਰਸ਼� ਸਥਿਤ� ਨਵ�ਨ ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1532
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "ਦਰਸ਼� ਹਾਲਤ ਨ�ੰ �ੱਪਡ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�, �ਿ��ਿ ��ਾ� ਹ�ਣ �ਪਲੱਬਧ ਨਹ�� ਰਹ� ਹ�"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1554
 msgid "Meeting information sent"
 msgstr "ਮ��ਿੰ� �ਾਣ�ਾਰ� ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1557
 msgid "Task information sent"
 msgstr "�ੰਮ �ਾਣ�ਾਰ� ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1560
 msgid "Memo information sent"
 msgstr "ਮ�ਮ� �ਾਣ�ਾਰ� ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1569
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ਮ��ਿੰ� �ਾਣ�ਾਰ� ਭ��ਣ ਲ� �ਸਮੱਰਥ ਹ�, ਮ��ਿੰ� ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1572
 msgid "Unable to send task information, the task does not exist"
 msgstr "�ੰਮ �ਾਣ�ਾਰ� ਭ��ਣ ਲ� �ਸਫ਼ਲ, �ੰਮ ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1575
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ਮ�ਮ� �ਾਣ�ਾਰ� ਭ��ਣ ਲ� �ਸਮੱਰਥ ਹ�, ਮ�ਮ� ਮ���ਦ ਨਹ�� ਹ�"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Save Calendar"
 msgstr "��ਲੰਡਰ ਸੰਭਾਲ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1586
-#: ../plugins/itip-formatter/itip-formatter.c:1597
+#: ../plugins/itip-formatter/itip-formatter.c:1703
+#: ../plugins/itip-formatter/itip-formatter.c:1714
 msgid "The calendar attached is not valid"
 msgstr "ਨੱਥ� ��ਲੰਡਰ ਠ�� ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1715
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ��ਲੰਡਰ ਹ�ਣ ਦਾ ਦਾ�ਵਾ ਤਾ� ਹ�, ਪਰ ��ਲੰਡਰ ਠ�� ����ਲੰਡਰ (iCalendar) ਨਹ�� ਹ�।"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1638
-#: ../plugins/itip-formatter/itip-formatter.c:1666
-#: ../plugins/itip-formatter/itip-formatter.c:1775
+#: ../plugins/itip-formatter/itip-formatter.c:1755
+#: ../plugins/itip-formatter/itip-formatter.c:1783
+#: ../plugins/itip-formatter/itip-formatter.c:1892
 msgid "The item in the calendar is not valid"
 msgstr "��ਲੰਡਰ ਵਿੱ� ���ਮ ਠ�� ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1756
+#: ../plugins/itip-formatter/itip-formatter.c:1784
+#: ../plugins/itip-formatter/itip-formatter.c:1893
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ��ਲੰਡਰ ਤਾ� ਹ�, ਪਰ ��ਲੰਡਰ ਵਿੱ� ��� ��ਨਾ, �ੰਮ �ਾ� ਵ�ਹਲਾ/ਰ��ਿ�� �ਾਣ�ਾਰ� ਨਹ� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1680
+#: ../plugins/itip-formatter/itip-formatter.c:1797
 msgid "The calendar attached contains multiple items"
 msgstr "ਨੱਥ� ��ਲੰਡਰ ਵਿੱ� �� ���ਮਾ� ਹਨ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1798
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "�ਹਨਾ� ਸਭ ���ਮਾ� ਤ� �ਾਰਵਾ� �ਰਨ ਲ਼�, ਫਾ�ਲ ਨ�ੰ ਸੰਭਾਲਣਾ ਪਵ��ਾ �ਤ� ��ਲੰਡਰ �ੰਪ�ਰ� �ਰਨਾ ਪਵ��ਾ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2454
+#: ../plugins/itip-formatter/itip-formatter.c:2460
+msgctxt "cal-itip"
+msgid "None"
+msgstr "��� ਨਹ��"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2476
+msgid "Tentatively Accepted"
+msgstr "�ਰ�� ਮਨ�਼�ਰ"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2594
 msgid "This meeting recurs"
 msgstr "�ਹ ਮ��ਿੰ� ਫ�ਰ ਹ�ਵ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2597
 msgid "This task recurs"
 msgstr "�ਹ �ੰਮ ਫ�ਰ ਹ�ਵ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2600
 msgid "This memo recurs"
 msgstr "�ਹ ਮ�ਮ� ਫ�ਰ ਹ�"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2694
+#: ../plugins/itip-formatter/itip-formatter.c:2834
 msgid "_Delete message after acting"
 msgstr "�ਾਰਵਾ� �ਪਰੰਤ ਸ�ਨ�ਹਾ ਹ�ਾ�(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2704
-#: ../plugins/itip-formatter/itip-formatter.c:2737
+#: ../plugins/itip-formatter/itip-formatter.c:2844
+#: ../plugins/itip-formatter/itip-formatter.c:2877
 msgid "Conflict Search"
 msgstr "�ਪਵਾਦ ���"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2719
+#: ../plugins/itip-formatter/itip-formatter.c:2859
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ਮ��ਿੰ� ��ਰਾ ਲੱਭਣ ਲ� ��ਲੰਡਰ ��ਣ�"
 
@@ -17697,6 +17680,14 @@ msgstr "%A, %B %e, %Y %l:%M %p"
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
+msgid "An unknown person"
+msgstr "�ਣ�ਾਣਾ ਵਿ��ਤ�"
+
 #: ../plugins/itip-formatter/itip-view.c:367
 #: ../plugins/itip-formatter/itip-view.c:455
 #: ../plugins/itip-formatter/itip-view.c:542
@@ -17925,7 +17916,7 @@ msgstr "ਦਿਨ ਸ਼�ਰ�:"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1053
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Start time:"
 msgstr "ਸ਼�ਰ� ਸਮਾ�:"
 
@@ -17935,7 +17926,7 @@ msgstr "ਦਿਨ �ੰਤ:"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1065
 msgid "End time:"
 msgstr "ਸਮਾਪਤ� ਸਮਾ�:"
 
@@ -17994,42 +17985,42 @@ msgid "_Update"
 msgstr "�ੱਪਡ��(_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1084
-#: ../plugins/itip-formatter/itip-view.c:1138
+#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1139
 msgid "Comment:"
 msgstr "�ਿੱਪਣ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:1123
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "Send _reply to sender"
 msgstr "ਭ��ਣ ਵਾਲ� ਨ�ੰ �ਵਾਬ ਦਿ�(_r)"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-view.c:1153
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "Send _updates to attendees"
 msgstr "ਦਰਸ਼�ਾ� ਨ�ੰ �ੱਪਡ�� ਭ���(_u)"
 
-#: ../plugins/itip-formatter/itip-view.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1163
 msgid "_Apply to all instances"
 msgstr "ਸਭ ਮ��ਿ�� �ੱਤ� ਲਾ��(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
+#: ../plugins/itip-formatter/itip-view.c:1172
 msgid "Show time as _free"
 msgstr "�ਾ�ਮ ਫਰ� ਵਾ�� ਵ���(_f)"
 
-#: ../plugins/itip-formatter/itip-view.c:1174
+#: ../plugins/itip-formatter/itip-view.c:1175
 msgid "_Preserve my reminder"
 msgstr "ਮ�ਨ�ੰ ਯਾਦ ਰੱ��(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1180
+#: ../plugins/itip-formatter/itip-view.c:1181
 msgid "_Inherit reminder"
 msgstr "�ੰਹ�ਰਿ� ਰ�ਮਾ�ਡਰ(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1923
+#: ../plugins/itip-formatter/itip-view.c:1924
 msgid "_Tasks:"
 msgstr "�ੰਮ(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1925
+#: ../plugins/itip-formatter/itip-view.c:1926
 msgid "_Memos:"
 msgstr "ਮ�ਮ�(_M):"
 
@@ -18058,84 +18049,68 @@ msgid "Beep or play sound file."
 msgstr "ਬ�ਪ �ਾ� ਸਾ��ਡ ਫਾ�ਲ �ਲਾ�"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Blink icon in notification area."
-msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ���ਾਨ �ਲ�ਾ�।"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable D-Bus messages."
 msgstr "ਡ�-ਬੱਸ ਸ�ਨ�ਹ� ਯ��।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ���ਾਨ ਯ�� �ਰ�।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "�ਦ�� ਨਵਾ� ਸ�ਨ�ਹਾ �ਵ� ਤਾ� D-BUS ਸ�ਨ�ਹਾ ਬਣਾ�।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
 msgstr "�� \"ਸਹ��\" ��ਤਾ ਤਾ� ਨਵ�� ਸ�ਨ�ਹ� ��ਣ �ੱਤ� ਸਾ��ਡ �ਾ� ਬ�ਪ �ਲਾ� �ਾਵ�।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Notify new messages for Inbox only."
 msgstr "��ਵਲ �ਨ-ਬਾ�ਸ ਵਿੱ� �� ਸ�ਨ�ਹਿ�� ਲ� ਨ���ਫਾ� �ਰ�।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Play sound when new messages arrive."
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ ��ਣ �ੱਤ� ਸਾ��ਡ �ਲਾ�।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr "�� ਬ�ਪ ਮ�ਡ ਵਿੱ� ਨਾ ਹ�ਵ� ਤਾ� ਨਵਾ� ਸ�ਨ�ਹਾ ��ਣ �ੱਤ� �ਲਾ�ਣ �ੱਤ� ਥ�ਮ ਸਾ��ਡ ਫਾ�ਲ।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
 msgstr "���ਾਨ ਨਾਲ ਪ�ਪ�ੱਪ ਸ�ਨ�ਹਾ ਵ� ਵ���।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "�ਦ�� ਨਵਾ� ਸ�ਨ�ਹਾ �ਵ� ਤਾ� ਨਵਾ� ਮ�ਲ ���ਾਨ ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ਵ���।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
 msgstr "�ਲਾ�ਣ ਲ� ਸਾ��ਡ ਫਾ�ਲ ਨਾ� ਹ�।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "�� ਬ�ਪ ਮ�ਡ ਵਿੱ� ਨਾ ਹ�ਵ� ਤਾ� ਨਵਾ� ਸ�ਨ�ਹਾ ��ਣ �ੱਤ� �ਲਾ�ਣ �ੱਤ� ਸਾ��ਡ ਫਾ�ਲ।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Use sound theme"
 msgstr "ਸਾ��ਡ ਥ�ਮ ਵਰਤ��"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "�� ਨਵ�� ਸ�ਨ�ਹ� ��ਣ �ੱਤ� ਸਾ��ਡ �ਾ� ਬ�ਪ �ਲਾ� �ਾਵ�।"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "�ਦ�� ਨਵਾ� ਸ�ਨ�ਹਾ �ਵ� ਤਾ� ���ਾਨ �ੱਤ� ਸ�ਨ�ਹਾ ਵ��ਣਾ"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
-msgid "Whether the icon should blink or not."
-msgstr "�� ���ਾਨ �ਪ�ਦਾ ਹ�ਣਾ �ਾਹ�ਦਾ ਹ� �ਾ� ਨਹ��।"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "�� ��ਵਲ �ਨ-ਬਾ�ਸ ਵਿ�ਲ� ਸ�ਨ�ਹਿ�� ਲ� ਹ� ਨ���ਫਾ� �ਰਨਾ ਹ�।"
 
-#: ../plugins/mail-notification/mail-notification.c:370
-msgid "Evolution's Mail Notification"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਦਾ ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ"
-
-#: ../plugins/mail-notification/mail-notification.c:392
-msgid "Mail Notification Properties"
-msgstr "ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ ਵਿਸ਼�ਸ਼ਤਾ"
-
-#: ../plugins/mail-notification/mail-notification.c:528
+#: ../plugins/mail-notification/mail-notification.c:390
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18152,67 +18127,64 @@ msgstr[1] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:540
+#: ../plugins/mail-notification/mail-notification.c:402
 #, c-format
 msgid "From: %s"
 msgstr "ਵਲ��: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:553
+#: ../plugins/mail-notification/mail-notification.c:415
 #, c-format
 msgid "Subject: %s"
 msgstr "ਵਿਸ਼ਾ: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:563
+#: ../plugins/mail-notification/mail-notification.c:425
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "ਤ�ਹਾਨ�ੰ �ੱ� ਨਵਾ� %d  ਸ�ਨ�ਹਾ ��� ਹ�।"
 msgstr[1] "ਤ�ਹਾਨ�ੰ %d  ਨਵ�� ਸ�ਨ�ਹ� �� ਹਨ।"
 
-#: ../plugins/mail-notification/mail-notification.c:585
-#: ../plugins/mail-notification/mail-notification.c:592
+#: ../plugins/mail-notification/mail-notification.c:438
+#: ../plugins/mail-notification/mail-notification.c:446
+#: ../plugins/mail-notification/mail-notification.c:449
 msgid "New email"
 msgstr "ਨਵ�� �ਮ�ਲ"
 
-#: ../plugins/mail-notification/mail-notification.c:653
+#: ../plugins/mail-notification/mail-notification.c:498
 msgid "Show icon in _notification area"
 msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ���ਾਨ ਵ���(_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:681
-msgid "B_link icon in notification area"
-msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ���ਾਨ �ਪ�ਾ�(_l)"
-
-#: ../plugins/mail-notification/mail-notification.c:691
+#: ../plugins/mail-notification/mail-notification.c:528
 msgid "Popup _message together with the icon"
 msgstr "���ਾਨ ਨਾਲ ਸ�ਨ�ਹਾ ਵ� ਪ�ਪ�ੱਪ �ਰ�(_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:878
+#: ../plugins/mail-notification/mail-notification.c:715
 msgid "_Play sound when new messages arrive"
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ ��ਣ �ੱਤ� ਸਾ��ਡ �ਲਾ�(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:907
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "_Beep"
 msgstr "ਬ�ਪ(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:920
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "Use sound _theme"
 msgstr "ਸਾ��ਡ ਥ�ਮ ਵਰਤ��(_t)"
 
-#: ../plugins/mail-notification/mail-notification.c:939
+#: ../plugins/mail-notification/mail-notification.c:777
 msgid "Play _file:"
 msgstr "ਫਾ�ਲ �ਲਾ�(_f):"
 
-#: ../plugins/mail-notification/mail-notification.c:950
+#: ../plugins/mail-notification/mail-notification.c:788
 msgid "Select sound file"
 msgstr "ਸਾ��ਡ ਫਾ�ਲ ��ਣ�"
 
-#: ../plugins/mail-notification/mail-notification.c:1008
+#: ../plugins/mail-notification/mail-notification.c:846
 msgid "Notify new messages for _Inbox only"
 msgstr "��ਵਲ �ਨ-ਬਾ�ਸ ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� ਨ���ਫਾ� �ਰ�(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:1017
+#: ../plugins/mail-notification/mail-notification.c:855
 msgid "Generate a _D-Bus message"
 msgstr "ਡ�-ਬੱਸ ਸ�ਨ�ਹਾ ਬਣਾ�(_D)"
 
@@ -18225,7 +18197,7 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "�ਦ�� ਵ� ਨਵਾ� ਸ�ਨ�ਹ� �ਵ� ਤਾ� ਤ�ਹਾਨ�ੰ ਸ��ਨਾ ਦ�ਵ�।"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:158
+#: ../plugins/mail-to-task/mail-to-task.c:157
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "%s ਵਲ�� ਮ�ਲ ਰਾਹ�� ਬਣਾ��"
@@ -18371,40 +18343,40 @@ msgid ""
 "source, please."
 msgstr "��ਣਿ� ਸਰ�ਤ ਪ��ਹਨ ਲ� ਹ�, �ਸ�ਰ�� ਮ�ਮ� �ੱਥ� ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�। ਹ�ਰ ਸਰ�ਤ ��ਣ� ��।"
 
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:955
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "ਸਰ�ਤ ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1071
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create an _Event"
 msgstr "�ਵ��� ਬਣਾ�(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1073
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 msgid "Create a new event from the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵਾ� �ਵ��� ਬਣਾ�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1078
+#: ../plugins/mail-to-task/mail-to-task.c:1081
 msgid "Create a Mem_o"
 msgstr "ਮ�ਮ� ਬਣਾ�(_o)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1080
+#: ../plugins/mail-to-task/mail-to-task.c:1083
 msgid "Create a new memo from the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵਾ� ਮ�ਮ� ਬਣਾ�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1085
+#: ../plugins/mail-to-task/mail-to-task.c:1088
 msgid "Create a _Task"
 msgstr "�ਾਸ� ਬਣਾ�(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1087
+#: ../plugins/mail-to-task/mail-to-task.c:1090
 msgid "Create a new task from the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵ�� �ਾਸ� ਬਣਾ�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1095
+#: ../plugins/mail-to-task/mail-to-task.c:1098
 msgid "Create a _Meeting"
 msgstr "ਮ��ਿੰ� ਬਣਾ�(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1097
+#: ../plugins/mail-to-task/mail-to-task.c:1100
 msgid "Create a new meeting from the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵ�� ਮ��ਿੰ� ਬਣਾ�"
 
@@ -18412,55 +18384,55 @@ msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵ�� ਮ��ਿੰ
 msgid "Convert a mail message to a task."
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹ� ਨ�ੰ �ਾਸ� ਵਿੱ� ਬਦਲ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
 msgid "Get List _Archive"
 msgstr "ਲਿਸ� ��ਾ�ਵ ਲਵ�(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
 msgid "Get an archive of the list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਲਿਸ� ਦ� ��ਾ�ਵ ����"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
 msgid "Get List _Usage Information"
 msgstr "ਲਿਸ� ਵਰਤ�� �ਾਣ�ਾਰ� ਲਵ��(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਲਿਸ� ਦ� ਵਰਤ�� ਬਾਰ� �ਾਣ�ਾਰ� ਲਵ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
 msgid "Contact List _Owner"
 msgstr "ਸੰਪਰ� ਲਿਸ� ਮਾਲ�(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਸ��� ਦ� ਮਾਲ� ਨਾਲ ਸੰਪਰ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
 msgid "_Post Message to List"
 msgstr "ਲਿਸ� ਲ� ਸ�ਨ�ਹ� ਭ���(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
 msgid "_Subscribe to List"
 msgstr "ਲਿਸ� ਲ� ਮ��ਬਰ(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� ਮ��ਬਰ ਬਣ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:326
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
 msgid "_Unsubscribe from List"
 msgstr "ਲਿਸ� ਤ�� ਮ��ਬਰ� ਹ�ਾ�(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "�ਸ ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� ਮ��ਬਰ� ਹ�ਾ�, �� ਸਬੰਧਿਤ ਹ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:335
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
 msgid "Mailing _List"
 msgstr "ਮ�ਲਿੰ� ਲਿਸ�(_L)"
 
@@ -18561,15 +18533,15 @@ msgstr ""
 "�ਸ ਨਾਲ ਮ���ਦਾ ਫ�ਲਡਰ ਵਿੱ� ਹ� ਸ�ਨ�ਹ� ਪ��ਹ� ਮਾਰ� �ਰਨਾ �ਾਹ�ੰਦ� ਹ� �ਾ� ਮ���ਦਾ ਫ�ਲਡਰ ਦ� ਨਾਲ ਸਭ �ਧ�ਨ-"
 "ਫ�ਲਡਰ ਵ�?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:194
+#: ../plugins/mark-all-read/mark-all-read.c:196
 msgid "In Current Folder and _Subfolders"
 msgstr "ਮ���ਦਾ ਫ�ਲਡਰ �ਤ� ਸਬ-ਫ�ਲਡਰਾ� ਵਿੱ�(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:208
+#: ../plugins/mark-all-read/mark-all-read.c:210
 msgid "In Current _Folder Only"
 msgstr "��ਵਲ ਮ���ਦਾ ਫ�ਲਡਰ ਵਿੱ�(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:437
+#: ../plugins/mark-all-read/mark-all-read.c:447
 msgid "Mark Me_ssages as Read"
 msgstr "ਸ�ਨ�ਹਿ�� ਨ�ੰ ਪ��ਹ� ਹ�� ਬਣਾ�(_S)"
 
@@ -18581,40 +18553,6 @@ msgstr "ਸਭ ਪ��ਹ� ਬਣਾ�"
 msgid "Mark all messages in a folder as read."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਮਾਰ� �ਰ�"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "Manage your Evolution plugins."
-msgstr "ਤ�ਹਾਡ� �ਵ�ਲ�ਸ਼ਨ ਪਲੱ��ਨ ਪਰਬੰਧ।"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:244
-msgid "Plugin Manager"
-msgstr "ਪਲੱ�-�ਨ ਮ�ਨ��ਰ"
-
-#: ../plugins/plugin-manager/plugin-manager.c:59
-msgid "Author(s)"
-msgstr "ਲ���"
-
-#: ../plugins/plugin-manager/plugin-manager.c:259
-msgid "Note: Some changes will not take effect until restart"
-msgstr "ਨ��: ��� ਤਬਦ�ਲ��� ਮ�� �ਾਲ� ਹ�ਣ ਤੱ� ਪ�ਰਭਾਵ� ਨਹ�� ਹ� ਸ�ਦ��� ਹਨ"
-
-#: ../plugins/plugin-manager/plugin-manager.c:285
-msgid "Overview"
-msgstr "ਸੰ��ਪ"
-
-#: ../plugins/plugin-manager/plugin-manager.c:356
-#: ../plugins/plugin-manager/plugin-manager.c:418
-msgid "Plugin"
-msgstr "ਪਲੱ�-�ਨ"
-
-#: ../plugins/plugin-manager/plugin-manager.c:430
-msgid "_Plugins"
-msgstr "ਪਲੱ�-�ਨ(_P)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:432
-msgid "Enable and disable plugins"
-msgstr "ਪਲੱ�-�ਨ �ਯ�� ਤ� �ਾਲ�"
-
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
@@ -18628,39 +18566,39 @@ msgstr "ਪਲ�ਨ-���ਸ� ਪਸੰਦ"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹ� ਨ�ੰ ਪਲ��-���ਸ� ਵ���, �� �ਹ HTML ਸਮੱ�ਰ� ਵ� ਰੱ�ਦ� ਹ�ਵ�।"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:225
 msgid "Show HTML if present"
 msgstr "���ਰ HTML ਹ�ਵ� ਤਾ� ਵ���"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:225
 msgid "Let Evolution choose the best part to show."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ��ਣਨ ਦਿ� �ਿ ਵ��ਾ�ਣ ਲ� �� ਸਭ ਤ�� ਵਧ�� ਹ�।"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:226
 msgid "Show plain text if present"
 msgstr "�� ਮ���ਦ ਹ�ਵ� ਤਾ� ਪਲ�ਨ ���ਸ� ਵ���"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:226
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "ਪਲ�ਨ ���ਸ� ਭਾ� ਵ���, �� ਮ���ਦ ਹ�ਵ�, ਨਹ�� ਤਾ� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਵ��ਾ�ਣ ਲ� ਵਧ�� ਢੰ� ��ਣਨ ਦਿ�।"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:227
 msgid "Only ever show plain text"
 msgstr "ਹਮ�ਸ਼ਾ ਪਲ�ਨ ���ਸ� ਹ� ਵ���"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:227
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "ਹਮ�ਸ਼ਾ ਪਲ�ਨ ���ਸ� ਭਾ� ਵ��ਾ� �ਤ� ਹ�ਰ ਭਾ� ਤ�� ����ਮ��� ਬਣਾ�, �� ਮੰ�ਿ� ਹ�ਵ� ਤਾ�।"
 
-#: ../plugins/prefer-plain/prefer-plain.c:247
+#: ../plugins/prefer-plain/prefer-plain.c:274
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "ਦਬਾ� �� HTML ਭਾ� ����ਮ��� ਵ��� ਵ���(_u)"
 
-#: ../plugins/prefer-plain/prefer-plain.c:267
+#: ../plugins/prefer-plain/prefer-plain.c:294
 msgid "HTML _Mode"
 msgstr "HT_ML ਮ�ਡ"
 
@@ -18684,41 +18622,42 @@ msgstr "Outlook PST �ੰਪ�ਰ�"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook ਨਿੱ�� ਫ�ਲਡਰ (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:295
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "_Mail"
 msgstr "ਪੱਤਰ(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:307
+#: ../plugins/pst-import/pst-importer.c:323
 msgid "Destination folder:"
 msgstr "ਨਿਯਤ ਫ�ਲਡਰ:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:313
+#: ../plugins/pst-import/pst-importer.c:329
 msgid "_Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ�(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "A_ppointments"
 msgstr "ਮ�ਲਾ�ਾਤ(_p)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:342 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "�ੰਮ(_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "_Journal entries"
 msgstr "�ਰਨਲ ���ਰ���(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:347
+#: ../plugins/pst-import/pst-importer.c:363
 msgid "Importing Outlook data"
 msgstr "���ਲ�ੱ� ਡਾ�ਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 #: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:153
+#: ../plugins/publish-calendar/publish-calendar.c:154
+#: ../plugins/publish-calendar/publish-calendar.c:156
 msgid "Calendar Publishing"
 msgstr "��ਲੰਡਰ ਪਰਾ�ਸ਼ਨ"
 
@@ -18730,49 +18669,49 @@ msgstr "�ਿ�ਾਣ�"
 msgid "Publish calendars to the web."
 msgstr "��ਲੰਡਰ ਵ�ੱਬ �ੱਤ� ਪਬਲਿਸ਼ �ਰ�।"
 
-#: ../plugins/publish-calendar/publish-calendar.c:208
-#: ../plugins/publish-calendar/publish-calendar.c:449
+#: ../plugins/publish-calendar/publish-calendar.c:212
+#: ../plugins/publish-calendar/publish-calendar.c:453
 #, c-format
 msgid "Could not open %s:"
 msgstr "%s ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:210
+#: ../plugins/publish-calendar/publish-calendar.c:214
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "%s ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�: �ਣ�ਾਣ �ਲਤ�"
 
-#: ../plugins/publish-calendar/publish-calendar.c:230
+#: ../plugins/publish-calendar/publish-calendar.c:234
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "%s ਪਬਲਿਸ਼ �ਰਨ ਦ�ਰਾਨ �ਲਤ� ��:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:232
+#: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "%s ਲ� ਪਬਲਿਸ ਸਫ਼ਲ ਰਿਹਾ"
 
-#: ../plugins/publish-calendar/publish-calendar.c:276
+#: ../plugins/publish-calendar/publish-calendar.c:280
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "%s ਦਾ ਮਾ��� ਫ�ਲ�ਹ:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:600
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "ਯ��(_n)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:739
+#: ../plugins/publish-calendar/publish-calendar.c:743
 msgid "Are you sure you want to remove this location?"
 msgstr "�� ਤ�ਸ�� �ਹ �ਿ�ਾਣਾ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. where the publishing should be done, fails. Basically, this shouldn't
 #. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1051
+#: ../plugins/publish-calendar/publish-calendar.c:1055
 msgid "Could not create publish thread."
 msgstr "ਥਰਿੱਡ ਪਬਲਿਸ਼ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�।"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1059
+#: ../plugins/publish-calendar/publish-calendar.c:1063
 msgid "_Publish Calendar Information"
 msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ� ਪਰ�ਾਸ਼ਤ(_P)"
 
@@ -18870,55 +18809,55 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "��ਲੰਡਰ ਪਬਲਿਸ਼ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: ��ਲੰਡਰ ਬ���ਡ ਹ�ਣ ਮ���ਦ ਨਹ�� ਰਿਹਾ।"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:476
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "ਨਵਾ� �ਿ�ਾਣਾ"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "�ਿ�ਾਣਾ ਸ�ਧ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin ਨਹ�� ਲੱਭਿ�, ��ਡ: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "ਪਾ�ਪ ਬਣਾ�ਣ ਲ� ਫ�ਲ�ਹ: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
 #, c-format
 msgid "Error after fork: %s"
 msgstr "ਫ�ਰ� ਬਾ�ਦ �ਲਤ�: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin �ਾ�ਲਡ ਪਰ�ਸ�ਸ �ਵਾਬ ਨਹ�� ਦਿੰਦਾ, �ਤਮ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "SpamAssassin �ਾ�ਲਡ ਪਰ�ਸ�ੱਸ ਦ�ਲ ਦ� �ਡ��, �ਤਮ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "SpamAssassin ਲ� ਪਾ�ਪ ਫ�ਲ�ਹ, �ਲਤ� ��ਡ: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin �ਪਲੱਬਧ ਨਹ�� ਹ�। �ਹ ਪਹਿਲਾ� �ੰਸ�ਾਲ �ਰ�।"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:940
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "�ਹ Spamassasin ਨ�ੰ ਹ�ਰ ਵ� ਭਰ�ਸ�ਯ�� ਬਣਾ�ਦਾ ਹ�, ਪਰ ਹ�ਲ� �ਰਦਾ ਹ�"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:948
 msgid "I_nclude remote tests"
 msgstr "ਰਿਮ�� �ਾ�� ਸ਼ਾਮਿਲ �ਰ�(_n)"
 
@@ -18970,6 +18909,10 @@ msgstr "ਸ਼�ਰ�"
 msgid "End"
 msgstr "ਸਮਾਪਤ"
 
+#: ../plugins/save-calendar/csv-format.c:372
+msgid "Due"
+msgstr "ਬ�ਾ��"
+
 #: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "ਫ�-ਸਦ� ਮ��ੰਮਲ"
@@ -19055,23 +18998,6 @@ msgstr "��ਣ� ਮ�ਮ� ਲਿਸ� ਡਿਸ� �ੱਤ� ਸੰ
 msgid "Save the selected task list to disk"
 msgstr "��ਣ� �ਾਸ� ਲਿਸ� ਡਿਸ� �ੱਤ� ਸੰਭਾਲ�"
 
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Sort mail message threads by subject."
-msgstr "ਪੱਤਰ ਸ�ਨ�ਹ� ਮਸਲਾ ਦ� ਵਿਸ਼� ਰਾਹ�� ਲ��ਬੱਧ �ਰ�।"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-msgid "Subject Threading"
-msgstr "ਵਿਸ਼ਾ ਮਸਲਾ"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
-msgid "Thread messages by subject"
-msgstr "ਵਿਸ਼� ਰਾਹ�� ਮਸਲਾ ਸ�ਨ�ਹ�"
-
-#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:63
-msgid "F_all back to threading messages by subject"
-msgstr "ਥਰਿੱਡ ਸ�ਨ�ਹਿ�� ਵਾਸਤ� ਫਾਲਬ�� ਲ� ਵਿਸ਼ਾ(_a)"
-
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
@@ -19082,15 +19008,15 @@ msgstr "ਸ�ਨ�ਹਾ ਮ�ੱ� ਭਾ� ਵਿੱ� ��ਪਲ�
 msgid "Drafts based template plugin"
 msgstr "��ਪਲ�� ਪਲੱ��ਨ ਮ�ਤਾਬ� ਡਰਾਫ�"
 
-#: ../plugins/templates/templates.c:621
+#: ../plugins/templates/templates.c:631
 msgid "No Title"
 msgstr "�ਾ��ਲ ਨਹ��"
 
-#: ../plugins/templates/templates.c:715
+#: ../plugins/templates/templates.c:741
 msgid "Save as _Template"
 msgstr "��ਪਲ�� ਵਾ�� ਸੰਭਾਲ�(_T)"
 
-#: ../plugins/templates/templates.c:717
+#: ../plugins/templates/templates.c:743
 msgid "Save as Template"
 msgstr "��ਪਲ�� ਵਾ�� ਸੰਭਾਲ�"
 
@@ -19110,27 +19036,27 @@ msgstr "�ਨ-ਲਾ�ਨ vCards"
 msgid "Show vCards directly in mail messages."
 msgstr "ਮ�ਲ ਸ�ਨ�ਹਿ�� ਵਿੱ� ਸਿੱਧ� vCard ਵ���।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:181
-#: ../plugins/vcard-inline/vcard-inline.c:266
+#: ../plugins/vcard-inline/vcard-inline.c:195
+#: ../plugins/vcard-inline/vcard-inline.c:280
 msgid "Show Full vCard"
 msgstr "ਪ�ਰਾ vCard ਵ���"
 
-#: ../plugins/vcard-inline/vcard-inline.c:184
+#: ../plugins/vcard-inline/vcard-inline.c:198
 msgid "Show Compact vCard"
 msgstr "ਥ��ਾ vCard ਵ���"
 
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:259
 msgid "There is one other contact."
 msgstr "�ੱ� ਹ�ਰ ਸੰਪਰ� ਹ�।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:268
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "%d ਹ�ਰ ਸੰਪਰ� ਹ�।"
 msgstr[1] "%d ਹ�ਰ ਸੰਪਰ� ਹਨ।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:275
+#: ../plugins/vcard-inline/vcard-inline.c:289
 msgid "Save in Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਸੰਭਾਲ�"
 
@@ -19306,7 +19232,7 @@ msgstr "ਬਾਹ� ਵ��ਾ� ਦਿੰਦ� ਹ�"
 msgid "Skip development warning dialog"
 msgstr "ਵਿ�ਾਸ ��ਤਾਵਨ� ਪ�ੱ��ਿੱ� ਡਾ�ਲਾ� �ੱਡ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:330
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:371
 msgid "Start in offline mode"
 msgstr "�ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
@@ -19456,11 +19382,11 @@ msgstr "ਵਿੰਡ� ਬ�ਨ ਸ�ਾ�ਲ"
 msgid "Window buttons are visible"
 msgstr "ਵਿੰਡ� ਬ�ਨ ਦਿੱ� ਹਨ।"
 
-#: ../shell/e-shell-content.c:528 ../shell/e-shell-content.c:529
+#: ../shell/e-shell-content.c:674 ../shell/e-shell-content.c:675
 msgid "Searches"
 msgstr "���"
 
-#: ../shell/e-shell-content.c:571
+#: ../shell/e-shell-content.c:717
 msgid "Save Search"
 msgstr "��� ਸੰਭਾਲ�"
 
@@ -19468,343 +19394,339 @@ msgstr "��� ਸੰਭਾਲ�"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:929
+#: ../shell/e-shell-searchbar.c:941
 msgid "Sho_w:"
 msgstr "ਵ���(_w):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:960
+#: ../shell/e-shell-searchbar.c:974
 msgid "Sear_ch:"
 msgstr "���(_c):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1021
+#: ../shell/e-shell-searchbar.c:1037
 msgid "i_n"
 msgstr " �ੰਦਰ(_n)"
 
-#: ../shell/e-shell-utils.c:253
+#: ../shell/e-shell-utils.c:255
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:255
+#: ../shell/e-shell-utils.c:257
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:276
+#: ../shell/e-shell-utils.c:278
 msgid "All Files (*)"
 msgstr "ਸਭ ਫਾ�ਲਾ� (*)"
 
+#: ../shell/e-shell-view.c:297
+msgid "Saving user interface state"
+msgstr "ਯ��਼ਰ �ੰ�ਰਫ�ਸ ਹਾਲਤ ਸੰਭਾਲ� �ਾ ਰਹ� ਹ�"
+
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:645
+#: ../shell/e-shell-window-actions.c:643
 msgid "translator-credits"
 msgstr ""
 "�ਮਨਪਰ�ਤ ਸਿੰ� �ਲਮ, ੨੦੦੪-੨੦੧੦\n"
 "Punjabi OpenSource Team\n"
 "http://www.satluj.org/";
 
-#: ../shell/e-shell-window-actions.c:656
+#: ../shell/e-shell-window-actions.c:654
 msgid "Evolution Website"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�ੱਬਸਾ��"
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../shell/e-shell-window-actions.c:1216
 msgid "Bug Buddy is not installed."
 msgstr "ਬੱ� ਬੱਡ� �ੰਸ�ਾਲ ਨਹ�� ਹ�।"
 
-#: ../shell/e-shell-window-actions.c:1238
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Bug Buddy could not be run."
 msgstr "ਬੱ� ਬੱਡ� ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
 
-#: ../shell/e-shell-window-actions.c:1419
+#: ../shell/e-shell-window-actions.c:1399
 msgid "Show information about Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਬਾਰ� �ਾਣ�ਾਰ� ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1424
-#: ../shell/e-shell-window-actions.c:1438
+#: ../shell/e-shell-window-actions.c:1404
+#: ../shell/e-shell-window-actions.c:1418
 msgid "_Close Window"
 msgstr "ਵਿੰਡ� ਬੰਦ �ਰ�(_C)"
 
-#: ../shell/e-shell-window-actions.c:1445
+#: ../shell/e-shell-window-actions.c:1425
 msgid "_Contents"
 msgstr "ਸਮੱ�ਰ�(_C)"
 
-#: ../shell/e-shell-window-actions.c:1447
+#: ../shell/e-shell-window-actions.c:1427
 msgid "Open the Evolution User Guide"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਯ��਼ਰ �ਾ�ਡ ��ਲ�ਹ�"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1453
 msgid "Evolution _FAQ"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਸਵਾਲ-�ਵਾਬ(_F)"
 
-#: ../shell/e-shell-window-actions.c:1475
+#: ../shell/e-shell-window-actions.c:1455
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "�ਮ ਪ�ੱ�� �ਾ�ਦ� ਸਵਾਲਾ� ਲ� ਵ�ੱਬ-ਪ��਼ ��ਲ�ਹ�"
 
-#: ../shell/e-shell-window-actions.c:1480
+#: ../shell/e-shell-window-actions.c:1460
 msgid "_Forget Passwords"
 msgstr "ਪਾਸਵਰਡ ਭ�ੱਲ �ਾ�(_F)"
 
-#: ../shell/e-shell-window-actions.c:1482
+#: ../shell/e-shell-window-actions.c:1462
 msgid "Forget all remembered passwords"
 msgstr "ਸਭ ਯਾਦ ਰੱ�� ਪਾਸਵਰਡ ਭ�ੱਲ �ਾ�"
 
-#: ../shell/e-shell-window-actions.c:1487
+#: ../shell/e-shell-window-actions.c:1467
 msgid "I_mport..."
 msgstr "�ੰਪ�ਰ� �ਰ�(_m)..."
 
-#: ../shell/e-shell-window-actions.c:1489
+#: ../shell/e-shell-window-actions.c:1469
 msgid "Import data from other programs"
 msgstr "ਹ�ਰ �ਾਰ�ਾ� ਤ�� ਡਾ�ਾ �ੰਪ�ਰ� �ਰ�"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1474
 msgid "New _Window"
 msgstr "ਨਵ�� ਵਿੰਡ�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1496
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Create a new window displaying this view"
 msgstr "�ਸ �ਲ� ਨ�ੰ ਵ��ਾ�ਣ ਲ� ਨਵ�� ਵਿੰਡ� ਬਣਾ�"
 
-#: ../shell/e-shell-window-actions.c:1510
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Configure Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਸੰਰ�ਨਾ"
 
-#: ../shell/e-shell-window-actions.c:1515
+#: ../shell/e-shell-window-actions.c:1495
 msgid "_Quick Reference"
 msgstr "ਤਰ�ੰਤ ਹਵਾਲਾ(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1517
+#: ../shell/e-shell-window-actions.c:1497
 msgid "Show Evolution's shortcut keys"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਦ� ਸ਼ਾਰ��ੱ� ��ੰ���� ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1524
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Exit the program"
 msgstr "ਪਰ��ਰਾਮ ਬੰਦ �ਰ�"
 
-#: ../shell/e-shell-window-actions.c:1529
+#: ../shell/e-shell-window-actions.c:1509
 msgid "_Advanced Search..."
 msgstr "ਤ�ਨ��� ���(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1531
+#: ../shell/e-shell-window-actions.c:1511
 msgid "Construct a more advanced search"
 msgstr "ਹ�ਰ ਵ� ਤ�ਨ��� ��� ਬਣਾ�"
 
-#: ../shell/e-shell-window-actions.c:1538
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Clear the current search parameters"
 msgstr "ਮ���ਦਾ ��� ਪ�ਰਾਮ��ਰ ਸਾਫ਼ �ਰ�"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1523
 msgid "_Edit Saved Searches..."
 msgstr "ਸੰਭਾਲ� ��� ਵਿੱ� ਸ�ਧ(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1545
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Manage your saved searches"
 msgstr "�ਪਣ� ਸੰਭਾਲ� ��� ਦਾ ਪਰਬੰਧ �ਰ�"
 
-#: ../shell/e-shell-window-actions.c:1552
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Click here to change the search type"
 msgstr "��� �ਾ�ਪ ਬਦਲਣ ਲ� �ਲਿੱ� �ਰ�"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1537
 msgid "_Find Now"
 msgstr "ਹ�ਣ ���(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1559
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Execute the current search parameters"
 msgstr "ਮ���ਦਾ ��� ਪ�ਰਾਮ��ਰ �ਲਾ�"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Save Search..."
 msgstr "��� ਸੰਭਾਲ�(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1566
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Save the current search parameters"
 msgstr "ਮ���ਦਾ ��� ਪ�ਰਾਮ��ਰ ਸੰਭਾਲ�"
 
-#: ../shell/e-shell-window-actions.c:1578
-msgid "Send / _Receive"
-msgstr "ਭ��� / ਲਵ�(_R)"
-
-#: ../shell/e-shell-window-actions.c:1580
-msgid "Send queued items and retrieve new items"
-msgstr "�ਤਾਰਬੱਧ ���ਮਾ� ਭ��� �ਤ� ਨਵ�� ���ਮਾ� ਪ�ਰਾਪਤ �ਰ�"
-
-#: ../shell/e-shell-window-actions.c:1585
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Submit _Bug Report..."
 msgstr "ਬੱ� �ਾਣ�ਾਰ� ਦਿ�(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1587
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ਬੱ� ਬੱਡ� ਵਰਤ �� ਬੱ� �ਾਣ�ਾਰ� ਭ���"
 
-#: ../shell/e-shell-window-actions.c:1592
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Work Offline"
 msgstr "�ਫ਼-ਲਾ�ਨ �ਾ�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1594
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Put Evolution into offline mode"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਰੱ��"
 
-#: ../shell/e-shell-window-actions.c:1599
+#: ../shell/e-shell-window-actions.c:1572
 msgid "_Work Online"
 msgstr "�ਨ-ਲਾ�ਨ �ਾ�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1601
+#: ../shell/e-shell-window-actions.c:1574
 msgid "Put Evolution into online mode"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਨਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਰੱ��"
 
-#: ../shell/e-shell-window-actions.c:1629
+#: ../shell/e-shell-window-actions.c:1602
 msgid "Lay_out"
 msgstr "ਲ����(_o)"
 
-#: ../shell/e-shell-window-actions.c:1636
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_New"
 msgstr "ਨਵਾ�(_N)"
 
-#: ../shell/e-shell-window-actions.c:1643
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Search"
 msgstr "���(_S)"
 
-#: ../shell/e-shell-window-actions.c:1650
+#: ../shell/e-shell-window-actions.c:1623
 msgid "_Switcher Appearance"
 msgstr "ਸਵਿੱ�ਰ ਦਿੱ�(_S)"
 
-#: ../shell/e-shell-window-actions.c:1664
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Window"
 msgstr "ਵਿੰਡ�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1693
+#: ../shell/e-shell-window-actions.c:1666
 msgid "Show Side _Bar"
 msgstr "ਸਾ�ਡ-ਬਾਰ ਵ���(_B)"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1668
 msgid "Show the side bar"
 msgstr "ਸਾ�ਡ-ਬਾਰ ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1701
+#: ../shell/e-shell-window-actions.c:1674
 msgid "Show _Buttons"
 msgstr "ਬ�ਨ ਵ���(_B)"
 
-#: ../shell/e-shell-window-actions.c:1703
+#: ../shell/e-shell-window-actions.c:1676
 msgid "Show the switcher buttons"
 msgstr "ਸਵਿੱ�ਰ ਬ�ਨ ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1709
+#: ../shell/e-shell-window-actions.c:1682
 msgid "Show _Status Bar"
 msgstr "ਹਾਲਤ ਪੱ�� ਵ���(_S)"
 
-#: ../shell/e-shell-window-actions.c:1711
+#: ../shell/e-shell-window-actions.c:1684
 msgid "Show the status bar"
 msgstr "ਹਾਲਤ ਪੱ�� ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1717
+#: ../shell/e-shell-window-actions.c:1690
 msgid "Show _Tool Bar"
 msgstr "��ਲਬਾਰ ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1719
+#: ../shell/e-shell-window-actions.c:1692
 msgid "Show the tool bar"
 msgstr "��ਲਬਾਰ ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1714
 msgid "_Icons Only"
 msgstr "���ਾਨ ਹ�(_I)"
 
-#: ../shell/e-shell-window-actions.c:1743
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Display window buttons with icons only"
 msgstr "ਵਿੰਡ� ਬ�ਨ ਨਾਲ ���ਾਨ ਹ� ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1748
+#: ../shell/e-shell-window-actions.c:1721
 msgid "_Text Only"
 msgstr "ਸਿਰ� ���ਸ�(_T)"
 
-#: ../shell/e-shell-window-actions.c:1750
+#: ../shell/e-shell-window-actions.c:1723
 msgid "Display window buttons with text only"
 msgstr "ਵਿੰਡ� ਬ�ਨ ਨਾਲ ���ਸ� ਹ� ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1755
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Icons _and Text"
 msgstr "���ਾਨ �ਤ� ���ਸ�(_a)"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1730
 msgid "Display window buttons with icons and text"
 msgstr "ਵਿੰਡ� ਬ�ਨਾ� ਨਾਲ ���ਾਨ �ਤ� ���ਸ� ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1762
+#: ../shell/e-shell-window-actions.c:1735
 msgid "Tool_bar Style"
 msgstr "��ਲਬਾਰ ਸ�ਾ�ਲ(_b)"
 
-#: ../shell/e-shell-window-actions.c:1764
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "ਵਿੰਡ� ਬ�ਨ ਡ�ਸ��ਾਪ ��ਲਬਾਰ ਸ��ਿੰ� ਨਾਲ ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1745
 msgid "Define Views..."
 msgstr "�ਲ� ਪ�ਰਭਾਸ਼ਿਤ �ਰ�..."
 
-#: ../shell/e-shell-window-actions.c:1774
+#: ../shell/e-shell-window-actions.c:1747
 msgid "Create or edit views"
 msgstr "ਵਿ� ਬਣਾ� �ਾ� ਸ�ਧ"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1752
 msgid "Save Custom View..."
 msgstr "�ਸ�ਮ �ਲ� ਸੰਭਾਲ�..."
 
-#: ../shell/e-shell-window-actions.c:1781
+#: ../shell/e-shell-window-actions.c:1754
 msgid "Save current custom view"
 msgstr "ਮ���ਦਾ �ਸ�ਮਾ��਼ ਵਿ� ਸੰਭਾਲ�"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1761
 msgid "C_urrent View"
 msgstr "ਮ���ਦਾ �ਲ�(_u)"
 
-#: ../shell/e-shell-window-actions.c:1798
+#: ../shell/e-shell-window-actions.c:1771
 msgid "Custom View"
 msgstr "�ਸ�ਮ �ਲ�"
 
-#: ../shell/e-shell-window-actions.c:1800
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Current view is a customized view"
 msgstr "ਮ���ਦਾ �ਲ� �ੱ� �ਸ�ਮਾ��਼ �ਲ� ਹ�"
 
-#: ../shell/e-shell-window-actions.c:1810
+#: ../shell/e-shell-window-actions.c:1783
 msgid "Change the page settings for your current printer"
 msgstr "�ਪਣ� ਮ���ਦਾ ਪਰਿੰ�ਰ ਲ� ਸਫ਼ਾ ਸ��ਿੰ� ਬਦਲ�"
 
-#: ../shell/e-shell-window-actions.c:2183
+#: ../shell/e-shell-window-actions.c:2168
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ਲ� ਤਬਦ�ਲ"
 
-#: ../shell/e-shell-window-actions.c:2396
+#: ../shell/e-shell-window-actions.c:2381
 msgid "Execute these search parameters"
 msgstr "�ਹ ��� ਪ�ਰਾਮ��ਰ �ਲਾ�"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:576
+#: ../shell/e-shell-window-private.c:584
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - �ਵ�ਲ�ਸ਼ਨ"
 
-#: ../shell/e-shell-window.c:419
+#: ../shell/e-shell-window.c:434
 msgid "New"
 msgstr "ਨਵਾ�"
 
-#: ../shell/e-shell.c:244
+#: ../shell/e-shell.c:247
 msgid "Preparing to go offline..."
 msgstr "�ਫਲਾ�ਨ �ਾਣ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../shell/e-shell.c:294
+#: ../shell/e-shell.c:300
 msgid "Preparing to go online..."
 msgstr "�ਨਲਾ�ਨ �ਾਣ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../shell/e-shell.c:353
+#: ../shell/e-shell.c:362
 msgid "Preparing to quit..."
 msgstr "ਬੰਦ �ਰਨ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:179
+#: ../shell/main.c:191
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19839,7 +19761,7 @@ msgstr ""
 "ਸਾਨ�ੰ �ਮ�ਦ ਹ� ਮਿੱਤਰ ਤ�ੰ ਸਾਡ� ਮ�ਹਨਤ ਦਾ �ਨੰਦ ਮਾਣ��ਾ �ਤ� �ਸ�� ਤ�ਰ� �ਸ ਸਹਿਯ�� ਦਾ\n"
 "ਤਹਿ ਦਿਲ�� ਧੰਨਵਾਦ �ਰਦ� ਹਾ�\n"
 
-#: ../shell/main.c:203
+#: ../shell/main.c:215
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19847,59 +19769,83 @@ msgstr ""
 "ਧੰਨਵਾਦ\n"
 "�ਵ�ਲ�ਸ਼ਨ ��ਮ\n"
 
-#: ../shell/main.c:210
+#: ../shell/main.c:222
 msgid "Do not tell me again"
 msgstr "ਮ�ਨ�ੰ ਮ�� ਨਾ ਦੱਸ�"
 
-#: ../shell/main.c:326
-msgid "Start Evolution activating the specified component"
-msgstr "�ਵ�ਲ�ਸ਼ਨ �ੱ� �ਾਸ ਭਾ� ਦ� ਸਰ�ਰਮ� ਨਾਲ ਸ਼�ਰ� ਹ� ਰਹ� ਹ�"
+#. Translators: Do NOT translate the five component names, they MUST remain in English!
+#: ../shell/main.c:367
+msgid ""
+"Start Evolution showing the specified component. Available options are "
+"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+msgstr ""
 
-#: ../shell/main.c:328
+#: ../shell/main.c:369
 msgid "Apply the given geometry to the main window"
 msgstr "ਦਿੱਤ� ��ਮ��ਰ� ਮ�ੱ� ਵਿੰਡ� �ੱਤ� ਲਾ�� �ਰ�"
 
-#: ../shell/main.c:332
+#: ../shell/main.c:373
 msgid "Start in online mode"
 msgstr "�ਨਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
-#: ../shell/main.c:334
+#: ../shell/main.c:375
+#, fuzzy
+#| msgid "Whether the network is available"
+msgid "Ignore network availability"
+msgstr "�� ਨ�ੱ�ਵਰ� �ਪਲੱਬਧ ਹ�ਵ�"
+
+#: ../shell/main.c:377
 msgid "Start in \"express\" mode"
 msgstr "\"��ਸਪ�ਰ�ਸ\" ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
-#: ../shell/main.c:337
+#: ../shell/main.c:380
 msgid "Forcibly shut down Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਧੱ�� ਨਾਲ ਬੰਦ �ਰ�"
 
-#: ../shell/main.c:340
+#: ../shell/main.c:383
 msgid "Send the debugging output of all components to a file."
 msgstr "ਸਾਰ� ਭਾ�ਾ� ਦ� ਡ�ਬੱ� ���ਪ�ੱ� �ੱ� ਫਾ�ਲ ਵਿੱ� ਭ���।"
 
-#: ../shell/main.c:342
+#: ../shell/main.c:385
 msgid "Disable loading of any plugins."
 msgstr "��� ਪਲੱ�-�ਨ ਲ�ਡ ਤ�� ਰ�� ਹ�।"
 
-#: ../shell/main.c:344
+#: ../shell/main.c:387
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ਮ�ਲ, ਸੰਪਰ� �ਤ� �ੰਮ ਲ� �ਲ� ਪ�ਨ �ਯ�� �ਰ�।"
 
-#: ../shell/main.c:348
+#: ../shell/main.c:391
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "URI �ਾ� ਬਾ�� ਦ� �ਰ��ਮ��� ਵ��� ਦਿੱਤ� ਫਾ�ਲ ਨਾ� �ੰਪ�ਰ� �ਰ�"
 
-#: ../shell/main.c:350
+#: ../shell/main.c:393
 msgid "Request a running Evolution process to quit"
 msgstr "�ੱਲਦ� �ਵ�ਲਸ਼ਨ ਪਰ�ਸ�ਸ ਨ�ੰ ਬੰਦ �ਰਨ ਦ� ਮੰ�"
 
-#: ../shell/main.c:474 ../shell/main.c:482
+#: ../shell/main.c:557 ../shell/main.c:565
 msgid "- The Evolution PIM and Email Client"
 msgstr "- �ਵ�ਲ�ਸ਼ਨ PIM �ਤ� �-ਮ�ਲ �ਲਾ��"
 
-#: ../shell/main.c:544
-#, c-format
+#: ../shell/main.c:627
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: --online and --offline cannot be used together.\n"
+#| "  Use %s --help for more information.\n"
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
-"  Use %s --help for more information.\n"
+"  Run '%s --help' for more information.\n"
+msgstr ""
+"%s: --online �ਤ� --offline �ੱ� ਸਮ�� ਨਹ�� ਵਰਤ� �ਾ ਸ�ਦ� ਹਨ।\n"
+"ਵਧ�ਰ� �ਾਣ�ਾਰ� ਲ�  %s --help ਵਰਤ��।\n"
+
+#: ../shell/main.c:633
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: --online and --offline cannot be used together.\n"
+#| "  Use %s --help for more information.\n"
+msgid ""
+"%s: --force-online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
 msgstr ""
 "%s: --online �ਤ� --offline �ੱ� ਸਮ�� ਨਹ�� ਵਰਤ� �ਾ ਸ�ਦ� ਹਨ।\n"
 "ਵਧ�ਰ� �ਾਣ�ਾਰ� ਲ�  %s --help ਵਰਤ��।\n"
@@ -19984,27 +19930,27 @@ msgstr "ਫਾ�ਲ �ੱ� ਠ�� .desktop ਫਾ�ਲ ਨਹ�� ਹ
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "ਬ�ਪ�ਾਣ ਡ�ਸ��ਾਪ ਫਾ�ਲ ਵਰ�ਨ '%s'"
 
-#: ../smclient/eggdesktopfile.c:958
+#: ../smclient/eggdesktopfile.c:957
 #, c-format
 msgid "Starting %s"
 msgstr "%s ਸ਼�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../smclient/eggdesktopfile.c:1100
+#: ../smclient/eggdesktopfile.c:1098
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "�ਪਲ���ਸ਼ਨ �ਮਾ�ਡ ਲਾ�ਨ ਤ�� ਡ���ਮ��� ਮਨ�਼�ਰ ਨਹ�� �ਰਦ� ਹ�"
 
-#: ../smclient/eggdesktopfile.c:1168
+#: ../smclient/eggdesktopfile.c:1166
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "ਬ�ਪ�ਾਣ ਲਾ�� ��ਣ: %d"
 
-#: ../smclient/eggdesktopfile.c:1373
+#: ../smclient/eggdesktopfile.c:1365
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "ਡ���ਮ��� URIs  'Type=Link' ਡ�ਸ��ਾਪ ���ਰ� ਨ�ੰ ਦਿੱਤਾ ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../smclient/eggdesktopfile.c:1394
+#: ../smclient/eggdesktopfile.c:1386
 #, c-format
 msgid "Not a launchable item"
 msgstr "�ੱਲਣਯ�� ���ਮ ਨਹ�� ਹ�"
@@ -20165,7 +20111,7 @@ msgstr ""
 "�ਸ ਨ� �ਾਰ� ��ਤਾ:\n"
 "  ਵਿਸ਼ਾ: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:169
 msgid "Select certificate"
 msgstr "ਸਰ��ਫਿ��� ��ਣ�"
 
@@ -20658,7 +20604,7 @@ msgstr "\"%s\" ਲ� �ਲ� ਪਰਿਭਾਸ਼ਿਤ"
 msgid "Table"
 msgstr "��ਬਲ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "ਮ���ਦਾ �ਲ� ਸੰਭਾਲ�"
 
@@ -20686,11 +20632,11 @@ msgstr "�ਲ� ਦ� �ਿਸਮ"
 msgid "Type of view:"
 msgstr "�ਲ� ਦ� �ਿਸਮ:"
 
-#: ../widgets/misc/e-account-manager.c:351
+#: ../widgets/misc/e-account-manager.c:355
 msgid "De_fault"
 msgstr "ਮ�ਲ(_f)"
 
-#: ../widgets/misc/e-account-tree-view.c:261
+#: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "ਪ�ਰ����ਾਲ"
 
@@ -20698,16 +20644,16 @@ msgstr "ਪ�ਰ����ਾਲ"
 msgid "Attachment Properties"
 msgstr "����ਮ��� ਵਿਸ਼�ਸਤਾ"
 
-#: ../widgets/misc/e-attachment-dialog.c:330
+#: ../widgets/misc/e-attachment-dialog.c:332
 msgid "_Filename:"
 msgstr "ਫਾ�ਲਨਾ�(_F):"
 
-#: ../widgets/misc/e-attachment-dialog.c:365
+#: ../widgets/misc/e-attachment-dialog.c:367
 msgid "MIME Type:"
 msgstr "MIME �ਾ�ਪ:"
 
-#: ../widgets/misc/e-attachment-dialog.c:373
-#: ../widgets/misc/e-attachment-store.c:525
+#: ../widgets/misc/e-attachment-dialog.c:375
+#: ../widgets/misc/e-attachment-store.c:533
 msgid "_Suggest automatic display of attachment"
 msgstr "ਨੱਥ� ਦਾ ���ਮ��ਿ� �ਲ� ਲ� ਸ��ਾ�(_S)"
 
@@ -20743,65 +20689,65 @@ msgstr "ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹ�..."
 msgid "Saving"
 msgstr "ਸੰਭਾਲ� �ਾ ਰਹ� ਹ�"
 
-#: ../widgets/misc/e-attachment-paned.c:98
+#: ../widgets/misc/e-attachment-paned.c:100
 msgid "Hide Attachment _Bar"
 msgstr "ਨੱਥ� ਪੱ�� �ਹਲ�(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:100
-#: ../widgets/misc/e-attachment-paned.c:631
+#: ../widgets/misc/e-attachment-paned.c:102
+#: ../widgets/misc/e-attachment-paned.c:640
 msgid "Show Attachment _Bar"
 msgstr "ਨੱਥ� ਪੱ�� ਵ��ਾ�(_B)"
 
-#: ../widgets/misc/e-attachment-store.c:513
+#: ../widgets/misc/e-attachment-store.c:521
 msgid "Add Attachment"
 msgstr "����ਮ��� ਸ਼ਾਮਲ �ਰ�"
 
-#: ../widgets/misc/e-attachment-store.c:516
+#: ../widgets/misc/e-attachment-store.c:524
 msgid "A_ttach"
 msgstr "����(_t)"
 
-#: ../widgets/misc/e-attachment-store.c:579
+#: ../widgets/misc/e-attachment-store.c:587
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "����ਮ��� ਸੰਭਾਲ�"
 msgstr[1] "����ਮ���ਾ� ਸੰਭਾਲ�"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:608
-#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
+#: ../widgets/misc/e-attachment-store.c:616
+#: ../widgets/misc/e-attachment.c:1786 ../widgets/misc/e-attachment.c:2328
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:351
+#: ../widgets/misc/e-attachment-view.c:352
 msgid "S_ave All"
 msgstr "ਸਭ ਸੰਭਾਲ�(_a)"
 
-#: ../widgets/misc/e-attachment-view.c:377
+#: ../widgets/misc/e-attachment-view.c:378
 msgid "A_dd Attachment..."
 msgstr "����ਮ��� ਸ਼ਾਮਲ(_d)..."
 
-#: ../widgets/misc/e-attachment-view.c:401
+#: ../widgets/misc/e-attachment-view.c:402
 msgid "_Hide"
 msgstr "�ਹਲ�(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:408
+#: ../widgets/misc/e-attachment-view.c:409
 msgid "Hid_e All"
 msgstr "ਸਭ �ਹਲ�(_e)"
 
-#: ../widgets/misc/e-attachment-view.c:415
+#: ../widgets/misc/e-attachment-view.c:416
 msgid "_View Inline"
 msgstr "ਲਾ�ਨ '� ਵ���(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:422
+#: ../widgets/misc/e-attachment-view.c:423
 msgid "Vie_w All Inline"
 msgstr "ਸਭ ਲਾ�ਨ '� ਵ���(_w)"
 
-#: ../widgets/misc/e-attachment-view.c:739
+#: ../widgets/misc/e-attachment-view.c:740
 #, c-format
 msgid "Open with \"%s\""
 msgstr "\"%s\" ਨਾਲ ��ਲ�ਹ�"
 
-#: ../widgets/misc/e-attachment-view.c:742
+#: ../widgets/misc/e-attachment-view.c:743
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "�ਹ ����ਮ��� %s ਵਿੱ� ��ਲ�ਹ�"
@@ -20814,55 +20760,55 @@ msgstr "�ਹ ����ਮ��� %s ਵਿੱ� ��ਲ�ਹ�"
 msgid "Attached message"
 msgstr "���� ��ਤਾ ਸ�ਨ�ਹਾ"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2630
 msgid "A load operation is already in progress"
 msgstr "ਪਹਿਲਾ� ਹ� ਲ�ਡ �ਾਰਵਾ� �ਾਰ� ਹ�।"
 
-#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:1837 ../widgets/misc/e-attachment.c:2638
 msgid "A save operation is already in progress"
 msgstr "ਪਹਿਲਾ� ਸੰਭਾਲਣ �ਾਰਵਾ� �ਾਰ� ਹ�।"
 
-#: ../widgets/misc/e-attachment.c:1928
+#: ../widgets/misc/e-attachment.c:1929
 #, c-format
 msgid "Could not load '%s'"
 msgstr "'%s' ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../widgets/misc/e-attachment.c:1931
+#: ../widgets/misc/e-attachment.c:1932
 #, c-format
 msgid "Could not load the attachment"
 msgstr "����ਮ��� ਲ�ਡ ਨਹ�� ��ਤ� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2207
+#: ../widgets/misc/e-attachment.c:2208
 #, c-format
 msgid "Could not open '%s'"
 msgstr "'%s' ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2210
+#: ../widgets/misc/e-attachment.c:2211
 #, c-format
 msgid "Could not open the attachment"
 msgstr "����ਮ��� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2645
+#: ../widgets/misc/e-attachment.c:2646
 msgid "Attachment contents not loaded"
 msgstr "����ਮ��� ਸਮੱ�ਰ� ਲ�ਡ ਨਹ�� ਹ�"
 
-#: ../widgets/misc/e-attachment.c:2721
+#: ../widgets/misc/e-attachment.c:2722
 #, c-format
 msgid "Could not save '%s'"
 msgstr "'%s' ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2724
+#: ../widgets/misc/e-attachment.c:2725
 #, c-format
 msgid "Could not save the attachment"
 msgstr "����ਮ��� ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:362
 msgid "Ctrl-click to open a link"
 msgstr "ਲਿੰ� ��ਲ�ਹਣ ਲ� �ੰ�ਰ�ਲ-�ਲਿੱ� �ਰ�"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1258
+#: ../widgets/misc/e-calendar-item.c:1259
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20874,96 +20820,96 @@ msgstr "ਮਹ�ਨਾ ��ਲੰਡਰ"
 msgid "Character Encoding"
 msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�"
 
-#: ../widgets/misc/e-charset-combo-box.c:120
+#: ../widgets/misc/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "ਵਰਤਣ ਲ� �ੱ�ਰ ਦਿ�"
 
-#: ../widgets/misc/e-charset-combo-box.c:339
+#: ../widgets/misc/e-charset-combo-box.c:341
 msgid "Other..."
 msgstr "ਹ�ਰ..."
 
-#: ../widgets/misc/e-dateedit.c:505
+#: ../widgets/misc/e-dateedit.c:507
 msgid "Date and Time"
 msgstr "ਮਿਤ� �ਤ� ਸਮਾ�"
 
-#: ../widgets/misc/e-dateedit.c:526
+#: ../widgets/misc/e-dateedit.c:528
 msgid "Text entry to input date"
 msgstr "ਮਿਤ� ਦ�ਣ ਲ� ���ਸ� �ੰਦਰਾ�"
 
-#: ../widgets/misc/e-dateedit.c:548
+#: ../widgets/misc/e-dateedit.c:550
 msgid "Click this button to show a calendar"
 msgstr "��ਲੰਡਰ ਵ��ਾ�ਣ ਲ� �ਹ ਬ�ਨ ਦਬਾ�"
 
-#: ../widgets/misc/e-dateedit.c:594
+#: ../widgets/misc/e-dateedit.c:605
 msgid "Drop-down combination box to select time"
 msgstr "ਸਮਾ� ��ਣਨ ਲ� ਲ��ਦਾ ਬ�ਸਾ"
 
-#: ../widgets/misc/e-dateedit.c:666
+#: ../widgets/misc/e-dateedit.c:677
 msgid "No_w"
 msgstr "ਹ�ਣ�(_w)"
 
-#: ../widgets/misc/e-dateedit.c:672
+#: ../widgets/misc/e-dateedit.c:683
 msgid "_Today"
 msgstr "�ੱ�(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:680
+#: ../widgets/misc/e-dateedit.c:691
 msgid "_None"
 msgstr "��� ਨਹ��(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
+#: ../widgets/misc/e-dateedit.c:1698 ../widgets/misc/e-dateedit.c:1930
 msgctxt "date"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../widgets/misc/e-dateedit.c:1812
+#: ../widgets/misc/e-dateedit.c:1825
 msgid "Invalid Date Value"
 msgstr "�ਲਤ ਤਾਰ�� ਮ�ੱਲ"
 
-#: ../widgets/misc/e-dateedit.c:1856
+#: ../widgets/misc/e-dateedit.c:1869
 msgid "Invalid Time Value"
 msgstr "�ਲਤ ਸਮਾ� ਮ�ੱਲ"
 
-#: ../widgets/misc/e-import-assistant.c:249
+#: ../widgets/misc/e-import-assistant.c:252
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "ਫਾ�ਲ, �� ਵ� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� �ਯਾਤ �ਰਨ� ਹ� �ਤ� �ਸ ਦ� �ਿਸਮ ਸ��� ਵਿੱ��� ��ਣ�।"
 
-#: ../widgets/misc/e-import-assistant.c:266
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "F_ilename:"
 msgstr "ਫਾ�ਲ਼ ਨਾ�(_i):"
 
-#: ../widgets/misc/e-import-assistant.c:276
+#: ../widgets/misc/e-import-assistant.c:279
 msgid "Select a file"
 msgstr "�ੱ� ਫਾ�ਲ ��ਣ�"
 
-#: ../widgets/misc/e-import-assistant.c:290
-#: ../widgets/misc/e-import-assistant.c:465
+#: ../widgets/misc/e-import-assistant.c:293
+#: ../widgets/misc/e-import-assistant.c:468
 msgid "File _type:"
 msgstr "ਫਾ�ਲ �ਿਸਮ(_t):"
 
-#: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:916
+#: ../widgets/misc/e-import-assistant.c:336
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Choose the destination for this import"
 msgstr "�ਸ �ਯਾਤ ਲ� ਨਿਯਤ ਸਥਾਨ ��ਣ�"
 
-#: ../widgets/misc/e-import-assistant.c:358
+#: ../widgets/misc/e-import-assistant.c:361
 msgid "Choose the type of importer to run:"
 msgstr "�ਲਾ�ਣ ਲ� �ਯਾਤ�ਾਰ ਦ� �ਿਸਮ ��ਣ�:"
 
-#: ../widgets/misc/e-import-assistant.c:366
+#: ../widgets/misc/e-import-assistant.c:369
 msgid "Import data and settings from _older programs"
 msgstr "ਪ�ਰਾਣ� �ਾਰ� ਤ�� ਡਾ�ਾ �ਤ� ਸ��ਿੰ� �ਯਾਤ �ਰ�"
 
-#: ../widgets/misc/e-import-assistant.c:374
+#: ../widgets/misc/e-import-assistant.c:377
 msgid "Import a _single file"
 msgstr "�ੱ� ��ਹ�ਰ� ਫਾ�ਲ �ਯਾਤ �ਰ�(_s)"
 
-#: ../widgets/misc/e-import-assistant.c:526
+#: ../widgets/misc/e-import-assistant.c:529
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -20974,37 +20920,37 @@ msgstr ""
 "\" ਬ�ਨ ਨ�ੰ ਦਬਾ �� ਮ�� ��ਸ਼ਿਸ �ਰ ਸ�ਦ� ਹ�।"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:773
+#: ../widgets/misc/e-import-assistant.c:769
 msgid "_Cancel Import"
 msgstr "�ੰਪ�ਰ� �ਰਨਾ ਰੱਦ �ਰ�(_C)"
 
-#: ../widgets/misc/e-import-assistant.c:915
+#: ../widgets/misc/e-import-assistant.c:911
 msgid "Preview data to be imported"
 msgstr "�ੰਪ�ਰ� ��ਤ� �ਾਣ ਵਾਲ� ਡਾ�� ਦ� �ਲ� ਵ���"
 
-#: ../widgets/misc/e-import-assistant.c:921
-#: ../widgets/misc/e-import-assistant.c:934
-#: ../widgets/misc/e-import-assistant.c:1284
-#: ../widgets/misc/e-import-assistant.c:1350
-#: ../widgets/misc/e-import-assistant.c:1359
+#: ../widgets/misc/e-import-assistant.c:917
+#: ../widgets/misc/e-import-assistant.c:930
+#: ../widgets/misc/e-import-assistant.c:1280
+#: ../widgets/misc/e-import-assistant.c:1346
+#: ../widgets/misc/e-import-assistant.c:1355
 msgid "Import Data"
 msgstr "�ਾਸ ਡਾ�ਾ"
 
-#: ../widgets/misc/e-import-assistant.c:929
+#: ../widgets/misc/e-import-assistant.c:925
 msgid "Select what type of file you want to import from the list."
 msgstr "ਫਾ�ਲ ਦ� �ਿਸਮ ��ਣ�, �� ਤ�ਸ�� ਲਿਸ� ਤ�� �ੰਪ�ਰ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�।"
 
-#: ../widgets/misc/e-import-assistant.c:1274
-#: ../widgets/misc/e-import-assistant.c:1308
+#: ../widgets/misc/e-import-assistant.c:1270
+#: ../widgets/misc/e-import-assistant.c:1304
 msgid "Evolution Import Assistant"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ੰਪ�ਰ� ਸਹਾ��"
 
-#: ../widgets/misc/e-import-assistant.c:1291
-#: ../widgets/misc/e-import-assistant.c:1338
+#: ../widgets/misc/e-import-assistant.c:1287
+#: ../widgets/misc/e-import-assistant.c:1334
 msgid "Import Location"
 msgstr "�ੰਪ�ਰ� �ਿ�ਾਣਾ"
 
-#: ../widgets/misc/e-import-assistant.c:1302
+#: ../widgets/misc/e-import-assistant.c:1298
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21014,27 +20960,27 @@ msgstr ""
 "�ਸ ਸਹਾ�� ਨਾਲ ਤ�ਸ� ਬਾਹਰ� ਫਾ�ਲਾ� �ਵ�ਲ�ਸ਼ਨ ਤ� �ੰਪ�ਰ� \n"
 "�ਰ ਸ�ਦ� ਹ�।"
 
-#: ../widgets/misc/e-import-assistant.c:1316
+#: ../widgets/misc/e-import-assistant.c:1312
 msgid "Importer Type"
 msgstr "�ੰਪ�ਰ�ਰ �ਿਸਮ"
 
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1320
 msgid "Select Information to Import"
 msgstr "�ੰਪ�ਰ� �ਰਨ ਲ� �ਾਣ�ਾਰ� ��ਣ�"
 
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select a File"
 msgstr "ਫਾ�ਲ ��ਣ�"
 
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../widgets/misc/e-import-assistant.c:1341
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਫਾ�ਲ �ੰਪ�ਰ� �ਰਨ ਲ� \"ਲਾ�� �ਰ�\" �ੱਤ� �ਲਿੱ� �ਰ�।"
 
-#: ../widgets/misc/e-map.c:557
+#: ../widgets/misc/e-map.c:752
 msgid "World Map"
 msgstr "ਸੰਸਾਰ ਨ�ਸ਼ਾ"
 
-#: ../widgets/misc/e-map.c:559
+#: ../widgets/misc/e-map.c:754
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21054,53 +21000,53 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�। 
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�। �ਸ ਬ�ਨ ਨ�ੰ �ਨਲਾ�ਨ �ਾਣ ਲ� ਵਰਤ��।"
 
-#: ../widgets/misc/e-preferences-window.c:278
+#: ../widgets/misc/e-preferences-window.c:281
 msgid "Evolution Preferences"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਸੰਦ"
 
 #  message-search popup match count string
-#: ../widgets/misc/e-search-bar.c:81
+#: ../widgets/misc/e-search-bar.c:82
 #, c-format
 msgid "Matches: %d"
 msgstr "ਮਿਲਦਾ: %d"
 
-#: ../widgets/misc/e-search-bar.c:557
+#: ../widgets/misc/e-search-bar.c:563
 msgid "Close the find bar"
 msgstr "�ਹ ਪੱ�� ਬੰਦ �ਰ�"
 
-#: ../widgets/misc/e-search-bar.c:565
+#: ../widgets/misc/e-search-bar.c:571
 msgid "Fin_d:"
 msgstr "���(_d):"
 
-#: ../widgets/misc/e-search-bar.c:577
+#: ../widgets/misc/e-search-bar.c:583
 msgid "Clear the search"
 msgstr "��� ਸਾਫ਼ �ਰ�"
 
-#: ../widgets/misc/e-search-bar.c:600
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Previous"
 msgstr "ਪਿੱ��(_P)"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr "ਸ਼ਬਦ ਦ� ਪਿ�ਲ� ਮ���ਦ�� ਲੱਭ�"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:626
 msgid "_Next"
 msgstr "�ੱ��(_N)"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Find the next occurrence of the phrase"
 msgstr "ਸ਼ਬਦ ਦ� ��ਲ� ਮ���ਦ�� ਲੱਭ�"
 
-#: ../widgets/misc/e-search-bar.c:632
+#: ../widgets/misc/e-search-bar.c:645
 msgid "Mat_ch case"
 msgstr "ਮਿਲਦ� ਸਭ(_c)"
 
-#: ../widgets/misc/e-search-bar.c:660
+#: ../widgets/misc/e-search-bar.c:673
 msgid "Reached bottom of page, continued from top"
 msgstr "ਪ��਼ ਦ� �ੰਤ �ੱਤ� ਪ�ੱ��, �ੱਤ� ਤ�� �ਾਰ� ਰੱ�ਿ�"
 
-#: ../widgets/misc/e-search-bar.c:682
+#: ../widgets/misc/e-search-bar.c:695
 msgid "Reached top of page, continued from bottom"
 msgstr "ਪ��਼ ਦ� �ੱਤ� ਪ�ੱ��, ਹ�ਠਾ� ਤ�� ਫ�ਰ �ਾਰ�"
 
@@ -21173,6 +21119,10 @@ msgstr "�ਵਾਬ ਲ���ਦਾ(_e)"
 msgid "Return Notification"
 msgstr "�ਵਾਬ� ਸ��ਨਾ"
 
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Secret"
+msgstr "��ਪਤ"
+
 #: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "ਹਾਲਤ ���(_t)"
@@ -21235,38 +21185,38 @@ msgctxt "send-options"
 msgid "None"
 msgstr "��� ਨਹ�"
 
-#: ../widgets/misc/e-signature-editor.c:136
-#: ../widgets/misc/e-signature-editor.c:524
-#: ../widgets/misc/e-signature-manager.c:353
-#: ../widgets/misc/e-signature-script-dialog.c:220
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:563
+#: ../widgets/misc/e-signature-manager.c:355
+#: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
 msgstr "ਬ�-ਨਾ�"
 
-#: ../widgets/misc/e-signature-editor.c:213
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_Save and Close"
 msgstr "ਸੰਭਾਲ� ਤ� ਬੰਦ �ਰ�(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:391
+#: ../widgets/misc/e-signature-editor.c:430
 msgid "Edit Signature"
 msgstr "ਦਸਤ�ਤ ਸ�ਧ"
 
-#: ../widgets/misc/e-signature-editor.c:406
+#: ../widgets/misc/e-signature-editor.c:445
 msgid "_Signature Name:"
 msgstr "ਦਸਤ�ਤ ਨਾ�(_S):"
 
-#: ../widgets/misc/e-signature-manager.c:298
+#: ../widgets/misc/e-signature-manager.c:300
 msgid "Add Signature Script"
 msgstr "ਦਸਤ�ਤ� ਸ��ਰਿਪ� ਸ਼ਾਮਿਲ"
 
-#: ../widgets/misc/e-signature-manager.c:363
+#: ../widgets/misc/e-signature-manager.c:365
 msgid "Edit Signature Script"
 msgstr "ਦਸਤ�ਤ ਸ��ਰਿਪ� ਸ�ਧ"
 
-#: ../widgets/misc/e-signature-manager.c:579
+#: ../widgets/misc/e-signature-manager.c:583
 msgid "Add _Script"
 msgstr "ਸ��ਰਿਪ� ����(_S)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:268
+#: ../widgets/misc/e-signature-script-dialog.c:269
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -21276,12 +21226,12 @@ msgstr ""
 "�ਾਵ���। ਨਾ�, �� ਵ� ਤ�ਸ�� ਦਿ���, ਸਿਰਫ ਵ��ਾ�ਣ ਦ� �ੰਮ\n"
 " �ਵ��ਾ।"
 
-#: ../widgets/misc/e-signature-script-dialog.c:313
+#: ../widgets/misc/e-signature-script-dialog.c:314
 msgid "S_cript:"
 msgstr "ਸ��ਰਿਪ�(_c):"
 
 #  mail:signature-notscript secondary
-#: ../widgets/misc/e-signature-script-dialog.c:344
+#: ../widgets/misc/e-signature-script-dialog.c:345
 msgid "Script file must be executable."
 msgstr "ਸ��ਰਿਪ� ਫਾ�ਲ �ੱਲਣਯ�� ਹ�ਣ� �ਾਹ�ਦ� ਹ�।"
 
@@ -21289,41 +21239,41 @@ msgstr "ਸ��ਰਿਪ� ਫਾ�ਲ �ੱਲਣਯ�� ਹ�ਣ� 
 msgid "Click here to go to URL"
 msgstr "URL �ੱਤ� �ਾਣ ਲ� �ੱਥ� ਦਬਾ�"
 
-#: ../widgets/misc/e-web-view.c:374
+#: ../widgets/misc/e-web-view.c:373
 msgid "_Copy Link Location"
 msgstr "ਲਿੰ� �ਿ�ਾਣ� ਦ� ਨ�ਲ(_C)"
 
-#: ../widgets/misc/e-web-view.c:376
+#: ../widgets/misc/e-web-view.c:375
 msgid "Copy the link to the clipboard"
 msgstr "ਲਿੰ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../widgets/misc/e-web-view.c:384
+#: ../widgets/misc/e-web-view.c:383
 msgid "_Open Link in Browser"
 msgstr "ਲਿੰ� ਬਰਾ��਼ਰ ਵਿੱ� ��ਲ�ਹ�(_O)"
 
-#: ../widgets/misc/e-web-view.c:386
+#: ../widgets/misc/e-web-view.c:385
 msgid "Open the link in a web browser"
 msgstr "ਲਿੰ� ਵ�ੱਬ ਬਰਾ��਼ਰ ਵਿੱ� ��ਲ�ਹ�"
 
-#: ../widgets/misc/e-web-view.c:394
+#: ../widgets/misc/e-web-view.c:393
 msgid "_Copy Email Address"
 msgstr "�ਮ�ਲ �ਡਰ�ੱਸ �ਾਪ� �ਰ�(_C)"
 
-#: ../widgets/misc/e-web-view.c:423 ../widgets/misc/e-web-view.c:1078
+#: ../widgets/misc/e-web-view.c:422 ../widgets/misc/e-web-view.c:1077
 msgid "Select all text and images"
 msgstr "ਸਭ ���ਸ� �ਤ� �ਿੱਤਰ ��ਣ�"
 
-#: ../widgets/misc/e-web-view.c:855 ../widgets/misc/e-web-view.c:857
-#: ../widgets/misc/e-web-view.c:859
+#: ../widgets/misc/e-web-view.c:854 ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ਨ�ੰ �ਾਲ �ਰਨ ਲ� �ਲਿੱ� �ਰ�"
 
-#: ../widgets/misc/e-web-view.c:861
+#: ../widgets/misc/e-web-view.c:860
 msgid "Click to hide/unhide addresses"
 msgstr "�ਡਰ�ੱਸ �ਹਲ�/ਵ��ਾ�ਣ ਲ� ਦਬਾ�"
 
-#: ../widgets/misc/e-web-view.c:863
+#: ../widgets/misc/e-web-view.c:862
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ��ਲ�ਹਣ ਲ� �ਲਿੱ� �ਰ�"
@@ -21342,7 +21292,7 @@ msgstr "��ਲੰਡਰ: %s ਤ�� %s ਤੱ�"
 msgid "evolution calendar item"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ��ਾ�"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:177
 msgid "popup list"
 msgstr "ਪ�ਪ�ੱਪ ਲਿਸ�"
 
@@ -21375,28 +21325,28 @@ msgstr "ਪ�ਰਤ�ਸ਼ਤ �ਾਸ ਤ�ਰ ਤ� ੦ ਤ� ੧੦੦ 
 msgid "click to add"
 msgstr "ਸ਼ਾਮਲ ਲ� �ਲਿੱ� �ਰ�"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(ਵੱਧਦਾ �ਰਮ)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(�ੱ�ਦਾ �ਰਮ)"
 
-#: ../widgets/table/e-table-config.c:388
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "ਨਾ ��ਰਮਬੱਧ"
 
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "��� �ਰ�ੱਪਿੰ� ਨਹ��"
 
-#: ../widgets/table/e-table-config.c:647
+#: ../widgets/table/e-table-config.c:654
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "��ਤਰ ਵ���"
 
-#: ../widgets/table/e-table-config.c:667
+#: ../widgets/table/e-table-config.c:674
 msgid "Available Fields"
 msgstr "�ਪਲੱਬਧ ��ਤਰ"
 
@@ -21405,7 +21355,7 @@ msgid "A_vailable Fields:"
 msgstr "�ਪਲੱਬਧ ��ਤਰ(_v):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1668
 msgid "Ascending"
 msgstr "ਵੱਧਦਾ �ਰਮ"
 
@@ -21418,7 +21368,7 @@ msgid "Clear _All"
 msgstr "ਸਭ ਸਾਫ਼(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1668
 msgid "Descending"
 msgstr "�ੱ�ਦਾ �ਰਮ"
 
@@ -21497,7 +21447,7 @@ msgstr ""
 #. Finally the %d is replaced with count of items in this group.
 #. Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:354
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -21510,80 +21460,75 @@ msgstr[1] "%s: %s (%d ���ਮਾ�)"
 #. The %d is replaced with count of items in this group.
 #. Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:363
+#: ../widgets/table/e-table-group-container.c:366
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d ���ਮ)"
 msgstr[1] "%s (%d ���ਮਾ�)"
 
-#: ../widgets/table/e-table-header-item.c:1546
+#: ../widgets/table/e-table-header-item.c:1512
 msgid "Customize Current View"
 msgstr "�ਸ�ਮਾ��਼ ਮ���ਦਾ �ਲ�"
 
-#: ../widgets/table/e-table-header-item.c:1567
+#: ../widgets/table/e-table-header-item.c:1533
 msgid "Sort _Ascending"
 msgstr "ਵੱਧਦਾ ��ਰਮ(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1570
+#: ../widgets/table/e-table-header-item.c:1536
 msgid "Sort _Descending"
 msgstr "�ੱ�ਦਾ ��ਰਮ(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1573
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Unsort"
 msgstr "��ਰ-��ਰਮਬੱਧ(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1576
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "Group By This _Field"
 msgstr "�ਸ ��ਤਰ ਨਾਲ �ਰ�ੱਪ(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1545
 msgid "Group By _Box"
 msgstr "ਬ�ਸ� ਨਾਲ �ਰ�ੱਪ(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1549
 msgid "Remove This _Column"
 msgstr "�ਹ �ਾਲਮ ਹ�ਾ�(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1586
+#: ../widgets/table/e-table-header-item.c:1552
 msgid "Add a C_olumn..."
 msgstr "�ਾਲਮ ਸ਼ਾਮਲ(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1590
+#: ../widgets/table/e-table-header-item.c:1556
 msgid "A_lignment"
 msgstr "��ਸਾਰ(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1593
+#: ../widgets/table/e-table-header-item.c:1559
 msgid "B_est Fit"
 msgstr "ਵਧ�� ਫਿੱ�(_e)"
 
-#: ../widgets/table/e-table-header-item.c:1596
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Format Column_s..."
 msgstr "�ਾਲਮ ਫਾਰਮ��(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1566
 msgid "Custo_mize Current View..."
 msgstr "�ਸ�ਮਾ��਼ ਮ���ਦਾ �ਲ�(_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1659
+#: ../widgets/table/e-table-header-item.c:1625
 msgid "_Sort By"
 msgstr "ਲ��ਬੱਧ(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1677
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "_Custom"
 msgstr "�ਸ�ਮ(_C)"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:126
 msgid "popup a child"
 msgstr "ਪ�ਪ�ੱਪ �ੱ� �ਾ�ਲਡ"
 
-#. Translators: description of an "edit" action
-#: ../widgets/table/gal-a11y-e-cell-text.c:618
-msgid "begin editing this cell"
-msgstr "�ਸ ਸ�ੱਲ਼ ਸ�ਧਣਾ ਸ਼�ਰ�"
-
 #. Translators: description of a "toggle" action
 #: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
@@ -21611,14 +21556,551 @@ msgstr "ਦਬਾ�"
 msgid "sort"
 msgstr "ਲ��ਬੱਧ"
 
-#: ../widgets/text/e-text.c:2536
+#: ../widgets/text/e-text.c:2289
 msgid "Select All"
 msgstr "ਸਭ ��ਣ�"
 
-#: ../widgets/text/e-text.c:2548
+#: ../widgets/text/e-text.c:2301
 msgid "Input Methods"
 msgstr "�ੰਪ�ੱ� ਢੰ�"
 
+#~ msgid "Count of default recurrence for a new event. -1 means forever."
+#~ msgstr "ਨਵ�� �ਵ��� ਲ� ਡਿਫਾਲ� ਮ��-ਵਾਪਰਨ ਦ� �ਿਣਤ�। -1 ਦਾ �ਰਥ ਹ� ਹਮ�ਸ਼ਾ� ਲ�।"
+
+#~ msgid "Default recurrence count"
+#~ msgstr "ਡਿਫਾਲ� ਦ�ਹਰਾ�ਣ �ਿਣਤ�"
+
+#~ msgid "Event Gradient"
+#~ msgstr "��ਨਾ ਰ�ਪ"
+
+#~ msgid "Event Transparency"
+#~ msgstr "��ਨਾ ਪਾਰਦਰਸ਼ਤਾ"
+
+#~ msgid "Gradient of the events in calendar views."
+#~ msgstr "��ਲੰਡਰ �ਲ� ਵਿੱ� ��ਨਾਵਾ� ਵਿੱ� ਢਾ�ਲ"
+
+#~ msgid ""
+#~ "Transparency of the events in calendar views, a value between 0 "
+#~ "(transparent) and 1 (opaque)."
+#~ msgstr "��ਲੰਡਰ �ਲ� ਵਿੱ� ��ਨਾਵਾ� ਵਿੱ� ਪਾਰਦਰਸ਼ਤਾ, ਮ�ੱਲ 0 (ਪਾਰਦਰਸ਼�) �ਤ� 1 (ਧ�ੰਧਲਾ)"
+
+#~ msgid "URI of the highlighted (\"primary\") calendar"
+#~ msgstr "ਹਾ�ਲਾ�� (\"ਪ�ਰਾ�ਮਰ�\") ��ਲੰਡਰ ਲ� URI"
+
+#~ msgid "URI of the highlighted (\"primary\") memo list"
+#~ msgstr "ਹਾ�ਲਾ�� (\"ਪ�ਰਾ�ਮਰ�\") ਮ�ਮ� ਲਿਸ� ਲ� URI"
+
+#~ msgid "URI of the highlighted (\"primary\") task list"
+#~ msgstr "ਹਾ�ਲਾ�� (\"ਪ�ਰਾ�ਮਰ�\") �ਾਸ� ਲ� URI"
+
+#~ msgid "Recurring:"
+#~ msgstr "�ਵਿਰਤ�:"
+
+#~ msgid "Yes. (Complex Recurrence)"
+#~ msgstr "ਹਾ� (��ੰ�ਲਦਾਰ �ਵਰਤ�)"
+
+#~ msgid "Every day"
+#~ msgid_plural "Every %d days"
+#~ msgstr[0] "ਹਰ ਦਿਨ"
+#~ msgstr[1] "ਹਰ %d ਦਿਨ"
+
+#~ msgid "Every week"
+#~ msgid_plural "Every %d weeks"
+#~ msgstr[0] "ਹਰ ਹਫਤ�"
+#~ msgstr[1] "ਹਰ %d ਹਫਤ�"
+
+#~ msgid "Every week on "
+#~ msgid_plural "Every %d weeks on "
+#~ msgstr[0] "ਹਰ ਹਫਤ�"
+#~ msgstr[1] "ਹਰ %d ਹਫਤ�"
+
+#~ msgid " and "
+#~ msgstr " �ਤ� "
+
+#~ msgid "The %s day of "
+#~ msgstr "ਦਿਨ %s "
+
+#~ msgid "The %s %s of "
+#~ msgstr "%s %s ਵਿੱ���"
+
+#~ msgid "every month"
+#~ msgid_plural "every %d months"
+#~ msgstr[0] "ਹਰ ਮਹ�ਨ�"
+#~ msgstr[1] "ਮਹ�ਨ� ਵਿੱ� %d ਵਾਰ"
+
+#~ msgid "Every year"
+#~ msgid_plural "Every %d years"
+#~ msgstr[0] "ਹਰ ਸਾਲ"
+#~ msgstr[1] "ਹਰ %d ਸਾਲ"
+
+#~ msgid "a total of %d time"
+#~ msgid_plural "a total of %d times"
+#~ msgstr[0] "��ੱਲ %d ਵਾਰ"
+#~ msgstr[1] "��ੱਲ %d ਵਾਰ "
+
+#~ msgid ", ending on "
+#~ msgstr ", ਤ� ਸਮਾਪਤ�"
+
+#~ msgid "Starts"
+#~ msgstr "ਸ਼�ਰ�"
+
+#~ msgid "Ends"
+#~ msgstr "ਸਮਾਪਤ"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "iCalendar �ਾਣ�ਾਰ�"
+
+#  Title
+#~ msgid "iCalendar Error"
+#~ msgstr "iCalendar �ਲਤ�"
+
+#  Describe what the user can do
+#~ msgid ""
+#~ "Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr " �ਿਰਪਾ �ਰ�� ਹ�ਠ ਦਿੱਤ� �ਾਣ�ਾਰ� ਤ� ਮ�� ਵਿ�ਾਰ �ਰ� �ਤ� ਮ�ਨ� ਤ�� ਤੱਦ ��� �ਾਰਵਾ� ��ਣ�।"
+
+#~ msgid ""
+#~ "The meeting has been canceled, however it could not be found in your "
+#~ "calendars"
+#~ msgstr "ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� �� ਹ�, ਪਰ ਤ�ਹਾਡ� ��ਲੰਡਰ ਵਿੱ� ਨਹ�� ਲੱਭ ਸ�ਦ� ਹ�।"
+
+#~ msgid ""
+#~ "The task has been canceled, however it could not be found in your task "
+#~ "lists"
+#~ msgstr "�ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ �ਿ� ਹ�, ਪਰ ਤ�ਹਾਡ� �ੰਮ ਸ��� ਵਿੱ� ਨਹ�� ਲੱਭ ਸ�ਦਾ ਹ�"
+
+#~ msgid "%s has published meeting information."
+#~ msgstr "%s ਨ� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
+
+#~ msgid "Meeting Information"
+#~ msgstr "ਮ��ਿੰ� ਬਾਰ� �ਾਣ�ਾਰ�"
+
+#~ msgid "%s requests the presence of %s at a meeting."
+#~ msgstr "%s ਨ� ਮ��ਿੰ� ਵਿੱ� %s ਦ� ਮ���ਦ�� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
+
+#~ msgid "%s requests your presence at a meeting."
+#~ msgstr "%s ਨ� ਮ��ਿੰ� ਵਿੱ� ਤ�ਹਾਡ� ਹਾ�਼ਰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "ਮ��ਿੰ� ਸ��ਾ�"
+
+#~ msgid "%s wishes to be added to an existing meeting."
+#~ msgstr "%s �ੱ� ਮ���ਦਾ ਮ��ਿੰ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�।"
+
+#~ msgid "Meeting Update"
+#~ msgstr "ਮ��ਿੰ� �ੱਪਡ��"
+
+#~ msgid "%s wishes to receive the latest meeting information."
+#~ msgstr "%s ਨਵ�� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦ� ਹ�।"
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "ਮ��ਿੰ� �ੱਪਡ�� ਮੰ�"
+
+#~ msgid "%s has replied to a meeting request."
+#~ msgstr "%s ਨ� �ੱ� ਮ��ਿੰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
+
+#~ msgid "Meeting Reply"
+#~ msgstr "ਮ��ਿੰ� �ਵਾਬ"
+
+#~ msgid "%s has canceled a meeting."
+#~ msgstr "%s ਨ� �ੱ� ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� ਹ�।"
+
+#~ msgid "Meeting Cancelation"
+#~ msgstr "ਮ��ਿੰ� ਰੱਦ"
+
+#~ msgid "%s has sent an unintelligible message."
+#~ msgstr "%s ਨ� �ੱ� ਨਾ ਬ�ਸਮ� ਸ�ਨ�ਹਾ ਭ��ਿ� ਹ�।"
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "�ਲਤ ਮ��ਿੰ� ਸ�ਨ�ਹਾ"
+
+#~ msgid "%s has published task information."
+#~ msgstr "%s ਨ� �ੰਮ �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
+
+#~ msgid "Task Information"
+#~ msgstr "�ੰਮ �ਾਣ�ਾਰ�"
+
+#~ msgid "%s requests %s to perform a task."
+#~ msgstr "%s ਨ� %s ਨ�ੰ �ਾਰ� ਪ�ਰਾ �ਰਨ ਲ� ਬ�ਨਤ� ਭ��� ਹ�।"
+
+#~ msgid "%s requests you perform a task."
+#~ msgstr "%s ਤ�ਹਾਨ�ੰ �ੱ� �ੰਮ ਲ� �ਹਿ ਰਿਹਾ ਹ�।"
+
+#~ msgid "Task Proposal"
+#~ msgstr "�ੰਮ ਸ��ਾ�"
+
+#~ msgid "%s wishes to be added to an existing task."
+#~ msgstr "%s ਨ� �ੱ� �ਾਰ� �ੰਮ ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�ਣ ਦ� �ੱ�ਾ �ਤਾ� ਹ�।"
+
+#~ msgid "Task Update"
+#~ msgstr "�ੰਮ �ੱਪਡ��"
+
+#~ msgid "%s wishes to receive the latest task information."
+#~ msgstr "%s ਤਾ�਼� �ੰਮ �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦਾ ਹ�।"
+
+#~ msgid "Task Update Request"
+#~ msgstr "�ੰਮ �ੱਪਡ�� ਬ�ਨਤ�"
+
+#~ msgid "%s has replied to a task assignment."
+#~ msgstr "%s ਨ� �ਾਰ� �ੰਮ ਲ� �ਵਾਬ ਭ��ਿ� ਹ�।"
+
+#~ msgid "Task Reply"
+#~ msgstr "�ੰਮ �ਵਾਬ"
+
+#~ msgid "%s has canceled a task."
+#~ msgstr "%s ਨ� �ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�।"
+
+#~ msgid "Task Cancelation"
+#~ msgstr "�ੰਮ ਰੱਦ��ਰਨ"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "�ਲਤ �ੰਮ ਸ�ਨ�ਹਾ"
+
+#~ msgid "%s has published free/busy information."
+#~ msgstr "%s ਨ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ�"
+
+#~ msgid "%s requests your free/busy information."
+#~ msgstr "%s ਨ� ਤ�ਹਾਡ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਲ� ਬ�ਨਤ� ਭ��� ਹ�।"
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "ਵ�ਹਲਾ/ਰ��ਿ� ਬ�ਨਤ�"
+
+#~ msgid "%s has replied to a free/busy request."
+#~ msgstr "%s ਨ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� �ਵਾਬ ਭ��ਿ� ਹ�।"
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "ਵ�ਹਲਾ/ਰ��ਿ�� �ਵਾਬ"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "�ਲਤ ਵ�ਹਲਾ/ਰ��ਿ� ਸ�ਨ�ਹਾ"
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "ਸ�ਨ�ਹਾ �ਪਣ� ਸਹ�� ਸਰ�ਪ ਵਿੱ� ਨਹ�� ਹ�"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ਨਾ-ਸਹਾ�� ਬ�ਨਤ��� ਹਨ।"
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "ਨੱਥ� ਵਿੱ� ��� ਵ� ਵ��ਣਯ�� ��ਲੰਡਰ ��ਾ� ਨਹ�� ਹ�"
+
+#~ msgid "Update complete\n"
+#~ msgstr "ਨਵ�ਨ��ਰਮ ਪ�ਰਨ\n"
+
+#~ msgid "Object is invalid and cannot be updated\n"
+#~ msgstr "��ਾ� �ਲਤ ਹ� �ਤ� �ੱਪਡ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ\n"
+
+#~ msgid "This response is not from a current attendee.  Add as an attendee?"
+#~ msgstr "�ਹ �ਵਾਬ �ੱ� ਦਰਸ਼� ਵਲ�� ਨਹ�� ਹ�। �� �ੱ� ਦਰਸ਼� ਵਾ�� ਸ਼ਾਮਿਲ �ਰਨਾ ਹ�?"
+
+#~ msgid "Attendee status could not be updated because of an invalid status!\n"
+#~ msgstr "�ਲਤ ਹਾਲਤ �ਰ�� ਦਰਸ਼� �ਾਣ�ਾਰ� �ੱਪਡ�� ਨਹ�� ��ਤ� �ਾ ਸ�� ਹ�!\n"
+
+#~ msgid "Attendee status updated\n"
+#~ msgstr "ਦਰਸ਼� ਸਥਿਤ� ਨਵ�ਨ ਹ�\n"
+
+#~ msgid "Item sent!\n"
+#~ msgstr "��ਾ� ਭ���!\n"
+
+#~ msgid "The item could not be sent!\n"
+#~ msgstr " ��ਾ� ਨ�ੰ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�!\n"
+
+#~ msgid "Choose an action:"
+#~ msgstr "�ਾਰਵਾ� ��ਣ�"
+
+#~ msgid "Update"
+#~ msgstr "�ੱਪਡ��"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "�ਰ�� ਮਨ�਼�ਰ"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਭ���"
+
+#~ msgid "Update respondent status"
+#~ msgstr "�ਵਾਬ ਦ�ਣ ਵਾਲਿ�� ਦ� ਹਾਲਤ �ੱਪਡ��"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "ਤਾ�� �ਾਣ�ਾਰ� ਭ���"
+
+#~ msgid "--to--"
+#~ msgstr "--ਵੱਲ--"
+
+#~ msgid "Calendar Message"
+#~ msgstr "��ਲੰਡਰ ਸ�ਨ�ਹਾ"
+
+#~ msgid "Date:"
+#~ msgstr "ਮਿਤ�:"
+
+#~ msgid "Loading Calendar"
+#~ msgstr "��ਲੰਡਰ ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#~ msgid "Loading calendar..."
+#~ msgstr "��ਲੰਡਰ ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
+
+#~ msgid "Organizer:"
+#~ msgstr "ਪ�ਰਬੰਧ�:"
+
+#~ msgid "Server Message:"
+#~ msgstr "ਸਰਵਰ ਸ�ਨ�ਹਾ:"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "�ੰਪ��਼ਰ ਵਿੰਡ� ਬਣਾ� ਨਹ�� �ਾ ਸ��।"
+
+#~ msgid ""
+#~ "Unable to activate the HTML editor control.\n"
+#~ "\n"
+#~ "Please make sure that you have the correct version of gtkhtml and "
+#~ "libgtkhtml installed."
+#~ msgstr ""
+#~ "HTML ਸੰਪਾਦ� �ੰ�ਰ�ਲ ਨ�ੰ ਸਰ�ਰਮ �ਰਨ ਤ�� �ਸਫਲ\n"
+#~ "\n"
+#~ "�ਹ ਯ��ਨ ਬਣਾ ਲਵ�� �ਿ ਤ�ਹਾਡ� ��ਲ gtkhtml �ਤ� libgtkhtml ਦਾ ਸਹ�� ਵਰ�ਨ �ੰਸ�ਾਲ ਹ�।"
+
+#~ msgid "Unable to activate the address selector control."
+#~ msgstr "�ਡਰ�ੱਸ ��ਣ�ਾਰ �ੰ�ਰ�ਲ ਨ�ੰ ਸਰ�ਰਮ �ਰਨ ਤ�� �ਸਫਲ।"
+
+#~ msgid "%s..."
+#~ msgstr "%s..."
+
+#~ msgid "Evolution Error"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਤ�"
+
+#~ msgid "Evolution Warning"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਤਾਵਨ�"
+
+#  setup a dummy error
+#~ msgid "Internal error, unknown error '%s' requested"
+#~ msgstr "�ੰਦਰ�ਨ� �ਲਤ�, �ਣ�ਾਣ �ਲਤ� '%s' ਬ�ਨਤ�"
+
+#~ msgid "%d day from now"
+#~ msgid_plural "%d days from now"
+#~ msgstr[0] "ਹ�ਣ ਤ�� %d ਦਿਨ"
+#~ msgstr[1] "ਹ�ਣ ਤ�� %d ਦਿਨ"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d ਦਿਨ ਪਹਿਲਾ�"
+#~ msgstr[1] "%d ਦਿਨ ਪਹਿਲਾ�"
+
+#~ msgid "Debug Logs"
+#~ msgstr "ਡ�ਬੱ� ਲਾ�"
+
+#~ msgid "Show _errors in the status bar for"
+#~ msgstr "ਹਾਲਤ ਪੱ�� ਵਿੱ� �ਲਤ��� ਵ���(_e)"
+
+#~ msgid "second(s)."
+#~ msgstr "ਸ�ਿੰ�।"
+
+#~ msgid "Log Messages:"
+#~ msgstr "ਲਾ� ਸ�ਨ�ਹ�:"
+
+#~ msgid "Log Level"
+#~ msgstr "ਲਾ� ਲ�ਵਲ"
+
+#~ msgid "Error"
+#~ msgstr "�ਲਤ�"
+
+#~ msgid "Errors"
+#~ msgstr "�ਲਤ���"
+
+#~ msgid "Warnings and Errors"
+#~ msgstr "��ਤਾਵਨ��� �ਤ� �ਲਤ���"
+
+#~ msgid "Debug"
+#~ msgstr "ਡ�ਬੱ�"
+
+#~ msgid "Error, Warnings and Debug messages"
+#~ msgstr "�ਲਤ���, ��ਤਾਵਨ��� �ਤ� ਡ�ਬੱ� ਸ�ਨ�ਹ�"
+
+#~ msgid "%s License Agreement"
+#~ msgstr "%s ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ�"
+
+#~ msgid ""
+#~ "\n"
+#~ "Please read carefully the license agreement\n"
+#~ "for %s displayed below\n"
+#~ "and tick the check box for accepting it\n"
+#~ msgstr ""
+#~ "\n"
+#~ "ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਧਿ�ਨ ਨਾਲ ਪ��ਹ ਲਵ� ��,\n"
+#~ "�� �ਿ %s ਲ� ਹ�ਠ ਦਿੱਤ��� ਹਨ,\n"
+#~ "�ਤ� ਮਨ�਼�ਰ �ਰਨ ਲ� �ਾ�� ਬ�ਸ� ਤ� �ਲਿੱ� �ਰ�\n"
+
+#~ msgid "This store does not support subscriptions, or they are not enabled."
+#~ msgstr "�ਹ ਭੰਡਾਰ ਮ��ਬਰ ਲ� ਸਹਾ� ਨਹ�� �ਾ� �ਹ ਯ�� ਨਹ�� ਹ�।"
+
+#~ msgid "Folder"
+#~ msgstr "ਫ�ਲਡਰ"
+
+#  FIXME: This is just to get the shadow, is there a better way?
+#~ msgid "Please select a server."
+#~ msgstr "ਸਰਵਰ ��ਣ� ��।"
+
+#~ msgid "No server has been selected"
+#~ msgstr "��� ਸਰਵਰ ��ਣਿ� ਨਹ�� �ਿ�"
+
+#~ msgid "Default height of the subscribe dialog."
+#~ msgstr "ਮ��ਬਰ� ਡਾ�ਲਾ� ਦ� ਡਿਫਾਲ� ��ਾ� ਹ�।"
+
+#~ msgid "Default width of the subscribe dialog."
+#~ msgstr "ਮ��ਬਰ� ਡਾ�ਲਾ� ਦ� ਡਿਫਾਲ� ���ਾ� ਹ�।"
+
+#~ msgid "Subscribe dialog default height"
+#~ msgstr "ਮ��ਬਰ ਬਣ� ਡਾ�ਲਾ� ਮ�ਲ ��ਾ�"
+
+#~ msgid "Subscribe dialog default width"
+#~ msgstr "ਮ��ਬਰ ਬਣ� ਡਾ�ਲਾ� ਮ�ਲ ���ਾ�"
+
+#~ msgid "(Not Recommended)"
+#~ msgstr "(ਸਿਫਾਰਸ਼� ਨਹ��)"
+
+#~ msgid "(Note: Requires restart of the application)"
+#~ msgstr "(ਨ��: �ਪਲ���ਸ਼ਨ ਮ��-ਸ�ਾਰ� �ਰਨ ਦ� ਲ�� ਹ�)"
+
+#~ msgid "Checks incoming mail messages to be Junk"
+#~ msgstr "��ਣ ਵਾਲ� ਪੱਤਰਾ� ਵਿੱ� �ੰ� ਦ� �ਾ�� �ਰ�"
+
+#~ msgid "Do not display messages when text si_ze exceeds"
+#~ msgstr "ਮ�ਲ ਵਿੱ� ���ਸ� ਸਮੱ�ਰ� ਫਾਰਮ�� ਨਾ �ਰ�, �� ���ਸ� ਸਾ��਼ ਵੱਧ �ਾਵ�(_z)"
+
+#~ msgid "Enable Magic S_pacebar"
+#~ msgstr "ਮ��ਿ� ਸਪ�ਸਬਾਰ ਯ��(_p)"
+
+#~ msgid "Enable Sea_rch Folders"
+#~ msgstr "��� ਫ�ਲਡਰ ਯ��(_r)"
+
+#~ msgid "Fi_xed-width:"
+#~ msgstr "ਸਥਿਰ ���ਾ�(_x):"
+
+#~ msgid "Font Properties"
+#~ msgstr "ਫ��� ਵਿਸ਼�ਸ਼ਤਾ"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "Message Fonts"
+#~ msgstr "ਸ�ਨ�ਹਾ ਫ���"
+
+#~ msgid ""
+#~ "Note: you will not be prompted for a password until you connect for the "
+#~ "first time"
+#~ msgstr ""
+#~ "ਸ��ਨਾ: �ਦ�� ਤੱ� �ਿ ਤ�ਸ�� ਪਹਿਲ�� ਵਾਰ ਲਾ��ਨ ਨਹ�� �ਰਦ�, ਤ�ਹਾਡ� ��ਲ�� ਪਾਸਵਰਡ ਪ��ਿ� ਨਹ�� �ਾਵ��ਾ"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "ਪਰਿੰ� ��ਤ� ਫ���"
+
+#~ msgid "Prompt when sending replies to _many recipients"
+#~ msgstr "ਸ��ਿਤ �ਰ�, �ਦ�� �� ਪ�ਰਾਪਤ-�ਰਨ ਵਾਲਿ�� ਨ�ੰ �ਵਾਬ ਭ��� �ਾ ਰਹ� ਹ�(_m)"
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "ਡਰਾਫ� ਫ�ਲਡਰ ��ਣ�"
+
+#~ msgid "Select HTML fixed width font for printing"
+#~ msgstr "ਪਰਿੰ� ਲ� HTML ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
+
+#~ msgid "Select HTML variable width font for printing"
+#~ msgstr "ਪਰਿ�ਿੰ� ਲ� HTML �ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
+
+#~ msgid "Select Junk Folder"
+#~ msgstr "�ੰ� ਫ�ਲਡਰ ��ਣ�"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "ਭ��� ਫ�ਲਡਰ ��ਣ�"
+
+#~ msgid "Select Trash Folder"
+#~ msgstr "ਰੱਦ� ਫ�ਲਡਰ ��ਣ�"
+
+#~ msgid "Sending Mail"
+#~ msgstr "ਪੱਤਰ ਭ��ਣ�"
+
+#~ msgid "Sent and Draft Messages"
+#~ msgstr "ਭ��� �ਤ� ਡਰਾਫ� ਸ�ਨ�ਹ�"
+
+#~ msgid "Top Posting Option"
+#~ msgstr "�ੱਤ� �ਵਾਬ ਦ�ਣ ��ਣ"
+
+#~ msgid "V_ariable-width:"
+#~ msgstr "�ਸਥਿਰ-���ਾ�(_a):"
+
+#~ msgid "_Mark messages as read after"
+#~ msgstr "�ਸ ਦ� ਬਾ�ਦ ਵਿੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਪ��ਹਿ� ਬਣਾ�(_M)"
+
+#~ msgid "_Show image animations"
+#~ msgstr "�ਿੱਤਰ �ਨ�ਮ�ਸ਼ਨ ਵ��ਾ�(_S)"
+
+#~ msgid "_Shrink To / Cc / Bcc headers to "
+#~ msgstr "ਵੱਲ / Cc / Bcc ਹ�ੱਡਰ ਨ�ੰ ਸ�ੰ���(_S) "
+
+#~ msgid "addresses"
+#~ msgstr "�ਡਰ�ੱਸ"
+
+#~ msgid "S_erver:"
+#~ msgstr "ਸਰਵਰ(_e):"
+
+#~ msgid ""
+#~ "Cannot create output file: %s:\n"
+#~ " %s"
+#~ msgstr ""
+#~ "���ਪ�ੱ� ਫਾ�ਲ ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�: %s:\n"
+#~ " %s"
+
+#~ msgid "Could not write data: "
+#~ msgstr "ਡਾ�ਾ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�: "
+
+#~ msgid ""
+#~ "Error on %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s �ੱਤ� �ਲਤ�\n"
+#~ " %s"
+
+#~ msgid "_Backup Evolution Settings..."
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ��ਿੰ� ਬ���ੱਪ(_B)..."
+
+#~ msgid "R_estore Evolution Settings..."
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ��ਿੰ� ਰ�ਸ��ਰ(_e)..."
+
+#~ msgid "_Sharing"
+#~ msgstr "ਸਾ��(_S)"
+
+#~ msgid "Blink icon in notification area."
+#~ msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ���ਾਨ �ਲ�ਾ�।"
+
+#~ msgid "Whether the icon should blink or not."
+#~ msgstr "�� ���ਾਨ �ਪ�ਦਾ ਹ�ਣਾ �ਾਹ�ਦਾ ਹ� �ਾ� ਨਹ��।"
+
+#~ msgid "Evolution's Mail Notification"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਦਾ ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ"
+
+#~ msgid "Mail Notification Properties"
+#~ msgstr "ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ ਵਿਸ਼�ਸ਼ਤਾ"
+
+#~ msgid "B_link icon in notification area"
+#~ msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ���ਾਨ �ਪ�ਾ�(_l)"
+
+#~ msgid "Manage your Evolution plugins."
+#~ msgstr "ਤ�ਹਾਡ� �ਵ�ਲ�ਸ਼ਨ ਪਲੱ��ਨ ਪਰਬੰਧ।"
+
+#~ msgid "Sort mail message threads by subject."
+#~ msgstr "ਪੱਤਰ ਸ�ਨ�ਹ� ਮਸਲਾ ਦ� ਵਿਸ਼� ਰਾਹ�� ਲ��ਬੱਧ �ਰ�।"
+
+#~ msgid "Subject Threading"
+#~ msgstr "ਵਿਸ਼ਾ ਮਸਲਾ"
+
+#~ msgid "Thread messages by subject"
+#~ msgstr "ਵਿਸ਼� ਰਾਹ�� ਮਸਲਾ ਸ�ਨ�ਹ�"
+
+#~ msgid "Start Evolution activating the specified component"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ �ੱ� �ਾਸ ਭਾ� ਦ� ਸਰ�ਰਮ� ਨਾਲ ਸ਼�ਰ� ਹ� ਰਹ� ਹ�"
+
+#~ msgid "begin editing this cell"
+#~ msgstr "�ਸ ਸ�ੱਲ਼ ਸ�ਧਣਾ ਸ਼�ਰ�"
+
 #~ msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
 #~ msgstr "<span size=\"large\" weight=\"bold\">ਵ�ਰਵਾ:</span>"
 
@@ -21805,9 +22287,6 @@ msgstr "�ੰਪ�ੱ� ਢੰ�"
 #~ msgid "Calendar repository is offline."
 #~ msgstr "��ਲੰਡਰ ਰਿਪ��਼�ਰ� �ਫਲਾ�ਨ ਹ�।"
 
-#~ msgid "Error on '{0}'"
-#~ msgstr "{0} ਵਿੱ� �ਲਤ�"
-
 #~ msgid "No response from the server."
 #~ msgstr "ਸਰਵਰ ਤ�� ��� �ਵਾਬ ਨਹ�� ਹ�।"
 
@@ -22093,9 +22572,6 @@ msgstr "�ੰਪ�ੱ� ਢੰ�"
 #~ msgid "Source List"
 #~ msgstr "ਸਰ�ਤ ਲਿਸ�"
 
-#~ msgid "The registry of address books"
-#~ msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਰ�ਿਸ�ਰ�"
-
 #~ msgid "Current View"
 #~ msgstr "ਮ���ਦਾ �ਲ�"
 
@@ -22268,9 +22744,6 @@ msgstr "�ੰਪ�ੱ� ਢੰ�"
 #~ msgid "Temporarily hide all messages that have already been read"
 #~ msgstr "ਸਾਰ� ਪ�� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ਰ�� ਤ�ਰ ਤ� �ਹਲ� �ਰ�"
 
-#~ msgid "Hide S_elected Messages"
-#~ msgstr "��ਣ� ਸ�ਨ�ਹ� �ਹਲ�(_e)"
-
 #~ msgid "Temporarily hide the selected messages"
 #~ msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ਰ�� ਤ�ਰ ਤ� �ਹਲ� �ਰ�"
 
@@ -22491,9 +22964,6 @@ msgstr "�ੰਪ�ੱ� ਢੰ�"
 #~ msgid "Network Available"
 #~ msgstr "ਨ�ੱ�ਵਰ� �ਪਲੱਬਧ ਹ�"
 
-#~ msgid "Whether the network is available"
-#~ msgstr "�� ਨ�ੱ�ਵਰ� �ਪਲੱਬਧ ਹ�ਵ�"
-
 #~ msgid "Online"
 #~ msgstr "�ਨਲਾ�ਨ"
 
@@ -23543,10 +24013,6 @@ msgstr "�ੰਪ�ੱ� ਢੰ�"
 #~ "�ਸ ਡਾ�ਰ���ਰ� ਦ� ਭਾ� ਸ਼ਾਮਿਲ �ਰਨ ਲ� �ਾ� ਤਾ� ਸਾਰ��� ਫਾ�ਲਾ� �ੱ� �ੱ� �ਰ�� ਸ਼ਾਮਿਲ �ਰ� �ਾ� "
 #~ "ਡਾ�ਰ���ਰ� ਦਾ �ੱ� ��ਾ�ਵ ਬਣਾ� ਤ� �ਹਨਾ� ਨ�ੰ ਨੱਥ� �ਰ ਦਿ�।"
 
-#  mail-composer:recover-autosave title
-#~ msgid "Unfinished messages found"
-#~ msgstr "ਨਾ-ਸਮਾਪਤ ਸ�ਨ�ਹ� ਲੱਭ� ਹਨ"
-
 #  mail-composer:exit-unsaved title
 #~ msgid "Warning: Modified Message"
 #~ msgstr "��ਤਾਵਨ�: ਸ�ਧਿ� ਸ�ਨ�ਹਾ"
@@ -23893,9 +24359,6 @@ msgstr "�ੰਪ�ੱ� ਢੰ�"
 #~ msgid "Copy Tool"
 #~ msgstr "��ਲ �ਾਪ� �ਰ�"
 
-#~ msgid "_Account:"
-#~ msgstr "��ਾ���(_A):"
-
 #~ msgid "_Folder Name:"
 #~ msgstr "ਫ�ਲਡਰ ਨਾ�(_F):"
 
@@ -24043,9 +24506,6 @@ msgstr "�ੰਪ�ੱ� ਢੰ�"
 #~ msgid "You have been designated as a delegate for %s"
 #~ msgstr "ਤ�ਹਾਨ�ੰ %s ਲ� �ੱ� ਡ�ਲ���� ਦਾ �ਹ�ਦਾ ਦਿੱਤਾ �ਿ� ਹ�"
 
-#~ msgid "Remove the delegate %s?"
-#~ msgstr "�� ਪ�ਰਤ�ਨਿਧ %s ਨ�ੰ ਹ�ਾ�ਣਾ ਹ�?"
-
 #~ msgid "Could not access Active Directory"
 #~ msgstr "ਸਰ�ਰਮ ਡਾ�ਰ���ਦ� ਲ� ਪਹ�ੰ� ਨਹ�� ਹ�"
 
@@ -24127,9 +24587,6 @@ msgstr "�ੰਪ�ੱ� ਢੰ�"
 #~ msgid "Unsubscribe Folder..."
 #~ msgstr "ਫ�ਲਡਰ ਲ� ਮ��ਬਰ ਹ�ਾ�..."
 
-#~ msgid "Really unsubscribe from folder \"%s\"?"
-#~ msgstr "�� ਫ�ਲਡਰ \"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ�ਣ� ਹ�?"
-
 #~ msgid "Unsubscribe from \"%s\""
 #~ msgstr "\"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ�"
 
@@ -24943,9 +25400,6 @@ msgstr "�ੰਪ�ੱ� ਢੰ�"
 #~ msgid "Prefere_nces"
 #~ msgstr "ਮ�ਰ� ਪਸੰਦ(_n)"
 
-#~ msgid "Send / Receive"
-#~ msgstr "ਭ��� / ਲਵ�"
-
 #~ msgid "Submit Bug Report"
 #~ msgstr "ਬੱ� �ਾਣ�ਾਰ� ਦਿ�"
 
@@ -26264,9 +26718,6 @@ msgstr "�ੰਪ�ੱ� ਢੰ�"
 #~ msgid "Save Attachments..."
 #~ msgstr "ਨੱਥ� ਸੰਭਾਲ�..."
 
-#~ msgid "Save all attachments"
-#~ msgstr "ਸਭ ਨੱਥ� ਸੰਭਾਲ�..."
-
 #~ msgid "Select save base name"
 #~ msgstr "ਸੰਭਾਲ ਮ�ਲ ਨਾ� ��ਣ�"
 



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