[evolution] update Punjabi translation

[Amanpreet Singh Alam <aman src gnome org>]

commit c5b5ae1e6797978e17f518979d4cf169edfcf33e
Author: A S Alam <aalam users sf net>
Date:   Mon Aug 16 19:53:00 2010 +0530

    update Punjabi translation

 po/pa.po |11557 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 6098 insertions(+), 5459 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index c6c0a9c..b000f0a 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:479
+#: ../shell/main.c:533
 # 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,10 +10,10 @@ 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-03-27 10:09+0000\n"
-"PO-Revision-Date: 2010-03-28 09:12+0530\n"
+"POT-Creation-Date: 2010-08-12 05:37+0000\n"
+"PO-Revision-Date: 2010-08-16 19:51+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
-"Language-Team: Punjabi/Panjabi <kde-i18n-doc kde org>\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"
@@ -85,40 +85,46 @@ 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
+#| msgid "Do not delete"
+msgid "Do _Not Delete"
+msgstr "ਨਾ ਹ�ਾ�(_N)"
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0} ਨ�ੰ {1} ਸੰਭਾਲਣ ਲ� �ਲਤ�: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "LDAP ਸਰਵਰ ਨਾਲ ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ� �ਸਫਲ।"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
 msgid "Failed to delete contact"
 msgstr "ਸੰਪਰ� ਹ�ਾ�ਣ ਦ�ਰਾਨ �ਲਤ�"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "�ਰ�ੱਪਵਾ��਼ �ਡਰ�ੱਸ-ਬ�ੱ� ਨਿਰਮਾਣ:"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP ਸਰਵਰ ਤ�� ਸ��ਮਾ �ਾਣਾ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ਸਫਲ।"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
 msgstr "ਤ�ਹਾਡ� ਮ���ਦਾ ਸਰਵਰ ਨਾਲ ��� ਫ��ਰ ਠ�� ਤਰਾ� �ੰਮ ਨਹ�� �ਰ ਸ�ਦ� ਹਨ"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ� �ਲਤ ਢੰ� ਨਾਲ ਬੰਦ ਹ� �� ਹ�।"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "�ਿੱਤਰ, �� ਤ�ਸ�� ��ਣਿ� ਹ�, ਵੱਡਾ ਹ�। �� ਤ�ਸ�� �ਸ ਦਾ ��ਾਰ ਤਬਦਲ �ਰ�� ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -127,46 +133,46 @@ msgstr ""
 "�ਹ LDAP ਸਰਵਰ LDAP ਦਾ ਪ�ਰਾਣਾ ਵਰ�ਨ ਵਰਤ ਰਿਹਾ ਹ�, �� �ਿ �ਹ �ਾਰਵਾ� ਲ� ਸਹਾ�� ਨਹ�� ਹ� �ਾ� "
 "ਠ�� ਤਰਾ� ਸੰਰ�ਿਤ ਨਹ�� ਹ�, �ਪਣ� ਸਿਸ�ਮ ਪਰਸ਼ਾਸ਼� ਨਾਲ ਮੱਦਦ ਲ� ਸੰਪਰ� �ਰ�।"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book server does not have any suggested search bases."
 msgstr "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਸਰਵਰ ਲ� ��� ��� �ਧਾਰ ਨਹ�� ਹ�।"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਸਰਵਰ �ਪਲੱਬਧ ਨਹ�� ਹ� �ਾ� ਸਰਵਰ ਨਾ� �ਲਤ ਹ� �ਾ� ਤ�ਹਾਡਾ ਨ�ੱ�ਵਰ� ਬੰਦ ਹ� ਰਿਹਾ ਹ�।"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This address book will be removed permanently."
 msgstr "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�� �ਾਵ��ਾ।"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This server does not support LDAPv3 schema information."
 msgstr "�ਹ ਸਰਵਰ LDAPv3 ਸ��ਮਾ �ਾਣ�ਾਰ� ਲ� ਸਹਾ�� ਨਹ�� ਹ�।"
 
 #  addressbook:load-error title
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ��ਲ�ਹਣ ਵਿੱ� �ਸਫਲ"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to perform search."
 msgstr "��� �ਰਨ ਵਿੱ� �ਸਫਲ।"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "{0} ਸੰਭਾਲਣ ਲ� �ਸਫ਼ਲ ਹ�।"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Would you like to save your changes?"
 msgstr "�� ਤ�ਸ�� ਤਬਦ�ਲ��� ਸੰਭਾਲ��� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -174,7 +180,7 @@ msgstr ""
 "ਤ�ਸ�� �ਪਣ� �ੱ� ਸੰਪਰ� ਨ�ੰ �ੱ� �ਿਤਾਬ ਤ�� ਦ��� ਵਿੱ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ ਰਹ� ਹ�, ਪਰ �ਹ ਸਰ�ਤ �ੱਤ� ਸੰਭਵ "
 "ਨਹ�� ਹ�, �� ਤ�ਸ�� �ਸ ਦ� ਬ�ਾ� �ਸ ਦ� �ਾਪ� ਭ��ਣਾ �ਾਹ���?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -183,82 +189,46 @@ msgstr ""
 "ਤ�ਸ�� �ੱ� ਨਾ-ਸਹਾ�� �ਰ�ੱਪਵਾ�� ਸਰਵਰ ਨਾਲ ���ਨ �ਾ ਰਹ� ਹ� �ਤ� �ਵ�ਲ�ਸ਼ਨ ਦ� ਵਰਤ�� �ਰਨ ਨਾਲ ਸਮੱਸਿ� � "
 "ਸ�ਦ� ਹ�। �ੰ�� ਨਤ��ਿ�� ਲ� ਸਰਵਰ ਨ�ੰ ਸਹਾ�� ਵਰ�ਨ ਲ� �ੱਪ�ਰ�ਡ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "ਤ�ਹਾਨ�ੰ �ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਸੰਪਰ� ਹ�ਾ�ਣ ਦਾ �ਧਿ�ਾਰ ਨਹ�� ਹ�।"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "ਤ�ਸ�� �ਪਣ� ਸੰਪਰ� ਵਿੱ� ਤਬਦ�ਲ��� ��ਤ��� ਹਨ, �� ਤ�ਸ�� �ਹਨਾ� ਨ�ੰ ਸੰਭਾਲਣਾ �ਾਹ���?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡ� ਸੰਪਰ� {0} ਲ� �ਦ�� ਤੱ� �ਪਲੱਬਧ ਨਹ�� ਹ� ਸ�ਦ� ਹਨ, �ਦ�� ਤੱ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਮ�� �ਾਲ� ਨਹ�� ਹ�ੰਦਾ।"
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "ਸ਼ਾਮਿਲ(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
 msgstr "ਰੱਦ �ਰ�(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "ਨਾ ਸੰਭਾਲ�(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "ਮ��-��ਾਰ(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Use as it is"
 msgstr "�ਹ �ੰ� ਹ� ਵਰਤ��(_U)"
 
-#  addressbook:remove-addressbook secondary
-#  addressbook:generic-error primary
-#  addressbook:load-error secondary
-#  addressbook:search-error secondary
-#  mail:session-message-info secondary
-#  mail:session-message-info-cancel secondary
-#  mail:session-message-warning secondary
-#  mail:session-message-warning-cancel secondary
-#  mail:session-message-error secondary
-#  mail:session-message-error-cancel secondary
-#  mail:ask-session-password secondary
-#  mail:filter-load-error secondary
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "ਡਿਫਾਲ� ਸਮ�ਾਲ� �ਡਰ�ੱਸ:"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਲ�ਡ ਨਹ�� ��ਤ� �ਾ ਸ��"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-msgstr "ਪਾ�ਲ� ਦਾ �ਡਰ�ੱਸ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2022
 msgid "Anniversary"
 msgstr "ਵਰ�ਹ� �ੰਢ"
 
@@ -269,260 +239,238 @@ 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:1986 ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:123
 msgid "Birthday"
 msgstr "�ਨਮ-ਦਿਨ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#| msgid "Blog"
+msgid "Blog:"
+msgstr "ਬਲ��:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "���ਾ�ਰ�(_t)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "��ਲੰਡਰ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:934
 msgid "Contact"
 msgstr "ਸੰਪਰ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2584
 msgid "Contact Editor"
 msgstr "ਸਬੰਧ ਸੰਪਾਦ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:295
 #: ../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:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "�-ਮ�ਲ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "ਵ�ਹਲ�/ਰ���:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "ਪ�ਰਾ ਨਾ�(_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "�ਰ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "ਮ�ੱ� ਸਫ਼ਾ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "�ਿੱਤਰ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "�ੱ�ਪ� ਸ�ਨ�ਹ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "�ਾਬ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "ਪੱਤਰ �ਡਰ�ੱਸ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "ਫ���ਲ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "�ਮ ਨਾ�(_k):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "ਨ��"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1725
 msgid "Other"
 msgstr "ਹ�ਰ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "ਨਿੱ�� �ਾਣ�ਾਰ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "��ਲ�ਫ�ਨ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "ਵਿਡ�� �ੱਲਬਾਤ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "ਵ�ੱਬ �ਡਰ�ੱਸ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "ਵ�ਬ ਲਾ�:"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#| msgid "Web Addresses"
+msgid "Web addresses"
+msgstr "ਵ�ੱਬ �ਡਰ�ੱਸ"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "�ੰਮ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Address:"
 msgstr "�ਡਰ�ੱਸ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Anniversary:"
 msgstr "ਵਰ�ਹ� �ੰਢ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Assistant:"
 msgstr "ਸਹਾ��(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Birthday:"
 msgstr "�ਨਮ-ਦਿਨ(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#| msgid "Blog"
+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.ui.h:17
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "��ਲੰਡਰ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_City:"
 msgstr "ਸ਼ਹਿਰ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Company:"
 msgstr "�ੰਪਨ�(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Country:"
 msgstr "ਦ�ਸ਼(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Department:"
 msgstr "ਵਿਭਾ�(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_File under:"
 msgstr "ਫਾ�ਲ ਹ�ਠਾ�(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Free/Busy:"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Home Page:"
 msgstr "ਮ�ੱ� ਸਫਾ(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Manager:"
 msgstr "ਪ�ਰਬੰਧ�(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Office:"
 msgstr "ਦ�ਤਰ(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_PO Box:"
 msgstr "_PO ਬਾ�ਸ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Profession:"
 msgstr "�ਿੱਤਾ(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Spouse:"
 msgstr "ਪਤ�/ਪਤਨ�(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_State/Province:"
 msgstr "ਸ�ਬਾ/��ਤਰ(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "�ਾ��ਲ(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Video Chat:"
 msgstr "ਵ�ਡਿ� �ੱਲਬਾਤ(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Wants to receive HTML mail"
 msgstr "HTML ਪੱਤਰ ਮਨ�਼�ਰ ਹਨ(_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "ਵ�ਬ ਲਾ�(_W):"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "�ਿੱਥ�(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Zip/Postal Code:"
 msgstr "�ਿਪ/ਡਾ� ��ਡ(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "ਨਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "ਸ�ਧਯ��"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -564,7 +512,7 @@ msgid "Skype"
 msgstr "ਸ�ਾ�ਪ�"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:353
 msgid "Error adding contact"
 msgstr "ਸ਼ਾਮਿਲ ਸੰਪਰ� �ਲਤ�"
 
@@ -576,45 +524,21 @@ msgstr "ਸੰਪਰ� ਸ��� �ਲਤ�"
 msgid "Error removing contact"
 msgstr "ਹ�ਾ�ਣ ਸੰਪਰ� �ਲਤ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "ਸਰ�ਤ �ਿਤਾਬ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "ਨਿਯਤ �ਿਤਾਬ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "ਨਵਾ� ਸੰਪਰ� ਹ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "ਲਿ�ਣਯ�� ��ਤਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "ਲ���ਦ� ��ਤਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "ਤਬਦ�ਲ"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ਸਬੰਧ ਸੰਪਾਦ� - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2987
 msgid "Please select an image for this contact"
 msgstr "�ਸ ਸੰਪਰ� ਲ� �ਿੱਤਰ ��ਣ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
 msgid "_No image"
 msgstr "��� �ਿੱਤਰ ਨਹ��(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -622,56 +546,46 @@ msgstr ""
 "ਸੰਪਰ� ਡਾ�ਾ �ਲਤ ਹ�:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' �ੱ� �ਲਤ ਫਾਰਮ�� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3272
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ਦਾ �ਲਤ ਫਾਰਮ�� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' �ਾਲ� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 msgid "Invalid contact."
 msgstr "�ਲਤ ਸੰਬੰਧ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "ਸੰਪਰ� ਤ��-ਸ਼ਾਮਿਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "ਪ�ਰਾ ਸ�ਧ�(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "ਪ�ਰਾ ਨਾ�(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "�-ਮ�ਲ(_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "ਸ਼�ੱਲ"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "EShell ਸਿੰ�ਲ��ਨ"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "ਡਾ."
@@ -738,7 +652,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:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "ਸੰਪਰ� ਸ��� ਸੰਪਾਦ�"
 
@@ -755,7 +669,7 @@ msgid "_List name:"
 msgstr "ਲਿਸ� ਨਾ�(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:173
 msgid "_Select..."
 msgstr "��ਣ�(_S)..."
 
@@ -763,39 +677,27 @@ 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:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
 msgid "Contact List Members"
 msgstr "ਸੰਪਰ� ਸ��� ਮ��ਬਰ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:911
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1328
 msgid "_Members"
 msgstr "ਮ��ਬਰ(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
 msgid "Error adding list"
 msgstr "ਸ਼ਾਮਿਲ ਸ��� �ਲਤ�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1180
 msgid "Error modifying list"
 msgstr "ਸ�ਧ ਸ��� �ਲਤ�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1194
 msgid "Error removing list"
 msgstr "ਹ�ਾ�ਣ ਸ��� �ਲਤ�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "�ਿਤਾਬ"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "ਨਵ�� ਲਿਸ�"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "ਬਦਲਿ� ਸੰਪਰ�:"
@@ -834,134 +736,111 @@ msgstr ""
 "ਸ਼ਾਮਿਲ ਹ�। �� ਤ�ਸ�� �ਸ ਨ�ੰ �ਿਸ� ਵ� ਤਰਾ� ਸ਼ਾਮਿਲ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
 msgid "_Merge"
 msgstr "ਮਿਲਾਨ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#, c-format
+msgid "Cancelled"
+msgstr "ਰੱਦ ��ਤਾ"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
 msgid "Merge Contact"
 msgstr "ਸੰਪਰ� ਮਿਲਾਨ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../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:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../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
 msgid "Any field contains"
 msgstr "��� ��ਤਰ ਸ਼ਾਮਿਲ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "�-ਮ�ਲ �ਸ ਨਾਲ �ਰੰਭ �ਰ�"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "ਨਾ� ਰੱ�ਦਾ ਹ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:142
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "��� ਸੰਪਰ� ਨਹ��"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d ਸੰਪਰ�"
 msgstr[1] "%d ਸੰਪਰ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
 msgid "Error getting book view"
 msgstr "ਬ�ੱ� �ਲ� ਲ�ਣ ਵਿੱ� �ਲਤ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "�ਿ�ਰ�"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#: ../addressbook/gui/widgets/e-addressbook-model.c:716
 msgid "Search Interrupted"
 msgstr "��� ਰ��� ��"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "ਮਾਡਲ"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "ਸ�ਧਿ� �ਾਰਡ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:626
 msgid "Cut selected contacts to the clipboard"
 msgstr "��ਣ� ਸੰਪਰ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ੱ��"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:632
 msgid "Copy selected contacts to the clipboard"
 msgstr "��ਣ� ਸੰਪਰ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:638
 msgid "Paste contacts from the clipboard"
 msgstr "�ਲਿੱਪਬ�ਰਡ ਤ�� ਸੰਪਰ� ��ਪ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਹ�ਾ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:650
 msgid "Select all visible contacts"
 msgstr "ਸਭ ਵ��ਾ� ਦਿੰਦ� ਸੰਪਰ� ��ਣ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "ਸ਼�ੱਲ �ਲ�"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "ਸਰ�ਤ"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "�� ਤ�ਸ�� �ਹ ਸੰਪਰ� ਲਿਸ�ਾ� ਨ�ੰ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete this contact list?"
 msgstr "�� ਤ�ਸ�� �ਹ ਸੰਪਰ� ਲਿਸ� ਹ�ਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "�� ਤ�ਸ�� ਸੰਪਰ� ਲਿਸ� (%s)ਨ�ੰ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete these contacts?"
 msgstr "�� ਤ�ਸ�� �ਹ ਸਭ ਸੰਪਰ� ਹ�ਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete this contact?"
 msgstr "�� ਤ�ਸ�� �ਹ ਸੰਪਰ� ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "�� ਤ�ਸ�� �ਹ ਸੰਪਰ� (%s) ਨ�ੰ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -970,11 +849,11 @@ msgstr ""
 "ਸੰਪਰ� %d ��ਲ�ਹਣ ਨਾਲ %d ਵਿੰਡ��਼ ��ਲ�ਹ �ਾਣ����।\n"
 "�� ਤ�ਸ�� �ਹ ਸਭ ਸੰਪਰ� ਵ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 msgid "_Don't Display"
 msgstr "ਨਾ ਵ��ਾ�(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "Display _All Contacts"
 msgstr "ਸਭ ਸੰਪਰ� ਵ���(_A)"
 
@@ -1008,7 +887,7 @@ msgid "Car Phone"
 msgstr "�ਾਰ ਫ�ਨ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -1109,7 +988,7 @@ msgid "Radio"
 msgstr "ਰ�ਡ��"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:569
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "ਰ�ਲ"
@@ -1134,7 +1013,6 @@ msgid "Telex"
 msgstr "��ਲ��ਸ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "�ਾ��ਲ"
 
@@ -1146,59 +1024,7 @@ msgstr "ਯ�ਨਿ�"
 msgid "Web Site"
 msgstr "ਵ�ਬ ਸਾ��"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "���ਾ�"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "��ਾ�"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "���ਦਰਿਤ ਹ�"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "��ਤਰ"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "��ਤਰ ਨਾ�"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "���ਸ� ਮਾਡਲ"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "ਨਾ� ਦ� �ਧਿ�ਤਮ ਲੰਬਾ�"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "�ਾਲਮ ���ਾ�"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1208,7 +1034,7 @@ msgstr ""
 "\n"
 "ਸੰਪਰ� ਦ� ��� �ਾਰ�..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1222,7 +1048,7 @@ msgstr ""
 "\n"
 "�ਾ� �ਥ� ਸੰਪਰ� ਬਣਾ�ਣ ਲ� ਦ� ਵਾਰ ਦਬਾ�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1236,7 +1062,7 @@ msgstr ""
 "\n"
 "�ਥ� ਸੰਪਰ� ਬਣਾ�ਣ ਲ� ਦ� ਵਾਰ ਦਬਾ�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1246,7 +1072,7 @@ msgstr ""
 "\n"
 "ਸੰਪਰ� ਦ� ���।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1256,10 +1082,6 @@ msgstr ""
 "\n"
 "�ਸ �ਲ� ਵਿੱ� ਵ��ਾ� ਲ� ��� ਸ��� ਨਹ�� ਹ�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "�ਡਪ�ਰ"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "�ੰਮ�ਾ�� �-ਮ�ਲ"
@@ -1269,21 +1091,13 @@ msgid "Home Email"
 msgstr "�ਰ �-ਮ�ਲ"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "ਹ�ਰ �-ਮ�ਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "��ਣਿ�"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "�ਰਸਰ ਹ�"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
 msgid "evolution address book"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ�"
 
@@ -1295,7 +1109,7 @@ msgstr "ਨਵਾ� ਸੰਪਰ�"
 msgid "New Contact List"
 msgstr "ਨਵ�� ਸੰਪਰ� ਲਿਸ�"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1323,17 +1137,17 @@ msgid "Copy _Email Address"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ ਨ�ਲ(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:391
 msgid "Copy the email address to the clipboard"
 msgstr "�ਮ�ਲ �ਡਰ�ੱਸ �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:396
 msgid "_Send New Message To..."
 msgstr "�ਸ ਨ�ੰ ਨਵਾ� ਸ�ਨ�ਹਾ ਭ���(_S)..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:398
 msgid "Send a mail message to this address"
 msgstr "�ਸ �ਡਰ�ੱਸ ਨ�ੰ ਮ�ਲ ਸ�ਨ�ਹਾ ਭ���"
 
@@ -1369,22 +1183,22 @@ msgid "Video Chat"
 msgstr "ਵ�ਡਿ� �ੱਲਬਾਤ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../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:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 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:115
+#: ../calendar/gui/dialogs/event-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:355
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�"
@@ -1412,21 +1226,19 @@ msgid "Web Log"
 msgstr "ਵ�ਬ ਲਾ�"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. 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:461 ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:115
+#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-migrate.c:151
+#: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../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
 msgid "Personal"
 msgstr "ਨਿੱ��"
@@ -1443,119 +1255,13 @@ msgstr "ਮ�ੱ� ਸਫਾ"
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to mail %s"
 msgstr "ਪੱਤਰ %s ਲ� ਦਬਾ�"
 
-#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Success"
-msgstr "ਸਫਲਤਾ"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
-msgid "Backend busy"
-msgstr "ਪਿੱ�ਾ ਰ��ਿ�"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Repository offline"
-msgstr "ਰਿਪ�ਸ�ਰ� ਬੰਦ ਹ�"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Address Book does not exist"
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਮ���ਦ ਨਹ�� ਹ�"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
-msgid "No Self Contact defined"
-msgstr "��� ਸਵ� ਸੰਪਰ� ਸ��� ਪ�ਰਭਾਸ਼ਿਤ ਨਹ��"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Permission denied"
-msgstr "�ਧਿ�ਾਰ ਨਹ� ਹ�"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Contact not found"
-msgstr "ਸਬੰਧ ਨਹ� ਲੱਭਾ"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Contact ID already exists"
-msgstr "ਸੰਪਰ� ID ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Protocol not supported"
-msgstr "ਪ�ਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
-
-#. E_BOOK_ERROR_CANCELLED
-#. To Translators: This is task status
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
-msgid "Canceled"
-msgstr "ਰੱਦ ��ਤਾ"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-msgid "Could not cancel"
-msgstr "ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Authentication Failed"
-msgstr "ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Authentication Required"
-msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲਾ�਼ਮ� ਹ�"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "TLS not Available"
-msgstr "TLS �ਪਲੱਬਧ ਨਹ� ਹ�"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "No such source"
-msgstr "�ੰ� ਦਾ ��� ਸਰ�ਤ ਨਹ��"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-msgid "Not available in offline mode"
-msgstr "�ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� �ਪਲੱਬਧ ਨਹ��"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-msgid "Other error"
-msgstr "ਹ�ਰ �ਲਤ�"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
-msgid "Invalid server version"
-msgstr "�ਲਤ ਸਰਵਰ ਵਰ�ਨ"
-
-#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Unsupported authentication method"
-msgstr "ਨਾ-ਸਹਾ�� ਪਰਮਾਣ�ਿਤਾ ਢੰ�"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1565,7 +1271,7 @@ msgstr ""
 "ਤਿ�ਰ ਨਾ ��ਤ� �� ਹ�ਵ� �ਾ� ਹਾਲ� ਡਾ�ਨਲ�ਡ ਨਾ ਹ�� ਹ�ਵ�। �ਿਰਪਾ �ਰ�� �ਨਲਾ�ਨ ਢੰ� ਨਾਲ �ਾਲ� ਹ�ਣ "
 "�ਪਰੰਤ �ਡਰ�ੱਸ-ਬ�ੱ� ਡਾ�ਨਲ�ਡ �ਰ� ਤਾ� �ਸ ਨ�ੰ ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਸ��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:81
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1574,7 +1280,7 @@ msgstr ""
 "�ਹ �ਡਰ�ੱਸ-ਬ�ੱ� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��। �ਿਰਪਾ �ਰ�� �ਾ�� �ਰ� �ਿ �ਹ ਮਾਰ� %s ਹ� �ਤ� ਤ�ਹਾਡ� ��ਲ "
 "�ਧਿ�ਾਰ ਹਨ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:93
 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."
@@ -1582,7 +1288,7 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਦ� �ਸ ਵਰ�ਨ ਵਿੱ� LDAP ਮੱਦਦ ਸ਼ਾਮਿਲ ਨਹ�� ਹ�। ���ਰ ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� LDAP ਮੱਦਦ �ਾਹ�ੰਦ� ਹ�, "
 "ਤ�ਹਾਨ�ੰ �ਵ�ਲ�ਸ਼ਨ ਪ���� LDAP-enabled �ੰਸ�ਾਲ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1590,11 +1296,11 @@ msgstr ""
 "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ��ਲ�ਹਣ ਵਿੱ� �ਸਫਲ। �ਸ ਦਾ �ਰਥ �ਹ ਹ� �ਿ �ਾ� ਤਾ� ਤ�ਸ�� �ਲਤ URI ਸ਼ਾਮਿਲ ��ਤਾ ਹ� "
 "�ਾ� ਸਰਵਰ ਪਹ�ੰ� ਤ�� ਬਾਹਰ ਹ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid "Detailed error message:"
 msgstr "ਵ�ਰਵ� ਸਮ�ਤ �ਲਤ� ਸ�ਨ�ਹਾ:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1606,7 +1312,7 @@ msgstr ""
 "�ਾ� �ਡਰ�ੱਸ-ਬ�ੱ� ਲ� ਡਾ�ਰ���ਰ� ਸਰਵਰ ਪਸੰਦ ਨਤ��ਾ� ਸਮਾ� ਵਧਾ\n"
 "ਦਿ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
 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"
@@ -1618,44 +1324,53 @@ msgstr ""
 "ਵਿੱ� ਡਾ�ਰ���ਰ� ਸਰਵਰ ਪਸੰਦ ਦਾ ਸਮਾ� ਹ�ਰ ਵਧਾ\n"
 "ਦਿ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
-msgid "The backend for this address book was unable to parse this query."
-msgstr "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਲ� ਬ���ਰਾ��ਡ �ਸ ਸਵਾਲ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#, c-format
+#| msgid "The backend for this address book was unable to parse this query."
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਲ� ਬ����ਡ �ਸ ਸਵਾਲ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ: %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
-msgid "The backend for this address book refused to perform this query."
-msgstr "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਲ� ਬ���ਰਾ��ਡ ਨ� �ਸ ਸਵਾਲ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਨ�ਾਰ� ਹ�"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#, c-format
+#| msgid "The backend for this address book refused to perform this query."
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਲ� ਬ����ਡ ਨ� �ਸ ਸਵਾਲ ਨ�ੰ ਪਾਰਸ �ਰਨ ਤ�� �ਨ�ਾਰ� ਹ�: %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-msgid "This query did not complete successfully."
-msgstr "�ਹ �ਿ�ਰ� ਨ�ੰ ਸਫਲਤਾਪ�ਰ� ਪ�ਰਾ ਨਹ� ��ਤਾ �ਾ ਸ�ਿ� ਹ�।"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#, c-format
+#| msgid "This query did not complete successfully."
+msgid "This query did not complete successfully. %s"
+msgstr "�ਹ �ਿ�ਰ� ਨ�ੰ ਸਫਲਤਾਪ�ਰ� ਪ�ਰਾ ਨਹ� ��ਤਾ �ਾ ਸ�ਿ� ਹ�। %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Select Address Book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:287
 msgid "list"
 msgstr "ਸ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:414
 msgid "Move contact to"
 msgstr "ਸੰਪਰ� ਭ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:416
 msgid "Copy contact to"
 msgstr "ਸੰਪਰ� ਦ� ਨ�ਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:419
 msgid "Move contacts to"
 msgstr "ਸੰਪਰ� ਭ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:421
 msgid "Copy contacts to"
 msgstr "ਸੰਪਰ� ਦ� ਨ�ਲ"
 
@@ -1663,54 +1378,62 @@ msgstr "ਸੰਪਰ� ਦ� ਨ�ਲ"
 msgid "Card View"
 msgstr "�ਾਰਡ ਵ��ਾ�"
 
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:720
 #: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../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:858
+#: ../addressbook/importers/evolution-csv-importer.c:1008
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "���ਲ�ੱ� CSV �ਾ� ��ਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:1009
 msgid "Outlook CSV and Tab Importer"
 msgstr "���ਲ�ੱ� CSV ਤ� ��ਬ �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "ਮ���ਲਾ CSV �ਾ� ��ਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:1018
 msgid "Mozilla CSV and Tab Importer"
 msgstr "ਮ���ਲਾ CSV �ਤ� ��ਬ �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "�ਵ�ਲ�ਸ਼ਨ CSV �ਾ� ��ਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:1027
 msgid "Evolution CSV and Tab Importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ CSV �ਤ� ��ਬ �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ਡਾ�ਾ �ੰਤਰ ਤਬਦ�ਲ� ਫਾਰਮ�� (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ LDIF �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
 msgid "Evolution vCard Importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ vCard �ੰਪ�ਰ�ਰ"
 
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:746
+#, c-format
+#| msgid "Page"
+msgid "Page %d"
+msgstr "%d ਪ��਼"
+
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
@@ -1783,21 +1506,21 @@ msgstr "�ਣਪ�ਾਤ� �ਲਤ�"
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP ਸਰਵਰ ਨ�ੰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../addressbook/util/addressbook.c:215
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ� �ਸਫਲ ।\n"
 
-#: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../addressbook/util/addressbook.c:222
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (ਯ��਼ਰ %s) ਲ� ਪਾਸਵਰਡ ਭਰ�"
 
-#: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../addressbook/util/addressbook.c:230
+#: ../calendar/common/authentication.c:55
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1822,20 +1545,26 @@ msgstr ""
 "ਤਾ� �ਿ ਮ�ਲਾ�ਾਤ ਮਨ�਼�ਰ ��ਤ��� �ਾ ਸ�ਣ।"
 
 #: ../calendar/calendar.error.xml.h:5
+#| msgid ""
+#| "Adding a meaningful summary to your appointment will give your recipients "
+#| "an idea of what your appointment is about."
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
 msgstr ""
-"�ਪਣ� ਮ�ਲ�ਾਤ ਦ� ਸੰ��ਪ ਵਿੱ� ��� �ਰਥ ਪ�ਰਨ �ਾਣ�ਾਰ� ਲਿ�ਣ ਨਾਲ ਪੱਤਰ ਪ�ਰਾਪਤ �ਰਨ ਵਾਲ� ਤ�ਹਾਡ� "
-"ਮ�ਲਾ�ਤਾ ਬਾਰ� ਸ��� ਤਰ�ਹਾ� ਸਮ� ਸ�ਣ��।"
+"�ਪਣ� ਮ�ਲ�ਾਤ ਦ� ਸੰ��ਪ ਵਿੱ� ��� �ਰਥ ਪ�ਰਨ �ਾਣ�ਾਰ� ਲਿ�ਣ ਨਾਲ ਤ�ਸ�� �ਪਣ� "
+"ਮ�ਲਾ�ਾਤ ਬਾਰ� ਸ��� ਤਰ�ਹਾ� ਸਮ� ਸ�ਦ� ਹ�।"
 
 #: ../calendar/calendar.error.xml.h:6
+#| msgid ""
+#| "Adding a meaningful summary to your task will give your recipients an "
+#| "idea of what your task is about."
 msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr ""
-"�ਪਣ� �ੰਮ ਦ� ਸੰ��ਪ ਵਿੱ� ��� �ਰਥ ਪ�ਰਨ �ਾਣ�ਾਰ� ਲਿ�ਣ ਨਾਲ ਪੱਤਰ ਪ�ਰਾਪਤ �ਰਨ ਵਾਲ� ਤ�ਹਾਡ� �ੰਮ ਬਾਰ� "
-"�ਸਾਨ� ਨਾਲ ਸਮ� ਸ�ਣ��।"
+"�ਪਣ� �ੰਮ ਦ� ਸੰ��ਪ ਵਿੱ� ��� �ਰਥ ਪ�ਰਨ �ਾਣ�ਾਰ� ਲਿ�ਣ ਨਾਲ ਤ�ਹਾਨ�ੰ ਤ�ਹਾਡ� �ੰਮ ਬਾਰ� "
+"�ਸਾਨ� ਨਾਲ ਸਮ� � ਸ�ਦ� ਹ�।"
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
@@ -1923,40 +1652,38 @@ msgstr "�� ਤ�ਸ�� �ਹ �ੰਮ ਹ�ਾ� ਬਾਰ� ਤਿ
 
 #  mail:ask-send-no-subject primary
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "�� ਤ�ਸ�� ਮ�ਮ� ਨ�ੰ ਸੰ��ਪ �ਾਣ�ਾਰ� ਬਿਨਾ� ਹ� ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
+#| msgid "Are you sure you want to send the appointment without a summary?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "�� ਤ�ਸ�� ਮ�ਲਾ�ਾਤ ਨ�ੰ ਸੰ��ਪ �ਾਣ�ਾਰ� ਬਿਨਾ� ਹ� ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #  mail:ask-send-no-subject primary
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "�� ਤ�ਸ�� ਮ�ਲਾ�ਾਤ ਨ�ੰ ਸੰ��ਪ ਬਿਨਾ� ਹ� ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "�� ਤ�ਸ�� ਮ�ਮ� ਨ�ੰ ਸੰ��ਪ �ਾਣ�ਾਰ� ਬਿਨਾ� ਹ� ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #  mail:ask-send-no-subject primary
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "�� ਤ�ਸ�� �ੰਮ ਨ�ੰ ਸੰ��ਪ �ਾਣ�ਾਰ� ਬਿਨਾ� ਹ� ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
+#| msgid "Are you sure you want to send the task without a summary?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "�� ਤ�ਸ�� �ੰਮ ਨ�ੰ ਸੰ��ਪ �ਾਣ�ਾਰ� ਬਿਨਾ� ਹ� ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "��ਲੰਡਰ ਰਿਪ��਼�ਰ� �ਫਲਾ�ਨ ਹ�।"
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "ਨਵ�� ��ਨਾ ਨਹ�� ਬਣਾ� �ਾ ਸ�ਦ� ਹ�"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "��ਨਾ ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "�� ��ਲੰਡਰ '{0}' ਹ�ਾ�ਣਾ ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "�� ਮ�ਮ� ਸ��� '{0}' ਹ�ਾ�ਣ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "�� �ੰਮ ਸ��� '{0}' ਹ�ਾ�ਣ� ਹ�?"
 
@@ -2000,12 +1727,7 @@ msgstr "ਮ�ਮ� ਸ��� ਲ�ਡ �ਰਨ ਵਿੱ� �ਲਤ�"
 msgid "Error loading task list"
 msgstr "�ੰਮ ਸ��� ਲ�ਡ �ਰਨ ਵਿੱ� �ਲਤ�"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "{0} ਵਿੱ� �ਲਤ�"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2013,7 +1735,7 @@ msgstr ""
 "���ਰ ਤ�ਸ�� ਰੱਦ �ਰਨ ਦ� ਸ��ਨਾ ਨਾ ਭ��� ਤਾ�, ਹ�ਰ ਭਾ� ਲ�ਣ ਵਾਲ� ਮ��ਿੰ� ਦ� ਰੱਦ ਹ�ਣ ਬਾਰ� �ਾਣ ਨਹ�� "
 "ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2021,7 +1743,7 @@ msgstr ""
 "���ਰ ਤ�ਸ�� ਰੱਦ �ਰਨ ਦਾ ਨ��ਿਸ ਨਾ ਭ��ਿ� ਤਾ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਪਤਾ ਨਹ�� ਲੱ���ਾ �ਿ ਮ�ਮ� ਨ�ੰ ਹ�ਾ "
 "ਦਿੱਤਾ �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2029,23 +1751,19 @@ msgstr ""
 "���ਰ ਤ�ਸ�� ਰੱਦ �ਰਨ ਦਾ ਨ��ਿਸ ਨਾ ਭ��ਿ� ਤਾ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਪਤਾ ਨਹ�� ਲੱ���ਾ �ਿ �ੰਮ ਨ�ੰ ਹ�ਾ "
 "ਦਿੱਤਾ �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "ਸਰਵਰ ਤ�� ��� �ਵਾਬ ਨਹ�� ਹ�।"
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "ਤਾ�� �ਾਣ�ਾਰ� ਭ��ਣ ਨਾਲ ਭਾ� ਲ�ਣ ਵਾਲ� �ਪਣਾ ��ਲੰਡਰ ਠ�� ਰੱ� ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "�ੰਮ ਬਾਰ� ਤਾ�� �ਾਣ�ਾਰ� ਭ��ਣ ਨਾਲ ਭਾ� ਲ�ਣ ਵਾਲ� �ਪਣਾ ��ਲੰਡਰ ਠ�� ਰੱ� ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2053,7 +1771,7 @@ msgstr ""
 "��� ਨੱਥ��� ਨ�ੰ ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�। ਮ�ਲਾ�ਾਤ ਨ�ੰ ਹ�ਣ� ਸੰਭਾਲਣ ਨਾਲ �ਹ ਨੱਥ� ��ੰਮ ਹ�ਣ ਦਾ �ਤਰਾ "
 "ਹ� ਸ�ਦਾ ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2061,95 +1779,91 @@ msgstr ""
 "��� ਨੱਥ��� ਨ�ੰ ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�। �ੰਮ ਨ�ੰ ਹ�ਣ� ਸੰਭਾਲਣ ਨਾਲ �ਹ ਨੱਥ� ��ੰਮ ਹ�ਣ ਦਾ �ਤਰਾ ਹ� "
 "ਸ�ਦਾ ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:51
 msgid "Some features may not work properly with your current server."
 msgstr "ਤ�ਹਾਡ� ਮ���ਦਾ ਸਰਵਰ ਨਾਲ ��� ਫ��ਰ ਠ�� ਤਰਾ� �ੰਮ ਨਹ�� �ਰਨ��।"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "�ਵ�ਲ਼�ਸ਼ਨ ��ਲੰਡਰ �ਸਧਾਰਨ ਤਰ��� ਨਾਲ ਬੰਦ ਹ� �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "�ਵ�ਲ਼�ਸ਼ਨ ��ਲੰਡਰ �ਸਧਾਰਨ ਤਰ��� ਨਾਲ ਬੰਦ ਹ� �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "�ਵ�ਲ਼�ਸ਼ਨ ਮ�ਮ� �ਸਧਾਰਨ ਤਰ��� ਨਾਲ ਬੰਦ ਹ� �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ੰਮ �ਸਧਾਰਨ ਤਰ��� ਨਾਲ ਬੰਦ ਹ� �ਿ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The calendar is not marked for offline usage."
 msgstr "��ਲੰਡਰ ਨ�ੰ �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The memo list is not marked for offline usage."
 msgstr "ਮ�ਮ� ਸ��� �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਨਹ�� ��ਤ� �ਾ ਸ�ਦ�।"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The task list is not marked for offline usage."
 msgstr "�ੰਮ ਸ��� �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "This calendar will be removed permanently."
 msgstr "�ਹ ��ਲੰਡਰ ਸਦਾ ਲ� ਹ�ਾ ਦਿੱਤਾ �ਾਵ��ਾ।"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "This memo list will be removed permanently."
 msgstr "�ਹ ਮ�ਮ� ਸ��� ਸਦਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਵ���।"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "This task list will be removed permanently."
 msgstr "�ਹ �ੰਮ ਸ��� ਸਦਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਵ���।"
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "��ਲੰਡਰ ਲ�ਡ �ਰਨ ਲ� �ਸਮਰੱਥ"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this appointment?"
 msgstr "�� ਤ�ਸ�� �ਸ ਮ�ਲਾ�ਾਤ ਬਾਰ� ਤਬਦ�ਲ� ਨ�ੰ ਸੰਭਾਲਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this meeting?"
 msgstr "�� ਤ�ਸ�� �ਹ ਮ��ਿੰ� ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਨ�ੰ ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "�� ਤ�ਸ�� �ਹ ਮ�ਮ� ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਨ�ੰ ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "�� ਤ�ਸ�� �ਸ �ੰਮ ਬਾਰ� ਤਬਦ�ਲ� ਨ�ੰ ਸੰਭਾਲਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "�� ਤ�ਸ�� �ਹ ਮ�ਮ� ਲ� ਰੱਦ �ਰਨ ਦ� ਸ��ਨਾ ਭ��ਣ� �ਾਹ���?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "�� ਤ�ਸ�� ਸਾਰ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਰੱਦ �ਰਨ ਦ� ਸ��ਨਾ ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "�� ਤ�ਸ�� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਮ��ਿੰ� ਲ� ਸੱਦਾ ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "�� ਤ�ਸ�� �ਸ �ੰਮ ਬਾਰ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਸ��ਿਤ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "�� ਤ�ਸ�� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਮ��ਿੰ� ਬਾਰ� ਤਾ�� �ਾਣ�ਾਰ� ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "�� ਤ�ਸ�� �ੰਮ ਬਾਰ� ਤਾ�� �ਾਣ�ਾਰ� ਭਾ� ਲ�ਣ ਵਾਲਿ�� ਨ�ੰ ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2158,103 +1872,57 @@ msgstr ""
 "ਤ�ਸ�� �ੱ� ਨਾ-ਸਹਾ�� �ਰ�ੱਪਵਾ��਼ (GroupWise) ਸਰਵਰ ਨਾਲ ���ਨ �ਾ ਰਹ� ਹ� �ਤ� �ਵ�ਲ�ਸ਼ਨ ਦ� ਵਰਤ�� �ਰਨ "
 "ਨਾਲ ਸਮੱਸਿ� � ਸ�ਦ� ਹ�। �ੰ�� ਨਤ��ਿ�� ਲ� ਸਰਵਰ ਨ�ੰ ਸਹਾ�� ਵਰ�ਨ ਲ� �ੱਪ�ਰ�ਡ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "�ਸ ਮ�ਲਾ�ਾਤ ਵਿੱ� ਤ�ਸ�� ਤਬਦ�ਲ��� ਤਾ� ��ਤ��� ���� ਹਨ, ਪਰ ਸੰਭਾਲ��� ਨਹ�� ����।"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "�ਸ ਮ��ਿੰ� ਵਿੱ� ਤ�ਸ�� ਤਬਦ�ਲ��� ��ਤ��� ���� ਹਨ, ਪਰ ਸੰਭਾਲ��� ਨਹ�� ���� ਹਨ।"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have changed this task, but not yet saved it."
 msgstr "�ਸ �ੰਮ ਵਿੱ� ਤ�ਸ�� ਤਬਦ�ਲ��� ��ਤ��� ���� ਹਨ, ਪਰ ਸੰਭਾਲ��� ਨਹ�� ���� ਹਨ।"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "�ਸ �ੰਮ ਵਿੱ� ਤ�ਸ�� ਤਬਦ�ਲ��� ਤਾ� ��ਤ��� ���� ਹਨ, ਪਰ ਸੰਭਾਲ��� ਨਹ�� ���� ਹਨ।"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡਾ ��ਲੰਡਰ �ਦ�� ਤੱ� �ਪਲੱਬਧ ਨਹ�� ਹ� ਸ���ਾ, �ਦ ਤੱ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ�� �ਾਲ� ਨਹ�� �ਰਦ�।"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡ� ਮ�ਮ� �ਵ�ਲ�ਸ਼ਨ ਦ� ਮ�� �ਾਲ� ਹ�ਣ ਤੱ� �ਪਲੱਬਧ ਨਹ�� ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:79
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ਤ�ਹਾਡ� �ੰਮ �ਵ�ਲ�ਸ਼ਨ ਦ� ਮ�� �ਾਲ� ਹ�ਣ ਤੱ� �ਪਲੱਬਧ ਨਹ�� ਸ�ਣ��।"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:80
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "ਤਬਦ�ਲ��� ਰੱਦ(_D)"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
 msgid "_Save"
 msgstr "ਸੰਭਾਲ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
 msgstr "ਤਬਦ�ਲ��� ਸੰਭਾਲ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "ਭ���(_S)"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:84
 msgid "_Send Notice"
 msgstr "ਸ��ਨਾ ਭ���(_S)"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "ਬਹ�-ਦਿਨ �ਾਰਵਾ��� ਨ�ੰ ਵੱ� �ਰ�:"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "evolution-data-server ਨ�ੰ ਸ਼�ਰ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr "ਪਾ�ਲ� ��ਲੰਡਰ �ਾਰ� ਭਾ� ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "ਪਾ�ਲ� ਦਾ ਮ�ਮ� �ਾਰ� ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "ਪਾ�ਲ� ਦਾ ਮ�ਮ� �ਾਰ� ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "ਮ�ਲ ਪਹਿਲ:"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "ਪਾ�ਲ� ਦਾ �ੰਮ �ਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr "ਪਾ�ਲ� ਦਾ �ਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
-
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
@@ -2267,7 +1935,7 @@ msgid_plural "hours"
 msgstr[0] "�ੰ�ਾ"
 msgstr[1] "�ੰ��"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "ਸ਼�ਰ� ਸਮਾ�"
 
@@ -2282,10 +1950,10 @@ msgstr "ਸਭ ਮਨਸ��(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "�ਿ�ਾਣਾ:"
 
@@ -2298,11 +1966,11 @@ msgid "_Dismiss"
 msgstr "ਮਨਸ��(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:1060
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:152
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1608
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "ਸ�ਧ(_E)"
@@ -2312,10 +1980,10 @@ msgid "_Snooze"
 msgstr "ਬ��ਾਰ(_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "�ੰ��"
 
@@ -2323,40 +1991,41 @@ msgstr "�ੰ��"
 msgid "location of appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਦਾ �ਿ�ਾਣਾ"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "ਮਿੰ�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 msgid "No summary available."
 msgstr "��� ਸੰ��ਪ �ਾਣ�ਾਰ� �ਪਲੱਬਧ ਨਹ� ਹ�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "��� ਵ�ਰਵਾ �ਪਲੱਬਧ ਨਹ� ਹ�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "��� �ਿ�ਾਣਾ �ਾਣ�ਾਰ� �ਪਲੱਬਧ ਨਹ� ਹ�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
 msgid "You have %d alarms"
 msgstr "ਤ�ਹਾਡ� ਲ� %d �ਲਾਰਮ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "��ਤਾਵਨ�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2368,7 +2037,7 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ �ੱ� ਸਧਾਰਨ ਯਾਦ-ਪੱਤਰ ਪ�ੱ��ਿੱ� ਬ�ਸਾ ਹ�\n"
 "ਵ��ਾ ਸ����।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2384,7 +2053,7 @@ msgstr ""
 "\n"
 "�� ਤ�ਸ�� �ਸ �ਾਰ� ਨ�ੰ �ਲਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
 msgid "Do not ask me about this program again."
 msgstr "�ਸ �ਾਰ� ਬਾਰ� ਮ�ਨ�ੰ ਮ�� ਨਾ ਪ�ੱ��।"
 
@@ -2426,7 +2095,7 @@ msgid "Alarm programs"
 msgstr "�ਲਾਰਮ �ਾਰ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "ਹਾਲਤ ਪੱ�� ਵਿੱ� �ਲਤ� ਨ�ੰ ਵ��ਾ� �ਾਣ ਦਾ ਸਮਾ� ਸ�ਿੰ�ਾ� ਵਿੱ�।"
 
@@ -2447,189 +2116,185 @@ msgid "Calendars to run alarms for"
 msgstr "�ਲਾਰਮ �ਲਾ�ਣ ਲ� ��ਲੰਡਰ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸਿਸ�ਮ ਸਮਾ� ਵਰਤਣ ਲ� �ਹ ��ੱ� �ਰ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "ਸਮਾ� ਰ��ਾ ਵਿੱ� ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ �ਿੱ�ਣ ਲ� ਰੰ� (ਮ�ਲ �ਾਲ� ਹ�)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../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:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਹਫਤ� ਸਮ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "ਤੱਥ �ੱਢਣ ਸਮ�� ਪ�ਸ਼��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../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:13
+#: ../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:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "ਮ�ਲ ਮ�ਲਾ�ਾਤ ਯਾਦ-ਪੱਤਰ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "ਡਿਫਾਲ� ਦ�ਹਰਾ�ਣ �ਿਣਤ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "ਡਿਫਾਲ� ਰ�ਮਾ�ਡਰ ਯ�ਨਿ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "ਮ�ਲ ਯਾਦਪੱਤਰ ਮ�ੱਲ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../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:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "��ਨਾ ਰ�ਪ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "��ਨਾ ਪਾਰਦਰਸ਼ਤਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� ਸਰਵਰ URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�� ��ਪਲ�� URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../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:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "ਮ��ੰਮਲ �ੰਮ �ਹਲ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "�ੰਮ ���ਮਾ� �ਹਲ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "�ੰਮ ਮ�ੱਲ �ਹਲ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "�ਿਤਿ�� ਪੱ�� ਸਥਿਤ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../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:29
+#: ../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:30
+#: ../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:31
+#: ../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:32
+#: ../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:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "��ਰ� �ਲਾਰਮ ਸਮਾ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../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:35
+#: ../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:36
+#: ../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:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਰੰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../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:39
+#: ../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:40
+#: ../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:41
+#: ../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:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "ਮ�ਮ� ਲ���� ਸ�ਾ�ਲ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਸਥਿਤ� (ਹਰ��ੱ�ਲ)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਸਥਿਤ� (ਵਰ���ਲ)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../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:46
+#: ../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:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "�ਿਤਿ�� ਪਾਸ� ਦ� ਸਥਿਤ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "ਮਹ�ਨਾ ਦਿੱ� ਲੰਬ�ਾਰ� ਪੱ�� ਸਥਿਤ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../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:50
+#: ../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:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "ਮਿ�ਦ ਪ�ੱ�� �ੰਮ ਦਾ ਰੰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../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."
@@ -2637,7 +2302,7 @@ msgstr ""
 "�ਿਤਿ�� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, �� "
 "�ਿ ਮਹ�ਨਾ ਨਾ ਦਿੱ� ਹ�ਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../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."
@@ -2645,25 +2310,25 @@ msgstr ""
 "�ਿਤਿ�� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, �� "
 "�ਿ ਮਹ�ਨਾ ਦਿੱ� ਹ�ਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../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:55
+#: ../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:56
+#: ../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:57
+#: ../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:58
+#: ../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."
@@ -2671,7 +2336,7 @@ msgstr ""
 "ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲਾ� ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ� ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, "
 "�ਦ�� �ਿ ਮਹ�ਨਾ ਦਿੱ� ਹ�ਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../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."
@@ -2679,105 +2344,102 @@ msgstr ""
 "ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲਾ� ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ� ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, "
 "�ਦ�� �ਿ ਮਹ�ਨਾ ਦਿੱ� ਨਾ ਹ�ਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "ਪ�ਰਾ�ਮਰ� ��ਲੰਡਰ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "ਪ�ਰਾ�ਮਰ� ਮ�ਮ� ਲਿਸ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "ਪ�ਰਾ�ਮਰ� �ਾਸ� ਲਿਸ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../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:64
+#: ../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:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "�ਲਾਰਮ �ਡ�� ਲ� ਡਾ�ਰ���ਰ� ਸੰਭਾਲ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../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:67
+#: ../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:68
+#: ../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:69
+#: ../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:70
+#: ../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:71
+#: ../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:72
+#: ../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:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "ਮ�ਮ� �ਲ� ਬਾਹ� ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../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:76
+#: ../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:77
-msgid "Show week number in Day and Work Week View"
-msgstr "ਦਿਨ �ਤ� �ੰਮ ਹਫ਼ਤ� �ਲ� ਵਿੱ� ਹਫ਼ਤਾ �ਿਣਤ� ਵ���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Show week numbers in date navigator"
-msgstr "ਮਿਤ� ਨ�ਵ����ਰ ਵਿੱ� ਹਫਤਾ �ੰ� ਵ���"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#| msgid "Show week number in Day and Work Week View"
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "ਦਿਨ �ਲ�, �ੰਮ ਹਫ਼ਤਾ �ਲ� �ਤ� ਮਿਤ� ਨ�ਵ����ਰ ਵਿੱ� ਹਫ਼ਤਾ �ਿਣਤ� ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../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:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Task layout style"
 msgstr "�ਾਸ� ਲ���� ਸ�ਾ�ਲ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task preview pane position (horizontal)"
 msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਸਥਿਤ� (ਹਰ��ੱ�ਲ)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (vertical)"
 msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਸਥਿਤ� (ਵਰ���ਲ)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Tasks due today color"
 msgstr "�ੱ� ਦ� �ੰਮ ਦਾ ਰੰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../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 "
@@ -2786,7 +2448,7 @@ msgstr ""
 "ਵ�ਹਲਾ/ਰ��ਿ� ਵਾ�� ਵਰਤਣ ਲ਼� URL ��ਪਲ�� ਡਾ�ਾ, %u ਨ�ੰ ਪੱਤਰ �ਡਰ�ੱਸ ਦ� ਯ��਼ਰ ��ਤਰ �ਤ� %d ਨ�ੰ ਡ�ਮ�ਨ ਨਾਲ "
 "ਤਬਦ�ਲ �ਰ ਦਿੱਤਾ �ਾਵ��ਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../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\"."
@@ -2794,111 +2456,111 @@ msgstr ""
 "��ਲੰਡਰ ਵਿੱ� ਵਰਤਣ ਲ� ਮਿਤ� ਤ� ਸਮਾ� ਲ� ਮ�ਲ ਸਮਾ�-��ਤਰ, �ੱ� ਨਾ-�ਨ�ਵਾਦ �ਲਸ�ਨ ਸਮਾ�-��ਤਰ ਡਾ�ਾਬ�ਸ "
 "��ਤਰ, �ਿਵ�� �ਿ \"America/New York\" �ਦਿ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../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\" (ਵਰ���ਲ �ਲ�) "
-"�ਲ� ਬਾਹ� ਨ�ੰ ਮ�ਮ� ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
+"ਲ���� ਸ�ਾ�ਲ ਤਹਿ �ਰਦਾ ਹ� �ਿ ਮ�ਮ� ਲਿਸ� ਨਾਲ ਸਬੰਧਿਤ �ਲ� ਬਾਹ� �ਿੱਥ� ਵ��ਾ� �ਾਵ�। \"0"
+"\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ ਮ�ਮ� ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) �ਲ� "
+"ਬਾਹ� ਨ�ੰ ਮ�ਮ� ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../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\" (ਵਰ���ਲ �ਲ�) "
-"�ਲ� ਬਾਹ� ਨ�ੰ �ਾਸ� ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
+"ਲ���� ਸ�ਾ�ਲ ਤਹਿ �ਰਦਾ ਹ� �ਿ �ਾਸ� ਲਿਸ� ਨਾਲ ਸਬੰਧਿਤ �ਲ� ਬਾਹ� �ਿੱਥ� ਵ��ਾ� �ਾਵ�। \"0"
+"\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ �ਾਸ� ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) �ਲ� "
+"ਬਾਹ� ਨ�ੰ �ਾਸ� ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../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:90
+#: ../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:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Time divisions"
 msgstr "ਸਮਾ� ਵੰਡ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../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:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
 msgstr "ਸਮਾ�-��ਤਰ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../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:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
 msgstr "��ਵ�� �ੰ�ਾ ਸਮਾ� ਫਾਰਮ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../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:97
+#: ../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:98
+#: ../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:99
+#: ../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:100
+#: ../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:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
 msgstr "ਸਿਸ�ਮ �ਾ�ਮ-�਼�ਨ ਵਰਤ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../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:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Vertical pane position"
 msgstr "ਲੰਬ�ਾਰ� ਬਾਹ� ਸਥਿਤ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Week start"
 msgstr "ਹਫਤਾ ਸ਼�ਰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../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:106
+#: ../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:107
+#: ../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:108
+#: ../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:109
+#: ../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."
@@ -2906,79 +2568,76 @@ msgstr ""
 "�� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਹਫਤਿ�� ਨ�ੰ �ੱ�ਠਾ �ਰਨਾ ਹ� ਤਾ� �ਿ ਸ਼ਨਿ�ੱਰਵਾਰ �ਤ� �ਤਵਾਰ ਨ�ੰ �ੱ� ਦਿਨ ਦ� ਤ�ਰ ਤ� "
 "ਵ��ਾ�� �ਾਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../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:111
+#: ../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:112
+#: ../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:113
+#: ../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:114
+#: ../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:115
+#: ../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:116
+#: ../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:117
+#: ../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:118
+#: ../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:119
+#: ../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:120
+#: ../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:121
+#: ../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:122
-msgid "Whether to show week number in the Day and Work Week View."
-msgstr "�� ਦਿਨ �ਤ� �ੰਮ ਹਫ਼ਤਾ �ਲ� ਵਿੱ� ਹਫ਼ਤਾ ਨੰਬਰ ਵ��ਾ�� �ਾਵ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Whether to show week numbers in the date navigator."
-msgstr "�� ਮਿਤ� �ਲ� ਦ�ਰਾਨ ਹਫਤ� ਦਾ �ੰ� ਵ��ਾ�� �ਾਵ� �ਾ� ਨਾ।"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#| msgid "Whether to show week numbers in the date navigator."
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "�� ��ਲੰਡਰ '� �� ਥਾਵਾ� ਵਿੱ� ਹਫ਼ਤਾ ਨੰਬਰ ਵ��ਾ�ਣਾ ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Work days"
 msgstr "�ਾਰ�� ਦਿਨ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Workday end hour"
 msgstr "�ਾਰ��ਾਰ� �ੰਤ �ੰ�ਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Workday end minute"
 msgstr "�ਾਰ��ਾਰ� �ੰਤ ਮਿੰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday start hour"
 msgstr "�ਾਰ�ਾ�ਰ� ਸ਼�ਰ� �ੰ�ਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday start minute"
 msgstr "�ਾਰ��ਾਰ� ਸ਼�ਰ� ਮਿੰ�"
 
@@ -3028,17 +2687,17 @@ msgid "Classification"
 msgstr "ਵਰ���ਰਨ"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../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
 msgid "Confidential"
 msgstr "��ਪਤ"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../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
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/misc/e-attachment-tree-view.c:514
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "ਵ�ਰਵਾ"
@@ -3059,7 +2718,7 @@ msgid "Exist"
 msgstr "ਬਾਹਰ"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../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.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
@@ -3072,25 +2731,26 @@ msgid "Organizer"
 msgstr "ਪ�ਰਬੰਧ�"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
 #: ../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:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../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
 msgid "Public"
 msgstr "ਸਰਵ�ਨ�"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:322
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "ਦ�ਹਰਾ�"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
@@ -3152,6 +2812,7 @@ msgid "Add Alarm"
 msgstr "ਸੰ��ਤ ਸ਼ਾਮਿਲ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:360
 msgid "Alarm"
 msgstr "�ਲਾਰਮ"
 
@@ -3167,7 +2828,7 @@ msgstr "ਸੰ��ਤ �ਵਾ� ਸ�ਧ"
 msgid "Mes_sage:"
 msgstr "ਸ�ਨ�ਹਾ(_s):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
 msgid "Options"
 msgstr "��ਣ"
 
@@ -3207,18 +2868,20 @@ msgstr "ਬਾ�ਦ"
 msgid "before"
 msgstr "ਪਹਿਲਾ�"
 
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "day(s)"
 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:424
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "ਦਿਨ"
 
@@ -3226,19 +2889,20 @@ msgstr "ਦਿਨ"
 msgid "end of appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਦਾ �ੰਤ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "ਹਰ ਵਾਧ� ਸਮਾ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "�ੰ��"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "ਮਿੰ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਸ਼�ਰ�"
 
@@ -3252,35 +2916,37 @@ 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:4
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Alarms"
 msgstr "�ਲਾਰਮ"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "��ਣ�..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
 msgid "Selected Calendars for Alarms"
 msgstr "�ਲਾਰਮ ਲ� ��ਣ� ��ਲੰਡਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "ਸਮਾ� �ਤ� ਮਿਤ�:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+#| msgid "Time and date:"
+msgid "Ti_me and date:"
+msgstr "ਸਮਾ� ਤ� ਮਿਤ�(_m):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "��ਵਲ ਮਿਤ�:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+#| msgid "Date only:"
+msgid "_Date only:"
+msgstr "��ਵਲ ਮਿਤ�(_D):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3311,13 +2977,13 @@ msgstr "੩੦ ਮਿੰ�"
 msgid "60 minutes"
 msgstr "੬੦ ਮਿੰ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../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:28
-#: ../modules/addressbook/autocompletion-config.c:153
+#: ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:156
 msgid "Date/Time Format"
 msgstr "ਮਿਤ�/ਸਮਾ� ਫਾਰਮ��"
 
@@ -3342,20 +3008,20 @@ msgid "Display alarms in _notification area only"
 msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ� ਵਿੱ� �ਲਾਰਮ ਵ���(_n)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../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:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../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:2676
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "ਸਧਾਰਨ"
 
@@ -3368,7 +3034,7 @@ msgid "Minutes"
 msgstr "ਮਿੰ�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "ਸ�ਮਵਾਰ"
@@ -3382,182 +3048,191 @@ msgid "None"
 msgstr "��� ਨਹ�"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
 msgid "Pick a color"
 msgstr "ਰੰ� ��ਣ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "�ਤ(_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../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
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "ਮਹ�ਨ� ਨ�ੰ ਹਫ਼ਤ� ਨਾਲ ਹਿਲਾ�(_r)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "ਦ��ਾ ��ਤਰ(_c):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "�ਲਾਰਮ ਸ��ਨਾ ਲ� �ਲੰਡਰ ��ਣ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. 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:32
 msgid "Sh_ow a reminder"
 msgstr "ਯਾਦਪੱਤਰ ਵ��ਾ�(_o)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. 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:34
 msgid "Show a _reminder"
 msgstr "ਯਾਦਪੱਤਰ ਵ��ਾ�(_r)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
-msgid "Show week _numbers in date navigator"
-msgstr "ਮਿਤ� ਨ�ਵ����ਰ ਵਿੱ� ਹਫਤ� ਦ� ਦਿਨ ਵ��ਾ�(_n)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
-msgid "Show week n_umber in Day and Work Week View"
-msgstr "ਦਿਨ �ਤ� �ੰਮ ਹਫ਼ਤਾ �ਲ� ਵਿੱ� ਹਫ਼ਤਾ �ਿਣਤ� ਵ��ਾ�(_u)"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#| msgid "Show week _numbers in date navigator"
+msgid "Show week _numbers"
+msgstr "ਹਫ਼ਤਾ ਨੰਬਰ ਵ���(_n)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#: ../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:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 msgid "T_asks due today:"
 msgstr "�ੱ� ਦ� �ੰਮ(_a):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
 msgid "T_hu"
 msgstr "ਵ�ਰ(_h)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "�ੰਮ ਲਿਸ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 msgid "Template:"
 msgstr "��ਪਲ��:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../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:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "ਸਮਾ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "Time _zone:"
 msgstr "ਸਮਾ�-��ਤਰ(_z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 msgid "Time format:"
 msgstr "ਸਮਾ�-ਫਾਰਮ��:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#: ../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:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 msgid "Use s_ystem time zone"
 msgstr "ਸਿਸ�ਮ ਸਮਾ� ��ਤਰ ਵਰਤ��(_y)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "ਬ�ੱਧਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "Wee_k starts on:"
 msgstr "ਹਫਤਾ ਸ਼�ਰ�(_k):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "�ੰਮ ਹਫਤਾ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "Work days:"
 msgstr "�ਾਰ�� ਦਿਨ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_12 hour (AM/PM)"
 msgstr "_੧੨ �ੰ�� (ਸਵ�ਰ/ ਸ਼ਾਮ)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_24 hour"
 msgstr "_੨੪ �ੰ��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Ask for confirmation when deleting items"
 msgstr "���ਮਾ� ਹ�ਾ�ਣ ਸਮ�� ਪ�ਸ਼�� �ਰਵਾ�(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Compress weekends in month view"
 msgstr "ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਹਫਤਾ-�ੰਤ ਸਮ���(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Day begins:"
 msgstr "ਦਿਨ ਸ਼�ਰ�(_D):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Fri"
 msgstr "ਸ਼�ੱ�ਰ(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Hide completed tasks after"
 msgstr "ਸੰਪ�ਰਨ �ੰਮ �ਸ ਬਾ�ਦ �ਹਲ� �ਰ�(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Mon"
 msgstr "ਸ�ਮ(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Overdue tasks:"
 msgstr "ਮਿ�ਦ ਪ�ੱ�� �ੰਮ(_O):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Sat"
 msgstr "ਸ਼ਨਿੱ(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Show appointment end times in week and month view"
 msgstr "ਹਫਤ� �ਤ� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਮ�ਲ�ਾਤ ਵ��ਾ�(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Time divisions:"
 msgstr "ਸਮਾ� ਵੰਡ(_T):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
 msgid "_Tue"
 msgstr "ਮੰ�ਲ(_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
 msgid "_Wed"
 msgstr "ਬ�ੱਧ(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. 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:73
 msgid "before every anniversary/birthday"
 msgstr "ਹਰ�� ਵਰ�ਹ�-�ੰਢ/�ਨਮਦਿਨ ਤ�� ਪਹਿਲਾ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. 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:75
 msgid "before every appointment"
 msgstr "ਹਰ ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ�"
 
@@ -3566,12 +3241,12 @@ msgid "Type:"
 msgstr "�ਿਸਮ:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "�ਿਸਮ(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3590,35 +3265,35 @@ msgstr "�ਫਲਾ�ਨ �ਾਰਵਾ� ਲ� �ੰਮ-ਸ��� ਭ
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "�ਫਲਾ�ਨ �ਾਰਵਾ� ਲ� ਮ�ਮ� ਸ��� ਭਾ�ਾ� ਨ�ੰ ਸਥਾਨ� �ਾਪ� �ਰ�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "ਰੰ�(_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "ਮ�ਮ� ਲਿਸ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "��ਲੰਡਰ ਵਿਸ਼�ਸਤਾ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "ਨਵਾ� ��ਲੰਡਰ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "�ੰਮ ਲਿਸ� ��ਣ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "ਨਵ�� �ੰਮ ਲਿਸ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "ਮ�ਮ� ਸ��� ਵਿਸ਼�ਸ਼ਤਾ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "ਨਵ�� ਮ�ਮ� ਲਿਸ�"
 
@@ -3671,264 +3346,240 @@ msgstr "%s  ਤ�ਸ�� ��� ਤਬਦ�ਲ� ਨਹ�� ��ਤ
 msgid "Validation error: %s"
 msgstr "�ਾ�� �ਲਤ�: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " ਵੱਲ "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (ਸਮਾਪਤ "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "ਸਮਾਪਤ "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (ਬਾ�� "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "ਬਾ�� "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
 msgstr "����ਮ��� ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:510
+#: ../calendar/gui/dialogs/comp-editor.c:522
 msgid "Could not update object"
 msgstr "��ਾ� �ੱਪਡ�� ਨਹ�� ਹ� ਸ�ਦ� ਹ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:637
 msgid "Edit Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਸ�ਧ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:644
 #, c-format
 msgid "Meeting - %s"
 msgstr "ਮ��ਿੰ� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:646
 #, c-format
 msgid "Appointment - %s"
 msgstr "ਮ�ਲਾ�ਾਤ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:652
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ਮਿਲ� �ੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:654
 #, c-format
 msgid "Task - %s"
 msgstr "�ੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Memo - %s"
 msgstr "ਮ�ਮ� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:643
+#: ../calendar/gui/dialogs/comp-editor.c:675
 msgid "No Summary"
 msgstr "ਸੰ��ਪ ਨਹ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:786
 msgid "Keep original item?"
 msgstr "�� �ਸਲ� ���ਮ ਰੱ�ਣ� ਹ�?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:983
 msgid "Click here to close the current window"
 msgstr "ਮ���ਦਾ ਵਿੰਡ� ਬੰਦ �ਰਨ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
+#: ../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:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
 msgid "Copy the selection"
 msgstr "��ਣ� ਦ� ਨ�ਲ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
+#: ../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:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1055
 msgid "Cut the selection"
 msgstr "��ਣ� �ੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../shell/e-shell-window-actions.c:1468
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "��ਣ� ਹ�ਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:1011
 msgid "Click here to view help available"
 msgstr "�ਪਲੱਬਧ ਮੱਦਦ ਵ��ਣ ਲ� �ੱਥ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
+#: ../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:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1067
 msgid "Paste the clipboard"
 msgstr "�ਲਿੱਪਬ�ਰਡ �ਿਪ�ਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:995
+#: ../calendar/gui/dialogs/comp-editor.c:1039
 msgid "Click here to save the current window"
 msgstr "ਮ���ਦਾ ਵਿੰਡ� ਸੰਭਾਲਣ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
+#: ../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:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "ਸਾਰਾ ���ਸ� ��ਣ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
+#: ../calendar/gui/dialogs/comp-editor.c:1053
 msgid "_Classification"
 msgstr "ਵਰ���ਰਨ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../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:217
 msgid "_File"
 msgstr "ਫਾ�ਲ(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../shell/e-shell-window-actions.c:1622
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1037
+#: ../calendar/gui/dialogs/comp-editor.c:1081
 msgid "_Insert"
 msgstr "ਸ਼ਾਮਿਲ(_i)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1044
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../composer/e-composer-actions.c:312
 msgid "_Options"
 msgstr "��ਣ(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../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:45
 msgid "_View"
 msgstr "ਵ���(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../composer/e-composer-actions.c:240
 msgid "_Attachment..."
 msgstr "ਨੱਥ�(_a)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1107
 msgid "Click here to attach a file"
 msgstr "�ੱ� ਫਾ�ਲ ਨੱਥ� �ਰਨ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "_Categories"
 msgstr "���ਾ�ਰ�(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Toggles whether to display categories"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ �ਲ� ���ਾ�ਰ� ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Time _Zone"
 msgstr "ਸਮਾ� ��ਤਰ(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Toggles whether the time zone is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਸਮਾ� ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1134
 msgid "Pu_blic"
 msgstr "ਪਬਲਿ�(_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Classify as public"
 msgstr "ਪਬਲਿ� ਵਾ�� ਰੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Private"
 msgstr "ਨਿੱ��(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "Classify as private"
 msgstr "ਨਿੱ�� ਵਾ�� ਰੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "_Confidential"
 msgstr "��ਪਤ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "Classify as confidential"
 msgstr "��ਪਤ ਦ� ਤ�ਰ 'ਤ� ਰੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "R_ole Field"
 msgstr "ਰ�ਲ ��ਤਰ(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "Toggles whether the Role field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਰ�ਲ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1166
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1124
+#: ../calendar/gui/dialogs/comp-editor.c:1168
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ RSVP ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1174
 msgid "_Status Field"
 msgstr "ਹਾਲਤ ��ਤਰ(_S):"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "Toggles whether the Status field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਹਾਲਤ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "_Type Field"
 msgstr "�ਿਸਮ ��ਤਰ(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1184
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਦਰਸ਼� �ਿਸਮ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1208
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "ਤਾ�਼ਾ ਦਸਤਾਵ��਼(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1684
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../composer/e-composer-actions.c:428
 msgid "Attach"
 msgstr "ਨੱਥ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1739
-msgid "Save"
-msgstr "ਸੰਭਾਲ�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2065
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2072
+#: ../calendar/gui/dialogs/comp-editor.c:2121
+#: ../calendar/gui/dialogs/comp-editor.c:3086
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "���ਰ �ੱਪਡ�� ��ਤਾ �ਸ ��ਾ� ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਰੱਦ �ਰ ਦਿੱਤ��� �ਾਣ����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2924
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "����ਮ���"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2986
+#: ../calendar/gui/dialogs/comp-editor.c:3118
 msgid "Unable to use current version!"
 msgstr "ਮ���ਦਾ ਵਰ�ਨ ਵਰਤਣ ਵਿੱ� �ਸਫਲ!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
 msgid "Could not open source"
 msgstr "ਸਰ�ਤ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
 msgid "Could not open destination"
 msgstr "ਨਿਯਤ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
 msgid "Destination is read only"
 msgstr "ਨਿਯਤ ਸਿਰਫ ਪ�ਨ ਲ� ਹ�"
 
@@ -3936,53 +3587,82 @@ msgstr "ਨਿਯਤ ਸਿਰਫ ਪ�ਨ ਲ� ਹ�"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "ਹ�ਰ ਸਭ ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਦ� ਪੱਤਰ-ਬ�ਸ� ਵਿੱ� �ਹ ��ਾ� ਹ�ਾ�ਣ� ਹ�?(_D)"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
-msgid "The event could not be deleted due to a corba error"
-msgstr "�ਹ ��ਨਾ ��ਰਬਾ �ਲਤ� �ਰ�� ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�"
+#: ../calendar/gui/dialogs/delete-comp.c:217
+#| msgid "P_ercent complete:"
+msgid "_Retract comment"
+msgstr "�ਿੱਪਣ� ਰ��ਰ�ਸ(_R)"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
-msgid "The task could not be deleted due to a corba error"
-msgstr "�ਹ �ੰਮ ��ਰਬਾ �ਲਤ� �ਰ�� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:56
+#, c-format
+#| msgid "The event could not be deleted due to an error"
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr "�ਹ �ਵ��� ਡ�ਬੱਸ �ਲਤ� �ਰ�� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
-msgid "The memo could not be deleted due to a corba error"
-msgstr "�ਹ ਮ�ਮ� ��ਰਬਾ �ਲਤ� �ਰ�� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਿ�"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:60
+#, c-format
+#| msgid "The task could not be deleted due to an error"
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr "�ਹ �ੰਮ ਡ�ਬੱਸ �ਲਤ� �ਰ�� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
+#. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:64
-msgid "The item could not be deleted due to a corba error"
-msgstr "�ਹ ��ਾ� ��ਰਬਾ �ਲਤ� �ਰ�� ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�"
+#, c-format
+#| msgid "The memo could not be deleted due to an error"
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr "�ਹ ਮ�ਮ� ਡ�ਬੱਸ �ਲਤ� �ਰ�� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:68
+#, c-format
+#| msgid "The item could not be deleted due to an error"
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr "�ਹ ���ਮ ਡ�ਬੱਸ �ਲਤ� �ਰ�� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
 msgstr "�ਹ ��ਨਾ �ਧਿ�ਾਰ ਪਾਬੰਦ� ਹ�ਣ �ਰ�� ਹ�ਾ� ਨਹ� �ਾ ਸ�ਦ� ਹ�"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The task could not be deleted because permission was denied"
 msgstr "�ਹ �ੰਮ �ਧਿ�ਾਰ ਪਾਬੰਦ� ਹ�ਣ �ਰ�� ਹ�ਾ�� ਨਹ� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The memo could not be deleted because permission was denied"
 msgstr "�ਹ ਮ�ਮ� �ਧਿ�ਾਰ ਪਾਬੰਦ� ਹ�ਣ �ਰ�� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
 msgstr "�ਹ ��ਾ� �ਧਿ�ਾਰ ਪਾਬੰਦ� ਹ�ਣ �ਰ�� ਹ�ਾ� ਨਹ� �ਾ ਸ�ਦ� ਹ�"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
-msgid "The event could not be deleted due to an error"
-msgstr "�ਹ ��ਨਾ �ਲਤ� �ਰ�� ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:92
+#, c-format
+#| msgid "The event could not be deleted due to an error"
+msgid "The event could not be deleted due to an error: %s"
+msgstr "�ਹ �ਵ��� �ਲਤ� �ਰ�� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਿ�: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
-msgid "The task could not be deleted due to an error"
-msgstr "�ਹ �ੰਮ �ਲਤ� �ਰ�� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:96
+#, c-format
+#| msgid "The task could not be deleted due to an error"
+msgid "The task could not be deleted due to an error: %s"
+msgstr "�ਹ �ੰਮ �ਲਤ� ਨਹ�� �ਰ�� ਨਹ�� ਹ�ਾ�� �ਾ ਸ�ਿ�: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
-msgid "The memo could not be deleted due to an error"
-msgstr "�ਹ ਮ�ਮ� �ਲਤ� �ਰ�� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:100
+#, c-format
+#| msgid "The memo could not be deleted due to an error"
+msgid "The memo could not be deleted due to an error: %s"
+msgstr "�ਹ ਮ�ਮ� �ਲਤ� �ਰ�� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:96
-msgid "The item could not be deleted due to an error"
-msgstr "�ਹ ��ਾ� �ਲਤ� �ਰ�� ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:104
+#, c-format
+#| msgid "The item could not be deleted due to an error"
+msgid "The item could not be deleted due to an error: %s"
+msgstr "�ਹ ��ਾ� �ਲਤ� �ਰ�� ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�: %s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
@@ -3996,133 +3676,148 @@ msgstr "�ਸ ਲ� ਪ�ਰਤ�ਨਿਧ:"
 msgid "Enter Delegate"
 msgstr "ਪ�ਰਤ�ਨਿਧ ਦਿ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "_Alarms"
 msgstr "�ਲਾਰਮ(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:219
 msgid "Click here to set or unset alarms for this event"
 msgstr "�ਹ ��ਨਾ ਲ� �ਲਾਰਮ ਨ�ੰ ਸ�ੱ� �ਾ� ਨਾ-ਸ�ੱ� �ਰਨ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "ਸਮਾ� ਰ��� ਵਾ�� ਵ��ਾ�(_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਵੱਲ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
 msgid "_Recurrence"
 msgstr "ਦ�ਹਰਾ(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:240
 msgid "Make this a recurring event"
 msgstr "�ਹ ਮ���ਦ�� ਨ�ੰ �ੱਲ ਬਣਾ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:245
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "ਭ��ਣ ��ਣ"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/task-editor.c:129
 msgid "Insert advanced send options"
 msgstr "ਤ�ਨ��� ਭ��ਣ ��ਣ ਸ਼ਾਮਲ"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "All _Day Event"
 msgstr "ਸਭ ਦਿਨ ��ਨਾਵਾ�(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:257
 msgid "Toggles whether to have All Day Event"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਸਾਰ� ਦਿਨ ਦ��� ��ਨਾਵਾ� ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
-msgid "Show Time as _Busy"
-msgstr "ਸਮਾ� ਰ��� ਵਾ�� ਵ��ਾ�(_B)"
-
-#: ../calendar/gui/dialogs/event-editor.c:235
-msgid "Toggles whether to show time as busy"
-msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਵੱਲ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:266
 msgid "_Free/Busy"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:268
 msgid "Query free / busy information for the attendees"
 msgstr "�ਸ ��ਲੰਡਰ ਲ� ਵ�ਹਲਾ / ਰ��ਿ� �ਾਣ�ਾਰ� ਪਤਾ �ਰ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
-msgid "Appoint_ment"
-msgstr "ਮ�ਲਾ�ਾਤ(_m)"
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+msgid "Appointment"
+msgstr "ਮ�ਲਾ�ਾਤ"
+
+#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "ਦਰਸ਼�"
 
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-editor.c:578
+#| msgid "Print this message"
+msgid "Print this event"
+msgstr "�ਹ �ਵ��� ਪਰਿੰ� �ਰ�"
+
+#: ../calendar/gui/dialogs/event-page.c:766
+msgid "Event's start time is in the past"
+msgstr "�ਵ��� ਦ� ਸ਼�ਰ� ਮਿਤ� ਲੰ� ��ੱ�� ਸਮ�� '� ਹ�"
+
+#: ../calendar/gui/dialogs/event-page.c:807
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "�ਵ��� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਿ�, �ਿ���ਿ ��ਣਿ� ��ਲੰਡਰ ��ਵਲ ਪ��ਹਨ ਲ� ਹ� ਹ�।"
 
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:811
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "�ਵ��� ਪ�ਰ� ਤਰ�ਹਾ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ, �ਿ���ਿ ਤ�ਸ�� ਪਰਬੰਧ� ਨਹ�� ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.c:2775
 msgid "This event has alarms"
 msgstr "�ਹ ��ਨਾ ਲ� �ਲਾਰਮ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:830
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "ਪ�ਰਬੰਧ�(_O):"
 
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:937
 msgid "_Delegatees"
 msgstr "ਪ�ਰਤ�ਨਿਧ(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:939
 msgid "Atte_ndees"
 msgstr "ਦਰਸ਼�(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1154
 msgid "Event with no start date"
 msgstr "ਬਿਨਾ� ਸ਼�ਰ��ਤ ਮਿਤ� ਨਾਲ ��ਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no end date"
 msgstr "ਬਿਨਾ� �ੰਤ ਮਿਤ� ਨਾਲ ��ਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "Start date is wrong"
 msgstr "ਸ਼�ਰ��ਤ� ਮਿਤ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1338
 msgid "End date is wrong"
 msgstr "ਸਮਾਪਤ� ਮਿਤ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1361
 msgid "Start time is wrong"
 msgstr "ਸ਼�ਰ��ਤ� ਸਮਾ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1368
 msgid "End time is wrong"
 msgstr "ਸਮਾਪਤ� ਸਮਾ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
 msgstr "��ਣ� ਪ�ਰਬੰਧ� ਦਾ ��ਾ��� ਨਹ�� ਰਿਹਾ ਹ�।"
 
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "�ੱ� ਪ�ਰਬੰਧ� ਲ���ਦਾ ਹ�।"
 
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1561
+#: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "�ੱ� ਦਰਸ਼� ਤਾ� ਲ���ਦਾ ਹ�।"
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2649
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' ��ਲੰਡਰ ��ਲਣ ਵਿੱ� �ਸਫਲ"
@@ -4133,130 +3828,142 @@ 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:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2693
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../calendar/gui/dialogs/task-page.c:1787
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ਤ�ਸ�� %s ਦ� ਤ�ਰ �ੱਤ� �ੰਮ �ਰ ਰਹ� ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2994
 #, 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:2947
+#: ../calendar/gui/dialogs/event-page.c:3000
 #, 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:2953
+#: ../calendar/gui/dialogs/event-page.c:3006
 #, 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:2966
+#: ../calendar/gui/dialogs/event-page.c:3019
 msgid "Customize"
 msgstr "ਪਸੰਦ"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:3021
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 msgid "1 day before appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ੧ ਦਿਨ ਪਹਿਲਾ�"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "1 hour before appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� ੧ �ੰ�ਾ"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "15 minutes before appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� ੧੫ ਮਿੰ�"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "ਦਰਸ਼�(_s)..."
-
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "ਦਰਸ਼�"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "ਦਰਸ਼�(_N)..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Custom Alarm:"
 msgstr "�ਲਾਰਮ ਸ�ਧ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Event Description"
 msgstr "�ਵ��� ਵ�ਰਵਾ"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "ਸੰ��ਪ(_m):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:16
 msgid "_Alarm"
 msgstr "�ਲਾਰਮ(_A)"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "ਵ�ਰਵਾ(_D):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "�ਿ�ਾਣਾ(_L):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+#| msgid "Summary:"
+msgid "_Summary:"
+msgstr "ਸੰ��ਪ(_S):"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:21
 msgid "_Time:"
 msgstr "ਸਮਾ�(_T):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
 msgid "for"
 msgstr "ਲ�"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
 msgid "until"
 msgstr "�ਦ�� ਤੱ�"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
 msgid "Memo"
 msgstr "ਮ�ਮ�"
 
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+#| msgid "Print the list of memos"
+msgid "Print this memo"
+msgstr "�ਹ ਮ�ਮ� ਪਰਿੰ� �ਰ�"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "ਮ�ਮ� ਦ� ਸ਼�ਰ� ਮਿਤ� ਲੰ� ��ੱ�� ਸਮ�� '� ਹ�"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ਮ�ਮ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ, �ਿ���ਿ ��ਣਿ� ਮ�ਮ� ��ਵਲ ਪ��ਹਨ ਲ� ਹ� ਹ�"
 
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ਮ�ਮ� ਪ�ਰ� ਤਰ�ਹਾ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ, �ਿ���ਿ ਤ�ਸ�� ਪਰਬੰਧ� ਨਹ�� ਹ�"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:907
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' ਵਿੱ� ਮ�ਮ� ��ਲਣ ਤ�� �ਸਮਰੱਥ"
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:269
+#: ../em-format/em-format.c:1026 ../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:80
 msgid "To"
 msgstr "ਵੱਲ"
 
@@ -4265,67 +3972,72 @@ msgstr "ਵੱਲ"
 msgid "Sta_rt date:"
 msgstr "ਸ਼�ਰ��ਤ� ਮਿਤ�(_r):"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "ਸੰ��ਪ(_m):"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "ਵੱਲ(_o):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:426
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "�ਰ�ੱਪ(_G):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "ਤ�ਸ�� �ੱ� �ਵਰਤ� ��ਨਾ ਨ�ੰ ਸ�ਧ ਰਹ� ਹ�। ਤ�ਸ�� �� ਸ�ਧਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "ਤ�ਸ�� �ੱ� �ਵਰਤ� ��ਨਾ ਲ� ਪ�ਰਤ�ਨਿਧ �ਰ ਰਹ� ਹ�, ਤ�ਸ�� �� ਪ�ਰਤ�ਨਿਧ ਬਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "ਤ�ਸ�� �ੱ� �ਵਰਤ� �ੰਮ ਨ�ੰ ਸ�ਧ ਰਹ� ਹ�। ਤ�ਸ�� �� ਸ�ਧਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "ਤ�ਸ�� �ੱ� �ਵਰਤ� ਮ�ਮ� ਨ�ੰ ਸ�ਧ ਰਹ� ਹ�। ਤ�ਸ�� �� ਸ�ਧਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "�ਸ ਮ��� ਤ� ਹ�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "�ਹ �ਤ� ਪਹਿਲ ਮ���"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "�ਹ �ਤ� ਭਵਿੱ�ਤ ਮ��� ਲ�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "ਸਭ ਮ���"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "�ਸ ਮ�ਲਾ�ਾਤ ਵਿੱ� ਲ�� ਹ�, �� �ਿ �ਵ�ਲ�ਸ਼ਨ ਸ�ਧ ਨਹ�� ਸ�ਦਾ ਹ�।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "�ਵਰਤ� ਮਿਤ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 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:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "�ਾਲ�"
 
@@ -4333,7 +4045,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "ਪਹਿਲਾ�"
 
@@ -4342,7 +4054,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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "ਦ��ਾ"
 
@@ -4350,7 +4062,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:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "ਤ��ਾ"
 
@@ -4358,7 +4070,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:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "��ਥਾ"
 
@@ -4366,7 +4078,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:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "ਪੰ�ਵਾ�"
 
@@ -4374,13 +4086,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:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "ਹ�ਰ ਮਿਤ�"
 
@@ -4388,7 +4100,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:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "੧ਲ� ਤ�� ੧੦ਵਾ�"
 
@@ -4396,7 +4108,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:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "੧੧ਵ�� ਤ�� ੨੦ਵਾ�"
 
@@ -4404,45 +4116,45 @@ 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:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 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
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 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:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "�ਸ ਤ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "ਮ���ਦ��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "�ਪਵਾਦ ਸ਼ਾਮਲ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "ਸ�ਧ ਲ� �ੱ� ��ਣ ਨਹ�� ਮਿਲ�।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "�ਪਵਾਦ ਸ�ਧ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "ਹ�ਾ�ਣ ਲ� �ੱ� ��ਣ ਨਹ�� ਮਿਲ�।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "ਮਿਤ�/ਸਮਾ�"
 
@@ -4454,7 +4166,7 @@ msgstr "ਹਰ��"
 msgid "Exceptions"
 msgstr "���"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
 msgid "Preview"
 msgstr "�ਲ�"
 
@@ -4462,48 +4174,64 @@ msgstr "�ਲ�"
 msgid "This appointment rec_urs"
 msgstr "�ਹ ਮ�ਲਾ�ਾਤ ਮ�� ਹ�(_u)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgid "forever"
 msgstr "ਹਮ�ਸ਼ਾ"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgid "month(s)"
 msgstr "ਮਹ�ਨਾ"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
 msgid "week(s)"
 msgstr "ਹਫਤਾ"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 msgid "year(s)"
 msgstr "ਸਾਲ"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "�ਸ �ਵ��� ਲ� ਮ�ਰ� �ਲਾਰਮ ਭ���"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "��ਵਲ ਦਰਸ਼�ਾ� ਲ� ਸ��ਨਾ ਦਿ�(_o)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
 msgid "Completed date is wrong"
 msgstr "ਸੰਪ�ਰਨ ਮਿਤ� �ਲਤ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:483
 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:2675 ../mail/em-sync-stream.c:151
+#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#, 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:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../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:2672 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "ਸਮਾਪਤ"
@@ -4511,35 +4239,35 @@ 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:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../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:8
 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:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../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:2669
 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:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../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:9
 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:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../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
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
@@ -4547,10 +4275,10 @@ 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:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../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:2666 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "ਸ਼�ਰ� ਨਹ�� ਹ�"
 
@@ -4566,8 +4294,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:1743
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-meeting-list-view.c:594
 #: ../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
@@ -4576,7 +4304,7 @@ msgstr "ਸਥਿਤ�"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "ਨਾ-ਪ�ਰਭਾਸ਼ਿਤ"
@@ -4586,7 +4314,7 @@ msgid "_Date completed:"
 msgstr "ਸੰਪ�ਰਨ ਮਿਤ�(_D):"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "ਪਹਿਲ(_P):"
 
@@ -4594,53 +4322,63 @@ msgstr "ਪਹਿਲ(_P):"
 msgid "_Web Page:"
 msgstr "ਵ�ਬ ਸ�ਾ(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:117
 msgid "_Status Details"
 msgstr "ਹਾਲਤ ਵ�ਰਵਾ(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:119
 msgid "Click to change or view the status details of the task"
 msgstr "�ੰਮ ਦ� ਹਾਲਤ ਵ�ਰਵ� ਲ� ਤਬਦ�ਲ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:127
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "ਭ��ਣ ��ਣ(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
-msgid "_Task"
-msgstr "�ੰਮ(_T)"
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
+#: ../widgets/misc/e-send-options.c:502
+msgid "Task"
+msgstr "�ਾਸ�"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:331
 msgid "Task Details"
 msgstr "�ੰਮ ਵ�ਰਵਾ"
 
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:373
+#| msgid "Print the list of tasks"
+msgid "Print this task"
+msgstr "�ਹ �ੰਮ ਪਰਿੰ� �ਰ�"
+
+#: ../calendar/gui/dialogs/task-page.c:343
+msgid "Task's start date is in the past"
+msgstr "�ਾਸ� ਦ� ਸ਼�ਰ� ਮਿਤ� ਲੰ� ��ੱ�� ਸਮ�� '� ਹ�"
+
+#: ../calendar/gui/dialogs/task-page.c:344
+msgid "Task's due date is in the past"
+msgstr "�ਾਸ� ਦ� ਮਿ�ਦ ਲੰ� ��ੱ�� ਸਮ�� '� ਹ�"
+
+#: ../calendar/gui/dialogs/task-page.c:379
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "�ਾਸ� ਸ�ਧ� ਨਹ�� �ਾ ਸ�ਦ�, �ਿ���ਿ ��ਣ� �ਾਸ� ��ਵਲ ਪ��ਹਨ ਲ� ਹ� ਹ�"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:383
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "�ਾਸ� ਪ�ਰ� ਤਰ�ਹਾ� ਸ�ਧ� ਨਹ�� �ਾ ਸ�ਦ�, �ਿ���ਿ ਤ�ਸ�� ਪਰਬੰਧ� ਨਹ�� ਹ�"
 
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "ਪਰਬੰਧ�(_z):"
 
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:880
 msgid "Due date is wrong"
 msgstr "ਮਿ�ਦ ਮਿਤ� �ਲਤ"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' ਵਿੱ� �ਾਸ� ��ਲਣ ਤ�� �ਸਮਰੱਥ"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "ਦਰਸ਼�(_N)..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "���ਾ�ਰ�(_i)..."
@@ -4738,7 +4476,7 @@ msgid "Categories:"
 msgstr "���ਾ�ਰ���:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "ਸੰ��ਪ:"
 
@@ -4753,8 +4491,8 @@ msgstr "ਮਿ�ਦ:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "ਸਥਿਤ�:"
 
@@ -4763,8 +4501,8 @@ msgid "Priority:"
 msgstr "ਪਹਿਲ:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "ਵ�ਰਵਾ:"
 
@@ -4779,32 +4517,32 @@ msgstr "ਵ�ਬ ਸਫਾ:"
 msgid "Created"
 msgstr "ਬਣਾ��"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "ਸਮਾਪਤ� ਮਿਤ�"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "��ਰ� ਸ�ਧ"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "ਸ਼�ਰ� ਮਿਤ�"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:563
 msgid "Free"
 msgstr "ਵ�ਹਲਾ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
 msgid "Busy"
 msgstr "ਰ��ਿ�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4815,63 +4553,47 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:856
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ਹਾ�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "ਨਹ�"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "ਡਿਫਾਲ� �ਲਾ��"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "ਸ਼�ੱਲ ਸ��ਿੰ�"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "���-ਪ�ਰਤ� ਸ��ਿੰ�"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../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-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../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
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2343
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "�ਣ�ਾਣ"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1271
 msgid "Recurring"
 msgstr "�ਵਿਰਤ�"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1273
 msgid "Assigned"
 msgstr "�ਾਰ� ��ਤ�"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2175
 #, c-format
 msgid "Opening %s"
 msgstr "%s ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
@@ -4908,97 +4630,97 @@ msgid "Start date"
 msgstr "ਸ਼�ਰ��ਤ� ਮਿਤ�"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Type"
 msgstr "�ਿਸਮ"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:407
 msgid "Cut selected events to the clipboard"
 msgstr "��ਣ� �ਵ��� �ਲਿੱਪਬ�ਰਡ ਤ�� �ੱ��"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:413
 msgid "Copy selected events to the clipboard"
 msgstr "��ਣ� �ਵ��� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:419
 msgid "Paste events from the clipboard"
 msgstr "�ਵ��� �ਲਿੱਪਬ�ਰਡ ਤ�� ��ਪ�"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:425
 msgid "Delete selected events"
 msgstr "��ਣ� �ਵ��� ਹ�ਾ�"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "��ਣ��� ���ਮਾ� ਹ�ਾ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-task-table.c:1068
 msgid "Updating objects"
 msgstr "��ਾ� �ੱਪਡ�� ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2331
 msgid "Accepted"
 msgstr "ਮਨ�਼�ਰ"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2337
 msgid "Declined"
 msgstr "�ਨ�ਾਰ"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1722
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "�ਰ��"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1723
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2340
 msgid "Delegated"
 msgstr "ਪ�ਰਤ�ਨਿਧ�"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1724
 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:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:528
+#: ../calendar/gui/e-task-table.c:743
 #, 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:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
+#: ../calendar/gui/e-task-table.c:746
 #, c-format
 msgid "Organizer: %s"
 msgstr "ਪ�ਰਬੰਧ�: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
 #, c-format
 msgid "Location: %s"
 msgstr "�ਿ�ਾਣਾ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1920
 #, c-format
 msgid "Time: %s %s"
 msgstr "ਸਮਾ�: %s %s"
@@ -5042,8 +4764,8 @@ msgstr "ਦ��ਾ ਸਮਾ� ��ਤਰ ਵ���"
 #. 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:864 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../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
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5053,10 +4775,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:868 ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../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
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5065,31 +4787,36 @@ 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:872 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../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
 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:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "ਸਵ�ਰ"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
 #: ../calendar/gui/print.c:821
 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:2614
+#: ../calendar/gui/e-day-view.c:2645
 #, c-format
 msgid "Week %d"
 msgstr "ਹਫ਼ਤਾ %d"
 
+#: ../calendar/gui/e-itip-control.c:761
+#| msgid "Recurring"
+msgid "Recurring:"
+msgstr "�ਵਿਰਤ�:"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "ਹਾ� (��ੰ�ਲਦਾਰ �ਵਰਤ�)"
@@ -5171,7 +4898,7 @@ msgstr "ਸਮਾਪਤ"
 msgid "Due"
 msgstr "ਬ�ਾ��"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "iCalendar �ਾਣ�ਾਰ�"
 
@@ -5181,303 +4908,324 @@ msgstr "iCalendar �ਾਣ�ਾਰ�"
 msgid "iCalendar Error"
 msgstr "iCalendar �ਲਤ�"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../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:1132
+#: ../calendar/gui/e-itip-control.c:1145
+#| msgid ""
+#| "<br> Please review the following information, and then select an action "
+#| "from the menu below."
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr "<br> �ਿਰਪਾ �ਰ�� ਹ�ਠ ਦਿੱਤ� �ਾਣ�ਾਰ� ਤ� ਮ�� ਵਿ�ਾਰ �ਰ� �ਤ� ਮ�ਨ� ਤ�� ਤੱਦ ��� �ਾਰਵਾ� ��ਣ�।"
+"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:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 msgctxt "cal-itip"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2334
 msgid "Tentatively Accepted"
 msgstr "�ਰ�� ਮਨ�਼�ਰ"
 
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../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:1279
+#: ../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:1356
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> ਨ� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
+#| msgid "<b>%s</b> has published meeting information."
+msgid "%s has published meeting information."
+msgstr "%s ਨ� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "ਮ��ਿੰ� ਬਾਰ� �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> ਨ� ਮ��ਿੰ� ਵਿੱ� %s ਦ� ਮ���ਦ�� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
+#| msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s ਨ� ਮ��ਿੰ� ਵਿੱ� %s ਦ� ਮ���ਦ�� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> ਨ� ਮ��ਿੰ� ਵਿੱ� ਤ�ਹਾਡ� ਹਾ�ਰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
+#| msgid "<b>%s</b> requests your presence at a meeting."
+msgid "%s requests your presence at a meeting."
+msgstr "%s ਨ� ਮ��ਿੰ� ਵਿੱ� ਤ�ਹਾਡ� ਹਾ�਼ਰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "ਮ��ਿੰ� ਸ��ਾ�"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> �ੱ� ਮ���ਦਾ ਮ��ਿੰ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�।"
+#| msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s �ੱ� ਮ���ਦਾ ਮ��ਿੰ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "ਮ��ਿੰ� �ੱਪਡ��"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> ਨਵ�� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦ� ਹ�।"
+#| msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s ਨਵ�� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "ਮ��ਿੰ� �ੱਪਡ�� ਮੰ�"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> ਨ� �ੱ� ਮ��ਿੰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
+#| msgid "<b>%s</b> has replied to a meeting request."
+msgid "%s has replied to a meeting request."
+msgstr "%s ਨ� �ੱ� ਮ��ਿੰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "ਮ��ਿੰ� �ਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> ਨ� �ੱ� ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� ਹ�।"
+#| msgid "<b>%s</b> has canceled a meeting."
+msgid "%s has canceled a meeting."
+msgstr "%s ਨ� �ੱ� ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "ਮ��ਿੰ� ਰੱਦ"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> ਨ� �ੱ� ਨਾ ਬ�ਸਮ� ਸ�ਨ�ਹਾ ਭ��ਿ� ਹ�।"
+#| msgid "<b>%s</b> has sent an unintelligible message."
+msgid "%s has sent an unintelligible message."
+msgstr "%s ਨ� �ੱ� ਨਾ ਬ�ਸਮ� ਸ�ਨ�ਹਾ ਭ��ਿ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "�ਲਤ ਮ��ਿੰ� ਸ�ਨ�ਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> ਨ� �ੰਮ �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
+#| msgid "<b>%s</b> has published task information."
+msgid "%s has published task information."
+msgstr "%s ਨ� �ੰਮ �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "�ੰਮ �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> ਨ� %s ਨ�ੰ �ਾਰ� ਪ�ਰਾ �ਰਨ ਲ� ਬ�ਨਤ� ਭ��� ਹ�।"
+#| msgid "<b>%s</b> requests %s to perform a task."
+msgid "%s requests %s to perform a task."
+msgstr "%s ਨ� %s ਨ�ੰ �ਾਰ� ਪ�ਰਾ �ਰਨ ਲ� ਬ�ਨਤ� ਭ��� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> ਤ�ਹਾਨ�ੰ �ੱ� �ੰਮ ਲ� �ਹਿ ਰਿਹਾ ਹ�।"
+#| msgid "<b>%s</b> requests you perform a task."
+msgid "%s requests you perform a task."
+msgstr "%s ਤ�ਹਾਨ�ੰ �ੱ� �ੰਮ ਲ� �ਹਿ ਰਿਹਾ ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "�ੰਮ ਸ��ਾ�"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> ਨ� �ੱ� �ਾਰ� �ੰਮ ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�ਣ ਦ� �ੱ�ਾ �ਤਾ� ਹ�।"
+#| msgid "<b>%s</b> wishes to be added to an existing task."
+msgid "%s wishes to be added to an existing task."
+msgstr "%s ਨ� �ੱ� �ਾਰ� �ੰਮ ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�ਣ ਦ� �ੱ�ਾ �ਤਾ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "�ੰਮ �ੱਪਡ��"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> ਤਾ�� �ੰਮ �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦਾ ਹ�।"
+#| msgid "<b>%s</b> wishes to receive the latest task information."
+msgid "%s wishes to receive the latest task information."
+msgstr "%s ਤਾ�਼� �ੰਮ �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦਾ ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "�ੰਮ �ੱਪਡ�� ਬ�ਨਤ�"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> ਨ� �ਾਰ� �ੰਮ ਲ� �ਵਾਬ ਭ��ਿ� ਹ�।"
+#| msgid "<b>%s</b> has replied to a task assignment."
+msgid "%s has replied to a task assignment."
+msgstr "%s ਨ� �ਾਰ� �ੰਮ ਲ� �ਵਾਬ ਭ��ਿ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "�ੰਮ �ਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> ਨ� �ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�।"
+#| msgid "<b>%s</b> has canceled a task."
+msgid "%s has canceled a task."
+msgstr "%s ਨ� �ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "�ੰਮ ਰੱਦ��ਰਨ"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "�ਲਤ �ੰਮ ਸ�ਨ�ਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> ਨ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
+#| msgid "<b>%s</b> has published free/busy information."
+msgid "%s has published free/busy information."
+msgstr "%s ਨ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> ਨ� ਤ�ਹਾਡ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਲ� ਬ�ਨਤ� ਭ��� ਹ�।"
+#| msgid "<b>%s</b> requests your free/busy information."
+msgid "%s requests your free/busy information."
+msgstr "%s ਨ� ਤ�ਹਾਡ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਲ� ਬ�ਨਤ� ਭ��� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� ਬ�ਨਤ�"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> ਨ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� �ਵਾਬ ਭ��ਿ� ਹ�।"
+#| msgid "<b>%s</b> has replied to a free/busy request."
+msgid "%s has replied to a free/busy request."
+msgstr "%s ਨ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� �ਵਾਬ ਭ��ਿ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�� �ਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "�ਲਤ ਵ�ਹਲਾ/ਰ��ਿ� ਸ�ਨ�ਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "ਸ�ਨ�ਹਾ �ਪਣ� ਸਹ�� ਸਰ�ਪ ਵਿੱ� ਨਹ�� ਹ�"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ਨਾ-ਸਹਾ�� ਬ�ਨਤ��� ਹਨ।"
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "ਨੱਥ� ਵਿੱ� �ੱ� �ਾ�� ��ਲੰਡਰ ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "ਨੱਥ� ਵਿੱ� ��� ਵ� ਵ��ਣਯ�� ��ਲੰਡਰ ��ਾ� ਨਹ�� ਹ�"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "ਨਵ�ਨ��ਰਮ ਪ�ਰਨ\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "��ਾ� �ਲਤ ਹ� �ਤ� �ੱਪਡ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../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:2040
+#: ../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:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "ਦਰਸ਼� ਸਥਿਤ� ਨਵ�ਨ ਹ�\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
+#: ../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:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../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:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../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:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "�ਾਰਵਾ� ��ਣ�"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../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:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "�ੱਪਡ��"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "ਮਨ�਼�ਰ"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "�ਰ�� ਮਨ�਼�ਰ"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "�ਨ�ਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਭ���"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "�ਵਾਬ ਦ�ਣ ਵਾਲਿ�� ਦ� ਹਾਲਤ �ੱਪਡ��"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "ਤਾ�� �ਾਣ�ਾਰ� ਭ���"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "ਰੱਦ �ਰ�"
 
@@ -5526,72 +5274,72 @@ msgid "Resources"
 msgstr "ਸਰ�ਤ"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../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
 msgid "Individual"
 msgstr "�ੱ�ਲਾ"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../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
 msgid "Group"
 msgstr "ਸਮ�ਹ"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "ਸਰ�ਤ"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "�ਮਰਾ"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "��ਰਸ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
+#: ../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
 msgid "Required Participant"
 msgstr "ਲ���ਦ� ਭਾ� ਲ�ਣ ਵਾਲ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "��ਣਵ�� ਭਾ� ਲ��ਣ ਵਾਲ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "��� ਭਾ� ਲ�ਣ ਵਾਲਾ ਨਹ�� ਹ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "�ਾਰਵਾ� ਲ���ਦ� ਹ�"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:537
 msgid "Attendee                          "
 msgstr "ਦਰਸ਼�                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "�ਾਰਵਾ� �ਧ�ਨ"
 
 #. 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:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2376
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -5600,7 +5348,7 @@ msgstr "%A, %B %d, %Y"
 #. 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:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2407
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -5610,67 +5358,63 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "ਦਫਤਰ ਤ�� ਬਾਹਰ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "��� �ਾਣ�ਾਰ� ਨਹ��"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "ਦਰਸ਼�(_T)..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "��ਣ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "ਸਿਰਫ �ੰਮ-�ੰ�� ਹ� ਵ��ਾ�(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "��ਾਰ ਵੱਡਾ ਵ��ਾ�(_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ੱਪਡ��(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "ਸਵ�-��ਣ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "ਸਭ ਵਿ��ਤ� ਤ� ਸਰ�ਤ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "ਸਭ ਵਿ��ਤ� ਤ� �ੱ� ਸਰ�ਤ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "ਲ���ਦ� ਵਿ��ਤ�(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "ਲ���ਦ� ਲ�� ਤ� �ੱ� ਸਰ�ਤ(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "ਸ਼�ਰ��ਤ� ਸਮਾ�(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "ਸਮਾਪਤ� ਸਮਾ�(_E):"
 
@@ -5698,45 +5442,47 @@ msgstr "ਭਾਸ਼ਾ"
 msgid "Member"
 msgstr "ਮ��ਬਰ"
 
-#: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../calendar/gui/e-memo-table.c:412
+#: ../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:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "ਮ�ਮ�"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
 msgid "* No Summary *"
 msgstr "* ਸੰ��ਪ ਨਹ�� *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
 msgid "Start: "
 msgstr "ਸ਼�ਰ�:"
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
 msgid "Due: "
 msgstr "ਬਾ��:"
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:710
 msgid "Cut selected memos to the clipboard"
 msgstr "��ਣ� ਮ�ਮ� ਨ�ੰ �ਲਿੱਪਬ�ਰਡ ਵਿੱ� ਭ���"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:716
 msgid "Copy selected memos to the clipboard"
 msgstr "��ਣ� ਮ�ਮ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:722
 msgid "Paste memos from the clipboard"
 msgstr "�ਲਿੱਪਬ�ਰਡ ਤ�� ਮ�ਮ� ��ਪ�"
 
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
 msgstr "��ਣ� �ੰਮ ਹ�ਾ�"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:734
 msgid "Select all visible memos"
 msgstr "ਸਾਰ� ਦਿੱਸ ਰਹ� ਮ�ਮ� ��ਣ�"
 
@@ -5744,86 +5490,52 @@ msgstr "ਸਾਰ� ਦਿੱਸ ਰਹ� ਮ�ਮ� ��ਣ�"
 msgid "Click to add a memo"
 msgstr "�ੱ� ਮ�ਮ� ਸ਼ਾਮਿਲ �ਰਨ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "੦%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "੧੦%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "੨੦%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "੩੦%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "੪੦%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "੫੦%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "੬੦%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "੭੦%"
-
-#: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "੮੦%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %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
-msgid "90%"
-msgstr "੯੦%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "੧੦੦%"
+#, c-format
+#| msgid "%d %b"
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../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:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../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:928
+#: ../calendar/gui/e-task-table.c:933
 msgid "Cut selected tasks to the clipboard"
 msgstr "��ਣ� �ਾਸ� �ਲਿੱਪਬ�ਰਡ ਤ�� �ੱ��"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:939
 msgid "Copy selected tasks to the clipboard"
 msgstr "��ਣ� �ਾਸ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:945
 msgid "Paste tasks from the clipboard"
 msgstr "�ਲਿੱਪਬ�ਰਡ ਵਿੱ��� �ਾਸ� ��ਪ�"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "��ਣ� �ਾਸ� ਹ�ਾ�"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:957
 msgid "Select all visible tasks"
 msgstr "ਸਭ ਦਿਸ ਰਹ��� �ਾਸ�ਾ� ��ਣ�"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "ਸਮਾ� ��ਤਰ ��ਣ�"
 
@@ -5833,56 +5545,56 @@ 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:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
 msgstr "�ਸ ਲ� �ਲਾਰਮ ਹ�।"
 
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
 msgid "It has recurrences."
 msgstr "�ਹ ਮ���ਦ�� ਹ�ਾ�।"
 
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
 msgid "It is a meeting."
 msgstr "�ੱ� ਮ��ਿੰ� ਹ�।"
 
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "��ਲੰਡਰ ��ਨਾਵਾ�: %s ਸੰ��ਪ ਹ�।"
 
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "Calendar Event: It has no summary."
 msgstr "��ਲੰਡਰ ��ਨਾਵਾ�: ��� �ਾਣ�ਾਰ� ਨਹ�� ਹ�।"
 
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
 msgid "calendar view event"
 msgstr "��ਲੰਡਰ ਵ��ਣ ��ਨਾ"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
 msgstr "ਫ��ਸ ਲਵ�"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New Appointment"
 msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New All Day Event"
 msgstr "ਨਵ��� ਸਾਰਾ ਦਿਨ ��ਨਾਵਾ�"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New Meeting"
 msgstr "ਨਵ�� ਮ��ਿੰ�"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Today"
 msgstr "�ੱ� 'ਤ� �ਾ�"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Date"
 msgstr "ਮਿਤ� 'ਤ� �ਾ�"
 
@@ -5891,7 +5603,7 @@ msgstr "ਮਿਤ� 'ਤ� �ਾ�"
 msgid "a table to view and select the current time range"
 msgstr "ਮ���ਦਾ ਸਮ�� ਸ�ਮਾ ਵ��ਣ �ਤ� ��ਣਨ ਲ� �ੱ� ��ਬਲ"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5900,14 +5612,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:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
 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:164
+#: ../calendar/gui/ea-day-view.c:162
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "�ੰਮ ਹਫਤਾ �ਲ�: %s. %s"
@@ -5915,47 +5627,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:170
+#: ../calendar/gui/ea-day-view.c:168
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "ਦਿਨ �ਲ�: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:202
 msgid "calendar view for a work week"
 msgstr "�ੰਮ ਹਫਤ� ਲ� ��ਲੰਡਰ ਦਿੱ�"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:204
 msgid "calendar view for one or more days"
 msgstr "�ੱ� �ਾ� ਵਧ�ਰ� ਦਿਨਾ� ਲ� ��ਲੰਡਰ ਦਿੱ�"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "�ਨ�ਮ ��ਲੰਡਰ"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1010
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../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:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../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
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -5977,15 +5689,15 @@ msgstr "ਮਹ�ਨਾ �ਲ�: %s. %s"
 msgid "Week View: %s. %s"
 msgstr "ਹਫਤਾ �ਲ�: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:195
 msgid "calendar view for a month"
 msgstr "ਮਹ�ਨ� ਦ� ��ਲੰਡਰ ਦਿੱ�"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for one or more weeks"
 msgstr "�ੱ� �ਾ� ਵਧ�ਰ� ਹਫਤਿ�� ਲ� ��ਲੰਡਰ �ਲ�"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2287
 msgid "Purging"
 msgstr "ਸ�ਧਿ� �ਾ ਰਿਹਾ ਹ�"
 
@@ -6038,39 +5750,40 @@ msgid "Select Date"
 msgstr "ਮਿਤ� ��ਣ�"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "ਸਤੰਬਰ"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+msgid "Select _Today"
+msgstr "�ੱ� ��ਣ�(_T)"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "�ੱ� ��ਣ�(_S)"
+msgid "September"
+msgstr "ਸਤੰਬਰ"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "�ੱ� ਪ�ਰਬੰਧ� ਹ�ਣਾ ਲਾ�ਮ� ਹ�"
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "�ੱ� ਦਰਸ਼� ਤਾ� ਲ���ਦਾ ਹ�"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "��ਨਾ �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "�ੰਮ �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "ਮ�ਮ� �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ�"
 
@@ -6078,7 +5791,7 @@ msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ਮਨ�਼�ਰ"
@@ -6087,7 +5800,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:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "�ਰ�� ਮਨ�਼�ਰ"
@@ -6099,7 +5812,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:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "�ਨ�ਾਰ"
@@ -6108,7 +5821,7 @@ msgstr "�ਨ�ਾਰ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ਪ�ਰਤ�ਨਿਧ�"
@@ -6116,7 +5829,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:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ਨਵ�ਨ"
@@ -6124,7 +5837,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:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ਰੱਦ �ਰ�"
@@ -6132,7 +5845,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:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ਮ��-ਤਾ�ਾ"
@@ -6140,29 +5853,29 @@ 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:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "�ਲ� ਸ��ਾ�"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� (%s ਤ�� %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "iCalendar �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "ਸਰ�ਤ ਬ�ੱ� �ਰਨ ਲ� �ਸਮਰੱਥ, ਨਵਾ� �ਵ��� ਪਹਿਲਾ� ਦ� �ਿਸ� ਨਾਲ ��ਰਾ ਰਿਹਾ ਹ�।"
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "ਸਰ�ਤ ਬ�ੱ� �ਰਨ ਲ� �ਸਮਰੱਥ, �ਲਤ�: "
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "ਸਮਾ�ਮ ਲ� ਤ�ਸ�� ਦਰਸ਼� ਹ�ਣ� �ਾਹ�ਦ� ਹ�"
 
@@ -6296,71 +6009,95 @@ msgstr "�ਤ"
 
 #: ../calendar/gui/print.c:593
 msgid "Mo"
-msgstr "ਸ�ਮ"
+msgstr "ਸ�"
 
 #: ../calendar/gui/print.c:593
 msgid "Tu"
-msgstr "ਮੰ�ਲ"
+msgstr "ਮੰ"
 
 #: ../calendar/gui/print.c:593
 msgid "We"
-msgstr "ਬ�ੱਧ"
+msgstr "ਬ�ੱ"
 
 #: ../calendar/gui/print.c:594
 msgid "Th"
-msgstr "ਵ�ਰ"
+msgstr "ਵ�"
 
 #: ../calendar/gui/print.c:594
 msgid "Fr"
-msgstr "ਸ਼�ੱ�ਰ"
+msgstr "ਸ਼�ੱ"
 
 #: ../calendar/gui/print.c:594
 msgid "Sa"
-msgstr "ਸ਼ਨਿ�ੱਰ"
+msgstr "ਸ਼"
 
-#: ../calendar/gui/print.c:2564
-msgid "Appointment"
-msgstr "ਮ�ਲਾ�ਾਤ"
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2429
+msgid " to "
+msgstr " ਵੱਲ "
 
-#: ../calendar/gui/print.c:2566
-msgid "Task"
-msgstr "�ਾਸ�"
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2437
+msgid " (Completed "
+msgstr " (ਸਮਾਪਤ "
 
-#: ../calendar/gui/print.c:2591
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2441
+msgid "Completed "
+msgstr "ਸਮਾਪਤ "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2449
+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:2454
+msgid "Due "
+msgstr "ਬਾ�� "
+
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Summary: %s"
 msgstr "ਸੰ��ਪ: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2639
 msgid "Attendees: "
 msgstr "ਦਰਸ਼�:"
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2682
 #, c-format
 msgid "Status: %s"
 msgstr "ਹਾਲਤ: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2697
 #, c-format
 msgid "Priority: %s"
 msgstr "ਪਹਿਲ: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ਪ�ਰਤ�ਸ਼ਤ ਪ�ਰਾ: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2726
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2739
 #, c-format
 msgid "Categories: %s"
 msgstr "���ਾ�ਰ�: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2750
 msgid "Contacts: "
 msgstr "ਸੰਪਰ�: "
 
@@ -6369,10 +6106,6 @@ msgstr "ਸੰਪਰ�: "
 msgid "% Completed"
 msgstr "% ਮ��ੰਮਲ"
 
-#: ../calendar/gui/tasktypes.xml.h:7
-msgid "Cancelled"
-msgstr "ਰੱਦ ��ਤਾ"
-
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "ਤਰੱ�� ਵਿੱ� ਹ�"
@@ -6385,44 +6118,215 @@ msgstr "ਤ� �ਿ�ਦਾ ਹ�"
 msgid "is less than"
 msgstr "ਤ� �ੱ� ਹ�"
 
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
 msgid "Appointments and Meetings"
 msgstr "ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ�"
 
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/itip-formatter/itip-formatter.c:1833
 msgid "Opening calendar"
 msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar ਫਾ�ਲਾ� (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�-��ਲੰਡਰ �ਯਾਤ�ਾਰ"
 
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "ਯਾਦ-ਪੱਤਰ!"
 
-#: ../calendar/importers/icalendar-importer.c:583
-msgid "vCalendar files (.vcf)"
-msgstr "vCalendar ਫਾ�ਲਾ� (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:662
+#| msgid "vCalendar files (.vcf)"
+msgid "vCalendar files (.vcs)"
+msgstr "vCalendar ਫਾ�ਲਾ� (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�-��ਲੰਡਰ �ਯਾਤ�ਾਰ"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
 msgstr "��ਲੰਡਰ ��ਨਾਵਾ�"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਸ਼ਲ ��ਲੰਡਰ �ਯਾਤ�ਾਰ"
 
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+#| msgctxt "New"
+#| msgid "M_eeting"
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "ਮ��ਿੰ�"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+#| msgid "Events"
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "�ਵ���"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1244
+#| msgid "Task"
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "�ਾਸ�"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1245
+#| msgid "Memo"
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "ਮ�ਮ�"
+
+#: ../calendar/importers/icalendar-importer.c:941
+#| msgid "It has recurrences."
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "ਮ��-ਵਾਪਰਦਾ ਹ�"
+
+#: ../calendar/importers/icalendar-importer.c:946
+#| msgid "This and Prior Instances"
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "�ੱ� ਮ��ਾ"
+
+#: ../calendar/importers/icalendar-importer.c:951
+#| msgid "It has alarms."
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "�ਲਾਰਮ ਹ�।"
+
+#: ../calendar/importers/icalendar-importer.c:956
+#| msgid "%s attachment"
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "ਨੱਥ�"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+#| msgid "Public"
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "ਪਬਲਿ�"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+#| msgid "Private"
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "ਪ�ਰਾ�ਵ��"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+#| msgid "Confidential"
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "��ਪਤ"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+#| msgid "Classification"
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "ਵਰ���ਰਨ"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1284
+#| msgid "Summary"
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "ਸੰ��ਪ"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+#| msgid "Location"
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "�ਿ�ਾਣਾ"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1280
+#| msgid "Start"
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "ਸ਼�ਰ�"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+#| msgid "Due"
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "ਮ��ੰਮਲ"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+#| msgid "End"
+msgctxt "iCalImp"
+msgid "End"
+msgstr "ਸਮਾਪਤ"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+#| msgid "Categories"
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "���ਾ�ਰ���"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+#| msgid "Completed"
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "ਸਮਾਪਤ"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+#| msgid "URL"
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+#| msgid "Organizer"
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "ਪ�ਰਬੰਧ�"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+#| msgid "Attendees"
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "ਦਰਸ਼�"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+#| msgid "Description"
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "ਵ�ਰਵਾ"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1276
+#| msgid "Type"
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "�ਿਸਮ"
+
 #  * These are the timezone names from the Olson timezone data.
 #  * We only place them here so gettext picks them up for translation.
 #  * Don't include in any C files.
@@ -7975,177 +7879,157 @@ msgstr "ਪ�ਰਸ਼ਾਤ/ਵਾਲਿਸ਼"
 msgid "Pacific/Yap"
 msgstr "ਪ�ਰਸ਼ਾਤ/ਯਾਪ�"
 
-#: ../composer/e-composer-actions.c:79
-msgid "Untitled Message"
-msgstr "�਼�ਰ-�ਾ��ਲ ਸ�ਨ�ਹਾ"
-
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:163
 msgid "Save as..."
 msgstr "�ੰ� ਸੰਭਾਲ�..."
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:242
+#: ../widgets/misc/e-attachment-view.c:374
 msgid "Attach a file"
 msgstr "�ੱ� ਫਾ�ਲ ਸ਼ਾਮਿਲ �ਰ�"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:247
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "ਬੰਦ �ਰ�(_C)"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:249
 msgid "Close the current file"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਬੰਦ �ਰ�"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:254
 msgid "_Print..."
 msgstr "ਪਰਿੰ� �ਰ�(_P)..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:261
 msgid "Print Pre_view"
 msgstr "�ਪਾ� �ਲ�(_v)"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:270
 msgid "Save the current file"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:275
 msgid "Save _As..."
 msgstr "�ੰ� ਸੰਭਾਲ�(_A)..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:277
 msgid "Save the current file with a different name"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਨ�ੰ ਵੱ�ਰ� ਨਾ� ਨਾਲ ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:282
 msgid "Save as _Draft"
 msgstr "ਡਰਾਫ� ਵਾ�� ਸੰਭਾਲ�(_D)"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:284
 msgid "Save as draft"
 msgstr "ਡਰਾਫ� ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:293
 msgid "S_end"
 msgstr "ਭ���(_e)"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:291
 msgid "Send this message"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਭ���"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:296
 msgid "New _Message"
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ(_M)"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:298
 msgid "Open New Message window"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਾ ਵਿੰਡ� ��ਲ�ਹ�"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:305
 msgid "Character _Encoding"
 msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�(_E)"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:322
 msgid "PGP _Encrypt"
 msgstr "PGP �ੰ��ਰਿਪ�(_E)"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:324
 msgid "Encrypt this message with PGP"
 msgstr "�ਸ ਸ�ਨ�ਹ� ਨ�ੰ PGP ਨਾਲ �ੰ��ਰਿਪ� �ਰ�"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:330
 msgid "PGP _Sign"
 msgstr "PGP ਦਸਤ�ਤ(_S)"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:332
 msgid "Sign this message with your PGP key"
 msgstr "�ਪਣ� PGP �� ਨਾਲ �ਸ ਸ�ਨ�ਹ� ਤ� ਦਸਤ�ਤ �ਰ�"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:338
 msgid "_Prioritize Message"
 msgstr "ਦਰ�ਾ ਸ�ਨ�ਹਾ(_P)"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:340
 msgid "Set the message priority to high"
 msgstr "ਸ�ਨ�ਹ� ਦਾ ਦਰ�ਾ ਵਧਾ�"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:346
 msgid "Re_quest Read Receipt"
 msgstr "ਪ��ਹਨ ਰਸ�ਦ ਦ� ਮੰ�(_q)"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:348
 msgid "Get delivery notification when your message is read"
 msgstr "�ਦ�� ਤ�ਹਾਡਾ ਸ�ਨ�ਹਾ ਪ�ਿ� �ਾਵ� ਤਾ� ਪ�ਰਾਪਤ� ਸ��ਨਾ ਲਵ�"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:354
 msgid "S/MIME En_crypt"
 msgstr "S/MIME �ੰ��ਰਿਪ�(_C)"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:356
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "�ਸ ਸ�ਨ�ਹ� ਨ�ੰ �ਪਣ� S/MIME ��ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਨਾਲ ��ਰਿਪ� �ਰ�"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:362
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ਸਾ�ਨ(_n)"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:364
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "�ਪਣ� S/MIME ਦਸਤ�ਤ ਸਰ��ਫਿ��� ਨਾਲ �ਸ ਸ�ਨ�ਹ� ਤ� ਦਸਤ�ਤ �ਰ�"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:370
 msgid "_Bcc Field"
 msgstr "_Bcc ��ਤਰ"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:372
 msgid "Toggles whether the BCC field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ BCC ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:378
 msgid "_Cc Field"
 msgstr "_Cc ��ਤਰ"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:380
 msgid "Toggles whether the CC field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ CC ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:425
-msgid "_From Field"
-msgstr "ਵੱਲ�� ��ਤਰ(_F)"
-
-#: ../composer/e-composer-actions.c:427
-msgid "Toggles whether the From chooser is displayed"
-msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਵੱਲ�� ��ਣ�ਾਰ ਵ��ਿ� �ਾਵ�"
-
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:386
 msgid "_Reply-To Field"
 msgstr "�ਵਾਬ ��ਤਰ(_R)"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:388
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ �ਵਾਬ ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:431
 msgid "Save Draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-header.c:129
-msgid "Show"
-msgstr "ਵ���"
-
-#: ../composer/e-composer-header.c:137
-msgid "Hide"
-msgstr "�ਹਲ�"
-
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "ਸ�ਨ�ਹ� ਦ� ਪ�ਰਾਪਤ �ਰਤਾ ਭਰ�"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�ਹ ਸਿਰਨਾਵ�� ਦਿ�, �� �ਿ ਸ�ਨ�ਹ� ਦ� �ਾਪ� ਪ�ਰਾਪਤ �ਰ�"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8154,111 +8038,103 @@ msgstr ""
 "�ਡਰ�ੱਸ।"
 
 #  * From
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:1005
 msgid "Fr_om:"
 msgstr "ਵਲ��(_o):"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
-msgid "From"
-msgstr "ਵਲ��"
-
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:1014
 msgid "_Reply-To:"
 msgstr "�ਵਾਬ(_R):"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:1018
 msgid "_To:"
 msgstr "ਵੱਲ(_T):"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:1023
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:1028
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
 #  * Post-To
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:1033
 msgid "_Post To:"
 msgstr "ਭ���(_P):"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:1037
 msgid "S_ubject:"
 msgstr "ਵਿਸ਼ਾ(_u):"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1046
 msgid "Si_gnature:"
 msgstr "ਦਸਤ�ਤ(_g):"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਲ� �ੱਥ� �ਲਿੱ� �ਰ�"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
 msgid "Click here to select folders to post to"
 msgstr "ਭ��ਣ ਲ� ਫ�ਲਡਰ ��ਣਨ ਲ� �ੱਥ� �ਲਿੱ� �ਰ�"
 
-#: ../composer/e-composer-private.c:199
+#: ../composer/e-composer-private.c:211
 msgid "Undo the last action"
 msgstr "ਪਿ�ਲ� �ਾਰਵਾ� ਵਾਪਸ ਲਵ�"
 
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:215
 msgid "Redo the last undone action"
 msgstr "��ਰ� ਵਾਪਸ ��ਤ� �ਾਰਵਾ� ਨ�ੰ ਮ��-�ਰ�"
 
-#: ../composer/e-composer-private.c:207
+#: ../composer/e-composer-private.c:219
 msgid "Search for text"
 msgstr "���ਸ� ����"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:223
 msgid "Search for and replace text"
 msgstr "���ਸ� ਦ� ��� �ਰ� �ਤ� ਬਦਲ�"
 
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:313
 msgid "Save draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:199
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਮ�� ਨਾ ਵ���(_D)।"
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:1029
+#, c-format
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ਬਾਹਰ� ਸ�ਨ�ਹ� ਲ� ਦਸਤ�ਤ ਨਹ� ��ਤ� �ਾ ਸ�ਦ�: �ਸ ��ਾ��� ਲ� ��� ਸਰ��ਫਿ��� ਨਹ�� ਹ�"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:1041
+#, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ਬਾਹਰ �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਨ�ੰ ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਸ ��ਾ��� ਲ� ��� ���ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਨਹ�� ਹ�"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1465
 msgid "Unable to reconstruct message from autosave file"
 msgstr "���ਸ�ਵ ਫਾ�ਲ ਤ�� ਸ�ਨ�ਹਾ ਫ�ਰ ਬਣਾ�ਣ ਲ� �ਸਮਰੱਥ"
 
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1533 ../composer/e-msg-composer.c:1817
 msgid "Compose Message"
 msgstr "ਸ�ਨ�ਹਾ ਲਿ��"
 
-#: ../composer/e-msg-composer.c:3310
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
-msgstr "<b>(ਲ��ਣ ਵਿੱ� ��� ਨਾ-���ਸ� ਭਾ� ਹ�, �ਿਸ ਨ�ੰ ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।) <b>"
+#: ../composer/e-msg-composer.c:3538
+#| msgid ""
+#| "<b>(The composer contains a non-text message body, which cannot be "
+#| "edited.)</b>"
+msgid "The composer contains a non-text message body, which cannot be edited."
+msgstr "ਲ��ਣ ਵਿੱ� ��� ਨਾ-���ਸ� ਭਾ� ਹ�, �ਿਸ ਨ�ੰ ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
+
+#: ../composer/e-msg-composer.c:4144
+msgid "Untitled Message"
+msgstr "�਼�ਰ-�ਾ��ਲ ਸ�ਨ�ਹਾ"
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -8343,7 +8219,9 @@ msgstr ""
 "�ਰਨ ਨਾਲ ਤ�ਹਾਨ�ੰ �ਸ ��ਾ� ਤ�� ਮ�� �ਾਲ� �ਰਨ ਵਿੱ� ਸਹਾ� ਹ� ਸ�ਦਾ ਹ�, �ਿੱਥ� �ੱਡਿ� ਸ�।"
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+#| msgid ""
+#| "The file `{0}' is not a regular file and cannot be sent in a message."
+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
@@ -8363,8 +8241,9 @@ msgid "Unable to activate the address selector control."
 msgstr "�ਡਰ�ੱਸ ��ਣ�ਾਰ �ੰ�ਰ�ਲ ਨ�ੰ ਸਰ�ਰਮ �ਰਨ ਤ�� �ਸਫਲ।"
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "ਤ�ਸ�� �ਸ ਸ�ਨ�ਹ� ਨਾਲ `{0}' ਫਾ�ਲ ਸ਼ਾਮਿਲ ਨਹ�� �ਰ ਸ�ਦ� ਹ�।"
+#| msgid "You cannot attach the file `{0}' to this message."
+msgid "You cannot attach the file n{0}' to this message."
+msgstr "ਤ�ਸ�� �ਸ ਸ�ਨ�ਹ� ਨਾਲ n{0}' ਫਾ�ਲ ਸ਼ਾਮਿਲ ਨਹ�� �ਰ ਸ�ਦ� ਹ�।"
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8386,125 +8265,141 @@ msgstr "ਪ�ਰਾਪਤ(_R)"
 msgid "_Save Draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�(_S)"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:199
 msgid "Run Anjal in a window"
 msgstr "�ੰ�ਾਲ ਵਿੰਡ� ਵਿੱ� �ਲਾ�"
 
-#: ../capplet/anjal-settings-main.c:203
+#: ../capplet/anjal-settings-main.c:200
 msgid "Make Anjal the default email client"
 msgstr "�ੰ�ਾਲ ਨ�ੰ ਡਿਫਾਲ� �ਮ�ਲ �ਲਾ�� ਬਣਾ�"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:210
+#: ../capplet/anjal-settings-main.c:207
 msgid "ID of the socket to embed in"
 msgstr "ਵਿ�� ਸ਼ਾਮਲ �ਰਨ ਲ� ਸਾ�� ਦਾ ID"
 
-#: ../capplet/anjal-settings-main.c:211
+#: ../capplet/anjal-settings-main.c:208
 msgid "socket"
 msgstr "ਸਾ��"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:221
 msgid "Anjal email client"
 msgstr "�ੰ�ਾਲ �ਮ�ਲ �ਲਾ��"
 
-#: ../capplet/settings/mail-view.c:244
-msgid "New Tab"
-msgstr "ਨਵ�� ��ਬ"
-
-#: ../capplet/settings/mail-account-view.c:56
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
 msgstr "�ਪਣਾ ਪ�ਰਾ ਨਾ� ਦਿ�।"
 
-#: ../capplet/settings/mail-account-view.c:57
+#: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
 msgstr "�ਪਣਾ �ਮ�ਲ �ਡਰ�ੱਸ ਦਿ� ��।"
 
-#: ../capplet/settings/mail-account-view.c:58
+#: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
 msgstr "ਤ�ਹਾਡ� ਵਲ�� ਦਿੱਤਾ �ਮ�ਲ �ਡਰ�ੱਸ ਢ�ੱ�ਵਾ� ਨਹ�� ਹ�।"
 
-#: ../capplet/settings/mail-account-view.c:224
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ਨਿੱ�� ਵ�ਰਵਾ:</span>"
+#: ../capplet/settings/mail-account-view.c:77
+#| msgid "Please enter your email address."
+msgid "Please enter your password."
+msgstr "�ਪਣਾ ਪਾਸਵਰਡ ਦਿ� ��।"
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:256
+#: ../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
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "���ਲ"
+
+#: ../capplet/settings/mail-account-view.c:464
+#| msgid "Personal"
+msgid "Personal details:"
+msgstr "ਨਿੱ�� ਵ�ਰਵਾ:"
+
+#: ../capplet/settings/mail-account-view.c:471
 msgid "Name:"
 msgstr "ਨਾ�:"
 
-#: ../capplet/settings/mail-account-view.c:238
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Email address:"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ:"
 
-#: ../capplet/settings/mail-account-view.c:248
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ਲ�ਣ ਵ�ਰਵਾ:</span>"
+#: ../capplet/settings/mail-account-view.c:490
+#| msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">ਵ�ਰਵਾ:</span>"
+
+#: ../capplet/settings/mail-account-view.c:496
+#| msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+msgstr "<span size=\"large\" weight=\"bold\">ਪ�ਰਾਪਤ�</span>"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
+#: ../capplet/settings/mail-account-view.c:501
 msgid "Server type:"
 msgstr "ਸਰਵਰ �ਿਸਮ:"
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
+#: ../capplet/settings/mail-account-view.c:510
 msgid "Server address:"
 msgstr "ਸਰਵਰ �ਡਰ�ੱਸ:"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:519
 msgid "Username:"
 msgstr "ਯ��਼ਰ ਨਾ�:"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
+#: ../capplet/settings/mail-account-view.c:528
 msgid "Use encryption:"
 msgstr "�ੰ��ਰਿਪਸ਼ਨ ਵਰਤ��:"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:533
+#: ../capplet/settings/mail-account-view.c:566
 msgid "never"
 msgstr "�ਦ� ਨਹ��"
 
-#: ../capplet/settings/mail-account-view.c:298
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ਭ��ਣ ਵ�ਰਵਾ:</span>"
+#: ../capplet/settings/mail-account-view.c:545
+#| msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+msgstr "<span size=\"large\" weight=\"bold\">ਭ��ਣ</span>"
 
-#: ../capplet/settings/mail-account-view.c:355
+#: ../capplet/settings/mail-account-view.c:585
 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. "
 "If we can't do it automatically you'll need your server details as well."
 msgstr ""
-"�ਮ�ਲ �ਪਲ���ਸ਼ਨ ਦ� ਵਰਤ�� �ਰਨ ਵਾਸਤ� ਤ�ਹਾਨ�ੰ ��ਾ��� ਸ���ੱਪ �ਰਨ ਦ� ਲ�� ਹ�। �ਪਣਾ �ਮ�ਲ "
-"�ਡਰ�ੱਸ �ਤ� ਪਾਸਵਰਡ ਹ�ਠਾ� ਭਰ� ��� �ਸ�� ਸਭ ਸ��ਿੰ� �ਪਣ� �ਪ ਲ�ਣ ਦ� ��ਸ਼ਿਸ਼ �ਰਾ���। "
-"�� �ਸ�� �ਹ ਸਭ ��� ���ਮ��ਿ� ਨਾ �ਰ ਸ�� ਤਾ� ਤ�ਹਾਨ�ੰ �ਪਣ� ਸਰਵਰ ਬਾਰ� �ਾਣ�ਾਰ� ਵ� ਦ�ਣ� ਪਵ���।"
+"�ਮ�ਲ �ਪਲ���ਸ਼ਨ ਦ� ਵਰਤ�� �ਰਨ ਵਾਸਤ� ਤ�ਹਾਨ�ੰ ��ਾ��� ਸ���ੱਪ �ਰਨ ਦ� ਲ�� ਹ�। �ਪਣਾ �ਮ�ਲ �ਡਰ�ੱਸ �ਤ� "
+"ਪਾਸਵਰਡ ਹ�ਠਾ� ਭਰ� ��� �ਸ�� ਸਭ ਸ��ਿੰ� �ਪਣ� �ਪ ਲ�ਣ ਦ� ��ਸ਼ਿਸ਼ �ਰਾ���। �� �ਸ�� �ਹ ਸਭ ��� ���ਮ��ਿ� "
+"ਨਾ �ਰ ਸ�� ਤਾ� ਤ�ਹਾਨ�ੰ �ਪਣ� ਸਰਵਰ ਬਾਰ� �ਾਣ�ਾਰ� ਵ� ਦ�ਣ� ਪਵ���।"
 
-#: ../capplet/settings/mail-account-view.c:357
+#: ../capplet/settings/mail-account-view.c:587
 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 "
 "entered but you may need to change them."
 msgstr ""
-"�ਫਸ�ਸ, �ਸ�� ਤ�ਹਾਡ� ਮ�ਲ ਲ� ���ਮ��ਿ� ਸ��ਿੰ� ਨਹ�� ਲ� ਸ��। �ਹ ਹ�ਠਾ� ਦਰ� �ਰ� ��। "
-"�ਸ�� ਤ�ਹਾਡ� ਵਲ�� ਦਿੱਤ� �� �ਾਣ�ਾਰ� ਮ�ਤਾਬ� ਪ�ਰਾ ਵ�ਰਵਾ ਲ�ਣ ਦ� ��ਸ਼ਿਸ਼ ਤਾ� ��ਤ� ਹ�, ਪਰ "
-"ਤ�ਹਾਨ�ੰ �ਹਨਾ� ਨ�ੰ ਬਦਲਣਾ ਵ� ਪ� ਸ�ਦਾ ਹ�।"
+"�ਫਸ�ਸ, �ਸ�� ਤ�ਹਾਡ� ਮ�ਲ ਲ� ���ਮ��ਿ� ਸ��ਿੰ� ਨਹ�� ਲ� ਸ��। �ਹ ਹ�ਠਾ� ਦਰ� �ਰ� ��। �ਸ�� ਤ�ਹਾਡ� ਵਲ�� "
+"ਦਿੱਤ� �� �ਾਣ�ਾਰ� ਮ�ਤਾਬ� ਪ�ਰਾ ਵ�ਰਵਾ ਲ�ਣ ਦ� ��ਸ਼ਿਸ਼ ਤਾ� ��ਤ� ਹ�, ਪਰ ਤ�ਹਾਨ�ੰ �ਹਨਾ� ਨ�ੰ ਬਦਲਣਾ ਵ� "
+"ਪ� ਸ�ਦਾ ਹ�।"
 
-#: ../capplet/settings/mail-account-view.c:359
+#: ../capplet/settings/mail-account-view.c:589
 msgid "You can specify more options to configure the account."
 msgstr "ਤ�ਸ�� ��ਾ��� ਸੰਰ�ਨਾ ਲ� ਹ�ਰ ��ਣਾ� ਦ� ਸ�ਦ� ਹ�।"
 
-#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:591
 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."
 msgstr ""
-"ਹ�ਣ ਤ�ਹਾਨ�ੰ ਮ�ਲ ਭ��ਣ ਲ� ਸ��ਿੰ� ਦ�ਣ ਦ� ਲ�� ਹ�। �ਸ�� ��� �ੰਦਾ�਼ਾ ਲ�ਾ�ਣ ਦ� ��ਸ਼ਿਸ਼ �ਰ ��ੱ�� ਹਾ�, ਪਰ ਤ�ਹਾਨ�ੰ "
-"�ਹ ��ੱ� �ਰ ਲ�ਣਾ �ਾਹ�ਦਾ ਹ� �ਿ �ਹ ਠ�� ਹਨ।"
+"ਹ�ਣ ਤ�ਹਾਨ�ੰ ਮ�ਲ ਭ��ਣ ਲ� ਸ��ਿੰ� ਦ�ਣ ਦ� ਲ�� ਹ�। �ਸ�� ��� �ੰਦਾ�਼ਾ ਲ�ਾ�ਣ ਦ� ��ਸ਼ਿਸ਼ �ਰ ��ੱ�� ਹਾ�, ਪਰ "
+"ਤ�ਹਾਨ�ੰ �ਹ ��ੱ� �ਰ ਲ�ਣਾ �ਾਹ�ਦਾ ਹ� �ਿ �ਹ ਠ�� ਹਨ।"
 
-#: ../capplet/settings/mail-account-view.c:362
+#: ../capplet/settings/mail-account-view.c:592
 msgid "You can specify your default settings for your account."
 msgstr "ਤ�ਸ�� �ਪਣ� ��ਾ��� ਲ� �ਪਣ� ਡਿਫਾਲ� ਸ��ਿੰ� ਦ� ਸ�ਦ� ਹ�।"
 
-#: ../capplet/settings/mail-account-view.c:363
+#: ../capplet/settings/mail-account-view.c:593
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8512,134 +8407,172 @@ msgstr ""
 "ਸਮਾ� ਹ� ��ੱ� �ਰਨ ਦਾ, �ਸ ਤ�� ਪਹਿਲਾ� �ਿ �ਸ�� ਸਰਵਰ ਨਾਲ ��ਨ��� �ਰਨ ਦ� ��ਸ਼ਿਸ਼ �ਰ�� �ਤ� ਤ�ਹਾਡ��� "
 "ਮ�ਲਾ� ਲ�ਣ��� ਸ਼�ਰ� �ਰ��।"
 
-#: ../capplet/settings/mail-account-view.c:378
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:608
+#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2219
+#: ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "ਪ�ਾਣ"
 
-#: ../capplet/settings/mail-account-view.c:378
+#: ../capplet/settings/mail-account-view.c:608
 msgid "Next - Receiving mail"
 msgstr "�ੱ�� - �ਮ�ਲ ਲ�ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Receiving mail"
 msgstr "�ਮ�ਲ ਲ�ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Next - Sending mail"
 msgstr "�ੱ�� - �ਮ�ਲ ਭ��ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Back - Identity"
 msgstr "ਪਿੱ�� - ਪ�ਾਣ"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Next - Receiving options"
 msgstr "�ੱ�� - ਲ�ਣ ��ਣਾ�"
 
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Receiving options"
 msgstr "ਲ�ਣ ��ਣਾ�"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving mail"
 msgstr "ਪਿੱ�� - ਮ�ਲ ਲ�ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Sending mail"
 msgstr "ਮ�ਲ ਭ��ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Review account"
 msgstr "�ੱ�� - ��ਾ��� ਪ�ਤਾਲ"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Next - Defaults"
 msgstr "�ੱ�� - ਡਿਫਾਲ�"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving options"
 msgstr "ਪਿੱ�� - ਲ�ਣ ��ਣਾ�"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2985 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "ਮ�ਲ"
 
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Back - Sending mail"
 msgstr "ਪਿੱ�� - ਮ�ਲ ਭ��ਣ���"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Review account"
 msgstr "��ਾ��� ਪ�ਤਾਲ"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Finish"
 msgstr "ਮ��ੰਮਲ"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Sending"
 msgstr "ਪਿੱ�� - ਭ��ਣਾ"
 
 #: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
+#| msgid "Add WebDAV contacts to Evolution."
+msgid "Setup Google contacts with Evolution"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਨਾਲ ���ਲ ਸੰਪਰ� ਸ���ੱਪ"
+
+#: ../capplet/settings/mail-account-view.c:720
+#| msgid "Add Google Calendars to Evolution."
+msgid "Setup Google calendar with Evolution"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਨਾਲ ���ਲ ��ਲੰਡਰ ਸ���ੱਪ"
+
+#: ../capplet/settings/mail-account-view.c:725
+msgid "You may need to enable IMAP access."
+msgstr "ਤ�ਹਾਨ�ੰ IMAP �ਸ�ੱਸ �ਾਲ� �ਰਨ ਦ� ਲ�� ਪ� ਸ�ਦ� ਹ�।"
+
+#: ../capplet/settings/mail-account-view.c:733
+#| msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">���ਲ ��ਾ��� ਸ��ਿੰ�:</span>"
+
+#: ../capplet/settings/mail-account-view.c:757
+#| msgid "Add weather calendars to Evolution."
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਨਾਲ ਯਾਹ� ��ਲੰਡਰ ਸ���ੱਪ"
+
+#: ../capplet/settings/mail-account-view.c:761
+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 "
+"correct."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:768
+#| msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">ਯਾਹ� ��ਾ��� ਸ��ਿੰ�:</span>"
+
+#: ../capplet/settings/mail-account-view.c:780
+#| msgid "Choose calendar file"
+msgid "Yahoo Calendar name:"
+msgstr "ਯਾਹ� ��ਲੰਡਰ ਨਾ�:"
+
+#: ../capplet/settings/mail-account-view.c:1023
+#| msgid "Pass_word:"
+msgid "Password:"
+msgstr "ਪਾਸਵਰਡ:"
+
+#: ../capplet/settings/mail-account-view.c:1091
+#: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "��ਬ ਬੰਦ �ਰ�"
 
-#: ../capplet/settings/mail-account-view.c:729
+#: ../capplet/settings/mail-account-view.c:1101
 msgid "Account Wizard"
 msgstr "��ਾ��� ਸਹਾ��"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਾ��� ਸਹਾ��"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "�ਮ�ਲ ਸ��ਿੰ�"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-msgid "Quit"
-msgstr "ਬਾਹਰ"
-
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1617
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../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
+#: ../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
+#: ../modules/addressbook/e-book-shell-backend.c:95
+#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/calendar/e-cal-shell-backend.c:102
+#: ../modules/calendar/e-cal-shell-migrate.c:141
+#: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-backend.c:92
+#: ../modules/calendar/e-task-shell-migrate.c:111
 msgid "On This Computer"
 msgstr "�ਸ �ੰਪਿ��ਰ �ੱਤ�"
 
-#: ../capplet/settings/mail-settings-view.c:148
-#: ../plugins/groupwise-features/share-folder.c:747
+#: ../capplet/settings/mail-settings-view.c:146
+#: ../plugins/groupwise-features/share-folder.c:737
 msgid "Modify"
 msgstr "ਸ�ਧ"
 
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "ਨਵਾ� ��ਾ��� ਸ਼ਾਮਲ"
 
-#: ../capplet/settings/mail-settings-view.c:185
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">��ਾ��� ਪਰਬੰਧ</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+#| msgid "Account Management"
+msgid "Account management"
+msgstr "��ਾ��� ਪਰਬੰਧ"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:277
 msgid "Settings"
 msgstr "ਸ��ਿੰ�"
 
@@ -8651,8 +8584,8 @@ msgstr "��ਲੰਡਰ �ਵ��� ਨ���ਫਿ��ਸ਼ਨ"
 msgid "Evolution Alarm Notify"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਾਰਮ ਨ���ਫਿ��ਸ਼ਨ"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
-#: ../shell/e-shell-window-private.c:251
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ"
 
@@ -8672,13 +8605,9 @@ msgstr "�ਪਣਾ �-ਮ�ਲ ��ਾ���, ਸੰਪਰ� �ਤ�
 msgid "Configure email accounts"
 msgstr "�ਮ�ਲ ��ਾ��� ਸੰਰ�ਨਾ"
 
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "�ਡਰਸ �ਾਰਡ"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ�"
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "�ਮ�ਲ ਸ��ਿੰ�"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:224
@@ -8704,16 +8633,16 @@ msgstr "%s..."
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ਸਮਾਪਤ)"
 
-#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
 msgid "Evolution Error"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਤ�"
 
-#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
 msgid "Evolution Warning"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਤਾਵਨ�"
 
 #  setup a dummy error
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:649
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "�ੰਦਰ�ਨ� �ਲਤ�, �ਣ�ਾਣ �ਲਤ� '%s' ਬ�ਨਤ�"
@@ -8774,56 +8703,68 @@ msgstr "ਪੱ�ਮ� ਯ�ਰਪ"
 msgid "Western European, New"
 msgstr "ਪੱ�ਮ� ਯ�ਰਪ, ਨਵਾ�"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "ਪ�ਰਾਤਨ"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "ਸਧਾਰਨ"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "ਯ��ਰ�ਨ"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "ਦਿੱ�"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../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:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "�ੱਲ�ਹ"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "�ੱਲ�ਹ"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "ਹ�ਣ ਤ�� %d ਦਿਨ"
+#| msgid "%d days from now"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "ਹ�ਣ ਤ�� %d ਦਿਨ"
+msgstr[1] "ਹ�ਣ ਤ�� %d ਦਿਨ"
 
-#: ../e-util/e-datetime-format.c:209
+#. 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 days ago"
-msgstr "%d ਦਿਨ ਪਹਿਲਾ�"
+#| msgid "%d days ago"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d ਦਿਨ ਪਹਿਲਾ�"
+msgstr[1] "%d ਦਿਨ ਪਹਿਲਾ�"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "ਲ���ਲ ਡਿਫਾਲ� ਵਰਤ��"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "ਫਾਰਮ��:"
 
@@ -8844,18 +8785,6 @@ msgstr "\"%s\" ਲਿ�� �ਾ ਰਹ� ਹ�"
 msgid "Writing \"%s\" to %s"
 msgstr "`%s' ਨ�ੰ `%s' �ੱਤ� ਲਿ�ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "ਲਾ�ਰ ਦਾ ਨਾ�"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "ਫਾ�ਲ-ਨਾ�"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "ਮ�ਡ��ਲ ਦਾ ਫਾ�ਲ ਨਾ�"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "ਡ�ਬੱ� ਲਾ�"
@@ -8878,13 +8807,15 @@ msgstr "ਲਾ� ਸ�ਨ�ਹ�:"
 msgid "Log Level"
 msgstr "ਲਾ� ਲ�ਵਲ"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../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:1446
+#: ../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 "�ਹ ਵਿੰਡ� ਬੰਦ �ਰ�"
 
@@ -8908,36 +8839,25 @@ msgstr "ਡ�ਬੱ�"
 msgid "Error, Warnings and Debug messages"
 msgstr "�ਲਤ���, ��ਤਾਵਨ��� �ਤ� ਡ�ਬੱ� ਸ�ਨ�ਹ�"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "ਯ�� ��ਤਾ"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "�ਦ�� ਪਲੱ��ਨ ਨ�ੰ �ਾਲ� ��ਤਾ �ਾਵ�"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "ਹਫਤ�"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "ਪਰਿੰ�ਿੰ� ਦ� ਦ�ਰਾਨ �ੱ� �ਲਤ� �� ਹ�"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "ਪਰਿ�ਿੰ� ਸਿਸ�ਮ ਨ� �ਲਤ� ਬਾਰ� ਹ�ਠ ਦਿੱਤ� �ਾਣ�ਾਰ� ਭ��� ਹ�:"
 
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
 msgid "The printing system did not report any additional details about the error."
 msgstr "ਪਰਿੰ�ਿੰ� ਸਿਸ�ਮ ਨ� �ਲਤ� ਬਾਰ� ਹ�ਰ �ਾਣ�ਾਰ� ਨਹ�� ਦਿੱਤ� ਹ�।"
 
-#: ../e-util/e-signature.c:701
+#: ../e-util/e-signature.c:731
 msgid "Autogenerated"
 msgstr "ਸਵ�-ਨਿਰਮਤ"
 
@@ -8947,7 +8867,7 @@ msgstr "ਸਵ�-ਨਿਰਮਤ"
 #  mail:no-delete-folder secondary
 #  system:no-save-file secondary
 #  system:no-load-file secondary
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "�ਿ���ਿ \"{1}\""
 
@@ -8967,15 +8887,15 @@ msgstr "�� ਤ�ਸ�� �ੱਪਰ ਲਿ�ਣਾ �ਾਹ�ੰਦ
 msgid "File exists \"{0}\"."
 msgstr "ਫਾ�ਲ ਮ���ਦ \"{0}\" ਹ�।"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
 msgid "_Overwrite"
 msgstr "�ੱਤ� ਲਿ��(_O)"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:146
 msgid "Could not open the link."
 msgstr "ਸਬੰਧ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�।"
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:193
 msgid "Could not display help for Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਲ� ਮੱਦਦ ਵ��ਾ� ਨਹ�� �ਾ ਸ��।"
 
@@ -8988,215 +8908,224 @@ msgstr "GConf �ਲਤ�: %s"
 msgid "All further errors shown only on terminal."
 msgstr "ਹ�ਰ ਬਾ�� ਸਭ �ਲਤ��� ��ਵਲ �ਰਮ�ਨਲ �ੱਤ� ਹ� ਵ���।"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1024
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:78
+msgid "From"
+msgstr "ਵਲ��"
+
+#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1025
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "Reply-To"
 msgstr "�ਸ ਨ�ੰ �ਵਾਬ"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1027
+#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
+#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:81
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1028
+#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
+#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:82
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:406 ../em-format/em-format.c:1029
 #: ../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:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "ਵਿਸ਼ਾ"
 
 #  pseudo-header
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:417 ../mail/em-format-html.c:2472
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "ਮ�ਲਰ"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:492 ../mail/em-composer-utils.c:1190
 msgid "-------- Forwarded Message --------"
 msgstr "-------- �ੱ�� ਭ��� ਸ�ਨ�ਹ� --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:1030 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "ਮਿਤ�"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:1031 ../modules/mail/em-mailer-prefs.c:85
 msgid "Newsgroups"
 msgstr "�ਬਰਸਾਰ ਸਮ�ਹ"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:1032 ../modules/mail/em-mailer-prefs.c:86
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "ਫ�ਸ"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1411
 #, c-format
 msgid "%s attachment"
 msgstr "%s ਨੱਥ�"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1472
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ਸ�ਨ�ਹਾ S/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1627 ../em-format/em-format.c:1803
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ਸ�ਨ�ਹਾ MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�, ਸਰ�ਤ ਦ� ਤ�ਰ ਤ� ਹ� ਵ��ਾ�� �ਾ ਰਿਹਾ ਹ�।"
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1635
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ਬਹ�ਭਾ�/���ਰਿਪਸ਼ਨ ਲ� ਨਾ-ਸਹਾ�� �ੰ��ਰਿਪਸ਼ਨ �ਿਸਮ"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1648
 msgid "Could not parse PGP/MIME message"
 msgstr "ਸ�ਨ�ਹਾ PGP/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1649
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ਸ�ਨ�ਹਾ PGP/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1827
 msgid "Unsupported signature format"
 msgstr "ਨਾ-ਸਹਾ�� ਦਸਤ�ਤ ਫਾਰਮ��"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1837 ../em-format/em-format.c:1997
 msgid "Error verifying signature"
 msgstr "ਦਸਤ�ਤ �ਾ�� ਦ�ਰਾਨ �ਲਤ�"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1838 ../em-format/em-format.c:1985
+#: ../em-format/em-format.c:1998
 msgid "Unknown error verifying signature"
 msgstr "ਦਸਤ�ਤ �ਾ�� ਦ�ਰਾਨ �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message"
-msgstr "PGP ਸ�ਨ�ਹਾ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
+#: ../em-format/em-format.c:2082
+#| msgid "Could not parse PGP message"
+msgid "Could not parse PGP message: "
+msgstr "PGP ਸ�ਨ�ਹਾ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: "
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message: Unknown error"
-msgstr "PGP ਸ�ਨ�ਹ� ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
+#: ../em-format/em-format.c:2088 ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
+msgid "Unknown error"
+msgstr "�ਣ�ਾਣ� �ਲਤ�"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "੧ ਸ�ਿੰ� ਪਹਿਲਾ�"
 msgstr[1] "%d ਸ�ਿੰ� ਪਹਿਲਾ�"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, 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:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "੧ ਮਿੰ� ਪਹਿਲਾ�"
 msgstr[1] "%d ਮਿੰ� ਪਹਿਲਾ�"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, 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:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "੧ �ੰ�ਾ ਪਹਿਲਾ�"
 msgstr[1] "%d �ੰ�ਾ ਪਹਿਲਾ�"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, 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:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "੧ ਦਿਨ ਪਹਿਲਾ�"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾ�"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "��ਣ ਵਾਲ� ੧ ਦਿਨ"
 msgstr[1] "��ਣ ਵਾਲ� %d ਦਿਨ"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "੧ ਹਫਤਾ ਪਹਿਲਾ�"
 msgstr[1] "%d ਹਫਤਾ ਪਹਿਲਾ�"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, 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:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "੧ ਮਹ�ਨਾ ਪਹਿਲਾ�"
 msgstr[1] "%d ਮਹ�ਨ� ਪਹਿਲਾ�"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, 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:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "੧ ਸਾਲ ਪਹਿਲਾ�"
 msgstr[1] "%d ਸਾਲ ਪਹਿਲਾ�"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, 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:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<ਮਿਤ� ��ਣਨ ਲ� �ਥ� �ਲਿੱ� �ਰ�>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "ਹ�ਣ"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "ਮ�ਲ �ਰਨ ਲ� ਸਮਾ� ��ਣ�"
 
@@ -9249,11 +9178,11 @@ msgid "I_nclude threads"
 msgstr "ਸ਼ਾਮਲ ਥਰਿੱਡ(_n)"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "� ਰਹ�"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "ਬਾਹਰ�"
 
@@ -9288,7 +9217,7 @@ msgstr "ਫਾ�ਲ਼ ਨਾ� ��ੰਮ ਹ�।"
 
 #  filter:no-name primary
 #  mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "ਨਾ� ��ੰਮ ਹ�।"
 
@@ -9345,7 +9274,7 @@ msgstr ""
 "ਫਿਲ�ਰ ਲ�ਾ�ਣ ਦ� ਦ�ਰਾਨ ਸ�ਨ�ਹ� ਦ� ਮਿਤ� ਨ�ੰ ਮ���ਦਾ ਮਿਤ�\n"
 " ਨਾਲ ਮਿਲਾ�� �ਾਵ��ਾ।"
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
 msgid "_Filter Rules"
 msgstr "ਫਿਲ�ਰ ਨਿਯਮ(_F)"
 
@@ -9366,7 +9295,7 @@ msgstr "ਭਵਿੱ� ਵਿੱ�"
 msgid "months"
 msgstr "ਮਹ�ਨ�"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
 msgid "seconds"
 msgstr "ਸ�ਿੰ�"
 
@@ -9382,44 +9311,29 @@ msgstr "ਸਮਾ� �� ਤ�ਸ�� ਨਿਰਧਾਰਿਤ ��ਤ
 msgid "years"
 msgstr "ਸਾਲ"
 
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../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:118
+#: ../widgets/misc/e-attachment-paned.c:123
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "����ਮ���"
 msgstr[1] "����ਮ���"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:586
+#: ../widgets/misc/e-attachment-paned.c:581
 msgid "Icon View"
 msgstr "���ਾਨ �ਲ�"
 
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:587
+#: ../widgets/misc/e-attachment-paned.c:582
 msgid "List View"
 msgstr "ਲਿਸ� �ਲ�"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "ਫ��ਸ �ਰ��ਰ"
-
-#: ../mail/e-mail-browser.c:742
-msgid "Shell Module"
-msgstr "ਸ਼�ੱਲ ਮ�ਡ��ਲ"
-
-#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "ਮ�ਲ ਸ਼�ੱਲ ਬ����ਡ"
-
-#: ../mail/e-mail-browser.c:753
-msgid "Show Deleted"
-msgstr "ਹ�ਾ� ਵ���"
-
-#: ../mail/e-mail-browser.c:754
-msgid "Show deleted messages"
-msgstr "ਹ�ਾ� �� ਸ�ਨ�ਹ� ਵ���"
+#: ../mail/e-mail-browser.c:265
+#| msgid "Subject"
+msgid "(No Subject)"
+msgstr "(��� ਵਿਸ਼ਾ ਨਹ��)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9467,7 +9381,7 @@ msgid "_Later"
 msgstr "ਬਾ�ਦ '�(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:478
 msgid "Add Label"
 msgstr "ਲ�ਬਲ ਸ਼ਾਮਲ"
 
@@ -9487,115 +9401,57 @@ msgstr ""
 msgid "Color"
 msgstr "ਰੰ�"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../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:700 ../mail/em-folder-tree.c:2759
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 msgid "Inbox"
 msgstr "��ਣ-ਬ�ਸਾ"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:693
 msgid "Drafts"
 msgstr "ਡਰਾਫ�"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:703
 msgid "Outbox"
 msgstr "ਬਾਹਰ�-ਬ�ਸਾ"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:705
 msgid "Sent"
 msgstr "ਭ���"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:696
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:573
 msgid "Templates"
 msgstr "��ਪਲ��"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "�ਾਸ"
-
-#  forest green
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "�ਰਨ-ਲ�"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "ਬਾ�ਦ ਵਿੱ�"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "ਮਾ��ਰ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "ਮਾ��ਰ��"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "'%s' ਨ�ੰ ਮਾ��ਰ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�:"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "ਨਵਾ� ਫ�ਲਡਰ `%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "ਫ�ਲਡਰ `%s' ਨ�ੰ `%s' ਵਿੱ� �ਾਪ� �ਰਨ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "`%s' ਤ� �ਪਲੱਬਧ ਪੱਤਰ-ਬ�ਸਿ�� ਦ� �ਾ�� ਲ� �ਸਫਲ: %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:649
 msgid "Migrating Folders"
 msgstr "ਫ�ਲਡਰ ਮਾ��ਰ�� ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ-ਬ�ਸਾ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� �ਵ�ਲ�ਸ਼ਨ ੧.੦ ਬਾ�ਦ ਤਬਦ�ਲ ਹ� �� ਹ�।\n"
-"\n"
-"�ਡ��� �� �ਦ�� ਤੱ� �ਿ ਤ�ਹਾਡ� ਫ�ਲਡਰ ਮਾ��ਰ�� ��ਤ� �ਾ ਰਹ� ਹਨ..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "POP3 ਸਰਵਰ ਤ� ਰੱ�ਿ� ਪ�ਰਾਣ� ਡਾ�� `%s' ਨ�ੰ ��ਲਣ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "POP3 ਸਰਵਰ ਤ� ਰੱ�� ਡਾ�ਾ ਡਾ�ਰ���ਰ� `%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "POP3 ਸਰਵਰ ਤ� ਰੱ�ਿ� ਡਾ�ਾ `%s' ਦ� �ਾਪ� ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "ਲ��ਲ ਪੱਤਰ ਸੰਭਾਲ`%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
-
-#: ../mail/e-mail-migrate.c:2934
+#: ../mail/e-mail-migrate.c:650
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9606,45 +9462,54 @@ msgstr ""
 "\n"
 "�ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਤ�ਹਾਡ� ਫ�ਲਡਰ ਮਾ��ਰ�� ਹ�ਣ ਤੱ� ਸਬਰ ਰੱ�� ��..."
 
-#: ../mail/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:739
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "`%s' �ੱਤ� ਲ��ਲ ਫ�ਲਡਰ ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
+#| msgid "Unable to create local mail folders at `%s': %s"
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "`%s' �ੱਤ� ਮ�ਲ ਲ��ਲ ਫ�ਲਡਰ ਬਣਾ�ਣ ਵਿੱ� �ਸਮਰੱਥ: %s"
 
-#: ../mail/e-mail-migrate.c:3049
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"ਪ�ਰਾਣ� �ਵ�ਲ�ਸ਼ਨ ਦ� ਸ��ਿੰ� ਪ��ਹਨ ਤ�� �ਸਫਲ, `evolution/config.xmldb' ਮ���ਦ ਨਹ�� ਹ� �ਾ� ਨਿ�ਾਰਾ "
-"ਹ� �� ਹ�।"
+#  FIXME: This is just to get the shadow, is there a better way?
+#: ../mail/e-mail-notebook-view.c:563
+#| msgid "Please select a user."
+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:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:109
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "ਮ�ਨ�ੰ ਮ�� ਨਾ ਪ�ੱ��।"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:274 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:274 ../mail/em-folder-utils.c:402
 msgid "C_opy"
 msgstr "�ਾਪ� �ਰ�(_o)"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:648 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:648 ../mail/em-folder-utils.c:402
 msgid "_Move"
 msgstr "ਭ���(_M)"
 
-#: ../mail/e-mail-reader.c:864
+#. Check buttons
+#: ../mail/e-mail-reader.c:908 ../mail/e-mail-reader.c:1019
+#: ../mail/e-mail-reader.c:1060
+#| msgid "Do not ask me again"
+msgid "_Do not ask me again."
+msgstr "ਮ�ਨ�ੰ ਫ�ਰ ਨਾ ਪ�ੱ��(_D)।"
+
+#: ../mail/e-mail-reader.c:1065
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਲ� �ਵਾਬ ਦਿ�: ਹਮ�ਸ਼ਾ �ਣਡਿੱਠਾ(_A)"
+
+#: ../mail/e-mail-reader.c:1155
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ਸ�ਨ�ਹਾ ਸੰਭਾਲ�"
@@ -9656,498 +9521,540 @@ 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:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:1176
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "ਸ�ਨ�ਹਾ"
 msgstr[1] "ਸ�ਨ�ਹ�"
 
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1441
 msgid "A_dd Sender to Address Book"
 msgstr "ਭ��ਣ ਵਾਲਾ �ਡਰ�ੱਸ ਸ��� ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�(_d)"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1443
 msgid "Add sender to address book"
 msgstr "ਭ��ਣ ਵਾਲਾ �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1448
 msgid "Check for _Junk"
 msgstr "�ੰ� ਲ� �ਾ��(_J)"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1450
 msgid "Filter the selected messages for junk status"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਬ��ਾਰ ਸਥਿਤ� ਲ� �ਾ���"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1455
 msgid "_Copy to Folder..."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ�(_C)..."
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1457
 msgid "Copy selected messages to another folder"
 msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ �ੱ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1462
 msgid "_Delete Message"
 msgstr "ਸ�ਨ�ਹਾ ਹ�ਾ�(_D)"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1464
 msgid "Mark the selected messages for deletion"
 msgstr "��ਣ� ਸ�ਨਹਿ�� ਨ�ੰ ਹ�ਾ�ਣ ਲ� ��ਣ�"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1469
 msgid "Filter on Mailing _List..."
 msgstr "ਮ�ਲਿੰ� ਲਿਸ� �ੱਤ� ਫਿਲ�ਰ(_L)..."
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1471
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਨਾਲ ਸੰਬੰਧਿਤ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1476
 msgid "Filter on _Recipients..."
 msgstr "ਸ�ਨ�ਹ��� ਤ� ਫਿਲ�ਰ(_R)..."
 
-#: ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1478
 msgid "Create a rule to filter messages to these recipients"
 msgstr "�ਹਨਾ� ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਨ�ੰ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1483
 msgid "Filter on Se_nder..."
 msgstr "ਭ��ਣ ਵਾਲਿ�� ਤ� ਫਿਲ�ਰ(_n)..."
 
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1485
 msgid "Create a rule to filter messages from this sender"
 msgstr "�ਹਨਾ� ਭ��ਣ�ਰਨ ਵਾਲਿ�� ਨ�ੰ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1490
 msgid "Filter on _Subject..."
 msgstr "ਵਿਸ਼� ਤ� ਫਿਲ�ਰ(_S)..."
 
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1492
 msgid "Create a rule to filter messages with this subject"
 msgstr "�ਸ ਵਿਸ਼� ਨਾਲ ਸੰਬੰਧਿਤ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1497
 msgid "A_pply Filters"
 msgstr "ਫਿਲ�ਰ ਲ�ਾ�(_p)"
 
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1499
 msgid "Apply filter rules to the selected messages"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਤ� ਫਿਲ�ਰ ਨਿਯਮ ਲਾ�� �ਰ�"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1504
 msgid "_Find in Message..."
 msgstr "ਸ�ਨ�ਹ� '� ���(_F)..."
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1506
 msgid "Search for text in the body of the displayed message"
 msgstr "ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ਵਿੱ� ���ਸ� ਦ� ���"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1511
 msgid "_Clear Flag"
 msgstr "ਨਿਸ਼ਾਨ ਸਾਫ਼(_C)"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1513
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਤ�� ਧਿ�ਨ-ਰੱ�� ਨਿਸ਼ਾਨ ਹ�ਾ�"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1518
 msgid "_Flag Completed"
 msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_F)"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1520
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਪ�ਰਾ ਹ�ਣ ਲ� ਧਿ�ਨ-ਰੱ�� ਨਿਸ਼ਾਨ ਸ�ੱ� �ਰ�"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1525
 msgid "Follow _Up..."
 msgstr "�ੱ�� ��ਲ�ਹ�(_U)..."
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1527
 msgid "Flag the selected messages for follow-up"
 msgstr "ਧਿ�ਨ ਰੱ�ਣ ਲ� ��ਣ� ਸ�ਨ�ਹ� ਨਿਸ਼ਾਨਬੱਧ"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1532
 msgid "_Attached"
 msgstr "����(_A)"
 
-#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1534 ../mail/e-mail-reader.c:1541
 msgid "Forward the selected message to someone as an attachment"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ ���� �ਰ�� �ਿਸ� ਨ�ੰ �ੱ�� ਭ���"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1539
 msgid "Forward As _Attached"
 msgstr "���� �ਰ�� �ੱ�� ਭ���(_A)"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1546
 msgid "_Inline"
 msgstr "ਲਾ�ਨ ਵਿੱ�(_I)"
 
-#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1548 ../mail/e-mail-reader.c:1555
 msgid "Forward the selected message in the body of a new message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ ਨਵ�� ਸ�ਨ�ਹ� ਦ� ਵਿੱ� ਮ�ੱ� ਭਾ� ਵਾ�� �ੱ�� ਭ���"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1553
 msgid "Forward As _Inline"
 msgstr "�ਨਲਾ�ਨ ਵਾ�� �ੱ�� ਭ���(_I)"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1560
 msgid "_Quoted"
 msgstr "ਹਵਾਲਾ(_Q)"
 
-#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1562 ../mail/e-mail-reader.c:1569
 msgid "Forward the selected message quoted like a reply"
 msgstr "��ਣ� ਸ�ਨ�ਹ� �ਿਸ� ਵੱਲ ਹਵਾਲਾ �ੱ� �ਵਾਬ ਦ� ਤਰ�ਹਾ� �ਰ�� ਭ���"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1567
 msgid "Forward As _Quoted"
 msgstr "ਹਵਾਲ� ਵਾ�� ਭ���(_Q)"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1574
 msgid "_Load Images"
 msgstr "�ਿੱਤਰ ਲ�ਡ(_L)"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1576
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML ਮ�ਲ ਵਿੱ� ਸ�ਨ�ਹ� ਲ�ਡ �ਰਨ ਲ� ਮ�ਬ�ਰ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1581
 msgid "_Important"
 msgstr "�ਾਸ(_I)"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1583
 msgid "Mark the selected messages as important"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ �ਾਸ ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1588
 msgid "_Junk"
 msgstr "�ੰ�(_J)"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1590
 msgid "Mark the selected messages as junk"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ �ੰ� ਵ��� ਨਿਸ਼ਾਨਬੱਧ"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1595
 msgid "_Not Junk"
 msgstr "�ੰ� ਨਹ��(_N)"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1597
 msgid "Mark the selected messages as not being junk"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ੰ�-ਨਹ�� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1602
 msgid "_Read"
 msgstr "ਪ��ਹ�(_R)"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1604
 msgid "Mark the selected messages as having been read"
 msgstr "��ਣ� ਸ�ਨਹਿ�� ਨ�ੰ ਪ��ਹ� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1609
 msgid "Uni_mportant"
 msgstr "ਨਾ-�ਾਸ(_m)"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1611
 msgid "Mark the selected messages as unimportant"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ ਨਾ-�਼ਰ�ਰ� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1616
 msgid "_Unread"
 msgstr "ਨਾ-ਪ��ਹ�(_U)"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1618
 msgid "Mark the selected messages as not having been read"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਨਾ-ਪ��ਹ� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1623
 msgid "_Edit as New Message..."
 msgstr "ਨਵਾ� ਸ�ਨ�ਹ� ਵਿੱ� ਸ�ਧ(_E)..."
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1625
 msgid "Open the selected messages in the composer for editing"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਸ�ਧ ਲ� ਰ��ਤਾ (�ੰਪ��਼ਰ) ਵਿੱ� ��ਲ�ਹ�"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1630
 msgid "Compose _New Message"
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ ਲਿ��(_N)"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1632
 msgid "Open a window for composing a mail message"
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ ਲਿ�ਣ ਲ� ਵਿੰਡ� ��ਲ�ਹ�"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1637
 msgid "_Open in New Window"
 msgstr "ਨਵ�� �ਰ��� '� ��ਲ�ਹ�(_O)"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1639
 msgid "Open the selected messages in a new window"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਵ�� �ਰ��� ਵਿੱ� ��ਲ�ਹ�"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1644
 msgid "_Move to Folder..."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)..."
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1646
 msgid "Move selected messages to another folder"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਭ���"
 
-#: ../mail/e-mail-reader.c:1353
+#: ../mail/e-mail-reader.c:1651
+#| msgid "Switch to %s"
+msgid "_Switch to Folder"
+msgstr "ਫ�ਲਡਰ �ੱਤ� �ਾ�(_S)"
+
+#: ../mail/e-mail-reader.c:1653
+#| msgid "Install the shared folder"
+msgid "Display the parent folder"
+msgstr "ਮ�ੱਢਲਾ ਫ�ਲਡਰ ਵ���"
+
+#: ../mail/e-mail-reader.c:1658
+#| msgid "Switch to %s"
+msgid "Switch to _next tab"
+msgstr "��ਲ� ��ਬ �ੱਤ� �ਾ�(_n)"
+
+#: ../mail/e-mail-reader.c:1660
+msgid "Switch to the next tab"
+msgstr "��ਲ� ��ਬ �ੱਤ� �ਾ�"
+
+#: ../mail/e-mail-reader.c:1665
+#| msgid "Switch to %s"
+msgid "Switch to _previous tab"
+msgstr "ਪਿ�ਲ� ��ਬ �ੱਤ� �ਾ�(_p)"
+
+#: ../mail/e-mail-reader.c:1667
+msgid "Switch to the previous tab"
+msgstr "ਪਿ�ਲ� ��ਬ �ੱਤ� �ਾ�"
+
+#: ../mail/e-mail-reader.c:1672
+#| msgid "Close the current file"
+msgid "Cl_ose current tab"
+msgstr "ਮ���ਦਾ ��ਬ ਬੰਦ �ਰ�(_o)"
+
+#: ../mail/e-mail-reader.c:1674
+#| msgid "Close the current file"
+msgid "Close current tab"
+msgstr "ਮ���ਦਾ ��ਬ ਬੰਦ �ਰ�"
+
+#: ../mail/e-mail-reader.c:1679
 msgid "_Next Message"
 msgstr "�ੱ�� ਸ�ਨ�ਹਾ(_N)"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1681
 msgid "Display the next message"
 msgstr "��ਲਾ ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1686
 msgid "Next _Important Message"
 msgstr "ਨਵਾ� �ਾਸ ਸ�ਨ�ਹਾ(_I)"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1688
 msgid "Display the next important message"
 msgstr "��ਲਾ �ਰ�ਰ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1693
 msgid "Next _Thread"
 msgstr "�ੱ�� ਮਸਲਾ(_T)"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1695
 msgid "Display the next thread"
 msgstr "�ੱ�� ਨਾ-ਪ��ਹਿ� ਮਸਲਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1700
 msgid "Next _Unread Message"
 msgstr "�ੱ�� ਨਾ-ਪ��ਹਿ� ਸ�ਨ�ਹਾ(_U)"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1702
 msgid "Display the next unread message"
 msgstr "��ਲਾ ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1707
 msgid "_Previous Message"
 msgstr "ਪਿੱ�� ਸ�ਨ�ਹਾ(_P)"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1709
 msgid "Display the previous message"
 msgstr "ਪਿ�ਲਾ ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1714
 msgid "Pr_evious Important Message"
 msgstr "�ਾਸ ਸ�ਨ�ਹਾ ਵ��ਾ�(_e)"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1716
 msgid "Display the previous important message"
 msgstr "ਪਿ�ਲਾ �ਰ�ਰ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1721
 msgid "P_revious Unread Message"
 msgstr "ਪਿੱ�� ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ(_r)"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1723
 msgid "Display the previous unread message"
 msgstr "ਪਿ�ਲਾ ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1730
 msgid "Print this message"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਪਰਿੰ� �ਰ�"
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1737
 msgid "Preview the message to be printed"
 msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਦ� �ਲ�"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1742
 msgid "Re_direct"
 msgstr "ਵਾਪਸ(_d)"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1744
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "��ਣ� ਸ�ਨ�ਹ� �ਿਸ� ਵੱਲ ਭ���"
 
-#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1749 ../mail/mail.error.xml.h:91
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "ਸਭ ਨ�ੰ �ਵਾਬ(_A)"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1751
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਸਾਰ� ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਲ� �ਵਾਬ ਲਿ��"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1756 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "ਲਿਸ� ਨ�ੰ �ਵਾਬ(_L)"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1758
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਸ��� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
 
-#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1763
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "ਭ��ਣ ਵਾਲ� ਨ�ੰ �ਵਾਬ(_R)"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1765
 msgid "Compose a reply to the sender of the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਭ��ਣ ਵਾਲ� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1770
 msgid "_Save as mbox..."
 msgstr "mbox ਵਾ�� ਸੰਭਾਲ�(_S)..."
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1772
 msgid "Save selected messages as an mbox file"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ mbox ਫਾ�ਲ ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1777
 msgid "Search Folder from Mailing _List..."
 msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਤ�� ��� ਫ�ਲਡਰ(_L)..."
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1779
 msgid "Create a search folder for this mailing list"
 msgstr "�ਸ ਮ�ਲਿੰ� ਲਿਸ� ਤ�� �ੱ� ��� ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1784
 msgid "Search Folder from Recipien_ts..."
 msgstr "ਪਰਾਪਤ �ਰਤਾ ਤ�� ��� ਫ�ਲਡਰ(_t)..."
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1786
 msgid "Create a search folder for these recipients"
 msgstr "�ਹਨਾ� ਸ�ਨ�ਹ��� ਤ�� �ੱ� ��� ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1465
+#: ../mail/e-mail-reader.c:1791
 msgid "Search Folder from Sen_der..."
 msgstr "ਭ��ਣ ਵਾਲ� ਤ�� ��� ਫ�ਲਡਰ(_d)..."
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1793
 msgid "Create a search folder for this sender"
 msgstr "�ਸ ਭ��ਣ ਵਾਲ� ਤ�� �ੱ� ��� ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1798
 msgid "Search Folder from S_ubject..."
 msgstr "ਵਿਸ਼� ਤ�� ��� ਫ�ਲਡਰ(_u)..."
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1800
 msgid "Create a search folder for this subject"
 msgstr "�ਸ ਵਿਸ਼� ਲ� �ੱ� ��� ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1479
+#: ../mail/e-mail-reader.c:1805
 msgid "_Message Source"
 msgstr "ਸ�ਨ�ਹਾ ਸਰ�ਤ(_M)"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1807
 msgid "Show the raw email source of the message"
 msgstr "ਸ�ਨ�ਹ� ਦ� �ੱ�� �-ਮ�ਲ ਸਰ�ਤ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1493
+#: ../mail/e-mail-reader.c:1819
 msgid "_Undelete Message"
 msgstr "ਨਾ-ਹ�ਾ�� ਸ�ਨ�ਹਾ(_U)"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1821
 msgid "Undelete the selected messages"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਾ-ਹ�ਾ� ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1500
+#: ../mail/e-mail-reader.c:1826
 msgid "_Normal Size"
 msgstr "�ਮ ��ਾਰ(_N)"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1828
 msgid "Reset the text to its original size"
 msgstr "���ਸ� ਨ�ੰ �ਸਲ� ��ਾਰ ਮ�ਤਾਬ� ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1507
+#: ../mail/e-mail-reader.c:1833
 msgid "_Zoom In"
 msgstr "�਼�ਮ �ੰਦਰ(_Z)"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1835
 msgid "Increase the text size"
 msgstr "���ਸ� ��ਾਰ ਵਧਾ�"
 
-#: ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1840
 msgid "Zoom _Out"
 msgstr "�਼�ਮ ਬਾਹਰ(_O)"
 
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1842
 msgid "Decrease the text size"
 msgstr "���ਸ� ��ਾਰ ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1849
 msgid "Create R_ule"
 msgstr "ਨਿਯਮ ਬਣਾ�(_u)"
 
-#: ../mail/e-mail-reader.c:1530
+#: ../mail/e-mail-reader.c:1856
 msgid "Ch_aracter Encoding"
 msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�(_A)"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1863
 msgid "F_orward As"
 msgstr "�ੱ�� ਭ��� �ਸ ਵਾ��(_O)"
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1870
+#| msgid "_Reply"
+msgid "_Group Reply"
+msgstr "�ਰ�ੱਪ �ਵਾਬ(_G)"
+
+#: ../mail/e-mail-reader.c:1877
 msgid "_Go To"
 msgstr "�ਾ�(_G)"
 
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1884
 msgid "Mar_k As"
 msgstr "ਨਿਸ਼ਾਨਬੱਧ(_k)"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1891
 msgid "_Message"
 msgstr "ਸ�ਨ�ਹਾ(_M)"
 
-#: ../mail/e-mail-reader.c:1565
+#: ../mail/e-mail-reader.c:1898
 msgid "_Zoom"
 msgstr "�਼�ਮ(_Z)"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1923
 msgid "Mark for Follo_w Up..."
 msgstr "ਪਿੱ�ਾ ��� ਲ� ਨਿਸ਼ਾਨਬੱਧ(_w)..."
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark as _Important"
 msgstr "�ਾਸ ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_I)"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1935
 msgid "Mark as _Junk"
 msgstr "ਰੱਦ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_J)"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1939
 msgid "Mark as _Not Junk"
 msgstr "ਰੱਦ� ਨਹ�� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_N)"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1943
 msgid "Mar_k as Read"
 msgstr "ਪ��ਹ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_k)"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1947
 msgid "Mark as Uni_mportant"
 msgstr "ਨਾ-�ਾਸ ਨਿਸ਼ਾਨਬੱਧ ਬਣਾ�(_m)"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1951
 msgid "Mark as _Unread"
 msgstr "ਨਾ-ਪ��ਹ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_U)"
 
-#: ../mail/e-mail-reader.c:1654
+#: ../mail/e-mail-reader.c:1987
 msgid "_Caret Mode"
 msgstr "��ਪਤ-ਲ��ਣ ਢੰ�(_C)"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:1989
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ਵਿੱ� �ਰਸਰ �ਪ�ਦ� ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1995
 msgid "All Message _Headers"
 msgstr "ਸਭ ਸ�ਨ�ਹ� ਹ�ੱਡਰ(_H)"
 
-#: ../mail/e-mail-reader.c:1664
+#: ../mail/e-mail-reader.c:1997
 msgid "Show messages with all email headers"
 msgstr "ਸ�ਨ�ਹ� ਸਭ �-ਮ�ਲ ਹ�ੱਡਰਾ� ਨਾਲ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:2218
 msgid "Unable to retrieve message"
 msgstr "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਲ� �ਸਫਲ"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:2278 ../mail/mail-ops.c:1891
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "ਸ�ਨ�ਹਾ '%s' ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
@@ -10155,77 +10062,98 @@ 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:2467
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../mail/e-mail-reader.c:2838 ../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:234
 msgid "Default"
 msgstr "ਡਿਫਾਲ�"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:3007
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "�ੱ�� ਭ���(_F)"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:3008
 msgid "Forward the selected message to someone"
 msgstr "��ਣ� ਸ�ਨ�ਹ� �ੱ�� ਭ���"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:753
+#. Likewise the "mail-reply-group" action
+#. For Translators: "Group Reply" will reply either to a mailing list
+#. (if possible and if that configuration option is enabled), or else
+#. it will reply to all. The word "Group" was chosen because it covers
+#. either of those, without too strongly implying one or the other.
+#: ../mail/e-mail-reader.c:3026
+#| msgid "Group Items By"
+msgid "Group Reply"
+msgstr "�ਰ�ੱਪ �ਵਾਬ"
+
+#: ../mail/e-mail-reader.c:3027
+#| msgid "Compose a reply to the mailing list of the selected message"
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਨ�ੰ �ਵਾਬ �ਾ� ਸਭ ਪ�ਰਾਪਤ-�ਰਤਾਵਾ� ਨ�ੰ"
+
+#: ../mail/e-mail-reader.c:3072 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "ਹ�ਾ�"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:3104
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "�ੱ��"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:3108
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "ਪਿੱ��"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:3118 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "�ਵਾਬ"
 
+#: ../mail/e-mail-reader.c:3730
+#, c-format
+#| msgid "Folder"
+msgid "Folder '%s'"
+msgstr "'%s' ਫ�ਲਡਰ"
+
 #: ../mail/e-mail-tag-editor.c:292
 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:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:77
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 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:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:136
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 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:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:105
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL �ੰ��ਰਿਪਸ਼ਨ"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:603
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ�"
 
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:610
 #, c-format
 msgid ""
 "\n"
@@ -10239,34 +10167,34 @@ msgstr ""
 "�ਤ� ਮਨ�਼�ਰ �ਰਨ ਲ� �ਾ�� ਬ�ਸ� ਤ� �ਲਿੱ� �ਰ�\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:897 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:981
 msgid "Never"
 msgstr "�ਦ� ਨਹ��"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:982
 msgid "Always"
 msgstr "ਹਮ�ਸ਼ਾ"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:983
 msgid "Ask for each message"
 msgstr "ਹਰ ਸ�ਨ�ਹ� ਲ� ਪ�ੱ��"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1720 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2095
 msgid "Mail Configuration"
 msgstr "ਮ�ਲ ਸੰਰ�ਨਾ"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2096
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10276,7 +10204,7 @@ msgstr ""
 "\n"
 "ਸ਼�ਰ� �ਰਨ ਲ� \"�ੱ��\" ਦਬਾ�।"
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2099
 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 "
@@ -10285,20 +10213,20 @@ msgstr ""
 "ਹ�ਠਾ� �ਪਣਾ ਨਾ� �ਤ� �-ਮ�ਲ �ਡਰ�ੱਸ ਦਿ� ��। ਹ�ਠਾ� \"��ਣਵਾ�\" ��ਤਰ ਭਰਨ ਦ� ਲ�� ਨਹ�� ਹ�, �ਦ�� ਤੱ� �ਿ "
 "ਤ�ਸ�� �-ਮ�ਲ ਰਾਹ� ਭ��� �ਾਣ ਵਾਲ� �ਾਣ�ਾਰ� ਵਿੱ� ਸ਼ਾਮਿਲ ਨਾ �ਰ �ਾਹ�।"
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2258
+#: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
 msgstr "�-ਮ�ਲ ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2102
 msgid "Please configure the following account settings."
 msgstr "ਹ�ਠ ਦਿੱਤ� ��ਾ��� ਸ��ਿੰ� ਦ� ਸੰਰ�ਨਾ �ਰ� ��।"
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2740
 msgid "Sending Email"
 msgstr "�-ਮ�ਲ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2105
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10306,11 +10234,11 @@ msgstr ""
 "�ਸ ਢੰ� ਦ� �ਾਣ�ਾਰ� ਦਿ� ��, �ਿਸ ਰਾਹ�� ਤ�ਸ�� ਪੱਤਰ ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�। ���ਰ ਤ�ਸ�� ਯ��ਨ� ਨਹ�� ਹ� "
 "ਤਾ� �ਪਣ� ਸਿਸ�ਮ ਪਰਸ਼ਾਸ਼� �ਾ� �ੰ�ਰਨ�ੱ� ਸਰਵਿਸ ਪ�ਰਬੰਧ� ਨਾਲ ਸੰਪਰ� �ਰ�।"
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2107
 msgid "Account Management"
 msgstr "��ਾ��� ਪਰਬੰਧ"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10318,11 +10246,11 @@ msgstr ""
 "�ੱ�� ਦਿੱਤ� ਥਾ� ਵਿੱ� �ਸ ��ਾ��� ਬਾਰ� ਵਰਣਨ �ਰਦ� �ਾਣ�ਾਰ� ਦਿ� ��। �ਹ ਨਾ� ਸਿਰ� \n"
 "ਵ��ਾ�ਣ ਲ� ਹ� ਵਰਤ� �ਾਵ���।"
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2112
 msgid "Done"
 msgstr "ਸਮਾਪਤ"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2113
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10336,56 +10264,53 @@ msgstr ""
 "\n"
 "�ਪਣਾ ਸ��ਿੰ� ਲਾ�� �ਰਨ ਲ� \"ਲਾ�� �ਰ�\" ਦਬਾ�।"
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2554
 msgid "Check for _new messages every"
 msgstr "�ੰਨ� �ੰਤਰਾਲ ਬਾ�ਦ ਪੱਤਰ ��ੱ� �ਰ�(_n)"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2562
 msgid "minu_tes"
 msgstr "ਮਿੰ�(_t)"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2838
+#| msgid "Please select an image for this contact"
+msgid "Please select a folder from the current account."
+msgstr "ਮ���ਦਾ ��ਾ��� ਤ�� ਫ�ਲਡਰ ��ਣ� ��।"
+
+#: ../mail/em-account-editor.c:3108 ../mail/mail-config.ui.h:112
 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:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:3153 ../mail/em-account-editor.c:3221
 msgid "Receiving Options"
 msgstr "ਪ�ਰਾਪਤ� ��ਣ"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:3154 ../mail/em-account-editor.c:3222
 msgid "Checking for New Messages"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� ��ੱ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-account-editor.c:3418
-msgid "Account Editor"
-msgstr "��ਾ��� ਸੰਪਾਦ�"
-
-#: ../mail/em-account-editor.c:3418
-msgid "Evolution Account Assistant"
-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:1578
+#: ../mail/em-composer-utils.c:1539
 #, 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:1626
+#: ../mail/em-composer-utils.c:1587
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ ਵਿਸ਼�ਸ਼ਤਾ: \"%s\""
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1991
 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:1997
+#: ../mail/em-composer-utils.c:2038
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10393,19 +10318,19 @@ msgstr ""
 "${AbbrevWeekdayName} , ${Year}-${Month}-${Day}, ${24Hour}:${Minute} ਵ�� "
 "${TimeZone}, ${Sender} ਨ� ਲਿ�ਿ�:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2182
 msgid "-----Original Message-----"
 msgstr "--------�ਸਲ� ਸ�ਨ�ਹਾ--------"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2372
 msgid "Posting destination"
 msgstr "ਭ��ਣ ਲ� ਨਿਯਤ"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2373
 msgid "Choose folders to post the message to."
 msgstr "ਸ�ਨ�ਹ� ਭ��ਣ ਲ� ਫ�ਲਡਰ ��ਣ�"
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "ਫ�ਲਡਰ ��ਣ�"
 
@@ -10423,10 +10348,18 @@ msgstr "ਰੰ� ਦਿ�"
 msgid "Assign Score"
 msgstr "ਸ��ਰ ਦਿ�"
 
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "�ਵਾ�"
 
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "ਸਮਾਪਤ "
@@ -10487,6 +10420,10 @@ msgstr "ਪਿੱ�� �ਾ�"
 msgid "Forward to"
 msgstr "�ੱ��"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "�ਾਸ"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "ਬਾ�ਦ ਹ�"
@@ -10511,7 +10448,7 @@ msgstr "ਸ�ੱ� ਨਹ�� ਹ�"
 msgid "is set"
 msgstr "ਸ�ੱ� ਹ�"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
 msgid "Junk"
 msgstr "�ੰ�"
 
@@ -10560,7 +10497,7 @@ msgid "Play Sound"
 msgstr "�ਵਾ� �ਲਾ�"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "ਪ��ਹ�"
 
@@ -10641,16 +10578,16 @@ msgid "Unset Status"
 msgstr "ਸਥਿਤ� ਨਾ-ਨਿਰਧਾਰਨ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "ਤਦ"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 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:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "ਨਾ ਪ�� ਸ�ਨ�ਹ�:"
@@ -10658,24 +10595,24 @@ 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:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "��ੱਲ ਸਨ�ਹ�:"
 msgstr[1] "��ੱਲ ਸਨ�ਹ�:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "���ਾ (%s) ਵਰਤ� ��:"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "���ਾ ਵਰਤ��"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "ਫ�ਲਡਰ ਵਿਸ਼�ਸਤਾ"
 
@@ -10683,33 +10620,33 @@ msgstr "ਫ�ਲਡਰ ਵਿਸ਼�ਸਤਾ"
 msgid "<click here to select a folder>"
 msgstr "<ਫ�ਲਡਰ ��ਣਨ ਲ� �ਥ� �ਲਿੱ� �ਰ�>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "ਬਣਾ�(_r)"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "ਫ�ਲਡਰ ਨਾ�(_n):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../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:1064 ../mail/mail-vfolder.c:1129
 msgid "Search Folders"
 msgstr "��� ਫ�ਲਡਰ"
 
 #  UNMATCHED is always last
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:768 ../mail/em-folder-tree-model.c:1111
 msgid "Loading..."
 msgstr "ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�...."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:184
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ਵਿੱ� ਫ�ਲਡਰ ਦ� �ਾ�� ��ਤ� �ਾ ਰਹ� ਹ�"
@@ -10736,134 +10673,136 @@ msgstr "ਫ�ਲਡਰ ਨਾ� �ੱ�ਰ \"/\" ਨਹ�� ਰੱ� ਸ
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1084
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1318
 msgid "Mail Folder Tree"
 msgstr "ਪੱਤਰ ਫ�ਲਡਰ ਲ��"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "ਫ�ਲਡਰ %s ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "ਫ�ਲਡਰ %s ਦ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ਸ�ਨ�ਹਿ�� ਨ�ੰ %s ਫ�ਲਡਰ ਵਿੱ� ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ %s ਵਿੱ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1650
+#, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "�ੱਪਰ� ਸੰਭਾਲ ਤ�� ਸ�ਨ�ਹਾ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Move Folder To"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Copy Folder To"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:533
+#: ../plugins/groupwise-features/share-folder-common.c:136
 #, c-format
-msgid "Creating folder `%s'"
-msgstr "ਫ�ਲਡਰ `%s' ਬਣਾ�� �ਾ ਰਿਹਾ ਹ�"
+#| msgid "Creating folder `%s'"
+msgid "Creating folder '%s'"
+msgstr "'%s' ਫ�ਲਡਰ ਬਣਾ�� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:693
 msgid "Create Folder"
 msgstr "ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:694
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
 msgid "Specify where to create the folder:"
 msgstr "ਦੱਸ� �ਿ ਫ�ਲਡਰ �ਿੱਥ� ਬਣਾ�� �ਾਵ�:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:714
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "ਫ�ਲਡਰ \"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
 msgid "Unsigned"
 msgstr "ਨਾ-ਦਸਤ�ਤ"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਦਸਤ�ਤ ਨਾਲ ਨਹ�� ਹ�। �ਸ ਦ� ��� �ਾਰੰ�� ਨਹ�� �ਿ �ਹ ਸ�ਨ�ਹਾ ਸਹ�� ਹ�।"
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
 msgid "Valid signature"
 msgstr "�ਾ�� ਦਸਤ�ਤ"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 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:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
 msgid "Invalid signature"
 msgstr "�ਲਤ ਦਸਤ�ਤ"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "�ਸ ਸ�ਨ�ਹ� ਦ� ਦਸਤ�ਤ �ਾ��� ਨਹ�� ਹਨ, ਪਰ ਸੰ�ਾਰ ਦ�ਰਾਨ �ਹ ਤਬਦ�ਲ ਹ� �� �ਾਪਦ� ਹਨ।"
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
 msgid "Valid signature, but cannot verify sender"
 msgstr "ਦਸਤ�ਤ ਠ�� ਹਨ, ਪਰ ਭ��ਣ ਵਾਲਾ ��ੱ� ਨਹ�� ��ਤਾ"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 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:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
 msgid "Signature exists, but need public key"
 msgstr "ਦਸਤ�ਤ ਮ���ਦ ਹਨ, ਪਰ ਪਬਲਿ� ��ੰ�� ਲ���ਦ� ਹ�"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "�ਸ ਸ�ਨ�ਹ� ਦ� ਦਸਤ�ਤ ਤਾ� ਹਨ, ਪਰ ਸਬੰਧਿਤ ਪਬਲਿ� �� ਨਾਲ ਸਬੰਧਿਤ ਨਹ��।"
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
 msgid "Unencrypted"
 msgstr "�ਣ-�ੰ��ਰਿਪ�ਡ"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "�ਹ ਸ�ਨ�ਹਾ �ੰ��ਰਿਪ�ਡ ਨਹ�� ਹ� �ਸ ਦ� ��� ਭਾ� �ੰ�ਰਨ�ੱ� ਤ� ਸੰ�ਾਰ ਦ�ਰਾਨ ਵ��� �ਾ ਸ�ਦ� ਹਨ।"
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
 msgid "Encrypted, weak"
 msgstr "�ੰ��ਰਿਪ�ਡ, ਹਲ�ਾ"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -10872,21 +10811,21 @@ msgstr ""
 "�ਹ ਸ�ਨ�ਹ� �ੰ��ਰਿਪ�ਡ ਹ� �ਤ� �ਸ ਲ� ਹਲ�ਾ �ਲ���ਰਿਥਮ ਵਰਤਿ� �ਿ� ਹ�। �ਸ ਸ�ਨ�ਹ� ਨ�ੰ �ੱ� ਸੰਭਵ ਸਮ�� ਵਿੱ� "
 "�ਿਸ� ਵ� ਬਾਹਰ� ਵਿ��ਤ� ਵਲ�� ��ਲਣ ��ਾ ਤਾ� ਹ�, ਪਰ �ਸੰਭਵ ਨਹ�� ਹ�।"
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
 msgid "Encrypted"
 msgstr "�ੰ��ਰਿਪ�ਡ"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 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:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
 msgid "Encrypted, strong"
 msgstr "�ੰ��ਰਿਪ�, ਸ�ਤ"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -10895,15 +10834,15 @@ msgstr ""
 "�ਹ ਸ�ਨ�ਹ� �ੰ��ਰਿਪ�ਡ ਹ� �ਤ� �ਸ ਲ� ਸ�ਤ �ਲ���ਰਿਥਮ ਵਰਤਿ� �ਿ� ਹ�। �ਸ ਸ�ਨ�ਹ� ਦ� ਭਾ�ਾ� ਨ�ੰ �ੱ� ਸੰਭਵ ਸਮ�� "
 "ਵਿੱ� �ਿਸ� ਵ� ਬਾਹਰ� ਵਿ��ਤ� ਵਲ�� ਵ��ਣਾ ��ਾ ਹ�।"
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "ਸਰ��ਫਿ��� ਵ���(_V)"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "�ਹ ਸਰ��ਫਿ��� ਵ��ਣਯ�� ਨਹ�� ਹ�"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10911,118 +10850,142 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ �ਹ �-ਮ�ਲ ਨ�ੰ ਰ�ਡਰ ਨਹ�� �ਰ ਸ�ਦ�, �ਿ���ਿ �ਹ ਬਹ�ਤ ਵੱਡ� ਹ�। ਤ�ਸ�� �ਸ ਨ�ੰ ਬਿਨਾ� ਫਾਰਮ�� ਵ�� "
 "ਸ�ਦ� ਹ� �ਾ� ਬਾਹਰ� ���ਸ� �ਡ��ਰ ਨਾਲ ਵ�� ਸ�ਦ� ਹ�।"
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:725
 msgid "Completed on"
 msgstr "ਸਮਾਪਤ "
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:733
 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:750
+#: ../mail/em-format-html-display.c:737
 msgid "by"
 msgstr "ਨ�ੰ"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
 msgid "View _Unformatted"
 msgstr "ਬਿਨ-ਫਾਰਮ�� ਵ���(_U)"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:951
 msgid "Hide _Unformatted"
 msgstr "ਬਿਨ-ਫਾਰਮ�� �ਹਲ�(_U)"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1016
 msgid "O_pen With"
 msgstr "�ਸ ਨਾਲ ��ਲ�ਹ�(_p)"
 
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:176
 #, c-format
 msgid "Page %d of %d"
 msgstr "%2$d ਵਿੱ��� %1$d ਸਫ਼ਾ"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:153
 msgid "Formatting message"
 msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਫਾਰਮ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:352
 msgid "Formatting Message..."
 msgstr "ਸ�ਨ�ਹਾ ਫਾਰਮ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "%s ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ"
+#| msgid "Retrieving `%s'"
+msgid "Retrieving '%s'"
+msgstr "'%s' ਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1901
 msgid "Unknown external-body part."
 msgstr "�ਣ�ਾਣ ਬਾਹਰ�-ਮ�ੱ� ਭਾ�।"
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1909
 msgid "Malformed external-body part."
 msgstr "ਨਿ�ਾਰਾ ਬਾਹਰ�-ਭਾ�"
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1939
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ਸਾ�� (%s) ਲ� ਸੰ��ਤ�"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1950
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ਲ��ਲ ਫਾ�ਲ (%s) ਲ� ਸਾ�� %s ਦ� ਲ� ਸੰ��ਤ�"
 
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1952
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ਲ��ਲ ਫਾ�ਲ (%s) ਲ� ਸੰ��ਤ�"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1973
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ਰਿਮ�� ਡਾ�ਾ(%s) ਲ� ਸੰ��ਤ�"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1984
 #, 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:2628
+#: ../mail/em-format-html.c:2647
+#, c-format
+#| msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgid "This message was sent by %s on behalf of %s"
+msgstr "�ਹ ਸ�ਨ�ਹਾ %s ਵਲ�� %s ਦ� ਤ�ਰ �ੱਤ� ਭ��ਿ� �ਿ� ਹ�"
+
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
 #, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "�ਹ ਸ�ਨ�ਹਾ <b>%s</b> ਵਲ�� <b>%s</b> ਦ� ਤ�ਰ �ੱਤ� ਭ��ਿ� �ਿ� ਹ�"
+#| msgid "No summary available."
+msgid "No HTML stream available"
+msgstr "��� HTML ਸ�ਰ�ਮ �ਪਲੱਬਧ ਨਹ��"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:677
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "�ਹ ਭੰਡਾਰ ਮ��ਬਰ ਲ� ਸਹਾ� ਨਹ�� �ਾ� �ਹ ਯ�� ਨਹ�� ਹ�।"
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:728
 msgid "Subscribed"
 msgstr "ਮਨ�਼�ਰ"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:732
 msgid "Folder"
 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:835
+#: ../mail/em-subscribe-editor.c:1120
 msgid "Please select a server."
 msgstr "ਸਰਵਰ ��ਣ� ��।"
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1166
 msgid "No server has been selected"
 msgstr "��� ਸਰਵਰ ��ਣਿ� ਨਹ�� �ਿ�"
 
-#: ../mail/em-utils.c:310
+#. 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
+#, c-format
+#| msgid "Are you sure you want to open {0} messages at once?"
+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?"
+msgstr[0] "�� ਤ�ਸ�� %d ਸ�ਨ�ਹ� �ੱ� ਸਮ�� ਹ� ��ਲ�ਹਣ� �ਾਹ�ੰਦ� ਹ�?"
+msgstr[1] "�� ਤ�ਸ�� %d ਸ�ਨ�ਹ� �ੱ� ਸਮ�� ਹ� ��ਲ�ਹਣ� �ਾਹ�ੰਦ� ਹ�?"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#| msgid "_Do not show this message again."
+msgid "_Do not show this message again"
+msgstr "�ਹ ਸ�ਨ�ਹਾ ਮ�� ਨਾ ਵ��ਾ�(_D)।"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "ਸ�ਨ�ਹਾ ਫਿਲ�ਰ"
 
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:848
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ਤ�� ਸ�ਨ�ਹਾ"
@@ -11031,7 +10994,7 @@ msgstr "%s ਤ�� ਸ�ਨ�ਹਾ"
 msgid "Search _Folders"
 msgstr "��� ਫ�ਲਡਰ(_F)"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:525
 msgid "Add Folder"
 msgstr "ਫ�ਲਡਰ ਸ਼ਾਮਲ"
 
@@ -11072,56 +11035,52 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "\"ਭ��� �ਤ� ਪ�ਰਾਪਤ ਡਾ�\" ਵਿੰਡ� ���ਾ�"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "ਸ�ਮਿਤ ਸਾ��਼ ਦਾ ���ਸ� ਭਾ� ਵ��ਾ�ਣ �ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਮਨ��ਰ"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "ਪ�ਨ ਰਸ�ਦ ਦ� ਹਮ�ਸ਼ਾ ਮੰ� �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "���ਮ��ਿ� �ਮ�ਸ਼ਨ ਪ�ਾਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "���ਮ��ਿ� ਸੰਬੰਧ ਪ�ਾਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "��ਣ ਵਾਲ� ਪੱਤਰਾ� ਲ� �ੰ� �ਾ��"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "���ਾ���ਨ �ਭਾਰਨ ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "���ਾ���ਨ �ਭਾਰਨ ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "�ੰਪ��਼ਰ ਵਿੰਡ� ਦ� ਮ�ਲ ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "�ੰਪ��਼ਰ ਵਿੰਡ� ਦ� ਮ�ਲ ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "�ੰਪ��਼ਰ ਲ�ਡ/����� ਡਾ�ਰ���ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "TO/CC/BCC ਵਿੱ� ���ਾ �ਡਰ�ੱਸ ਵ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 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:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11129,11 +11088,11 @@ msgstr ""
 "�ੰ�ਰ�ਲ, �ਿਸ ਤ��਼� ਨਾਲ ਸਥਾਨ� ਬਦਲਾ� ਰਿਮ�� ਮ�ਲ ਸਰਵਰ ਨਾਲ ਸਮ�ਾਲ� ��ਤ� �ਾਣ। �ੰਤਰਾਲ�ੱ��-�ੱ� 30 "
 "ਸ�ਿੰ� ਹ�ਣਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "�ੰ� ਵਾਸਤ� ��ੱ� �ਰਨ ਵਾਸਤ� �ਸ�ਮ ਹ�ੱਡਰ"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11141,73 +11100,73 @@ msgstr ""
 "�ੰ� ਲ� ��ੱ� �ਰਨ ਦ� ਦ�ਰਾਨ ਵਰਤਣ ਵਾਸਤ� ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ। ਸ��� ��ਾ��� \"headername=value\" "
 "ਫਾਰਮ�� ਦ� ਲਾ�ਨ ਦ� ਰ�ਪ '� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "ਸ�ਨ�ਹਾ ਬਣਾ�ਣ ਲ� ਡਿਫਾਲ� �ੱ�ਰ ਸਮ�ਹ"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "ਸ�ਨ�ਹਾ ਬਣਾ�ਣ ਲ� ਡਿਫਾਲ� �ੱ�ਰ ਸਮ�ਹ।"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "ਸ�ਨ�ਹਾ ਵ��ਾ�ਣ ਲ� ਡਿਫਾਲ� �ੱ�ਰ ਸਮ�ਹ"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "ਸ�ਨ�ਹਾ ਵ��ਾ�ਣ ਲ� ਡਿਫਾਲ� �ੱ�ਰ ���ਡਿੰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "ਡਿਫਾਲ� �ੱ�� ਭ��ਣ ਦ� ਸ�ਾ�ਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "�ੰਪ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ��ਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "ਮ��ਬਰ� ਡਾ�ਲਾ� ਦ� ਡਿਫਾਲ� ��ਾ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ।"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "ਡਿਫਾਲ� �ਵਾਬ ਸ�ਾ�ਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "ਥਰਿੱਡ ਫ�ਲ� ਹਾਲਤ ਲ� ਡਿਫਾਲ� ਮ�ੱਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "�ੰਪ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ���ਾ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ���ਾ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "ਮ��ਬਰ� ਡਾ�ਲਾ� ਦ� ਡਿਫਾਲ� ���ਾ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "ਦੱਸ� �ਿ �� �ੰ� ਫਿਲ�ਰਿੰ� ਲ� �ਡਰ�ੱਸ ��ਵਲ ਲ��ਲ  �ਡਰ�ੱਸ-ਬ�ੱ� '� ਹ� ���� �ਾਣ।"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "ਦੱਸ� �ਿ �� ਭ��ਣ ਵਾਲਾ �ਮ�ਲ �ਡਰ�ੱਸ-ਬ�ੱ� '� ���ਿ� �ਾਵ�"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 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 "
@@ -11218,11 +11177,11 @@ msgstr ""
 "ਹ�ਵ��ਾ। �ਹ ਬ�ੱ� ਵਿੱ� ਲੱਭਦਾ ਹ�, �� �ਿ ���-ਪ�ਰਨ ਲ� ਮਾਰ� ਹਨ। �ਸ ਹ�ਲ� ਹ� ਸ�ਦਾ ਹ�, �� ਰਿਮ�� �ਡਰ�ਸ "
 "ਬ�ੱ� (LDAP ਵਾ��) ਨ�ੰ ���-ਪ�ਰਨ ਲ� ਮਾਰ� ��ਤਾ �ਿ� ਹ�ਵ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "ਦੱਸ� �ਿ �ੰ� ਲ� ��ੱ� �ਰਨ ਸਮ�� ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ ਵਰਤ� �ਾਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 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 "
@@ -11231,7 +11190,7 @@ msgstr ""
 "�� �ੰ� ��ੱ� �ਰਨ ਲ� �ਸ�ਮ ਹ�ੱਡਰ ਵਰਤਣ� �ਾਹ�ਦ� ਹਨ। �� �ਹ ��ਣ �ਾਲ� ਰਹ� �ਤ� ਹ�ੱਡਰ ਦ� ਨਿ�ਰਾਨ� "
 "��ਤ ਤਾ� �ਹ �ੰ� ��ੱ� �ਰਨ ਦ� �ਤ� ਵਧਾ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11239,18 +11198,22 @@ msgstr ""
 "�� ਵਰ���ਲ �ਲ� ਵਿੱ� \"ਸ�ਨ�ਹਾ\" �ਾਲਮ ਵਿੱ� \"ਵਲ��\" �ਤ� \"ਵਿਸ਼ਾ\" ਲਾ�ਨਾ� ਲ� �ੱ�� ਫ��� ਵਰਤਣ� "
 "ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "�ੰਪ��਼ਰ ਵਿੱ� ਫਾ�ਲਾ� ਲ�ਡ �ਰਨ/����� �ਰਨ ਵਾਸਤ� ਡਾ�ਰ���ਰ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "ਮ�ਲ ਭਾ� ਫਾ�ਲਾ� ਸੰਭਾਲਣ ਵਾਸਤ� ਡਾ�ਰ��ਰ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "ਬਾਹ� ਵਿੱ� ਫ�ਲਡਰ ਨਾ� ਲ� �ੰਡਾ�ਾਰ-ਸਾ��਼ ਯ�� �ਾ� �ਯ��"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr "��ਵਲ �ਹ� ���ਸ� ਸ�ਨ�ਹ� ਵ���, �� �ਿ ��� ��ਾਰ ਤ�� ਵੱਧ ਨਹ�� ਹਨ"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "ਦਸਤ�ਤ ਡ�ਲਿਮ�ਰ ਸ਼ਾਮਲ ਨਾ �ਰ�"
@@ -11320,18 +11283,31 @@ msgid ""
 msgstr "�ਸ ਨ�ੰ ਯ�� �ਰਨ ਨਾਲ ਸਪ�ਸ ਬਾਰ ਸਵਿੱ� ਸ�ਨ�ਹਾ �ਲ�, ਸ�ਨ�ਹਾ ਸ��� �ਤ� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਰ�ਲ �ਰ���। "
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "ਰ�ਡਰ ਸ�ਨ�ਹਾ ���ਸ� ਭਾ� ਨ�ੰ ਸ�ਮਿਤ ��ਾਰ ਦਿ�।"
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr "ਸਭ ਫ�ਲਡਰਾ� ਲ� ਰਲਦ� ਸ�ਨ�ਹਾ ਲਿਸ� �ਲ� ਸ��ਿੰ� ਵਰਤਣ ਲ� �ਾਲ� �ਰ�।"
+
+#: ../mail/evolution-mail.schemas.in.h:66
+#| msgid ""
+#| "Enable this to use Space bar key to scroll in message preview, message "
+#| "list and folders."
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr "ਸਭ ਫ�ਲਡਰਾ� ਲ� ਰਲਦ� ਸ�ਨ�ਹਾ ਲਿਸ� �ਲ� ਸ��ਿੰ� ਵਰਤਣ ਲ� �ਾਲ� �ਰ�।"
+
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "�ਾਰ�� ਮ�ਡ ਯ��/�ਯ��"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "���ਲ�ੱ�/��ਮ�ਲ ਢੰ� ਨਾਲ ਫਾ�ਲ ਨਾ� �ੰ��ਡ �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 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, "
@@ -11342,19 +11318,27 @@ msgstr ""
 "UTF-8 �ੱ�ਰ ਨਾਲ ਭ��� ਫਾ�ਲ ਨਾ� ਵਿੱ� ਭ��ਿ� ਹ�, �ਿ���ਿ �ਹ RFC ੨੨੩੧ ਦ� ਮ�ਤਾਬ� ਨਹ��, ਬਲ�ਿ RFC "
 "੨੦੪੭ ਸ���ਡਰਡ ਨ�ੰ ਮੰਨਦ� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Flush Outbox after filtering"
+msgstr "ਫਿਲ�ਰ �ਰਨ ਦ� ਬਾ�ਦ ���ਬਾ�ਸ ਸਾਫ਼ �ਰ�"
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Group Reply replies to list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Height of the message-list pane"
 msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਪੱ�� ਦ� ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Height of the message-list pane."
 msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਪੱ�� ਦ� ��ਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ਪਰ-ਫ�ਲਡਰ �ਲ� �ਹਲ� �ਰ� �ਤ� ��ਣ ਹ�ਾ ਦਿ�"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -11362,7 +11346,7 @@ msgstr ""
 "���ਰ ਯ��਼ਰ ਨ� ੧੦ �ਾ� ਵਧ�ਰ� ਸ�ਨ�ਹ� �ੱ�� ਸਮ�� ��ਲਣ ਦ� ��ਸ਼ਿਸ ��ਤ� ਤਾ�, ਯ��਼ਰ ਨ�ੰ ਪ�ੱ�� �ਿ �� �ਹ �ੰ� �ਰਨਾ "
 "�ਾਹ�ੰਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:76
 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 "
@@ -11371,7 +11355,11 @@ msgstr ""
 "�ੱ� �ਾਸ MIME �ਿਸਮ ਲ� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਦਰਸ਼� ਸ਼ਾਮਿਲ ਨਹ�� ਹ�, �ਿਸ� MIME �ਿਸਮ ਨ�ੰ �ਸ ਸ��� ਵਿੱ� "
 "�ਪਲੱਬਧ ਹ�ਣ ਲ� �ਸ ਨ�ੰ �ਨ�ਮ ਦ� MIME �ਿਸਮ ਡਾ�ਾਬ�ਸ ਦ� ਬ�ਨਬ�-ਭਾ� ਦਰਸ਼� ਵਿੱ� �ਪਲੱਬਧ ਹ�ਣਾ ਸਹਾ�� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Ignore list Reply-To:"
+msgstr "ਲਿਸ� ਨ�ੰ �ਵਾਬ ਦਿ� �ਣਡਿੱਠਾ:"
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -11379,7 +11367,7 @@ msgstr ""
 "\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ �ਰ��� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
 "ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11387,7 +11375,7 @@ msgstr ""
 "\"��� ਫ�ਲਡਰ �ਡ��ਰ ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ �ਰ��� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
 "ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11395,7 +11383,7 @@ msgstr ""
 "\"ਮ�ਲ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ �ਰ��� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
 "ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11406,7 +11394,7 @@ msgstr ""
 "ਨ�ੰ ਵੱਧ�-ਵੱਧ �ਾ� �ਣ-ਵੱਧ�-ਵੱਧ �ਰਦਾ ਹ�। ਯਾਦ ਰੱ�� �ਿ �ਹ �ਾਸ ਮ�ੱਲ �ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਨਹ�� ਵਰਤਿ� �ਾ�ਦਾ, �ਦ�� "
 "\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਨਾ ਹ�ਵ�। �ਹ ��ੰ�� ��ਵਲ ਸਥਾਪਨ ਵ�ਰਵਾ ਵ��� ਹ� ਮ���ਦ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11417,7 +11405,7 @@ msgstr ""
 "ਵਿੰਡ� ਨ�ੰ ਵੱਧ�-ਵੱਧ �ਾ� �ਣ-ਵੱਧ�-ਵੱਧ �ਰਦਾ ਹ�। ਯਾਦ ਰੱ�� �ਿ �ਹ �ਾਸ ਮ�ੱਲ �ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਨਹ�� ਵਰਤਿ� �ਾ�ਦਾ, "
 "�ਦ�� \"��� ਫ�ਲਡਰ �ਡ��ਰ\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਨਾ ਹ�ਵ�। �ਹ ��ੰ�� ��ਵਲ ਸਥਾਪਨ ਵ�ਰਵਾ ਵ��� ਹ� ਮ���ਦ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11429,7 +11417,7 @@ msgstr ""
 "ਨ�ੰ ਵੱਧ�-ਵੱਧ �ਾ� �ਣ-ਵੱਧ�-ਵੱਧ �ਰਦਾ ਹ�। ਯਾਦ ਰੱ�� �ਿ �ਹ �ਾਸ ਮ�ੱਲ �ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਨਹ�� ਵਰਤਿ� �ਾ�ਦਾ, �ਦ�� "
 "\"ਮ�ਲ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਨਾ ਹ�ਵ�। �ਹ ��ੰ�� ��ਵਲ ਸਥਾਪਨ ਵ�ਰਵਾ ਵ��� ਹ� ਮ���ਦ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -11437,7 +11425,7 @@ msgstr ""
 "\"ਫਿਲ�ਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ���ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਹਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
 "ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11445,7 +11433,7 @@ msgstr ""
 "\"��� ਫ�ਲਡਰ �ਡ��ਰ\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ���ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਹਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
 "ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11453,7 +11441,15 @@ msgstr ""
 "\"ਮ�ਲ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ���ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਹਰ���ਲ ਮ��-��ਾਰ �ਰ��ਾ ਤਾ� "
 "ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:87
+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 "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:88
 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 "
@@ -11462,35 +11458,66 @@ msgstr ""
 "�ਹ ਲ�ਾਤਾਰ ਪ�ੱ�ਣ ਨ�ੰ �ਯ��/ਯ�� ਰਦ� ਹ�, �� �ਿ ��ਤਾਵਨ� ਦਿੰਦ� �ਿ ��� ਫ�ਲਡਰ ਤ�� ਸ�ਨ�ਹ� ਹ�ਾ�ਣ ਨਾਲ "
 "ਸ�ਨ�ਹ� ਨ�ੰ ਪੱ�� ਤ�ਰ �ੱਤ� ਹ�ਾ�� �ਾਵ��ਾ, ਨਾ �ਿ ��ਵਲ ��� ਨਤ��ਿ�� ਵਿੱ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+#: ../mail/evolution-mail.schemas.in.h:89
+#, fuzzy
+#| 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 the search results."
+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."
+msgstr ""
+"�ਹ ਲ�ਾਤਾਰ ਪ�ੱ�ਣ ਨ�ੰ �ਯ��/ਯ�� ਰਦ� ਹ�, �� �ਿ ��ਤਾਵਨ� ਦਿੰਦ� �ਿ ��� ਫ�ਲਡਰ ਤ�� ਸ�ਨ�ਹ� ਹ�ਾ�ਣ ਨਾਲ "
+"ਸ�ਨ�ਹ� ਨ�ੰ ਪੱ�� ਤ�ਰ �ੱਤ� ਹ�ਾ�� �ਾਵ��ਾ, ਨਾ �ਿ ��ਵਲ ��� ਨਤ��ਿ�� ਵਿੱ���।"
+
+#: ../mail/evolution-mail.schemas.in.h:90
+#| msgid ""
+#| "It disables/enables the repeated prompts to ask if offline sync is "
+#| "required before going into offline mode."
+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
+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 "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:92
+#| msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
 msgstr "��ਰ� ਵਾਰ �ੰ� ਨ�ੰ �ਾਲ� ��ਤਾ ਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
-msgstr "��ਰ� ਵਾਰ ਰੱਦ �ਾਲ� �ਰਨ ਦਾ ਸਮਾ�"
+#: ../mail/evolution-mail.schemas.in.h:93
+#| msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
+msgstr "��ਰ� ਵਾਰ ਰੱਦ� �ਾਲ� �ਰਨ ਦਾ ਸਮਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Layout style"
 msgstr "ਲ���� ਸ�ਾ�ਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "List of Labels and their associated colors"
 msgstr "ਲ�ਬਲ ਸ��� �ਤ� ਸੰਬੰਧਿਤ ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "ਬ�ਨਬ� ਭਾ� ਦਰਸ਼� ਦ� �ਾ�� ਲ� MIME �ਿਸਮ ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "List of accepted licenses"
 msgstr "ਮਨ�਼�ਰ ਲਾ�ਸ��ਸਾ� ਦ� ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "List of accounts"
 msgstr "��ਾ��� ਦ� ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11498,15 +11525,15 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਦ� ਪੱਤਰ ਭਾ� ��ਲ �ਪਲੱਬਧ ��ਾ���ਾ� ਦ� ਲਿਸ�। �ਸ ਸ��� ਵਿੱ� ਲਾ�ਨਾ� ਸਬ-ਡਾ�ਰ���ਰ��� /apps/"
 "evolution/mail/accounts ਦ� �ਨ�ਸਾਰ ਸ਼ਾਮਿਲ ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of custom headers and whether they are enabled."
 msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰਾ� ਦ� ਸ��� �ਤ� �� �ਹ ਵਰਤ� �ਾਣ।"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ਸ਼ਬਦ-��� ��ੱ� �ਰਨ ਲ� ਡਿ�ਸ਼ਨਰ� ਭਾਸ਼ਾ ��ਡ ਦ� ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:103
 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."
@@ -11514,15 +11541,15 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਦ� ਪੱਤਰ ਭਾ� ਲ� ਪ�ਾਣ ਦ� ਲ�ਬਲ ਸ��� ਹ�। �ਹ ਸ��� �ਹ ਸਾਰ� ਰੰ� ਰੱ�ਦ� ਹ�, �� �ਿ HTML "
 "ਹ��ਸਾ �ੰ��ਡਿੰ� ਲ� ਵਰਤ� �ਾਦ� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "List of protocol names whose license has been accepted."
 msgstr "ਪਰ�����ਲਾ� ਨਾ� ਦ� ਲਿਸ�, �ਿਹਨਾ� ਦਾ ਲਾ�ਸ��ਸ ਮਨ�਼�ਰ ��ਤਾ �ਿ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Load images for HTML messages over HTTP"
 msgstr "HTML ਸ�ਨ�ਹ� ਲ� HTTP ਤ�� �ਿੱਤਰ ਪ�ਰਾਪਤ �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:106
 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 "
@@ -11532,103 +11559,123 @@ msgstr ""
 "�ਿੱਤਰ ਡਾ�ਨਲ�ਡ ਤਾ� ਹ� �ਰ�, ���ਰ ਭ��ਣ ਵਾਲਾ �ਡਰ�ੱਸ ਸ��� ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�ਵ� \"2\" -  ਨ�ੱ� ਤ�� ਹਮ�ਸ਼ਾ "
 "�ਿੱਤਰ ਡਾ�ਨਲ�ਡ �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Log filter actions"
 msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Log filter actions to the specified log file."
 msgstr "ਨਿਰਧਾਰਿਤ ਲਾੱ� ਫਾ�ਲ ਲ� ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Logfile to log filter actions"
 msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਲ� ਲਾੱ�-ਫਾ�ਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Logfile to log filter actions."
 msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਲ� ਲਾੱ�-ਫਾ�ਲ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Mail browser height"
 msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Mail browser maximized"
 msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ਵੱਧ�-ਵੱਧ"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Mail browser width"
 msgstr "ਮ�ਲ ਬਰਾ��਼ਰ ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Mark as Seen after specified timeout"
 msgstr "ਨਿਰਧਾਰਿਤ ਸਮ�� ਬਾ�ਦ ਵ��ਿ� ਨਿਰਧਾਰਿਤ �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mark as Seen after specified timeout."
 msgstr "ਨਿਰਧਾਰਿਤ ਸਮ�� ਬਾ�ਦ ਵ��ਿ� ਨਿਰਧਾਰਿਤ �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mark citations in the message \"Preview\""
 msgstr "ਸ�ਨ�ਹਾ \"�ਲ�\" ਵਿੱ� ਨਿਸ਼ਾਨ ਦਿ�"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mark citations in the message \"Preview\"."
 msgstr "ਸ�ਨ�ਹਾ \"�ਲ�\" ਵਿੱ� ਨਿਸ਼ਾਨ ਦਿ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:118
+#| msgid "Message Display"
+msgid "Message text limit for display"
+msgstr "ਵ��ਾ�ਣ ਲ� ਸ�ਨ�ਹਾ ���ਸ� ਲਿਮ�"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "ਸ�ਨ�ਹਾ ਵ��ਾ�ਣ ਸ਼�ਲ� (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ਬੰਦ �ਰਨ ਸਮ�� �ੰ� ਨ�ੰ �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� ਦਿਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ਬੰਦ �ਰਨ ਤ� ਰੱਦ� �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� ਦਿਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "ਬੰਦ �ਰਨ �ੱਤ� ਰੱਦ� �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� ਸਮਾ� ਦਿਨਾ� ਵਿੱ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ਬੰਦ �ਰਨ ਤ� ਰੱਦ� �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� �ੰਤਰਾਲ ਦਿਨਾ� ਵਿੱ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "ਵੱਲ/CC/BCC ਵਿੱ� ਵ��ਾ�ਣ ਲ� ਸਿਰਨਾਵ��� ਦ� �ਿਣਤ�"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt on empty subject"
 msgstr "�ਾਲ� ਵਿਸ਼� ਤ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "�ਦ�� ਯ��਼ਰ ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�ਣ �ਾ ਰਿਹਾ ਹ�ਵ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "�ਦ�� ਯ��਼ਰ ਬਿਨਾ� ਵਿਸ਼� ਤ�� ਸ�ਨ�ਹਾ ਭ��ਣ �ਾ ਰਿਹਾ ਹ�ਵ� ਤਾ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Prompt when deleting messages in search folder"
 msgstr "ਪ�ੱ��, �ਦ�� ��� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨ�ਹ� ਹ�ਾ�ਣ� ਹ�ਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:129
+#| msgid "Prompt while marking multiple messages"
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "ਪ�ੱ��, �ਦ�� ਮ�ਲਿ� ਲਿਸ� ਹਾ���� ਪ�ਰਾ�ਵ�� �ਵਾਬ"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+#| msgid "Prompt while marking multiple messages"
+msgid "Prompt when replying privately to list messages"
+msgstr "ਪ�ੱ��, �ਦ�� ਲਿਸ� ਸ�ਨ�ਹਿ�� ਲ� ਪ�ਰਾ�ਵ�� �ਵਾਬ ਦਿੱਤਾ �ਾ ਰਿਹਾ ਹ�ਵ�"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when replying to many recipients"
+msgstr "ਪ�ੱ��, �ਦ�� �� ਪ�ਰਾਪਤ-�ਰਤਾਵਾ� ਨ�ੰ �ਵਾਬ ਦਿੱਤਾ �ਾ ਰਿਹਾ ਹ�ਵ�"
+
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Prompt when user expunges"
 msgstr "�ਦ�� ਯ��਼ਰ ਹ�ਾ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when user only fills Bcc"
 msgstr "���ਰ ਸਿਰਫ Bcc ��ਤਰ ਹ� ਭਰਿ� ਹ�ਵ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "�ਦ�� ਯ��਼ਰ �ੱ�� ਸਮ�� ੧੦ ਸ�ਨ�ਹ� ��ਲਣ ਦ� ��ਸ਼ਿਸ �ਰ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11636,131 +11683,127 @@ msgstr ""
 "�ਦ�� ਯ��਼ਰ HTML ਸ�ਨ�ਹ�, �ਹਨਾ� ਯ��਼ਰ ਨ�ੰ ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ�, �� �ਿ �ਹ ਪ�ਰਾਪਤ ਹ� ਨਹ�� �ਰਨਾ �ਾਹ�ੰਦ� "
 "ਹਨ, ਤਾ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "�ਦ�� ਯ��਼ਰ ਬਿਨਾ� ਵੱਲ �ਾ� Cc ਪ�ਰਾਪਤ�ਰਤਾ ਦ� ਸ�ਨ�ਹ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ� ਤਾ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "�ਦ�� ਯ��਼ਰ ਨਾ-�ਾਹਿ�� HTML ਸ�ਨ�ਹ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt while marking multiple messages"
 msgstr "�ਦ�� �� ਸ�ਨ�ਹ� ਨਿਸ਼ਾਨਬੱਧ �ਰਨ� ਹ�ਣ ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Put personalized signatures at the top of replies"
 msgstr "�ਵਾਬ ਦ� �ੱਤ� ਨਿੱ�� ਦਸਤ�ਤ ਦਿ�"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Put the cursor at the bottom of replies"
 msgstr "�ਵਾਬਾ� ਦ� ਹ�ਠਾ� �ਰਸਰ ਰੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "���ਸ� ਵਿੱ��� �ਮ�ਸ਼ਨ ਦ� ਪ�ਾਣ �ਰ�� �ਿੱਤਰਾ� ਨਾਲ ਬਦਲ ਦਿ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Recognize links in text and replace them."
 msgstr "���ਸ� ਵਿੱ� ਲਿੰ�ਾ� ਦ� �ਾ�� �ਰ� �ਤ� ਤਬਦ�ਲ �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Run junk test on incoming mail."
 msgstr "� ਰਹ��� ਮ�ਲਾ� ਲ� �ੰ� ��ਸ� �ਲਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Save directory"
 msgstr "ਡਾ�ਰ���ਰ� ਸੰਭਾਲ�"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Search for the sender photo in local address books"
 msgstr "ਲ��ਲ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਭ��ਣ ਵਾਲ� ਫ��� ਦ� ���"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Send HTML mail by default"
 msgstr "ਡਿਫਾਲ� HTML ਪੱਤਰ ਭ���"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Send HTML mail by default."
 msgstr "ਡਿਫਾਲ� HTML ਪੱਤਰ ਭ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Sender email-address column in the message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਵਿੱ� ਸ�ਨ�ਹਾ �ਾਲਮ ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� �-ਮ�ਲ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Server synchronization interval"
 msgstr "ਸਰਵਰ ਸ��ਰ�ਨਾ��਼ �ੰਤਰਾਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
-"ਸਹ�� ਸ�ੱ� �ਰ�, �� ਤ�ਸ�� ਮ�ਲ ਲਿ�ਣ ਦ� ਦ�ਰਾਨ, �ਪਣ� ਦਸਤ�ਤਾ� ਤ�� ਪਹਿਲਾ� ਦਸਤ�ਤ ਡ�ਲਿਮ�ਰ ਸ਼ਾਮਲ "
-"ਨਹ�� �ਰਨਾ �ਾਹ�ੰਦ� ਹ�।"
+"ਸਹ�� ਸ�ੱ� �ਰ�, �� ਤ�ਸ�� ਮ�ਲ ਲਿ�ਣ ਦ� ਦ�ਰਾਨ, �ਪਣ� ਦਸਤ�ਤਾ� ਤ�� ਪਹਿਲਾ� ਦਸਤ�ਤ ਡ�ਲਿਮ�ਰ ਸ਼ਾਮਲ ਨਹ�� "
+"�ਰਨਾ �ਾਹ�ੰਦ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "�ਦ�� ਮ�ਲ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Bcc\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "�ਦ�� ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Cc\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "ਨਿ��਼�ਰ�ੱਪ ਵਿੱ� ਭ��ਣ ਦ�ਰਾਨ \"ਵਲ��\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show \"From\" field when sending a mail message"
-msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣ ਦ�ਰਾਨ \"ਵਲ��\" ��ਤਰ ਵ���"
-
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "ਨਿ��਼�ਰ�ੱਪ ਨ�ੰ ਭ��ਣ ਦ�ਰਾਨ \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Show Animations"
 msgstr "�ਨ�ਮ�ਸ਼ਨ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show all message headers"
 msgstr "ਸਭ ਸ�ਨ�ਹ� ਹ�ੱਡਰ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show all the headers when viewing a messages."
 msgstr "ਸ�ਨ�ਹਾ ਵ��ਣ ਦ�ਰਾਨ ਸਭ ਹ�ੱਡਰ ਵ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Show animated images as animations."
 msgstr "�ਨ�ਮ�ਸ਼ਨ ਸ�ਨ�ਹ� �ਨ�ਮ�ਸ਼ਨ ਵ��� ਹ� ਵ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਵਿੱ� ਹ�ਾ� ਸ�ਨ�ਹ� ਵ��� (ਵਿੰਨ� ਹ��)।"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show deleted messages in the message-list"
 msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਵਿੱ� ਹ�ਾ� ਸ�ਨ�ਹ� ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show image animations"
 msgstr "�ਿੱਤਰ �ਨ�ਮ�ਸ਼ਨ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show original \"Date\" header value."
 msgstr "�ਸਲ� \"ਮਿਤ�\" ਹ�ੱਡਰ ਮ�ੱਲ ਵ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show photo of the sender"
 msgstr "ਭ��ਣ ਵਾਲ� ਦ� ਫ��� ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11768,7 +11811,7 @@ msgstr ""
 "�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Bcc\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� �ੰ�ਰ�ਲ "
 "��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11776,7 +11819,7 @@ msgstr ""
 "�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Cc\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� �ੰ�ਰ�ਲ "
 "��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11784,15 +11827,7 @@ msgstr ""
 "�ਦ�� ਨਿ��਼�ਰ�ੱਪ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"ਵਲ��\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� �ੰ�ਰ�ਲ "
 "��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid ""
-"Show the \"From\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"ਵਲ��\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� �ੰ�ਰ�ਲ "
-"��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
-
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11800,7 +11835,7 @@ msgstr ""
 "�ਦ�� ਨਿ��਼�ਰ�ੱਪ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
 "�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11808,13 +11843,13 @@ msgstr ""
 "�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
 "�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "ਸ�ਨ�ਹਾ ਲਿਸ� ਵਿੱ� ਵੱ�ਰ� �ਾਲਮ ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� �-ਮ�ਲ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:171
 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 "
@@ -11823,84 +11858,98 @@ msgstr ""
 "�ਸਲ� \"ਮਿਤ�\" ਹ�ੱਡਰ ਵ��� (ਲ��ਲ ਸਮ�� ਨਾਲ, �� ਸਮਾ� ��ਤਰ ਵੱ�ਰਾ ਹ�ਵ�)। ਨਹ�� ਤਾ� ਹਮ�ਸ਼ਾ \"ਮਿਤ�\" "
 "ਹ�ੱਡਰ ਮ�ੱਲ ਯ��਼ਰ ਵਲ�� ਦੱਸ� ਫਾਰਮ�� ਨਾਲ �ਤ� ਲ��ਲ ਸਮਾ� ��ਤਰ ਵ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "ਸ�ਨ�ਹਾ ਪ��ਹਨ ਪ��ਨ ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� ਫ��� ਵ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:173
+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. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Spell check inline"
 msgstr "ਲਾ�ਨ ਵਿੱ� ਸ਼ਬਦ-��� �ਾ��"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Spell checking color"
 msgstr "ਸ਼ਬਦ-��� �ਾ�� ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Spell checking languages"
 msgstr "ਸ਼ਬਦ-��� �ਾ�� ਭਾਸ਼ਾਵਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Subscribe dialog default height"
 msgstr "ਮ��ਬਰ ਬਣ� ਡਾ�ਲਾ� ਮ�ਲ ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Subscribe dialog default width"
 msgstr "ਮ��ਬਰ ਬਣ� ਡਾ�ਲਾ� ਮ�ਲ ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Terminal font"
 msgstr "�ਰਮ�ਨਲ ਫ���"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "���ਸ� ਸ�ਨ�ਹਾ ਭਾ� ਸ�ਮਾ"
-
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "The default plugin for Junk hook"
 msgstr "�ੰ� ਹ�ੱ� ਲ� ਡਿਫਾਲ� ਪਲੱ��ਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
-msgstr "��ਰ� ਵਾਰ �ੰ� �ਾਲ ��ਤਾ �ਿ� ਸ�, �ੰਨ�ਹ� ਦਿਨ ਪਹਿਲਾ�।"
+#: ../mail/evolution-mail.schemas.in.h:181
+#| msgid "The last time empty junk was run, in days since the epoch."
+msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr "��ਰ� ਵਾਰ �ੰ� �ਾਲ ��ਤਾ �ਿ� ਸ�, 1 �ਨਵਰ� 1970 ਤ�� ਲ� �� ਦਿਨਾ� '� (�ਪ��)"
 
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
-msgstr "�ਾਫ� ਦਿਨ ਪਹਿਲਾ� ਰੱਦ� �ਾਲ� ��ਤ� ਸ�।"
+#: ../mail/evolution-mail.schemas.in.h:182
+#| msgid "The last time empty trash was run, in days since the epoch."
+msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr "��ਰ� ਵਾਰ ਰੱਦ� �ਾਲ� �ਰਨ ਦ� �ਾਰਵਾ�, 1 �ਨਵਰ� 1970 ਤ�� ਲ� �� ਦਿਨਾ� �।"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:183
 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 "
 "message list. \"1\" (Vertical View) places the preview pane next to the "
 "message list."
 msgstr ""
-"ਲ���� ਸ�ਾ�ਲ ਤਹਿ �ਰਦਾ ਹ� �ਿ ਸ�ਨ�ਹਾ ਲਿਸ� ਨਾਲ ਸਬੰਧਿਤ �ਲ� ਬਾਹ� �ਿੱਥ� ਵ��ਾ� �ਾਵ�। "
-"\"0\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ ਸ�ਨ�ਹਾ ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) "
-"�ਲ� ਬਾਹ� ਨ�ੰ ਸ�ਨ�ਹਾ ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
+"ਲ���� ਸ�ਾ�ਲ ਤਹਿ �ਰਦਾ ਹ� �ਿ ਸ�ਨ�ਹਾ ਲਿਸ� ਨਾਲ ਸਬੰਧਿਤ �ਲ� ਬਾਹ� �ਿੱਥ� ਵ��ਾ� �ਾਵ�। \"0"
+"\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ ਸ�ਨ�ਹਾ ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) �ਲ� "
+"ਬਾਹ� ਨ�ੰ ਸ�ਨ�ਹਾ ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "The terminal font for mail display."
 msgstr "ਮ�ਲ ਵ��ਾ�ਣ ਲ� �ਰਮ�ਨਲ ਫ��� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "The variable width font for mail display."
 msgstr "ਮ�ਲ ਵ��ਾ�ਣ ਲ� ਵ�ਰ�ਬਲ ���� ਫ��� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:186
 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:176
+#: ../mail/evolution-mail.schemas.in.h:187
+#| msgid ""
+#| "This decides the max size of the text part that can be formatted under "
+#| "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"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 "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
 "�ਹ ���ਸ� ਭਾ� ਦਾ ਵੱਧ ਤ�� ਵੱਧ ��ਾਰ ਤਹਿ �ਰਦਾ ਹ�, �ਿਸ ਨ�ੰ �ਵ�ਲ�ਸ਼ਨ ਮ�ਤਾਬ� ਫਾਰਮ�� ��ਤਾ �ਾ ਸ�ਦਾ "
-"ਹ�। ਡਿਫਾਲ� 4 (੪) MB / ੪੦੯੬ KB ਹ� �ਤ� KB ਦ� ਰ�ਪ ਵਿੱ� ਦਿੱਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+"ਹ�। ਡਿਫਾਲ� 4 (੪) MB / ੪੦੯੬ KB ਹ� �ਤ� KB ਦ� ਰ�ਪ ਵਿੱ� ਦਿੱਤਾ �ਾ ਸ�ਦਾ ਹ�। �ਹ ਮ�ੱਲ ਤਾ� ਹ� "
+"ਵਰਤਿ� �ਾ ਸ�ਦਾ ਹ�, �ਦ�� 'force_message_limit' ��ੰ�� ����ਵ�� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:188
 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 "
@@ -11909,7 +11958,7 @@ msgstr ""
 "�ਹ ਡਿਫਾਲ� �ੰ� ਪਲੱ��ਨ ਹ�, ਭਾਵ�� �ਿ �� ਪਲੱ��ਨ ਯ�� ਹਨ। �� ਡਿਫਾਲ� ਦਿੱਤ� ਪਲੱ��ਨ �ਯ�� ਹ� ਤਾ� �ਹ "
 "ਹ�ਰ �ਪਲੱਬਧ ਪਲੱ��ਨ �ਾਲ� ਨਹ�� �ਰ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:189
 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."
@@ -11917,7 +11966,7 @@ msgstr ""
 "�ਹ �� ��ਵਲ ਪ��ਹਨ ਲ� ਹ� �ਤ� ਪ��ਹਨ ਬਾ�ਦ \"�ਲਤ\" ਲ� ਰ�-ਸ�ੱ� ��ਤਾ ਹ�। ਸ��� ਵਿੱ��ਹ ਮ�ਲ �ਣ-"
 "��ਣ� ਹ� �ਤ� �ਸ ਫ�ਲਡਰ ਲ� �ਲ� ਹ�ਾ�ਦ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:190
 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;"
@@ -11928,7 +11977,7 @@ msgstr ""
 "XML ਢਾ��� ਦਾ ਫਾਰਮ�� ਹ� &lt; �ਾ��ਲ ਯ��&gt; - ਸ�ੱ� �ਰ�, ���ਰ ਮ�ਲ �ਲ� ਵਿੱ� ਤ�ਸ�� ਹ�ੱਡਰ ਵ��ਣਾ "
 "�ਾਹ�ੰਦ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:191
 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 "
@@ -11937,11 +11986,11 @@ msgstr ""
 "�ਹ ��ਣ lookup_addressbook ��ੰ�� ਨਾਲ ਸਬੰਧਿਤ ਹ� �ਤ� �ਸ ਨ�ੰ ਲ��ਲ �ਡਰ�ੱਸ ਵਿੱ� �ਡਰ�ੱਸ ਦ� ��� ਲ� "
 "ਵਰਤਿ� �ਾ�ਦਾ ਹ�, �ਦ�� �ਿ �ੰ� ਫਿਲ�ਰ ਤ�� �ਣ�ਾਣ ਸੰਪਰ� ਨ�ੰ �ੱਡ ��ਤਾ �ਾ ਸ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "This option would help in improving the speed of fetching."
 msgstr "�ਹ ��ਣ ਲ�ਣ ਦ� ਸਪ�ਡ ਸ�ਧਾਰਨ ਲ� ਮੱਦਦ �ਰ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11949,7 +11998,7 @@ msgstr ""
 "�ਹ ਡਿਫਾਲ� ਸ�ਨ�ਹਾ ਸ��� �ਲ� ਵਿੱ� �ਡਰ�ੱਸਾ� ਦ� �ਿਣਤ� ਸ�ੱ� �ਰਦ� ਹ�, �ਿਸ ਤ�� ਬਾ�ਦ �ੱ� '...' "
 "ਵ��ਾ�� �ਾ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -11957,7 +12006,7 @@ msgstr ""
 "�ਹ ਸ��ਿੰ� ਤਹਿ �ਰਦ� ਹ� �ਿ ਡਿਫਾਲ� ਰ�ਪ ਵਿੱ� ਥਰਿੱਡ ਫ�ਲਿ� ਹ�ਵ� �ਾ� ਸਮ��ਿ� ਹ���। �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ��-"
 "�ਾਲ� �ਰਨਾ ਪਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:195
 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 "
@@ -11966,51 +12015,51 @@ msgstr ""
 "�ਹ ਸ��ਿੰ� ਤਹਿ �ਰਦ� ਹ� �ਿ ਥਰਿੱਡਾ� ਨ�ੰ ਹਰ�� ਥਰਿੱਡ ਵਿੱ� ਤਾ�਼ਾ ਸ�ਨ�ਹਿ�� ਮ�ਤਾਬ� ਲ��ਬੱਧ ��ਤਾ �ਾਵ�, "
 "ਨਾ �ਿ ਸ�ਨ�ਹ� ਦ� ਮਿਤ� ਮ�ਤਾਬ�। �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ��-ਸ�ਾਰ� �ਰਨਾ ਪਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Thread the message-list based on Subject"
 msgstr "ਵਿਸ਼� ਤ� �ਧਾਰਿਤ ਸ�ਨ�ਹਾ-ਸ��� ਦਾ ਥਰਿੱਡ ਬਣਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Timeout for marking message as seen"
 msgstr "ਸ�ਨ�ਹ� ਵ��ਿ� ਬਣਾ�ਣ ਲ� �ਾ�ਮ-���"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Timeout for marking message as seen."
 msgstr "ਸ�ਨ�ਹ� ਵ��ਿ� ਬਣਾ�ਣ ਲ� �ਾ�ਮ-��� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "UID string of the default account."
 msgstr "ਮ�ਲ ��ਾ��� ਲ਼� UID ਲਾ�ਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "�ਦ�� �ਨ-ਲਾ�ਨ ਸਪ�ਲਿੰ� ਦ� ਵਰਤ�� ਹ�ਵ� ਤਾ� �ਲਤ ਸ਼ਬਦ ਲ� ਹ�ਠਾ� ਲਾ�ਨ ਲ� ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Use SpamAssassin daemon and client"
 msgstr "Spamasssassin ਡ�ਮਨ �ਤ� �ਲਾ�� ਵਰਤ��"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAsssassin ਡ�ਮਨ �ਤ� �ਲਾ�� ਵਰਤ�� (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Use custom fonts"
 msgstr "ਪਸੰਦ�ਦਾ ਫ��� ਵਰਤ��"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Use custom fonts for displaying mail."
 msgstr "ਮ�ਲ ਵ��ਾ�ਣ ਲ� �ਸ�ਮ ਫ��� ਵਰਤ�� ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use only local spam tests."
 msgstr "ਸਿਰਫ ਸਥਾਨ� ਫਰ�� �ਾ�� ਹ� ਵਰਤ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ਸਿਰਫ ਸਥਾਨ� ਫਰ�� �ਾ�� ਹ� ਵਰਤ�� (DNS ਨਹ��)।"
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:207
 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 "
@@ -12019,7 +12068,7 @@ msgstr ""
 "ਯ��਼ਰ ਨ�ੰ ਸ�ਨ�ਹਾ ਦਾ �ਵਾਬ ਦ�ਣ ਸਮ�� �ਰਸਰ �ਿੱਥ� ਰੱ� �� ਦ�ਣ� ਹ�। �ਹ ਤਹਿ �ਰਦਾ ਹ� �ਿ �ਰਸਰ ਨ�ੰ ਸ�ਨ�ਹ� ਦ� "
 "�ੱਤ� ਰੱ�ਿ� �ਾਵ��ਾ �ਾ� ਹ�ਠਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:208
 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 "
@@ -12028,19 +12077,19 @@ msgstr ""
 "ਯ��਼ਰ ਸ�ਨ�ਹ� ਦਾ �ਵਾਬ ਦ�ਣ ਸਮ�� �ਪਣ� ਦਸਤ�ਤ �ਿੱਥ� ਲ� ਸ���ਾ। �ਹ ਤਹਿ �ਰਦਾ ਹ� �ਿ ਦਸਤ�ਤਾ� ਨ�ੰ ਸ�ਨ�ਹ� ਦ� "
 "�ੱਤ� ਰੱ�ਿ� �ਾਵ��ਾ �ਿ ਹ�ਠਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Variable width font"
 msgstr "�ਸਥਿਰ ���ਾ� ਫ���"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "�� ਮ�ਲ ਰ�ਪ ਵਿੱ� ਹਰ�� ਸ�ਨ�ਹ� ਨਾਲ �ਵਾਬ� ਰਸ�ਦ ਦ� ਮੰ� ��ਤ� �ਾਵ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "�� ਬਾਹ�  ਵਿੱ� �ੰਡਾ�ਾਰ ਫ�ਲਡਰ ਨਾ� ਫ��ਰ �ਯ�� �ਰਨਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12048,73 +12097,99 @@ msgstr ""
 "�� ਮਾਮਲਿ�� ਨ�ੰ ਵਿਸ਼� ਮ�ਤਾਬ� ��ਤਾ �ਾਵ� �ਾ� ਨਾ, �ਦ�� �ਿ ਸ�ਨ�ਹਿ�� ਵਿੱ� �ਵਾਬ �ਾ� ਹਵਾਲਾ ��ਤਰ "
 "ਸ਼ਾਮਿਲ ਨਾ ਹ�ਵ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "�� ਮਾਮਲ� ਨ�ੰ �ਸ ਮਾਮਲ� ਵਿੱ� ਤਾ�਼ਾ ਸ�ਨ�ਹਾ ਮ�ਤਾਬ� ਲ��ਬੱਧ �ਰਨਾ ਹ�"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:214
+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 "
+"one minute after the last action invocation."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Width of the message-list pane"
 msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਬਾਹ� ਦ� ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Width of the message-list pane."
 msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਬਾਹ� ਦ� ���ਾ� ਹ�।"
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "�ਲਨ ਡਾ�ਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
-#: ../modules/mail/e-mail-shell-view.c:952
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
+#: ../modules/mail/e-mail-shell-view.c:951
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "ਪੱਤਰ"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਮ �ਯਾਤ�ਾਰ"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
 msgstr "Elm ਤ�� ਪੱਤਰ �ਯਾਤ ਹ�।"
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "ਨਿਯਤ ਫ�ਲਡਰ:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+#: ../plugins/dbx-import/dbx-importer.c:226
+#| msgid "Destination folder:"
+msgid "_Destination folder:"
+msgstr "ਨਿਯਤ ਫ�ਲਡਰ(_D):"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder"
 msgstr "ਫ�ਲਡਰ ��ਣ�"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder to import into"
 msgstr "�ਯਾਤ �ਰਨ ਲ� ਫ�ਲਡਰ ��ਣ�"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#. Translators: Column header for a message subject
+#: ../mail/importers/evolution-mbox-importer.c:372
+#| msgid "Subject"
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "ਵਿਸ਼ਾ"
+
+#. Translators: Column header for a message From address
+#: ../mail/importers/evolution-mbox-importer.c:376
+#| msgid "From"
+msgctxt "mboxImp"
+msgid "From"
+msgstr "ਵਲ��"
+
+#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "ਬਰ�ਸ�ਲ� ਪੱਤਰ-ਬ�ਸਾ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:413
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "ਬਰ�ਸ�ਲ� ਪੱਤਰ-ਬ�ਸਾ ਫਾਰਮ�� ਫ�ਲਡਰ �ਯਾਤ�ਾਰ"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "ਪੱਤਰ-ਬ�ਸਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../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
 #, c-format
-msgid "Importing `%s'"
-msgstr "`%s' �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+#| msgid "Importing `%s'"
+msgid "Importing '%s'"
+msgstr "`%s' �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:295
 #, c-format
 msgid "Scanning %s"
 msgstr "�ਾ�� �ਾਰ� ਹ� %s"
@@ -12123,469 +12198,552 @@ msgstr "�ਾ�� �ਾਰ� ਹ� %s"
 msgid "Importing Pine data"
 msgstr "ਪਾ�ਨ ਡਾ�ਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:405
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ�"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:447
 msgid "Evolution Pine importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਾ�ਨ �ਯਾਤ�ਾਰ"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:448
 msgid "Import mail from Pine."
 msgstr "Pine ਤ�� ਪੱਤਰ �ਯਾਤ ਹ�।"
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "%s ਨ�ੰ ਪੱਤਰ"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "%s ਤ�� ਪੱਤਰ"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "ਵਿਸ਼ਾ ਹ� %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s ਪੱਤਰ ਲਿਸ�"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "ਫਿਲ�ਰ ਨਿਯਮ ਸ਼ਾਮਿਲ �ਰ�"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(ਨ��: �ਪਲ���ਸ਼ਨ ਮ��-ਸ�ਾਰ� �ਰਨ ਦ� ਲ�� ਹ�)"
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed 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:450
+#, 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\"."
+msgstr[0] ""
+msgstr[1] ""
 
+#. 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 "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>�ਾਪ ਪ�ਸ�ਿੰ� ��ਣ</b> (ਸਿਫਾਰਸ਼� ਨਹ�� ਹ�)"
+msgid "(Not Recommended)"
+msgstr "(ਸਿਫਾਰਸ਼� ਨਹ��)"
 
 #: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(ਨ��: �ਪਲ���ਸ਼ਨ ਮ��-ਸ�ਾਰ� �ਰਨ ਦ� ਲ�� ਹ�)"
+
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "��ਾ��� �ਾਣ�ਾਰ�"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "ਨਵ�� ਦਸਤ�ਤ ਸ਼ਾਮਿਲ �ਰ�(_w)..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "�ਸ ��ਾ��� ਵਿੱ��� ਭ��ਣ ਵਾਲ� ਸ�ਨਹਿ�� ਤ� ਹਮ�ਸ਼ਾ ਦਸਤ�ਤ �ਰ�(_w)"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "���ਰਿਪਸ਼ਨ ਸ�ਨ�ਹ� ਭ��ਣ ਸਮ�� ��ਦ �ੰ��ਰਿਪ� �ਰ�(_f)"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "�ਸ ਨ�ੰ ਹਮ�ਸ਼ਾ �ਾਰਬਨ �ਾਪ� ਭ��� �ਾਵ�(CC):"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "�ਸ ਨ�ੰ ਹਮ�ਸ਼ਾ ਲ��ਵ�� �ਾਪ� ਭ��� �ਾਵ�(_BCC):"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "���ਰਿਪਸ਼ਨ �ਰਨ ਸਮ�� ਮ�ਰ� ��-ਰਿੰ� �ੱਤ� ਭਰ�ਸਾ ਰੱ��(_t)"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "���ਰਿਪ�ਡ ਸ�ਨ�ਹ� ਭ��ਣ ਸਮ�� ਮ�ਨ�ੰ ਹਮ�ਸ਼ਾ �ੰ��ਰਿਪ� �ਰ�(_m)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "ਪ�ਨ ਰਸ�ਦ ਹਮ�ਸ਼ਾ ਮੰ��(_d)"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:14
+msgid "Apply the same _view settings to all folders"
+msgstr "ਸਭ ਫ�ਲਡਰਾ� ਲ� �ਹ� �ਲ� ਸ��ਿੰ� ਲਾ�� �ਰ�(_v)"
+
+#: ../mail/mail-config.ui.h:16
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "ਪ�ਰਮਾਣਿ�ਤਾ"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "Automatically insert _emoticon images"
 msgstr "�ਮ�ਸ਼ਨ �ਿੱਤਰ ���ਮ��ਿ� ਸ਼ਾਮਿਲ �ਰ�(_e)"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "C_haracter set:"
 msgstr "�ੱ�ਰ ਸਮ�ਹ(_h):"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 msgid "Ch_eck for Supported Types"
 msgstr "ਸਹਾ�� �ਿਸਮ ਲ� �ਾ��(_e)"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Check cu_stom headers for junk"
 msgstr "�ੰ� ਲ� �ਸ�ਮ ਹ�ੱਡਰ ��ੱ� �ਰ�(_s)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "�ੰ� ਲ� � ਰਹ� ਸ�ਨ�ਹ� ��ੱ� �ਰ�(_m)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
 msgstr "I �ਿਸਮ ਲ� ਸ਼ਬਦ-��� ਦ� �ਾ�� �ਰ�(_t)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgid "Checks incoming mail messages to be Junk"
 msgstr "��ਣ ਵਾਲ� ਪੱਤਰਾ� ਵਿੱ� �ੰ� ਦ� �ਾ�� �ਰ�"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "ਸਾ�(_a)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "ਸਾ�(_r)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "�ਲਤ ਸ਼ਬਦ-��� �ੱ�ਰਾ� ਦਾ ਰੰ�(_m):"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "ਸ�ਨ�ਹਾ ਲਿ�ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "ਸੰਰ�ਨਾ"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "ਫ�ਲਡਰ ਦ� ਤੱਥ �ੱਢਣ ਸਮ�� ਪ�ਸ਼�� �ਰ�(_w)"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "ਡਿਫਾਲ� ਰਵੱ��"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:33
 msgid "Default character e_ncoding:"
 msgstr "ਮ�ਲ �ੱ�ਰ ���ਡਿੰ�(_n):"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "ਮ�ਲ ਹ�ਾ�"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "ਬੰਦ �ਰਨ ਸਮ�� �ੰ� ਮ�ਲ ਹ�ਾ�(_x)"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ਬਾਹਰ �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਡਿ���ਲ ਸਾ�ਨ �ਰ� (ਡਿਫਾਲ�)(_s)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "ਵ��ਾ� ਸ�ਨ�ਹਾ ਹ�ੱਡਰ(_H)"
+#: ../mail/mail-config.ui.h:39
+#| msgid "Displayed Message _Headers"
+msgid "Displayed Message Headers"
+msgstr "ਸ�ਨ�ਹਾ ਹ�ੱਡਰ ਵ��ਾ�� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
+#: ../mail/mail-config.ui.h:40
+#| msgid "Do not format messages when text si_ze exceeds"
+msgid "Do not display messages when text si_ze exceeds"
 msgstr "ਮ�ਲ ਵਿੱ� ���ਸ� ਸਮੱ�ਰ� ਫਾਰਮ�� ਨਾ �ਰ�, �� ���ਸ� ਸਾ��਼ ਵੱਧ �ਾਵ�(_z)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:41
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "�� ਭ��ਣ ਵਾਲਾ ਮ�ਰ� �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਹ�ਵ� ਤਾ� ਸ�ਨ�ਹਾ �ੰ� ਨਾ ਬਣਾ�(_k)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:42
 msgid "Do not quote"
 msgstr "��� ਨਾ �ਰ�"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:43
 msgid "Drafts _Folder:"
 msgstr "ਡਰਾਫ� ਫ�ਲਡਰ(_F):"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:44
 msgid "Email _Address:"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ(_A):"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:45
 msgid "Empty trash folders on e_xit"
 msgstr "ਬੰਦ �ਰਨ ਤ� ਰੱਦ� ਫ�ਲਡਰ ਬੰਦ �ਰ ਦਿ�(_x)"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Magic S_pacebar"
 msgstr "ਮ��ਿ� ਸਪ�ਸਬਾਰ ਯ��(_p)"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:47
 msgid "Enable Sea_rch Folders"
 msgstr "��� ਫ�ਲਡਰ ਯ��(_r)"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
 msgstr "���ਰਿਪਸ਼ਨ ਸਰ��ਫਿ���(_p):"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
 msgstr "ਬਾਹਰ� �ਾਣ ਵਾਲ� ਪੱਤਰਾ� ਨ�ੰ ���ਰਿਪਸ਼ਨ(ਮ�ਲ ਹ�)(_g)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:51
 msgid "Fi_xed-width:"
 msgstr "ਸਥਿਰ ���ਾ�(_x):"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:52
 msgid "Fix_ed width Font:"
 msgstr "ਸਥਿਰ ���ਾ� ਫ���(_e):"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:53
 msgid "Font Properties"
 msgstr "ਫ��� ਵਿਸ਼�ਸ਼ਤਾ"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:54
 msgid "Format messages in _HTML"
 msgstr "_HTML ਵਿੱ� ਫਾਰਮ�� ਸ�ਨ�ਹਾ"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:55
 msgid "Full Nam_e:"
 msgstr "ਪ�ਰਾ ਨਾ�(_E):"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:57
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr "�ਰ�ੱਪ �ਵਾਬ ��ਵਲ ਮ�ਲਿੰ� ਲਿਸ� ਨ�ੰ �ਵਾਬ ਦਿ�, �� ਸੰਭਵ ਹ�ਵ�"
+
+#: ../mail/mail-config.ui.h:58
 msgid "HTML Messages"
 msgstr "HTML ਸ�ਨ�ਹ�"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:59
 msgid "H_TTP Proxy:"
 msgstr "H_TTP ਪਰਾ�ਸ�:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:60
 msgid "Headers"
 msgstr "ਹ�ੱਡਰ"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:61
 msgid "Highlight _quotations with"
 msgstr "ਹਵਾਲ� ਨ�ੰ �ਭਾਰ�(_q)"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:63
+msgid "Ignore Reply-To: for mailing lists"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:64
 msgid "Inline"
 msgstr "ਲਾ�ਨ '�"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:65
 msgid "Inline (Outlook style)"
 msgstr "�ਨਲਾ�ਨ (���ਲ�ੱ� ਸ�ਾ�ਲ)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:67
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "ਲ�ਬਲ"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:69
 msgid "Languages Table"
 msgstr "ਭਾਸ਼ਾ ��ਬਲ"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:70
 msgid "Loading Images"
 msgstr "�ਿੱਤਰ ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:71
 msgid "Mail Headers Table"
 msgstr "ਮ�ਲ ਹ�ੱਡਰ ��ਬਲ"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:72
 msgid "Mailbox location"
 msgstr "ਮ�ਲ-ਬਾ�ਸ �ਿ�ਾਣਾ"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:73
 msgid "Message Display"
 msgstr "ਸ�ਨ�ਹਾ �ਲ�"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:74
 msgid "Message Fonts"
 msgstr "ਸ�ਨ�ਹਾ ਫ���"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:75
 msgid "Message Receipts"
 msgstr "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ�ਰਤਾ"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:76
 msgid "No _Proxy for:"
 msgstr "�ਸ ਲ� ��� ਪਰਾ�ਸ� ਨਹ��(_P):"
 
-#: ../mail/mail-config.ui.h:73
+#: ../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:74
+#: ../mail/mail-config.ui.h:79
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "��ਣ ਨ�ੰ �ਣਡਿੱਠਾ ��ਤਾ �ਾਵ��ਾ, �� ਰਲਦਾ �ਸ�ਮ �ੰ� ਹ�ੱਡਰ ���ਿ� �ਾਵ�।"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:80
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "��ਣਵ�� �ਾਣ�ਾਰ�"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:82
 msgid "Or_ganization:"
 msgstr "ਸੰ�ਠਨ(_g):"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:84
 msgid "Pass_word:"
 msgstr "ਪਾਸਵਰਡ(_w):"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
 msgid "Port:"
 msgstr "ਪ�ਰ�:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../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:83
+#: ../mail/mail-config.ui.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "ਪ�ਰਿੱ�� ��ੱਡ ਪਰਾ�ਵ�ਸ� (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
 msgid "Printed Fonts"
 msgstr "ਪਰਿੰ� ��ਤ� ਫ���"
 
-#: ../mail/mail-config.ui.h:86
+#: ../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 while marking multiple messages"
+msgid "Prompt when sending private replies to mailing _list messages"
+msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਸ�ਨ�ਹਿ�� ਲ� ਪ�ਰਾ�ਵ�ਤ �ਵਾਬ ਭ��ਣ ਦ�ਰਾਨ ਪ�ੱ��"
+
+#: ../mail/mail-config.ui.h:93
+#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when sending replies to _many recipients"
+msgstr "ਸ��ਿਤ �ਰ�, �ਦ�� �� ਪ�ਰਾਪਤ-�ਰਨ ਵਾਲਿ�� ਨ�ੰ �ਵਾਬ ਭ��� �ਾ ਰਹ� ਹ�(_m)"
+
+#: ../mail/mail-config.ui.h:94
 msgid "Proxy Settings"
 msgstr "ਪਰਾ�ਸ� ਸ��ਿੰ�"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:95
 msgid "Quoted"
 msgstr "ਹਵਾਲਾ"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:96
 msgid "Re_member password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_m)"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:97
 msgid "Re_ply-To:"
 msgstr "�ਸ ਨ�ੰ �ਵਾਬ(_p):"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:99
 msgid "Remember _password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_p)"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:100
 msgid "Required Information"
 msgstr "ਲ���ਦ� �ਾਣ�ਾਰ�"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:101
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:102
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:103
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:104
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:106
 msgid "SSL is not supported in this build of Evolution"
 msgstr " SSL ਸਹਿਯ�� �ਵ�ਲ�ਸ਼ਨ ਦ� �ਸ ਵਰ�ਨ ਲ� ਸਹਿਯ�� ਨਹ��"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:107
 msgid "S_earch for sender photograph only in local address books"
 msgstr "ਭ��ਣ ਵਾਲ� ਦ� ਤਸਵ�ਰ ਦ� ��� ਸਿਰਫ਼ ਲ��ਲ �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਹ� �ਰ�(_e)"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:108
 msgid "S_elect..."
 msgstr "��ਣ�(_e)..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:109
 msgid "S_end message receipts:"
 msgstr "ਸ�ਨ�ਹਾ ਰਸ�ਦ ਭ���(_e):"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:110
 msgid "S_tandard Font:"
 msgstr "ਸ���ਡਰਡ ਫ���(_t):"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:111
 msgid "Secure MIME (S/MIME)"
 msgstr "ਸ�ਰੱ�ਿ�ਤ MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:113
 msgid "Select Drafts Folder"
 msgstr "ਡਰਾਫ� ਫ�ਲਡਰ ��ਣ�"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:114
 msgid "Select HTML fixed width font"
 msgstr "HTML ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:115
 msgid "Select HTML fixed width font for printing"
 msgstr "ਪਰਿੰ� ਲ� HTML ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:116
 msgid "Select HTML variable width font"
 msgstr "HTML �ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:117
 msgid "Select HTML variable width font for printing"
 msgstr "ਪਰਿ�ਿੰ� ਲ� HTML �ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:118
+#| msgid "Select Folder"
+msgid "Select Junk Folder"
+msgstr "�ੰ� ਫ�ਲਡਰ ��ਣ�"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Select Sent Folder"
 msgstr "ਭ��� ਫ�ਲਡਰ ��ਣ�"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:120
+#| msgid "Select Drafts Folder"
+msgid "Select Trash Folder"
+msgstr "ਰੱਦ� ਫ�ਲਡਰ ��ਣ�"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Sender Photograph"
 msgstr "ਭ��ਣ ਵਾਲ� ਦ� ਫ���"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:122
 msgid "Sending Mail"
 msgstr "ਪੱਤਰ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:123
 msgid "Sent _Messages Folder:"
 msgstr "ਭ��� ਸ�ਨ�ਹ� ਫ�ਲਡਰ(_M):"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:124
 msgid "Sent and Draft Messages"
 msgstr "ਭ��� �ਤ� ਡਰਾਫ� ਸ�ਨ�ਹ�"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:125
 msgid "Ser_ver requires authentication"
 msgstr "ਸਰਵਰ ਲ� ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:126
 msgid "Server Configuration"
 msgstr "ਸਰਵਰ ਸੰਰ�ਨਾ"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:127
 msgid "Server _Type:"
 msgstr "ਸਰਵਰ �ਾ�ਪ(_T): "
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:128
+#| msgid "Sig_ning certificate:"
+msgid "Si_gning algorithm:"
+msgstr "ਸਾ�ਨਿੰ� �ਲ��ਰਿਥਮ(_g):"
+
+#: ../mail/mail-config.ui.h:129
 msgid "Sig_natures"
 msgstr "ਦਸਤ�ਤ(_n)"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:130
 msgid "Sig_ning certificate:"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ(_n):"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:131
 msgid "Signat_ure:"
 msgstr "ਦਸਤ�ਤ(_u):"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:132
 msgid "Signatures"
 msgstr "ਦਸਤ�ਤ"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:133
+#| msgid "Sig_ning certificate:"
+msgid "Signing _algorithm:"
+msgstr "ਸਾ�ਨਿੰ� �ਲ��ਰਿਥਮ(_a):"
+
+#: ../mail/mail-config.ui.h:134
 msgid "Spell Checking"
 msgstr "ਸ਼ਬਦ-��� �ਾ��"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:135
 msgid "Start _typing at the bottom on replying"
 msgstr "�ਦ�� �ਵਾਬ ਦ�ਣਾ ਹ�ਵ� ਤਾ� ਹ�ਠਾ� ਲਿ�ਣਾ �ਾਹ�ੰਦ� ਹ�(_t)"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:137
 msgid "T_ype:"
 msgstr "�ਿਸਮ(_y):"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:138
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "ਭਾਸ਼ਾਵਾ� ਦ� ਲਿਸ�, ਸਿਰਫ �ਹਨਾ� ਨ�ੰ ਵ��ਾ�ਦ� ਹ�, �ਿਨਾ� ਲ� ਸ਼ਬਦ-��ਸ਼ �ੰਸ�ਾਲ ਹ�।"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:139
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12595,7 +12753,13 @@ msgstr ""
 "�ਾਵ���।ਨਾ�, �� ਵ� ਤ�ਸ�� ਦਿ���, ਸਿਰਫ ਵ��ਾ�ਣ ਦ� �ੰਮ\n"
 " �ਵ���।"
 
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:143
+#| msgid "Posting destination"
+msgid "Top Posting Option"
+msgstr "�ੱਤ� �ਵਾਬ ਦ�ਣ ��ਣ"
+
+#: ../mail/mail-config.ui.h:144
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12603,183 +12767,196 @@ msgstr ""
 "ਨਾ� ਲਿ��, �ਿਸ ਨਾਲ ਤ�ਸ�� �ਸ ��ਾ��� ਨ�ੰ ਸੰਬ�ਧਨ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�।\n"
 "�ਦਾਹਰਨ ਲ�: \"�ੰਮ�ਾਰ�\" �ਾ� \"ਨਿੱ��\""
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:146
 msgid "Us_ername:"
 msgstr "ਯ��਼ਰ ਨਾ�(_e):"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:147
 msgid "Use Authe_ntication"
 msgstr "ਪ�ਰਮਾਣਿ�ਤਾ ਵਰਤ��(_n)"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../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:131
+#: ../mail/mail-config.ui.h:149
 msgid "V_ariable-width:"
 msgstr "�ਸਥਿਰ-���ਾ�(_a):"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:150
 msgid "_Add Signature"
 msgstr "ਦਸਤ�ਤ ਸ਼ਾਮਿਲ(_A)"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:151
 msgid "_Always load images from the Internet"
 msgstr "�ੰ�ਰਨ�ੱ� ਤ�� �ਿੱਤਰ ਹਮ�ਸ਼ਾ ਪ�ਰਾਪਤ �ਰ�(_A)"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:152
 msgid "_Authentication Type"
 msgstr "ਪਰਮਾਣਿ�ਤਾ �ਾ�ਪ(_A)"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:153
 msgid "_Default junk plugin:"
 msgstr "ਡਿਫਾਲ� �ੰ� ਪਲੱ��ਨ(_D):"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:154
 msgid "_Direct connection to the Internet"
 msgstr "�ੰ�ਰਨ�ੱ� ਲ� ਸਿੱਧਾ ��ਨ��ਸ਼ਨ(_D)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:155
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ਮ��ਿੰ� ਬ�ਨਤ� �ੱਤ� ਦਸਤ�਼ਤ ਨਾ �ਰ� (���ਲ�ੱ� �ਨ���ਲਤਾ ਲ�) (_D)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:156
 msgid "_Forward style:"
 msgstr "�ੱ�� ਭ��ਣ ਸ�ਾ�ਲ(_F):"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:157
+#| msgid "Current Folder"
+msgid "_Junk Folder:"
+msgstr "�ੰ� ਫ�ਲਡਰ(_J):"
+
+#: ../mail/mail-config.ui.h:158
 msgid "_Keep Signature above the original message on replying"
-msgstr "�ਵਾਬ ਦ�ਣ ਸਮ�� ਦਸਤ�ਤ �ਸਲ�� ਸ�ਨ�ਹ� ਦ� �ੱਤ� ਰੱ��(_K)"
+msgstr "�ਵਾਬ ਦ�ਣ ਸਮ�� ਦਸਤ�ਤ �ਸਲ� ਸ�ਨ�ਹ� ਦ� �ੱਤ� ਰੱ��(_K)"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:159
 msgid "_Languages"
 msgstr "ਭਾਸ਼ਾ(_L)"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:160
 msgid "_Load images in messages from contacts"
 msgstr "ਸੰਪਰ�ਾ� ਤ�� �� ਸ�ਨ�ਹਿ�� '� �ਿੱਤਰ ਲ�ਡ �ਰ�(_L)"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:161
 msgid "_Lookup in local address book only"
 msgstr "ਲ��ਲ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਹ� ਵ���(_L)"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:162
 msgid "_Make this my default account"
 msgstr "ਮ�ਰ� �ਸ ��ਾ��� ਨ�ੰ ਮ�ਲ ਬਣਾ�(_M)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:163
 msgid "_Manual proxy configuration:"
 msgstr "ਦਸਤ� ਪਰਾ�ਸ� ਸੰਰ�ਨਾ(_M):"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:164
 msgid "_Mark messages as read after"
 msgstr "ਬਾ�ਦ ਵਿੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਪ�ਿ� ਬਣਾ�(_M)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:166
 msgid "_Never load images from the Internet"
 msgstr "�ੰ�ਰਨ�ੱ� ਤ�� �ਿੱਤਰ �ਦ� ਵ� ਲ�ਡ ਨਾ �ਰ�(_N)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:167
 msgid "_Path:"
 msgstr "ਮਾਰ�(_P):"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:168
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML ਸ�ਨ�ਹਾ ਸੰਪਰ�ਾ� ਨ�ੰ ਭ��ਣ ਸਮ�� ਪ�ੱ��, �� �ਿ ਨਹ�� �ਾਹ�ੰਦ� ਹਨ (_P)"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:169
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "�ਾਲ� ਵਿਸ਼ਾ ਲਾ�ਨ ਨਾਲ ਸ�ਨ�ਹਾ ਭ��ਣ ਸਮ�� ਪ�ੱ��(_P)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:170
 msgid "_Reply style:"
 msgstr "�ਵਾਬ ਸ�ਾ�ਲ(_R):"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:171
 msgid "_Script:"
 msgstr "ਸ��ਰਿਪ�(_S):"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:172
 msgid "_Secure HTTP Proxy:"
 msgstr "ਸ�ਰੱ�ਿ�ਤ HTTP ਪਰਾ�ਸ�(_S):"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:174 ../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:157
+#: ../mail/mail-config.ui.h:176
 msgid "_Show image animations"
 msgstr "�ਿੱਤਰ ਸ��ਵਤਾ ਵ��ਾ�(_S)"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:177
 msgid "_Show the photograph of sender in the message preview"
 msgstr "�ਮ�ਲ �ਲ� ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� ਫ��� ਵ���(_S)"
 
-#: ../mail/mail-config.ui.h:159
+#. 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:160
+#: ../mail/mail-config.ui.h:180
+#| msgid "Drafts _Folder:"
+msgid "_Trash Folder:"
+msgstr "ਰੱਦ� ਫ�ਲਡਰ(_T):"
+
+#: ../mail/mail-config.ui.h:181
 msgid "_Use Secure Connection:"
 msgstr "ਸ�ਰੱ�ਿ�ਤ ��ਨ��ਸ਼ਨ ਵਰਤ��(_U):"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:182
 msgid "_Use system defaults"
 msgstr "ਸਿਸ�ਮ ਡਿਫਾਲ� ਵਰਤ��(_U)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:183
 msgid "_Use the same fonts as other applications"
 msgstr "ਹ�ਰ �ਾਰ� ਵਾ�� �ਹ� ਫ��� ਵਰਤ��(_U)"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:164
+#. 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:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:188
 msgid "color"
 msgstr "ਰੰ�"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:189
 msgid "description"
 msgstr "ਵ�ਰਵਾ"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "     "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "ਸਭ ਸਰ�ਰਮ ਰਿਮ�� ਫ�ਲਡਰ"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "ਸਭ ਸਥਾਨ� �ਤ� ਸਰ�ਰਮ ਰਿਮ�� ਫ�ਲਡਰ"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "ਸਭ ਸਥਾਨ� ਫ�ਲਡਰ"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "�ਾਲ"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "ਮ��ੰਮਲ(_m)"
 
+#: ../mail/mail-dialogs.ui.h:6
+#| msgid "collapse"
+msgid "Collapse _all"
+msgstr "ਸਭ ਸਮ���(_a)"
+
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "ਡਿ�਼�ਲ ਦਸਤ�ਤ"
@@ -12789,58 +12966,67 @@ msgid "Do Not Forward"
 msgstr "�ੱ�� ਨਾ ਭ���"
 
 #: ../mail/mail-dialogs.ui.h:9
+#| msgid "E_xpand All Threads"
+msgid "E_xpand all"
+msgstr "ਸਭ ਫ�ਲਾ�(_x)"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
 msgstr "�ੰ��ਰਿਪਸ਼ਨ"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "ਫ�ਲਡਰ ਮ��ਬਰ�"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Follow-Up"
 msgstr "ਸਹਾ��"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
 msgstr "ਤ�ਹਾਡ� �ਾਣ�ਾਰ� ਲ�"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
 msgstr "�ੱ��"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ�"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
 msgstr "��� �ਵਾਬ ਲ���ਦਾ ਨਹ�� ਹ�"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Reply to All"
 msgstr "ਸਭ ਨ�ੰ �ਵਾਬ"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Review"
 msgstr "ਮ��-�ਾ��"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "ਸਰਵਰ(_e):"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr "��ਵਲ ���ਮਾ� ਰੱ�ਣ ਵਾਲ� ਵ���(_h):"
+
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
 msgstr "��� ਫ�ਲਡਰ ਸਰ�ਤ"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "ਸ�ਰੱ�ਿ� �ਾਣ�ਾਰ�"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "�ਾਸ ਫ�ਲਡਰ"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12848,183 +13034,185 @@ msgstr ""
 "ਸ�ਨ�ਹ�, �� �ਿ ਤ�ਸ�� ਪਿੱ�ਾ �ਰਨ ਲ� ��ਣ� ਸਨ, ਹ�ਠਾ� ਦਿੱਤ� �ਾ ਰਹ� ਹਨ।\n"
 "�ਿਰਪਾ �ਰ�� \"ਨਿਸ਼ਾਨ\" ਮ�ਨ�ੰ ਵਿੱ��� �ਾਰਵਾ� �ਰਨ ਲ� ��ਣ।"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "ਲਾ�ਸ��ਸ ਮਨ�਼�ਰ(_A)"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "ਦ�ਣਯ��(_D):"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "ਨਿਸ਼ਾਨ(_F):"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਮਨ�਼�ਰ �ਰਨ ਲ� �ਸ ਨ�ੰ ��ਣ�(_T)"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:783
 #, c-format
 msgid "Pinging %s"
 msgstr "ਪਿੰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ� %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:245
 msgid "Fetching Mail"
 msgstr "ਪੱਤਰ ਲ� �ਾ ਰਹ� ਹਨ"
 
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:592
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ਬਾਹਰ� ਫਿਲ�ਰ ਲਾ�� �ਰਨ ਤ�� �ਸਫਲ: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../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."
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
-"%s ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� �ਸਫਲ: %s\n"
-"ਲ��ਲ`Sent' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ ��ਤ� �ਾ ਰਹ� ਹ�।"
+"%s ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� ਫ�ਲ�ਹ: %s\n"
+"�ਸ ਦ� ਬ�ਾ� ਲ��ਲ`ਭ���/Sent' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ ��ਤ� �ਾ ਰਹ� ਹ�।"
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:654
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "ਸਥਾਨ� `Sent' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� �ਸਫਲ: %s"
+#| msgid "Failed to append to local `Sent' folder: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "ਲ��ਲ `ਭ���/Sent' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� ਫ�ਲ�ਹ: %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:782
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d ਵਿੱ��� %1$d ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:826
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ਸ�ਨ�ਹ� %2$d ਵਿੱ��� %1$d ਭ��ਣ ਵਿੱ� �ਸਫ਼ਲ"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
 msgid "Canceled."
 msgstr "ਰੱਦ ��ਤਾ।"
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
 msgid "Complete."
 msgstr "ਸਮਾਪਤ"
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:938
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "ਸ�ਨ�ਹਾ '%s' ਫ�ਲਡਰ ਵਿੱ� ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "ਸ�ਨ�ਹ� '%s' ਵਿੱ� ਭ��� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "ਸ�ਨ�ਹ� '%s' ਵਿੱ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1127
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "'%s' ਵਿੱ� ਫ�ਲਡਰ �ਾ��� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1235
 msgid "Forwarded messages"
 msgstr "�ੱ�� ਭ��� ਸ�ਨ�ਹ�"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1276
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "ਫ�ਲਡਰ '%s' ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "'%s' ਫ�ਲਡਰ ਲ� ���ਾ �ਾਣ�ਾਰ� ਲ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1414
 #, c-format
 msgid "Opening store '%s'"
 msgstr "ਸ��ਰ '%s' ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1485
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "ਫ�ਲਡਰ '%s' ਹ�ਾ�� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1609
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ਫ�ਲਡਰ '%s' ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1672
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "��ਾ��� '%s' ਸ�ੰ��ਿ� �ਾ ਰਿਹਾ ਹ� �ਤ� ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1673
 #, c-format
 msgid "Storing account '%s'"
 msgstr "��ਾ��� '%s' ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1727
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "'%s' ਫ�ਲਡਰ ਤਾ�਼ਾ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1767
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "'%s' ਨਿ�ਾਲਾ ਫ�ਲਡਰ"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1812
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ਵਿੱ� ਰੱਦ� �ਾਲ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1813
 msgid "Local Folders"
 msgstr "ਲ��ਲ ਫ�ਲਡਰ"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ਸ�ਨ�ਹਾ %d ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 msgstr[1] "ਸ�ਨ�ਹ� %d ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2105
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "ਸ�ਨ�ਹਾ %d ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 msgstr[1] "ਸ�ਨ�ਹ� %d ਸੰਭਾਲ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2192
 #, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"ਸ�ਨ�ਹਾ ਸੰਭਾਲਣ ਵਿੱ� �ਲਤ�: %s:\n"
-" %s"
+#| msgid ""
+#| "Error saving messages to: %s:\n"
+#| " %s"
+msgid "Error saving messages to: %s:\n"
+msgstr "ਸ�ਨ�ਹ� ਸੰਭਾਲਣ ਵਿੱ� �ਲਤ�: %s:\n"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2265
 msgid "Saving attachment"
 msgstr "ਨੱਥ� ਸੰਭਾਲ�"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13033,146 +13221,184 @@ msgstr ""
 "���ਪ�ੱ� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
-#, c-format
-msgid "Could not write data: %s"
-msgstr "ਡਾ�ਾ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s"
+#: ../mail/mail-ops.c:2310
+#| msgid "Could not write data: %s"
+msgid "Could not write data: "
+msgstr "ਡਾ�ਾ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�: "
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "'%s' ਨਾਲ�� ��ਨ��ਸ਼ਨ �ਤਮ ��ਤਾ �ਾ�ਦਾ ਹ�"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "'%s' ਨਾਲ ਮ�� ���ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2550
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "�ਫਲਾ�ਨ ਲ� ��ਾ��� '%s' ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2636
 msgid "Checking Service"
 msgstr "ਸਰਵਿਸ �ਾ��� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "ਰੱਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:424
 msgid "Send & Receive Mail"
 msgstr "ਪੱਤਰ ਭ��� �ਤ� ਲਵ�"
 
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:441
 msgid "Cancel _All"
 msgstr "ਸਭ ਰੱਦ(_A)"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:551
 msgid "Updating..."
 msgstr "�ੱਪਡ�� �ਾਰ�..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
 msgid "Waiting..."
 msgstr "�ਡ�� �ਾਰ�..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:866
 #, c-format
 msgid "Checking for new mail"
 msgstr "ਨਵਾ� ਪੱਤਰ ਲ� �ਾ�� �ਾਰ�"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਦਿ�"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:227
 msgid "Enter Passphrase"
 msgstr "ਪਾਸਵਰਡ ਦਿ�"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:230
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਭਰ�"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:232
 msgid "Enter Password"
 msgstr "ਪਾਸਵਰਡ ਭਰ�"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:277
+#, c-format
 msgid "User canceled operation."
 msgstr "ਯ��਼ਰ ਨ� �ਾਰਵਾ� ਰੱਦ ��ਤ�।"
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:724
+#, c-format
 msgid "No destination address provided, forward of the message has been cancelled."
 msgstr "��� �ਿ�ਾਣਾ �ਡਰ�ੱਸ ਨਹ�� ਦਿੱਤਾ �ਿ�,  ਸ�ਨ�ਹ� ਲ� �ੱ�� ਭ��ਣਾ ਰੱਦ ��ਤਾ।"
 
-#: ../mail/mail-session.c:669
+#: ../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:123
+#: ../mail/mail-tools.c:128
 #, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "ਸਪ�ਲ ਡਾ�ਰ���ਰ�`%s' ਬਣਾ� ਨਹ�� �ਾ ਸ�� ਹ�: %s"
+#| msgid "Could not create spool directory `%s': %s"
+msgid "Could not create spool directory '%s': %s"
+msgstr "ਸਪ�ਲ ਡਾ�ਰ���ਰ� '%s' ਬਣਾ� ਨਹ�� �ਾ ਸ�� ਹ�: %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:161
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "�ੱ� non-mbox ਸਰ�ਤ `%s' ਤ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ�"
+#| msgid "Trying to movemail a non-mbox source `%s'"
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "�ੱ� non-mbox ਸਰ�ਤ `%s' ਤ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਾਰ�"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:273
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "�ੱ�� ਭ��ਿ� ਸ�ਨ�ਹਾ - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:275
 msgid "Forwarded message"
 msgstr "�ੱ�� ਭ��ਿ� ਸ�ਨ�ਹਾ"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:318
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "�ਲਤ ਫ�ਲਡਰ: `%s'"
+#| msgid "Invalid folder: `%s'"
+msgid "Invalid folder: '%s'"
+msgstr "�ਲਤ ਫ�ਲਡਰ: '%s'"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "��� ਫ�ਲਡਰ ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:224
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s:%s' ਲ� ��� ਫ�ਲਡਰ �ੱਪਡ�� �ਰਨਾ �ਾਰ�"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:231
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' ਲ� ��� ਫ�ਲਡਰ �ੱਪਡ�� �ਰਨਾ �ਾਰ�"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the 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:674
+#, 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\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-vfolder.c:1182
 msgid "Edit Search Folder"
 msgstr "��� ਫ�ਲਡਰ ਸ�ਧ"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1287
 msgid "New Search Folder"
 msgstr "ਨਵਾ� ��� ਫ�ਲਡਰ"
 
+#: ../mail/mail.error.xml.h:1
+#| msgid "Check Junk Failed"
+msgid "\"Check Junk\" Failed"
+msgstr "\"�ੰ� ��ੱ� �ਰ�\" ਫ�ਲ�ਹ ਹ�"
+
+#: ../mail/mail.error.xml.h:2
+#| msgid "Report Junk Failed"
+msgid "\"Report Junk\" Failed"
+msgstr "\"�ੰ� ਰਿਪ�ਰ� �ਰ�\" ਫ�ਲ�ਹ ਹ�"
+
+#: ../mail/mail.error.xml.h:3
+#| msgid "Report Not Junk Failed"
+msgid "\"Report Not Junk\" Failed"
+msgstr "\"�ੰ� ਨਹ�� ਰਿਪ�ਰ� �ਰ�\" ਫ�ਲ�ਹ ਹ�"
+
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
-#: ../mail/mail.error.xml.h:1
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "ਫ�ਲਡਰ ਨਾ� \"{0}\" ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। ਵੱ�ਰਾ ਨਾ� ਦਿ� ��।"
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "ਫ�ਲਡਰ ਨਾ� \"{1}\" ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। �ੱ� ਵੱ�ਰਾ ਨਾ� ਵਰਤ�� ��।"
 
 #  mail:ask-migrate-existing secondary
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13184,7 +13410,7 @@ msgstr ""
 "ਤ�ਸ�� �ਸ ਫ�ਲਡਰ ਨ�ੰ �ਣਡਿੱਠਾ �ਰ ਸ�ਦ� ਹ�, �ੱਪਰ ਲਿ� ਸ�ਦ� ਹ� �ਾ� ਭਾ� ਸ਼ਾਮਿਲ �ਰ ਸ�ਦ� ਹ� �ਾ� ਬੰਦ �ਰ "
 "ਸ�ਦ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13192,13 +13418,13 @@ msgstr "\"{1}\" ਲ� ਪ�ਨ ਰਸ�ਦ ਸ��ਨਾ ਦ� ਮੰ� 
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr "ਨਾ� \"{1}\" ਨਾਲ �ੱ� ਦਸਤ�ਤ ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹਨ। �ਿਰਪਾ �ਰ�� ਵੱ�ਰਾ ਨਾ� ਵਰਤ��।"
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13206,116 +13432,105 @@ msgstr ""
 "�ਪਣ� ਪੱਤਰ ਦ� ਵਿਸ਼� ਵਿੱ� ��� �ਰਥ ਪ�ਰਨ �ਾਣ�ਾਰ� ਲਿ�ਣ ਨਾਲ ਪੱਤਰ ਪ�ਰਾਪਤ �ਰਨ ਵਾਲ� ਤ�ਹਾਡ� ਪੱਤਰ ਬਾਰ� "
 "�ਸਾਨ� ਨਾਲ ਸਮ� �ਾਦ� ਹਨ।"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "�� ਤ�ਸ�� �ਹ ��ਾ��� �ਤ� �ਸ ਦ� ਸਭ ਪਰਾ�ਸ��� ਨ�ੰ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "�� ਤ�ਸ�� ��ਾ��� �ਾਣ�ਾਰ� ਹ�ਾ�ਣ ਲ� ਸਹਿਮਤ ਹ�?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "�� ਤ�ਸ�� �ਹ ��ਾ��� ਹ�ਾ�ਣ ਲ� ਸਹਿਮਤ ਹ� �ਤ� �ਸ ਦ� ਸਭ ਪਰਾ�ਸ��� ਨ�ੰ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "�� ਤ�ਸ�� {0} ਸ�ਨ�ਹ� �ੱ� ਸਮ�� ਹ� ��ਲਣ� �ਾਹ�ੰਦ� ਹ�?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "�� ਤ�ਸ�� ਸਭ ਹ�ਾ� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਸਭ ਫ�ਲਡਰਾ� ਵਿੱ��� ਹਮ�ਸ਼ਾ ਲ� ਸਮਾਪਤ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr "�� ਤ�ਸ�� ਸਭ ਹ�ਾ� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਫ�ਲਡਰ \"{0}\" ਵਿੱ��� ਹਮ�ਸ਼ਾ ਲ� ਸਮਾਪਤ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "�� ਤ�ਸ�� ਸ�ਨ�ਹ� ਨ�ੰ HTML ਫਾਰਮ�� ਵਿੱ� ਭ��ਣ ਲ� ਸਹਿਮਤ ਹ�?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "�� ਤ�ਸ�� �ਹ ਸ�ਨ�ਹਾ �ਲਤ �ਡਰ�ੱਸ ਨ�ੰ ਹ� ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "�� ਤ�ਸ�� �ਹ ਸ�ਨ�ਹਾ �ਲਤ �ਡਰ�ੱਸ ਨਾਲ ਹ� ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "�� ਤ�ਸ�� �ਹ ਸ�ਨ�ਹਾ ਸਿਰਫ BCC ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਨ�ੰ ਹ� ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #  mail:ask-send-no-subject primary
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "�� ਤ�ਸ�� ਪੱਤਰ ਨ�ੰ ਵਿਸ਼� ਬਿਨਾ� ਹ� ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "�ਿ���ਿ \"{0}\""
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "�ਿ���ਿ \"{2}\"।"
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "�ਾਲ� ਦਸਤ�ਤ"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "��� ਫ�ਲਡਰ \"{0}\" ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" ਫ�ਲਡਰ ਨ�ੰ \"{1}\" ਵਿੱ� �ਾਪ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "ਫ�ਲਡਰ \"{0}\" ਨਹ�� ਬਣ ਸ�ਿ�।"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "�ਰ�� ਸੰਭਾਲ ਡਾ�ਰ���ਰ� ਨਹ�� ਬਣਾ� �ਾ ਸ�ਦ� ਹ�"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "�ਰ�� ਸੰਭਾਲ ਡਾ�ਰ���ਰ� ਨਹ�� ਬਣਾ� �ਾ ਸ�ਦ� ਹ�, �ਿ��ਿ \"{1}\""
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "\"{0}\" ਫ�ਲਡਰ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "ਸਿਸ�ਮ ਫ�ਲਡਰ \"{0}\" ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "��� ਫ�ਲਡਰ \"{0}\" ਫ�ਲਡਰ ਨ�ੰ ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�, �ਿ��ਿ �ਹ ਮ���ਦ ਨਹ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "ਫ�ਲਡਰ \"{0}\" ਨ�ੰ \"{1}\" ਵਿੱ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
+#: ../mail/mail.error.xml.h:32
+#| msgid "Cannot open source \"{1}\""
+msgid "Cannot open source \"{1}\"."
 msgstr "ਸਰ�ਤ \"{1}\" ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "ਸਰ�ਤ\"{2}\" ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "ਨਿਯਤ \"{2}\" ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13323,35 +13538,31 @@ msgstr ""
 "ਲਾ�ਸ��ਸ ਫਾ�ਲ \"{0}\" ਨ�ੰ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�, �ਿ��ਿ �ੰਸ�ਾਲ�ਸ਼ਨ ਸਮੱਸਿ� ਹ�। ਤ�ਸ�� �ਹ �ਪਲੱਬਧ "
 "�ਰਤਾ ਨ�ੰ ਵਰਤਣ ਦ� ਤੱਦ ਤੱ� ਯ�� ਨਹ�� ਹ� ਸ�ਦ�, �ਦ ਤੱ� ਲਾ�ਸ��ਸ ਨਾਲ ਸਹਿਮਤ ਨਹ�� ਹ�ੰਦ�।"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" ਦਾ ਨਾ� \"{1}\" ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "ਸਿਸ�ਮ ਫ�ਲਡਰ \"{0}\"; ਦਾ ਨਾ� ਤਬਦ�ਲ �ਾ� ਭ��ਿ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "��ਾ��� ਲ� ਤਬਦ�ਲ��� ਸੰਭਾਲ��� ਨਹ�� �ਾ ਸ�ਦ��� ਹਨ।"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "ਡਾ�ਰ���ਰ� \"{0}\" ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "ਫਾ�ਲ \"{0}\" ਨ�ੰ ਸੰਭਾਲਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "ਦਸਤ�ਤ ਸ��ਰਿਪ� \"{0}\" ਸ�� ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "�ੰ� ��ੱ� �ਰਨ ਲ� ਫ�ਲ�ਹ"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13359,87 +13570,98 @@ msgstr ""
 "�ਾ�� �ਰ� �ਿ ਤ�ਹਾਡ� ਪਾਸਵਰਡ ਸਹ�� ਤਰਾ� ਭਰਿ� ਹ�। �ਹ ਯਾਦ ਰੱ�� �ਿ ਪਾਸਵਰਡ �ੱ�ਰ ਪ�ਰਤ� ਸੰਵ�ਦਨਸ਼�ਲ "
 "ਹ�, ਤ�ਸ�� ਸ਼ਾ�ਦ �ਪਣਾ ��ਪਸ ਲਾੱ� �ਾਲ� ��ਤਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "ਦਸਤ�ਤ� ਫਾ�ਲ ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "\"{0}\" ��� ਫ�ਲਡਰ ਵਿੱ��� ਸ�ਨ�ਹ� ਹ�ਾ�"
 
+#: ../mail/mail.error.xml.h:46
+#| msgid "Do not disable"
+msgid "Do _Not Disable"
+msgstr "ਬੰਦ ਨਾ �ਰ�(_N)"
+
 #: ../mail/mail.error.xml.h:47
-msgid "Do not d_elete"
-msgstr "ਨਾ ਹ�ਾ�(_e)"
+#| msgid "Do _not Send"
+msgid "Do _Not Send"
+msgstr "ਨਾ ਭ���(_N)"
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do not delete"
-msgstr "ਨਾ ਹ�ਾ�"
+#| msgid "_Do not Synchronize"
+msgid "Do _Not Synchronize"
+msgstr "ਸ��ਰ�ਨਾ��਼ ਨਾ �ਰ�(_N)"
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do not disable"
-msgstr "�ਯ�� ਨਾ �ਰ�"
-
-#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "�� ਤ�ਸ�� ਫ�ਲਡਰਾ� ਨ�ੰ ਸਥਾਨ� ਸਮ�ਾਲ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�, �� �ਿ �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਨਿਸ਼ਾਨਬੱਧ ਹਨ?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "�� ਤ�ਸ�� ਸਭ ਸ�ਨ�ਹਿ�� ਨ�ੰ ਪ��ਹਿ� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "�� ਤ�ਸ�� ਤਬਦ�ਲ��� ਸੰਭਾਲਣ��� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "ਪਾਸਵਰਡ ਭਰ�।"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "ਫਿਲ�ਰ ਲ�ਡ �ਰਨ ਵਿੱ� �ਲਤ�।"
 
 #  mail:async-error-nodescribe primary
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "�ਾਰਵਾ� �ਰਨ ਦ�ਰਾਨ �ਲਤ�।"
 
-#: ../mail/mail.error.xml.h:56
+#. 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
 msgid "Error while {0}."
 msgstr "{0} ਦ�ਰਾਨ �ਲਤ�।"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "ਫਾ�ਲ ਮ���ਦ ਤਾ� ਹ�, ਪਰ �ਸ �ੱਪਰ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
 #  mail:no-write-path-notfile secondary
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "ਫਾ�ਲ ਮ���ਦ ਤਾ� ਹ�, ਪਰ �ਹ ਨਿਯਮਿਤ ਫਾ�ਲ ਨਹ�� ਹ�"
 
 #  mail:ask-expunge secondary
 #  mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "���ਰ ਤ�ਸ�� �ਾਰ� ਰੱ�ਿ� ਤਾ� ਤ�ਸ�� �ਹਨਾ� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਮ��-ਪ�ਰਾਪਤ ਨਹ�� �ਰ ਸ�ਦ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
+#| msgid ""
+#| "If you delete the folder, all of its contents and its subfolders contents "
+#| "will be deleted permanently."
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
-msgstr "���ਰ ਤ�ਸ�� ਫ�ਲਡਰ ਹ�ਾ ਦਿੱਤਾ ਤਾ�, �ਸ �ਤ� �ਸ ਦ� ਸਬ-ਫ�ਲਡਰਾ� ਦ� ਸਾਰ� ਭਾ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਣ��।"
+msgstr ""
+"���ਰ ਤ�ਸ�� ਫ�ਲਡਰ ਹ�ਾ ਦਿੱਤਾ ਤਾ�, �ਸ �ਤ� �ਸ ਦ� ਸਬ-ਫ�ਲਡਰਾ� ਦ� ਸਾਰ� ਭਾ� ਹਮ�ਸ਼ਾ ਲ� "
+"ਹ�ਾ ਦਿੱਤ� �ਾਣ��।"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
 msgid "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "���ਰ ਤ�ਸ�� ਫ�ਲਡਰ ਹ�ਾ ਦਿੱਤਾ ਤਾ�, �ਸ ਦ� ਸਾਰ� ਸਮੱ�ਰ� ਪੱ�� ਤ�ਰ �ੱਤ� ਹ�ਾ�� �ਾਵ��ਾ।"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "���ਰ ਤ�ਸ�� �ੱ�� ��, ਸਭ ਪਰਾ�ਸ� ��ਾ��� �ਾਣ�ਾਰ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਵ���।"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13447,11 +13669,11 @@ msgstr ""
 "���ਰ ਤ�ਸ�� �ੱ�� ��, ��ਾ��� �ਾਣ�ਾਰ� �ਤ� ਸਭ ਪਰਾ�ਸ� �ਾਣ�ਾਰ� ਨ�ੰ\n"
 "ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦਿੱਤਾ �ਾਵ��ਾ।"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "���ਰ ਤ�ਸ�� �ੱ�� ��, ��ਾ��� �ਾਣ�ਾਰ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਵ���।"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13459,23 +13681,23 @@ msgstr ""
 "���ਰ ਤ�ਸ�� ਬੰਦ �ਰ ਦਿੱਤਾ, ਤਾ� �ਹ ਸ�ਨ�ਹ� �ਦ�� ਤੱ� ਭ��� ਨਹ�� �ਾਣ��, �ਦ�� ਤੱ� �� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ�� �ਾਲ� ਨਹ�� "
 "��ਤਾ �ਾਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Ignore"
 msgstr "�ਣਡਿੱਠਾ"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ �ਲਤ"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
 msgstr "ਮ�ਲ ਹ�ਾ�ਣਾ ਫ�ਲ�ਹ"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid "Mail filters automatically updated."
 msgstr "ਪੱਤਰ-ਫਿਲ�ਰ ���ਮ��ਿ� ਹ� �ੱਪਡ�� ��ਤ� �� ਹਨ।"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
 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 "
@@ -13486,33 +13708,33 @@ msgstr ""
 "���ਰ ਸ਼ਾਮਿਲ ��ਤਾ ਹ�, ਤਾ� ਸਾਰ� ਪ�ਰਾਪਤ �ਰਤਾ �ਾਹਿਰ ਹ� �ਾਣ��। �ਸ ਤ�� ਬੱ�ਣ ਲ� ਤ�ਹਾਨ�ੰ �ੱ��-�ੱ� �ੱ� "
 "ਪ�ਰਾਪਤ �ਰਤਾ ਨ�ੰ To: �ਾ� CC: ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�।"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "ਫ�ਲਡਰ ��ੰਮ ਹ�।"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "��� ਸਰ�ਤ ਨਹ�� ��ਣਿ�।"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "�ੱ�� ਸਮ�� �ੰਨ� ਸ�ਨ�ਹ� ��ਲਣ ਲ� ਲੰਮਾ ਸਮਾ� ਲੱ� ਸ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "�ਿਰਪਾ �ਰ�� �ਪਣਾ ��ਾ��� ਸ��ਿੰ� ਵ��� �ਤ� ਮ�� ��ਸ਼ਿਸ �ਰ�।"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "�ਿਰਪਾ �ਰ�� �ਪਣਾ ��ਾ��� ਸ��ਿੰ� ਵ��� �ਤ� ਮ�� ��ਸ਼ਿਸ �ਰ�।"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
 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 "�ਿਰਪਾ �ਰ�� ਵੱਲ ਲ� �ਾ�� �-ਮ�ਲ �ਡਰ�ੱਸ ਦਿ�। ਤ�ਸ�� ਵੱਲ ਤ� �ਲਿੱ� �ਰ�� �-ਮ�ਲ �ਡਰ�ੱਸ ��� ਸ�ਦ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13522,64 +13744,62 @@ msgstr ""
 "ਲ� ਸੰਭਵ ਵ� ਹ�:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "�ਸ ਦਸਤ�ਤ ਲ� ਵਿਲੱ�ਣ ਨਾ� ਦਿ� ��।"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "�ਿਰਪਾ �ਰ�� �ਡ���।"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "ਪ�ਰਾਣ� ਪੱਤਰ ਫ�ਲਡਰ \"{0}\" ਨ�ੰ ਤਬਦ�ਲ �ਰਨ ਵਿੱ� ਸਮੱਸਿ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ਲ���ਦ� ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ�ਾ� ਦ� ਸ��� ਲ� ਸਰਵਰ ਨ�ੰ ਬ�ਨਤ� ��ਤ� �� ਹ�।"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
 msgstr "ਪ�ਨ ਰਸ�ਦ ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "�� ਤ�ਸ�� ਫ�ਲਡਰ \"{0}\" �ਤ� �ਸ ਦ� ਸਬ-ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�ਣ ਦ� ਪ�ਸ਼�� �ਰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\"?"
 msgstr "\"{0}\" ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�ਣਾ ਹ�?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "�ੰ� ਰਿਪ�ਰ� ਲ� ਫ�ਲ�ਹ"
-
-#: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "�ੰ� ਨਹ�� ਫ�ਲ�ਹ ਹ�ਣ ਦ� ਰਿਪ�ਰ� ਦਿ�"
-
 #: ../mail/mail.error.xml.h:90
+#| msgid "_Private"
+msgid "Reply _Privately"
+msgstr "ਨਿੱ�� �ਵਾਬ(_P)"
+
+#: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
 msgstr "��� ਫ�ਲਡਰਾ� ਨ�ੰ ���ਮ��ਿ� ਹ� �ੱਪਡ�� �ਰ ਦਿੱਤਾ �ਾਵ��ਾ।"
 
-#: ../mail/mail.error.xml.h:91
-msgid "Send Receipt"
-msgstr "ਰਸ�ਦ ਭ���"
+#: ../mail/mail.error.xml.h:94
+msgid "Send private reply?"
+msgstr "ਪ�ਰਾ�ਵ�� �ਵਾਬ ਭ��ਣਾ ਹ�?"
+
+#: ../mail/mail.error.xml.h:95
+#| msgid "Sender or Recipients"
+msgid "Send reply to all recipients?"
+msgstr "ਸਭ ਪ�ਰਾਪਤ-�ਰਤਾਵਾ� ਨ�ੰ �ਵਾਬ ਭ��ਣਾ ਹ�?"
 
 #  XXX we shouldn't be popping up dialogs in this code.
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:96
 msgid "Signature Already Exists"
 msgstr "ਦਸਤ�ਤ ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹਨ"
 
-#: ../mail/mail.error.xml.h:93
-msgid "Synchronize"
-msgstr "ਸ��ਰ�ਨਾ��਼"
-
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Synchronize folders locally for offline usage?"
 msgstr "�� �ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਫ�ਲਡਰ ਲ��ਲ� ਸ��ਰ�ਨਾ��਼ �ਰਨ� ਹਨ?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13587,7 +13807,7 @@ msgstr ""
 "ਸਿਸ�ਮ ਫ�ਲਡਰ �ਵ�ਲ�ਸ਼ਨ ਦ� �ੰਮ �ਰਨ ਲ� ਲਾ�ਮ� ਹਨ �ਤ� �ਹਨਾ� ਨ�ੰ ਤਬਦ�ਲ, ਨਾ�-ਤਬਦ�ਲ �ਾ� ਹ�ਾ�ਣਾ "
 "ਸੰਭਵ ਨਹ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13602,36 +13822,7 @@ msgstr ""
 "���ਰ ਸ਼ਾਮਿਲ ��ਤਾ ਹ�, ਤਾ� ਸਾਰ� ਪ�ਰਾਪਤ �ਰਤਾ �ਾਹਿਰ ਹ� �ਾਣ��। �ਸ ਤ�� ਬੱ�ਣ ਲ� ਤ�ਹਾਨ�ੰ �ੱ��-�ੱ� �ੱ� "
 "ਪ�ਰਾਪਤ �ਰਤਾ ਨ�ੰ To: �ਾ� CC: ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�।"
 
-#  mail:vfolder-updated secondary
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"ਹ�ਠ ਲਿ�� ��� ਫ�ਲਡਰ:\n"
-"{0}\n"
-"ਹ�ਣ ਫ�ਲਡਰ ਹ�ਾ�ਣ ਲ� ਵਰਤਿ� �ਾਦਾ ਹ�:\n"
-"    \"{1}\"\n"
-"�ਤ� �ੱਪਡ�� ਹ�।"
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"ਹ�ਠ ਲਿ�� ਫਿਲ�ਰ ਨਿਯਮ ਹਨ:\n"
-"{0}\n"
-"ਹ�ਣ ਫ�ਲਡਰ ਹ�ਾ�ਣ ਲ� ਵਰਤਿ� �ਾਵ��ਾ:\n"
-"    \"{1}&\"\n"
-"�ਤ� �ੱਪਡ�� ��ਤਾ �ਿ� ਹ�।"
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13639,7 +13830,7 @@ msgstr ""
 "�ੱ�� ਦਿੱਤ� ਪ�ਰਾਪਤ �ਰਤਾ ਨ�ੰ ਢ�ੱ�ਵ�� ਮ�ਲ �ਡਰ�ੱਸ ਵ��� ਪ�ਾਣਿ� ਨਹ�� �ਾ ਸ�ਿ�:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13648,11 +13839,11 @@ msgstr ""
 "{0}"
 
 #  mail:signature-notscript secondary
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "ਸ��ਰਿਪ� ਫਾ�ਲ ਮ���ਦ �ਤ� �ੱਲਣਯ�� ਹ�ਣ� �ਾਹ�ਦ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13660,7 +13851,7 @@ msgstr ""
 "�ਹ ਫ�ਲਡਰ ਲ�ਪਤ ਸ਼ਾਮਿਲ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�, ���\n"
 "ਫ�ਲਡਰ ਸੰਪਾਦ� ਵਿੱ� �ਾ �� �ਸ ਨ�ੰ ਪਰਤੱ� ਸ਼ਾਮਿਲ �ਰ�, �� ਲ�� ਹ� ਤਾ�।"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13668,31 +13859,38 @@ msgstr ""
 "�ਹ ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�, �ਿ��ਿ �ਿਸ ��ਾ��� ਨਾਲ ਤ�ਸ�� ਭ��ਣ ਦ� ��ਣ ��ਤ� ਹ�, �ਹ ਤਾ� "
 "�ਯ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:110
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�, �ਿ��ਿ ਤ�ਸ�� ��� ਸ�ਨ�ਹ� ਨਹ�� ਦਿੱਤਾ ਹ�"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "ਸਰਵਰ �ਸ ਤਰਾ� ਦ� ਪ�ਰਮਾਣਿਤ ਲ� ਸਹਾ�� ਨਹ�� ਹ� �ਤ� ਸਭ ਪ�ਰਮਾਣ�ਿਤਾ ਲ� ਸਹਾ� ਵ� ਨਹ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "�ਹ ਦਸਤ�ਤ ਤਬਦ�ਲ ਹ� �� ਹਨ, ਪਰ ਸੰਭਾਲ� ਨਹ�� �� ਹਨ।"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "�ਸ ਨਾਲ ��ਣ� ਫ�ਲਡਰ �ਤ� �ਸ ਦ� �ਧ�ਨ-ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਬਣਾ ਦਿੱਤ� �ਾਣ��।"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:114
+#| msgid ""
+#| "This will mark all messages as read in the selected folder and its "
+#| "subfolders."
+msgid "This will mark all messages as read in the selected folder."
+msgstr "�ਸ ਨਾਲ ��ਣ� ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਬਣਾ ਦਿੱਤ� �ਾਣ��।"
+
+#: ../mail/mail.error.xml.h:115
 msgid "Unable to connect to the GroupWise server."
 msgstr "�ਰ�ੱਪਵਾ�ਸ ਸਰਵਰ ਨਾਲ ���ਨ ਵਿੱ� �ਸਫਲ ਹ�।"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13700,19 +13898,19 @@ msgstr ""
 "�ਸ ��ਾ��� ਲ� ਡਰਾਫ� ਫ�ਲਡਰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�। �� �ਸ ਦ� ਬ�ਾ� ਸਿਸ�ਮ ਡਰਾਫ� ਫ�ਲਡਰ "
 "ਵਰਤਿ� �ਾਵ�?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "Unable to read license file."
 msgstr "ਲਾ�ਸ��ਸ ਫਾ�ਲ ਪ�ਨ ਵਿੱ� �ਯ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid "Use _Default"
 msgstr "ਮ�ਲ ਵਰਤ��(_D)"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:119
 msgid "Use default drafts folder?"
 msgstr "ਮ�ਲ ਡਰਾਫ� ਫ�ਲਡਰ ਵਰਤਿ� �ਾਵ�?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13722,32 +13920,58 @@ msgstr ""
 "�ਾਵ��ਾ।\n"
 "�� ਤ�ਸ�� �ਾਰ� ਰੱ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:122
+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 "
+"you sure you want to proceed?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:123
+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 "
+"proceed?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:124
+#, fuzzy
+#| msgid ""
+#| "Retracting a message may remove it from the recipient's mailbox. Are you "
+#| "sure you want to do this?"
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr ""
+"�ੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਮ��-�ਾ��ਣ ਨਾਲ �ਸ ਨ�ੰ ਪ�ਰਾਪਤ-�ਰਤਾ ਦ� ਮ�ਲ ਬ�ਸ� ਤ�� ਮ��-�ਰ�ਸ ��ਤਾ �ਾਵ��ਾ। �� ਤ�ਸ�� �ਹ "
+"�ਰਨ ਲ� ਯ��ਨ� ਹ�?"
+
+#: ../mail/mail.error.xml.h:125
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "�ਹ ਪੱਤਰ ਹ�ਾ�ਣ ਲ� ਤ�ਹਾਨ�ੰ ਲ���ਦ� �ਧਿ�ਾਰ ਨਹ�� ਹਨ।"
 
 #  mail:account-incomplete secondary
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:126
 msgid "You have not filled in all of the required information."
 msgstr "ਤ�ਸ�� ਸਾਰ� ਲਾ�ਮ� �ਾਣ�ਾਰ� ਭਰ� ਨਹ�� ਹ�।"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "ਤ�ਹਾਡ� ��ਲ �� ਨਾ-ਭ��� ਸ�ਨ�ਹ� ਹਨ, �� ਤ�ਸ�� �ਿਸ� ਤਰਾ� ਵ� ਬਾਹਰ ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:128
 msgid "You may not create two accounts with the same name."
 msgstr "ਤ�ਸ�� �ੱ� ਸਮ�� ਦ� ��ਾ��� ਨਹ�� ਬਣਾ ਸ�ਦ� ਹ�।"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:129
 msgid "You must name this Search Folder."
 msgstr "ਤ�ਹਾਨ�ੰ �ਸ ��� ਫ�ਲਡਰ ਦਾ ਨਾ� ਦ�ਣਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "You must specify a folder."
 msgstr "ਤ�ਹਾਨ�ੰ ਫ�ਲਡਰ ਨਿਰਧਾਰਿਤ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13756,127 +13980,129 @@ msgstr ""
 "ਤ�ਹਾਨ�ੰ �ੱ��-�ੱ� �ੱ� ਸਰ�ਤ ਨਿਰਧਾਰਿਤ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।\n"
 "�ਾ� �ੱ�ਲਾ-�ੱ�ਲਾ ਫ�ਲਡਰ ��ਣ �� �ਤ�/�ਾ� ਸਾਰ� ਲ��ਲ, ਸਾਰ� ਰਿਮ�� ਫ�ਲਡਰ �ਾ� ਦ�ਵ�� ��ਣ ��।"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:133
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "ਤ�ਹਾਡਾ ਸਰਵਰ \"{0}\" 'ਤ� \"{0}\" ਦ� ਤ�ਰ ਤ� ਲਾ��ਨ �ਸਫਲ"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:134
 msgid "_Append"
 msgstr "��ਲ�ਹ�(_A)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:135
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "�ਯ��(_D)"
+
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "ਤਬਦ�ਲ��� ਰੱਦ(_D)"
 
-#: ../mail/mail.error.xml.h:139
-msgid "_Do not Synchronize"
-msgstr "ਸ��ਰ�ਨਾ��਼ ਨਾ �ਰ�(_D)"
-
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:137
+#: ../modules/mail/e-mail-shell-view-actions.c:827
 msgid "_Empty Trash"
 msgstr "ਰੱਦ� �ਾਲ�(_E)"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:138
 msgid "_Expunge"
 msgstr "ਸ�ੰ���(_E)"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:139
 msgid "_Open Messages"
 msgstr "ਸ�ਨ�ਹ� ��ਲ�ਹ�(_O)"
 
-#: ../mail/message-list.c:1122
+#: ../mail/mail.error.xml.h:142
+#| msgid "Send Receipt"
+msgid "_Send Receipt"
+msgstr "ਰਸ�ਦ ਭ���(_S)"
+
+#: ../mail/mail.error.xml.h:143
+#| msgid "Synchronize"
+msgid "_Synchronize"
+msgstr "ਸ��ਰ�ਨਾ��਼(_S)"
+
+#: ../mail/message-list.c:1170
 msgid "Unseen"
 msgstr "ਨਾ-ਵ���"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1171
 msgid "Seen"
 msgstr "ਵ���"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1172
 msgid "Answered"
 msgstr "�ਵਾਬ ਦਿੱਤ�"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1173
 msgid "Forwarded"
 msgstr "�ੱ�� ਭ��ਿ�"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1174
 msgid "Multiple Unseen Messages"
 msgstr "ਬਹ� ਨਾ-ਵ��� ਸ�ਨ�ਹ�"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1175
 msgid "Multiple Messages"
 msgstr "ਬਹ�-ਸ�ਨ�ਹ�"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1179
 msgid "Lowest"
 msgstr "ਨਿ�ਨਤਮ"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1180
 msgid "Lower"
 msgstr "�ੱ�"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1184
 msgid "Higher"
 msgstr "ਵੱਧ"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1185
 msgid "Highest"
 msgstr "ਸਭ ਤ�� ਵੱਧ"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "�ੱ� %l:%M %p"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1811
 msgid "Yesterday %l:%M %p"
 msgstr "�ੱਲ�ਹ %l:%M %p"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1823
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1831
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1833
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2598
 msgid "Select all visible messages"
 msgstr "ਸਾਰ� ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ��ਣ�"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
-msgid "Shell Backend"
-msgstr "ਸ�ੱਲ ਬ����ਡ"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4402 ../mail/message-list.c:4809
 msgid "Generating message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਬਣਾ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4633
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "��� ਸ�ਨ�ਹਾ ਤ�ਹਾਡ� ��� ਮ�ਤਾਬ� ਨਹ�� ਹ�। �ਾ� ਤਾ� ��� -> ��� ਮ�ਨ� ���ਮ ਰਾਹ�� ਸਾਫ਼ �ਰ� �ਾ� ਬਦਲ� ��।"
 
-#: ../mail/message-list.c:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr "�ਸ ਫ�ਲਡਰ ਵਿੱ� ��ਵਲ ਲ��ਵ�� ਸ�ਨ�ਹ� ਹ� ਹਨ। �ਹਨਾ� ਨ�ੰ ਵ��ਣ ਲ� ਵ���->ਲ��ਵ�� ਸ�ਨ�ਹ� ਵਰਤ��।"
-
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4635
 msgid "There are no messages in this folder."
 msgstr "�ਸ ਫ�ਲਡਰ ਵਿੱ� ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�।"
 
@@ -13905,7 +14131,7 @@ msgid "Sent Messages"
 msgstr "ਭ��� ਸ�ਨ�ਹ�"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:560
 msgid "Size"
 msgstr "��ਾਰ"
 
@@ -13914,27 +14140,27 @@ msgid "Subject - Trimmed"
 msgstr "ਵਿਸ਼ਾ - ���ਾ ��ਤਾ"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "Body contains"
 msgstr "ਪੱਤਰ '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "Message contains"
 msgstr "ਸ�ਨ�ਹ� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
 msgid "Recipients contain"
 msgstr "ਸ�ਨ�ਹ��� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1239
 msgid "Sender contains"
 msgstr "ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1246
 msgid "Subject contains"
 msgstr "ਵਿਸ਼� '� ਹ�"
 
@@ -13967,15 +14193,16 @@ msgstr ""
 "�ਹ ��ਣ �ਰਨ ਦਾ �ਰਥ ਹ� �ਿ ਤ�ਹਾਡਾ ਸਰਵਰ SSL �ਾ� TLS ਲ� ਸਹਾ�� ਨਹ�� ਹ�। �ਸਦਾ �ਰਥ ਹ� ਤ�ਹਾਡਾ "
 "��ਨ��ਸ਼ਨ �ਣ-ਸ�ਰੱ�ਿ�ਤ ਵ� ਹ� ਸ�ਦਾ ਹ� �ਤ� ਤ�ਸ�� ਸ�ਰੱ�ਿ� ਲ� �ਤਰਾ ਬਣ ਸ�ਦ� ਹ�।"
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
-msgstr "�ਨਮ-ਦਿਨ ਤ� ਵਰ�-�ੰਢ ��ਲੰਡਰ(_B)"
+#: ../modules/addressbook/addressbook-config.c:602
+#| msgid "Use in _Birthday & Anniversaries calendar"
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "�ਨਮਦਿਨ ਤ� ਵਰ�ਹ�-�ੰਢ ��ਲੰਡਰ '� ਵਰਤ��(_s)"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "�ਫਲਾ�ਨ �ਪਰ�ਸ਼ਨ ਲ� ਬ�ੱ� ਸਮੱ�ਰ� �ਾਪ� �ਰ�(_b)"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -13984,7 +14211,7 @@ msgstr ""
 "�ਹ LDAP ਸਰਵਰ ਦ� �ਹ ਪ�ਰ� ਹ�, �ਿਸ ਤ� �ਵ�ਲ�ਸ਼ਨ ���ਨ ਦ� ��ਸ਼ਿਸ �ਰ ਰਿਹਾ ਹ�। �ੱ� ਸ���ਡਰਡ ਪ�ਰ�ਾ� "
 "ਦ� ਸ��� �ਪਲੱਬਧ ਹ�। �ਪਣ� ਸਿਸ�ਮ ਪ�ਰਬੰਧ� ਨ�ੰ ਪ�ੱ�� �ਿ �ਿਹ�� ਪ�ਰ� ਨਿਰਧਾਰਿਤ �ਰਨ� ਹ�।"
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13993,7 +14220,7 @@ msgstr ""
 "�ਹ ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� �� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� ਲ� �ਸਤ�ਮਾਲ �ਰ���। �ਸ ਨ�ੰ \"�ਮ�ਲ �ਡਰ�ੱਸ\" ਨਿਰਧਾਰਿਤ "
 "�ਰਨ ਨਾਲ ਤ�ਹਾਡ� ldap ਸਰਵਰ ਲ� ਬ�ਪ�ਾਣ ਪਹ�ੰ� ਲ���ਦ� ਹ�ਵ���।"
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 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 "
@@ -14004,29 +14231,29 @@ msgstr ""
 "\"sub\" ਸ�ਮਾ ਨਾਲ ��� �ਧਾਰ ਦ� ਹ�ਠਾ� ਸਭ ���ਮਾ� ਦ� �ਾ�� �ਰ���। ��� ਸ�ਮਾ� \"one\" ਨਾਲ "
 "ਤ�ਹਾਡ� �ਧਾਰ ਤ�� �ੱ� ਪੱਧਰ ਤੱ� �ਾ�� ��ਤ� �ਾਵ���।"
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "ਸਰਵਰ �ਾਣ�ਾਰ�"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "ਵ�ਰਵਾ"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "��� �ਾਰ� ਹ�"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿਸ਼�ਸ਼ਤਾ"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "ਨਵ�� �ਡਰ�ੱਸ-ਬ�ੱ�"
 
@@ -14077,9 +14304,9 @@ msgid ""
 "contact list. \"1\" (Vertical View) places the preview pane next to the "
 "contact list."
 msgstr ""
-"ਲ���� ਸ�ਾ�ਲ ਤਹਿ �ਰਦਾ ਹ� �ਿ ਸੰਪਰ� ਲਿਸ� ਨਾਲ ਸਬੰਧਿਤ �ਲ� ਬਾਹ� �ਿੱਥ� ਵ��ਾ� �ਾਵ�। "
-"\"0\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ ਸੰਪਰ� ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) "
-"�ਲ� ਬਾਹ� ਨ�ੰ ਸੰਪਰ� ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
+"ਲ���� ਸ�ਾ�ਲ ਤਹਿ �ਰਦਾ ਹ� �ਿ ਸੰਪਰ� ਲਿਸ� ਨਾਲ ਸਬੰਧਿਤ �ਲ� ਬਾਹ� �ਿੱਥ� ਵ��ਾ� �ਾਵ�। \"0"
+"\" (�ਲਾਸਿ� �ਲ�) �ਲ� ਬਾਹ� ਨ�ੰ ਸੰਪਰ� ਲਿਸ� ਹ�ਠਾ� ਵ��ਾ��ਦ� ਹ�। \"1\" (ਵਰ���ਲ �ਲ�) �ਲ� "
+"ਬਾਹ� ਨ�ੰ ਸੰਪਰ� ਲਿਸ� ਦ� ਨਾਲ ਰੱ�ਦ� ਹ�।"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid ""
@@ -14105,406 +14332,310 @@ msgstr "�� ���ਰ� ਵਿੱ� ���-ਪ�ਰਨ ਸੰਪਰ
 msgid "Whether to show the preview pane."
 msgstr "�� �ਲ� ਪ�ਨ ਵ��ਾ�ਣ� ਹ�"
 
-#: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-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:1165
+msgid "_Table column:"
+msgstr "��ਬਲ �ਾਲਮ(_ T):"
+
+#: ../modules/addressbook/autocompletion-config.c:165
 msgid "Autocompletion"
 msgstr "ਸਵ�-ਪ�ਰਤ�"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:168
 msgid "Always _show address of the autocompleted contact"
 msgstr "���-ਪ�ਰਾ ��ਤ� ਸੰਪਰ� ਦਾ �ਡਰ�ੱਸ ਹਮ�ਸਾ� ਵ���"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:97
+#: ../modules/addressbook/e-book-shell-migrate.c:148
 msgid "On LDAP Servers"
 msgstr "LDAP ਸਰਵਰਾ� �ੱਤ�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:267
 msgctxt "New"
 msgid "_Contact"
 msgstr "ਸੰਪਰ�(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "ਨਵਾ� ਸੰਪਰ� ਬਣਾ�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
 msgstr "ਸੰਪਰ� ਲਿਸ�(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "ਨਵ�� ਸੰਪਰ� ਸ��� ਬਣਾ�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "Address _Book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ�(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "�ੱ� ਸ�ਨ�ਹਾ �ਿਤਾਬ ਬਣਾ�"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:401
+#: ../modules/calendar/e-cal-shell-backend.c:104
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "ਸੰਪਰ�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "ਸਰ�ਤ ਲਿਸ�"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਰ�ਿਸ�ਰ�"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "ਮ���ਦਾ �ਲ�"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "ਮ���ਦਾ ��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� �ਲ�"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "�ਲ� ਵਿ�ਲਾ ਸੰਪਰ�"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "�ਲ� ਬਾਹ� ਵਿੱ� ਵ��ਾ�� �ਾ ਰਿਹਾ ਸੰਪਰ�"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "�ਲ� ਵਿ�ਾ� ਦਿੰਦ� ਹ�"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "�� �ਲ� ਬਾਹ� ਵ��ਾ� ਦ�ਵ�"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP ਸਰਵਰ"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "���-ਪ�ਰਤ� ਸ��ਿੰ�"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਸੰਪਰ� ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� ਵਿੱ� �ਵ�ਲ�ਸ਼ਨ 1.x ਤ�� ਬਾ�ਦ ਤਬਦ�ਲ� � �� ਹ�।\n"
-"\n"
-"ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ਮ�ਲਿੰ� ਸ��� ਸੰਪਰ� ਦਾ ਫਾਰਮ�� ਤਬਦ�ਲ ਹ� �ਿ� ਹ�।\n"
-"\n"
-"ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਦਾ ਫ�ਨ ਨੰਬਰ ਸੰਭਾਲਣਾ ਦਾ ਢੰ� ਤਬਦ�ਲ ਹ� �ਿ� ਹ�\n"
-"\n"
-"ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਦ� ਪਾਲਮ ਸਿ�ਰ�ਨਾ��਼ ਤਬਦ�ਲ ਲਾ� ਤ� ਫਾ�ਲ਼ �ਾ�ਾ ਤਬਦ�ਲ ਹ� �ਿ� ਹ�।\n"
-"\n"
-"ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "ਸਰ�ਤ ��ਣ�ਾਰ� ਵਿਦ��ੱ�"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "�ਹ ਵਿਦ��ੱ� �ਡਰ�ੱਸ-ਬ�ੱ� ਦ� �ਰ�ੱਪ ਵ��ਾ��ਦਾ ਹ�"
+#: ../modules/addressbook/e-book-shell-backend.c:312
+msgid "Certificates"
+msgstr "ਸਰ��ਫਿ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "vCard ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "ਸਭ ਸੰਪਰ�ਾ� ਦ� �ੱਥ� �ਾਪ� (_p)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਸੰਪਰ� ਦ� �ਾਪ� ਹ�ਰ ਨ�ੰ ਭ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਹ�ਾ�(_e)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਹ�ਾ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "ਸਭ ਸੰਪਰ�ਾ� ਨ�ੰ ਭ���(_v)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਸੰਪਰ�ਾ� ਨ�ੰ ਹ�ਰਾ� ਵਿੱ� ਭ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "ਨਵ�� �ਡਰ�ੱਸ-ਬ�ੱ�(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿਸ਼�ਸ਼ਤਾ (_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਵਿਸ਼�ਸ਼ਤਾ ਵ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../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:911
 msgid "_Rename..."
 msgstr "ਨਾ� ਬਦਲ�(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦਾ ਨਾ� ਬਦਲ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� vC_ard ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਸੰਪਰ�ਾ� ਨ�ੰ vCard ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "ਲ�ਡ �ਰਨਾ ਰ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "ਸੰਪਰ�ਾ� �ੱਥ� �ਾਪ� �ਰ�(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "��ਣ� ਸੰਪਰ� ਹ�ਰ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "ਸੰਪਰ� ਹ�ਾ�(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "ਸੰਪਰ� ਵਿੱ� ���(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "ਦਿੱਸ ਰਹ� ਸੰਪਰ� ਵਿੱ� ���ਸ� ਦ� ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "ਸੰਪਰ� ਨ�ੰ �ੱ�� ਭ���(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "��ਣ� ਸੰਪਰ� ਹ�ਰ ਵਿ��ਤ� ਨ�ੰ ਭ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "ਸੰਪਰ� �ੱਥ� ਭ���(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "��ਣ� ਸੰਪਰ� ਹ�ਰ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਭ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "ਨਵਾ� ਸੰਪਰ�(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "ਨਵ�� ਸੰਪਰ� ਲਿਸ�(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "ਸੰਪਰ� ��ਲ�ਹ�(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "ਮ���ਦਾ ਸੰਪਰ� ਵ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "ਸੰਪਰ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "ਸ�ਨ�ਹਾ ��ਣ� ਸੰਪਰ�ਾ� ਵਿੱ� ਭ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "�ਾਰਵਾ�(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../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:1034
 msgid "_Preview"
 msgstr "�ਲ�(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../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
 msgid "_Delete"
 msgstr "ਹ�ਾ�(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "ਵਿਸ਼�ਸਤਾ(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "vCard ਵਾ�� ਸੰਭਾਲ�(_S)...."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "ਸੰਪਰ� �ਲ�(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "ਸੰਪਰ� �ਲ� ਵਿੰਡ� ਵ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../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:1128
 msgid "_Classic View"
 msgstr "��ਸਾਲ� �ਲ�(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "ਸ�ਨ�ਹਾ ਲਿਸ� ਦ� ਹ�ਠਾ� ਸੰਪਰ� �ਲ� ਵ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../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:1135
 msgid "_Vertical View"
 msgstr "ਲੰਬ�ਾਰ� �ਲ�(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "ਸੰਪਰ� ਲਿਸ� ਦ� ਨਾਲ ਸੰਪਰ� �ਲ� ਵ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../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
 msgid "Any Category"
 msgstr "��� ���ਾ�ਰ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../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
 msgid "Unmatched"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../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:1211
+#: ../shell/e-shell-content.c:459
 msgid "Advanced Search"
 msgstr "ਤ�ਨ��� ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "ਸਭ ਦਿ�ਾ� ਦਿੰਦ� ਸੰਪਰ� ਪਰਿੰ� �ਰ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "ਪਰਿੰ� �ਾਣ ਵਾਲ� ਸੰਪਰ�ਾ� ਦ� �ਲ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "��ਣ� ਸੰਪਰ� ਪਰਿੰ� �ਰ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "vCard �ੰ� ਸੰਭਾਲ�..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "��ਣ� ਸੰਪਰ� VCard ਵ��� ਸੰਭਾਲ�"
 
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Forward Contacts"
 msgstr "ਸੰਪਰ� �ੱ�� ਭ���(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Forward Contact"
 msgstr "ਸੰਪਰ� �ੱ�� ਭ���(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:378
 msgid "_Send Message to Contacts"
 msgstr "ਸੰਪਰ�ਾ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:380
 msgid "_Send Message to List"
 msgstr "ਲਿਸ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contact"
 msgstr "ਸੰਪਰ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_S)"
 
@@ -14528,57 +14659,47 @@ msgstr "ਸੰਪਰ� �ਾਣ�ਾਰ�"
 msgid "Contact information for %s"
 msgstr "%s ਲ� ਸੰਪਰ� �ਾਣ�ਾਰ�"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "੧"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "੩੨੬੮"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "੩੮੯"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "à©«"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "੬੩੬"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "�ਣ�ਾਣ"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "�ਹ �ਿਤਾਬ ਸ�ਮਾ �ੱਪ� ਤੱ� ਵ���(_r)"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "ਲਾ��ਨ(_g):"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "�ੱ�"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "��� ਫਿਲ�ਰ"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "��� ਬ�ਸ(_b):"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "ਫਿਲ�ਰ ���(_F):"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14587,55 +14708,56 @@ msgstr ""
 "��ਤ� �� ਤਾ�,  ਮ�ਲ ��� ਨ�ੰ \"ਵਿ��ਤ�\" �ਿਸਮ ਨ�ੰ ਮੰਨ �� ��� ��ਤ� �ਾਵ���।"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "�ਧ�ਨ"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "ਸਹਾ�� ��� �ਧਾਰ"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "ਵਿੱਲਣ ਨਾ� (DN) ਵਰਤ��"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ ਵਰਤ��"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "ਡਾ�ਨਲ�ਡ ਸ�ਮਾ(_D):"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "ਸੰਭਵ ��� �ਧਾਰ ਲੱਭ�(_F)"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "ਲਾ��ਨ ਢੰ�(_L):"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "ਪ�ਰ�(_P):"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "��� ਸ�ਮਾ(_S):"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "ਸਮਾ�-ਸ�ਮਾ(_T):"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "ਸ�ਰੱ�ਿ�ਤ ��ਨ��ਸ਼ਨ ਵਰਤ��(_U):"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "�ਾਰਡ"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "�ੰਪ�ਰ�(_m)"
 
@@ -14656,101 +14778,71 @@ msgid "I_mport to Tasks"
 msgstr "�ੰਮ �ੰਪ�ਰ�(_m)"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-cal-shell-backend.c:106
+#: ../modules/calendar/e-cal-shell-migrate.c:176
+#: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../modules/calendar/e-task-shell-migrate.c:145
 msgid "On The Web"
 msgstr "ਵ�ੱਬ ਤ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-backend.c:108
 #: ../plugins/calendar-weather/calendar-weather.c:117
 msgid "Weather"
 msgstr "ਮ�ਸਮ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:193
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "�ਨਮ-ਦਿਨ ਤ� ਵਰ�-�ੰਢ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:396
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:403
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "ਸਾਰ� ਦਿਨ ਦ� ਮ�ਲਾ�ਾਤ(_p)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:405
 msgid "Create a new all-day appointment"
 msgstr "ਨਵ�� ਸਾਰਾ-ਦਿਨ ਮ�ਲਾ�ਾਤ ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:410
 msgctxt "New"
 msgid "M_eeting"
 msgstr "ਮ��ਿੰ�(_e)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:412
 msgid "Create a new meeting request"
 msgstr "ਨਵ�� ਮ��ਿੰ� ਲ� ਬ�ਨਤ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:420
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "��ਲੰਡਰ(_n)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-backend.c:422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "ਨਵਾ� ��ਲੰਡਰ ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../modules/calendar/e-cal-shell-backend.c:707
+#: ../plugins/itip-formatter/itip-formatter.c:2667
 msgid "Calendar and Tasks"
 msgstr "��ਲੰਡਰ ਤ� �ੰਮ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "��ਲੰਡਰਾ� ਲ� ਰ�ਿਸ�ਰ�"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� ਵਿੱ� �ਵ�ਲ�ਸ਼ਨ 1.x ਤ�� ਬਾ�ਦ ਤਬਦ�ਲ� � �� ਹ�। \n"
-"\n"
-"�ਿਰਪਾ �ਰ�� ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ�, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
-
-#  FIXME: set proper domain/code
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "evolution/config.xmldb ਤ�� ਪ�ਰਾਣ� ਸ��ਿੰ� ਪ�ਰਾਪਤ �ਰਨ ਤ�� �ਸਫਲ"
-
-#  FIXME: domain/code
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "��ਲੰਡਰ `%s' ਮਾ��ਰ�� �ਰਨ ਲ� �ਸਮਰੱਥ"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
+#: ../modules/calendar/e-cal-shell-sidebar.c:169
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14759,36 +14851,21 @@ msgstr ""
 "%s �ੱਤ� �ਲਤ�\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:237
 msgid "Loading calendars"
 msgstr "��ਲੰਡਰ ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:664
+#| msgid "_New Calendar"
+msgid "_New Calendar..."
+msgstr "ਨਵਾ� ��ਲੰਡਰ(_N)..."
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:681
 msgid "Calendar Selector"
 msgstr "��ਲੰਡਰ ��ਣ�ਾਰ "
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "ਡਾ�ਾ ਨ�ਵ����ਰ ਵਿਦ��ੱ�"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "�ਹ ਵਿਦ��ੱ� ਮਿੰਨ���ਰ ��ਲੰਡਰ ਵ��ਾ��ਦਾ ਹ�"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "ਡਿਫਾਲ� ��ਲੰਡਰ �ਲਾ��"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "��ਲੰਡਰ �ਪਰ�ਸ਼ਨ ਲ� ਡਿਫਾਲ� �ਲਾ��"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "�ਹ ਵਿਦ��ੱ� ��ਲੰਡਰਾ� ਦਾ �ਰ�ੱਪ ਵ��ਾ��ਦਾ ਹ�"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:1022
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s ਤ�� ��ਲੰਡਰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
@@ -14817,298 +14894,298 @@ msgstr "�ਸ ਤ�� ਪ�ਰਾਣ��� ��ਨਾਵਾ� ਸ�
 msgid "Copying Items"
 msgstr "���ਮਾ� ਦ� �ਾਪ� �ਾਰ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 msgid "Moving Items"
 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:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
 msgid "event"
 msgstr "�ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../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:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:504
+#: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
 msgstr "iCalendar ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Copy..."
 msgstr "�ਾਪ� �ਰ�(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "D_elete Calendar"
 msgstr "��ਲੰਡਰ ਹ�ਾ�(_e)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Delete the selected calendar"
 msgstr "��ਣਿ� ��ਲੰਡਰ ਹ�ਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Back"
 msgstr "ਪਿੱ�� �ਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Go Forward"
 msgstr "�ੱ�� �ਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "�ੱ� ��ਣ�(_T)"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select today"
 msgstr "�ੱ� ��ਣ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select _Date"
 msgstr "ਮਿਤ� ��ਣ�(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Select a specific date"
 msgstr "�ਾਸ ਮਿਤ� ��ਣ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "ਨਵਾ� ��ਲੰਡਰ(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
 msgstr "ਨਿ���(_e)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "ਪ�ਰਾਣ� ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ�ਾ� ਵਿੱ� ਸ�ਧ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../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
 msgid "Re_fresh"
 msgstr "ਮ��-ਤਾ�ਾ(_f)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "��ਣ� ��ਲੰਡਰ ਤਾ�਼ਾ �ਰ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Rename the selected calendar"
 msgstr "��ਣ� ��ਲੰਡਰ ਦਾ ਨਾ� ਬਦਲ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Show _Only This Calendar"
 msgstr "ਸਿਰਫ਼ �ਹ ��ਲੰਡਰ ਹ� ਵ���(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Cop_y to Calendar..."
 msgstr "��ਲੰਡਰ ਵਿੱ� �ਾਪ� �ਰ�(_y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "_Delegate Meeting..."
 msgstr "ਡ�ਲ���� ਮ��ਿੰ�(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "_Delete Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਹ�ਾ�(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete selected appointments"
 msgstr "��ਣ� ਮ�ਲਾ�ਾਤ ਹ�ਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete This _Occurrence"
 msgstr "�ਹ ਮ���ਦ�� ਹ�ਾ�(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Delete this occurrence"
 msgstr "�ਹ ਮ���ਦ�� ਹ�ਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete All Occ_urrences"
 msgstr "ਸਾਰ��� ਮ���ਦ���� ਹ�ਾ�(_u)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Delete all occurrences"
 msgstr "ਸਭ ਮ���ਦ���� ਹ�ਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New All Day _Event..."
 msgstr "ਨਵਾ� ਸਾਰ� ਦਿਨ ਦਾ �ਵ���(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Create a new all day event"
 msgstr "ਨਵਾ� ਸਾਰ� ਦਿਨ ਦਾ �ਵ��� ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../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:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar ਵਾ�� �ੱ�� ਭ���(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "New _Meeting..."
 msgstr "ਨਵ�� ਮ��ਿੰ�(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Create a new meeting"
 msgstr "ਨਵ�� ਮ��ਿੰ� ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Mo_ve to Calendar..."
 msgstr "��ਲੰਡਰ ਵਿੱ� ਭ���(_v)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "New _Appointment..."
 msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Make this Occurrence _Movable"
 msgstr "�ਹ ਮ���ਦ�� ਨ�ੰ �ੱਲ ਬਣਾ�(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Open Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ��ਲ�ਹ�(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "View the current appointment"
 msgstr "ਮ���ਦਾ ਮ�ਲਾ�ਾਤ ਦ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "_Reply"
 msgstr "�ਵਾਬ(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
 msgid "Save as iCalendar..."
 msgstr "iCalendar ਵਾ�� ਸੰਭਾਲ�..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "_Schedule Meeting..."
 msgstr "ਮ��ਿੰ� ਨਿਯਤ ਸਮਾ�(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Converts an appointment to a meeting"
 msgstr "ਮ�ਲਾ�ਾਤ ਨ�ੰ ਮ��ਿੰ� ਵਿੱ� ਬਦਲ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Conv_ert to Appointment..."
 msgstr "ਮ�ਲਾ�ਤਾ '� ਬਦਲ�(_e)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Converts a meeting to an appointment"
 msgstr "ਮ��ਿੰ� ਨ�ੰ ਮ�ਲਾ�ਾਤ ਵਿੱ� ਬਦਲ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+msgid "Quit"
+msgstr "ਬਾਹਰ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Day"
 msgstr "ਦਿਨ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
 msgid "Show one day"
 msgstr "�ੱ� ਦਿਨ ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "List"
 msgstr "ਲਿਸ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show as list"
 msgstr "ਲਿਸ� ਦ� ਤਰਾ� ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Month"
 msgstr "ਮਹ�ਨਾ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show one month"
 msgstr "�ੱ� ਮਹ�ਨਾ ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Week"
 msgstr "ਹਫਤਾ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one week"
 msgstr "�ੱ� ਹ�ਤਾ ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one work week"
 msgstr "�ੱ� �ੰਮ ਹਫ਼ਤਾ ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
 msgid "Active Appointments"
 msgstr "���ਿਵ ਮ�ਲਾ�ਾਤ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
 msgid "Next 7 Days' Appointments"
 msgstr "��ਲ� ੭ ਦਿਨ ਦ��� ਮ�ਲਾ�ਾਤਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../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
 msgid "Description contains"
 msgstr "ਵ�ਰਵ� ਵਿੱ� ਸ਼ਾਮਿਲ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../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
 msgid "Summary contains"
 msgstr "ਸੰ��ਪ ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
 msgid "Print this calendar"
 msgstr "�ਹ ��ਲੰਡਰ ਪਰਿੰ� �ਰ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Preview the calendar to be printed"
 msgstr "ਪਰਿੰ� ਹ�ਣ ਵਾਲ� ��ਲੰਡਰ ਦ� �ਲ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 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:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:502
 msgid "memo"
 msgstr "ਮ�ਮ�"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
 msgid "New _Memo"
 msgstr "ਨਵਾ� ਮ�ਮ�(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-memo-shell-backend.c:279
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Create a new memo"
 msgstr "�ੱ� ਨਵਾ� ਮ�ਮ� ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
 msgid "_Open Memo"
 msgstr "ਮ�ਮ� ��ਲ�ਹ�(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "View the selected memo"
 msgstr "��ਣਿ� ਮ�ਮ� ਵ���"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../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:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Open _Web Page"
 msgstr "ਵ�ੱਬ ਸਫ਼ਾ ��ਲ�ਹ�(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the selected memo"
 msgstr "��ਣਿ� ਮ�ਮ� ਪਰਿੰ� �ਰ�"
 
@@ -15117,22 +15194,22 @@ msgstr "��ਣਿ� ਮ�ਮ� ਪਰਿੰ� �ਰ�"
 #. 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:609
+#: ../modules/calendar/e-task-shell-view-actions.c:619
 msgid "task"
 msgstr "�ਾਸ�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "_Assign Task"
 msgstr "�ੰਮ �ਾਰ� �ਰ�(_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "_Mark as Complete"
 msgstr "ਨਿਸ਼ਾਨਾ ਪ�ਰਾ(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
 msgstr "��ਣ� �ੰਮ ਨ�ੰ ਲਿ�� �ਿ ਸਮਾਪਤ"
 
@@ -15141,97 +15218,76 @@ msgid "_Mark as Incomplete"
 msgstr "ਨਾ-ਪ�ਰਾ ਬਣਾ�(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
 msgstr "��ਣ� �ੰਮ ਨ�ੰ ਲਿ�� �ਿ ਸਮਾਪਤ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "New _Task"
 msgstr "ਨਵਾ� �ੰਮ(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-backend.c:277
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "ਨਵਾ� �ੰਮ ਬਣਾ�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Open Task"
 msgstr "�ੰਮ ��ਲ�ਹ�(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
 msgstr "��ਣ� �ਾਰ� ਵ���"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
 msgstr "iCalendar ਵਾ�� ਸੰਭਾਲ�(_S)..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
 msgstr "��ਣ� �ਾਸ� ਪਰਿੰ� �ਰ�"
 
-#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-backend.c:277
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ਮ�ਮ�(_o)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:284
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "ਸਾ��ਾ ਮ�ਮ�(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:327
+#: ../modules/calendar/e-memo-shell-backend.c:286
 msgid "Create a new shared memo"
 msgstr "ਨਵਾ� ਸਾ��ਾ ਮ�ਮ� ਬਣਾ�"
 
-#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "ਮ�ਮ� ਲਿਸ�(_s)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-backend.c:296
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo list"
 msgstr "ਨਵ�� ਮ�ਮ� ਸ��� ਬਣਾ�"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "ਮ�ਮ� ਲਿਸ�ਾ� ਦ� ਰ�ਿਸ�ਰ�"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "ਮ�ਮ� ��ਬਲ ਮਾਡਲ"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:231
 msgid "Loading memos"
 msgstr "ਮ�ਮ� ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:603
 msgid "Memo List Selector"
 msgstr "ਮ�ਮ� ਲਿਸ� ��ਣ�ਾਰ"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "ਡਿਫਾਲ� ਮ�ਮ� �ਲਾ��"
-
-#  mail:async-error-nodescribe primary
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "ਮ�ਮ� �ਪਰ�ਸ਼ਨ ਲ� ਡਿਫਾਲ� �ਲਾ��"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "�ਹ ਵਿਦ��ੱ� ਮ�ਮ� ਲਿਸ� ਦਾ �ਰ�ੱਪ ਵ��ਾ��ਦਾ ਹ�"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:908
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s �ੱਤ� ਮ�ਮ� ��ਲ ਰਿਹਾ ਹ�"
@@ -15241,63 +15297,63 @@ msgstr "%s �ੱਤ� ਮ�ਮ� ��ਲ ਰਿਹਾ ਹ�"
 msgid "Print Memos"
 msgstr "ਮ�ਮ� ਪਰਿੰ� �ਰ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_Delete Memo"
 msgstr "ਮ�ਮ� ਹ�ਾ�(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
 msgid "_Find in Memo..."
 msgstr "ਮ�ਮ� '� ���(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Search for text in the displayed memo"
 msgstr "ਦਿੱਸ ਰਹ� ਮ�ਮ� ਵਿੱ� ���ਸ� ਦ� ���"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "D_elete Memo List"
 msgstr "ਮ�ਮ� ਲਿਸ� ਹ�ਾ�(_e)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Delete the selected memo list"
 msgstr "��ਣ� ਮ�ਮ� ਲਿਸ� ਹ�ਾ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "_New Memo List"
 msgstr "ਨਵ�� ਮ�ਮ� ਲਿਸ�(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Refresh the selected memo list"
 msgstr "��ਣ� ਮ�ਮ� ਲਿਸ� ਤਾ�਼ਾ �ਰ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Rename the selected memo list"
 msgstr "��ਣ� ਮ�ਮ� ਲਿਸ� ਦਾ ਨਾ� ਬਦਲ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
 msgid "Show _Only This Memo List"
 msgstr "��ਵਲ �ਹ ਮ�ਮ� ਲਿਸ� ਵ���(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:706
 msgid "Memo _Preview"
 msgstr "ਮ�ਮ� �ਲ�(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:708
 msgid "Show memo preview pane"
 msgstr "ਮ�ਮ� �ਲ� ਪ�ਨ ਵ���"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview below the memo list"
 msgstr "ਮ�ਮ� ਲਿਸ� ਦ� ਹ�ਠਾ� ਮ�ਮ� �ਲ� ਵ���"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview alongside the memo list"
 msgstr "ਮ�ਮ� ਲਿਸ� ਦ� ਨਾਲ ਮ�ਮ� �ਲ� ਵ���"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:794
 msgid "Print the list of memos"
 msgstr "ਮ�ਮ� ਦ� ਸ��� ਪਰਿੰ� �ਰ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Preview the list of memos to be printed"
 msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� ਮ�ਮ� ਦ� ਸ��� ਦ� �ਲ�"
 
@@ -15322,78 +15378,40 @@ msgstr "ਮ�ਮ� ਹ�ਾ�"
 msgid "Delete Memo"
 msgstr "ਮ�ਮ� ਹ�ਾ�"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-backend.c:275
 msgctxt "New"
 msgid "_Task"
 msgstr "�ੰਮ(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:282
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "ਦਿੱਤਾ �ੰਮ(_d)"
 
-#: ../modules/calendar/e-task-shell-backend.c:331
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgid "Create a new assigned task"
 msgstr "ਨਵਾ� �ੰਮ ਬਣਾ�"
 
-#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-backend.c:292
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "�ਾਸ� ਲਿਸ�(_k)"
 
-#: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-backend.c:294
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "ਨਵ�� �ੰਮ ਸ��� ਬਣਾ�"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "�ੰਮ ਲਿਸ� ਦ� ਰ�ਿ�ਰ�"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "�ਾਸ� ��ਬਲ ਮਾਡਲ"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ 1.x ਤ�� �ਵ�ਲ�ਸ਼ਨ �ੰਮ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� ਤਬਦ�ਲ ਹ� ��ੱ�� ਹ�।\n"
-"\n"
-"�ਿਰਪਾ �ਰ�� �ਡ�� �ਰ�, �ਦ ਤੱ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� ਫ�ਲਡਰ ਨ�ੰ ਤਬਦ�ਲ �ਰ ਰਹ� ਹ�..."
-
-#  FIXME: domain/code
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "�ੰਮ `%s' ਮਾ��ਰ�� �ਰਨ ਲ� �ਸਮਰੱਥ"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:231
 msgid "Loading tasks"
 msgstr "�ੰਮ ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:603
 msgid "Task List Selector"
 msgstr "�ਾਸ� ਲਿਸ� ��ਣ�ਾਰ"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "ਡਿਫਾਲ� �ਾਸ� �ਲਾ��"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "�ਾਸ� �ਪਰ�ਸ਼ਨ ਲ� ਡਿਫਾਲ� �ਲਾ��"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "�ਹ ਵਿਦ��ੱ� �ਾਸ� ਲਿਸ� ਦ� �ਰ�ੱਪ ਵ��ਾ��ਦਾ ਹ�"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:908
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s ਤ� �ੰਮ ��ਲ�ਹ ਰਿਹਾ ਹ�"
@@ -15403,7 +15421,7 @@ msgstr "%s ਤ� �ੰਮ ��ਲ�ਹ ਰਿਹਾ ਹ�"
 msgid "Print Tasks"
 msgstr "�ੰਮ ਪਰਿੰ� �ਰ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15415,95 +15433,95 @@ msgstr ""
 "\n"
 "�� ਤ�ਸ�� �ਹਨਾ� �ੰਮਾ� ਨ�ੰ ਹ�ਾ�ਣ ਲ� ਸਹਿਮਤ ਹ�?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
 msgstr "�ਾਸ� ਹ�ਾ�(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Find in Task..."
 msgstr "�ਾਸ� '� ���(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Search for text in the displayed task"
 msgstr "ਦਿੱਸ ਰਹ� �ਾਸ� ਵਿੱ� ���ਸ� ਦ� ���"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Copy..."
 msgstr "�ਾਪ�..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "D_elete Task List"
 msgstr "�ੰਮ ਲਿਸ� ਹ�ਾ�(_e)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
 msgstr "��ਣ� �ੰਮ ਲਿਸ� ਹ�ਾ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
 msgstr "ਨਵ�� �ਾਸ� ਲਿਸ�(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
 msgstr "��ਣ� �ਾਸ� ਲਿਸ� ਤਾ�਼ਾ �ਰ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
 msgstr "��ਣ� �ਾਸ� ਲਿਸ� ਦਾ ਨਾ� ਬਦਲ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
 msgstr "�ਹ �ਾਸ� ਲਿਸ� ਹ� ਵ���(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Mar_k as Incomplete"
 msgstr "�ਧ�ਰ� ਵ��� ਨਿਸ਼ਾਨਬੱਧ(_k)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
 msgstr "ਸਮਾਪਤ �ੰਮ ਹ�ਾ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
 msgstr "�ੰਮ �ਲ�(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
 msgstr "�ਾਸ� �ਲ� ਪ�ਨ ਵ���"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
 msgstr "�ਾਸ� ਲਿਸ� ਹ�ਠਾ� �ਾਸ� �ਲ� ਵ���"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
 msgstr "�ਾਸ� ਲਿਸ� ਨਾਲ �ਾਸ� �ਲ� ਵ���"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
 msgstr "���ਿਵ �ਾਸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Completed Tasks"
 msgstr "ਸਮਾਪਤ �ਾਸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Next 7 Days' Tasks"
 msgstr "�ੱ�� ੭ ਦਿਨ ਦ��� �ਾਸ�ਾ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Overdue Tasks"
 msgstr "ਮਿ�ਦ ਪ�ੱ���� �ਾਸ�ਾ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Tasks with Attachments"
 msgstr "����ਮ��� ਨਾਲ �ਾਸ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
 msgstr "�ੰਮ ਸ��� ਪਰਿੰ� �ਰ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
 msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� �ਾਰ� ਸ��� ਦ� �ਲ�"
 
@@ -15527,14 +15545,14 @@ msgid "Delete Task"
 msgstr "�ਾਸ� ਹ�ਾ�"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, 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:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "��� ਨਹ��"
@@ -15557,370 +15575,340 @@ msgstr "ਪੱਤਰ ਫ�ਲਡਰ(_F)"
 msgid "Create a new mail folder"
 msgstr "ਨਵਾ� ਪੱਤਰ ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:478
 msgid "Mail Accounts"
 msgstr "ਪੱਤਰ ��ਾ���"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:486
 msgid "Mail Preferences"
 msgstr "ਪੱਤਰ ਪਸੰਦ"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:494
 msgid "Composer Preferences"
 msgstr "�ੰਪ��਼ਰ ਪਸੰਦ"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:502
 msgid "Network Preferences"
 msgstr "ਨ�ੱ�ਵਰ� ਪਸੰਦ"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "ਥਰਿੱਡ ਨਾਲ �ਰ�ੱਪ"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "�� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਮਾਮਲ� ਰਾਹ�� �ਰ�ੱਪ �ਰਨਾ ਹ�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
-#: ../modules/mail/e-mail-shell-view.c:875
+#: ../modules/mail/e-mail-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view.c:870
 msgid "_Disable Account"
 msgstr "��ਾ��� �ਯ��(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:822
 msgid "Disable this account"
 msgstr "�ਹ ��ਾ��� �ਯ��"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:829
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "ਸਭ ਫ�ਲਡਰਾ� ਤ�� ਸਭ ਹ�ਾ� ਸ�ਨ�ਹ� ਪੱ�� ਤ�ਰ �ੱਤ� ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:834
 msgid "C_reate Search Folder From Search..."
 msgstr "��� ਤ�� ��� ਫ�ਲਡਰ ਬਣਾ�(_r)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:841
 msgid "_Download Messages for Offline Usage"
 msgstr "�ਫਲਾ�ਨ ਲ� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ �ਰ�(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:843
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "�ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਮਾਰ� ��ਤ� ��ਾ��� �ਤ� ਫ�ਲਡਰ ਲ� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:848
 msgid "Fl_ush Outbox"
 msgstr "���ਬਾ�ਸ ਫਲੱਸ਼(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:855
 msgid "_Copy Folder To..."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:857
 msgid "Copy the selected folder into another folder"
 msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ �ੱ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:864
 msgid "Permanently remove this folder"
 msgstr "�ਹ ਫ�ਲਡਰ ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "E_xpunge"
 msgstr "ਮਿ�ਾ�(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:871
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ਸਭ ਹ�ਾ� ਸ�ਨ�ਹ� �ਸ ਫ�ਲਡਰ ਵਿੱ��� ਹ�ਾ ਦਿ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:876
 msgid "Mar_k All Messages as Read"
 msgstr "ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਬਣਾ�(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:878
 msgid "Mark all messages in the folder as read"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਮਾਰ� �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "_Move Folder To..."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:885
 msgid "Move the selected folder into another folder"
 msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਭ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:890
 msgid "_New..."
 msgstr "ਨਵਾ�(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:892
 msgid "Create a new folder for storing mail"
 msgstr "ਸੰਭਾਲ� ਪੱਤਰਾ� ਤ�� ਨਵਾ� ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:899
 msgid "Change the properties of this folder"
 msgstr "�ਸ ਫ�ਲਡਰ ਦ��� ਵਿਸ਼�ਸਤਾਵਾ� ਬਦਲ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:906
 msgid "Refresh the folder"
 msgstr "ਫ�ਲਡਰ ਤਾ�਼ਾ �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:913
 msgid "Change the name of this folder"
 msgstr "�ਸ ਫ�ਲਡਰ ਦਾ ਨਾ� ਬਦਲ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:918
 msgid "Select Message _Thread"
 msgstr "ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਵ���(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:920
 msgid "Select all messages in the same thread as the selected message"
 msgstr "�ੱ�� ਮਸਲ� ਦ� ਸਾਰ� ਸ�ਨ�ਹ� ��ਣ� ਸ�ਨ�ਹ� ਬਣਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "Select Message S_ubthread"
 msgstr "ਸ�ਨ�ਹਾ ਸਬ-ਥਰਿੱਡ ��ਣ�(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:927
 msgid "Select all replies to the currently selected message"
 msgstr "ਮ���ਦਾ ਸ�ਨ�ਹ� ਲ� ਸਭ �ਵਾਬ ��ਣ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:932
 msgid "_Unsubscribe"
 msgstr "ਮ��ਬਰ� ਹ�ਾ�(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:934
 msgid "Unsubscribe from the selected folder"
 msgstr "��ਣ� ਫ�ਲਡਰ ਤ�� ਮ��ਬਰ ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:939
 msgid "Empty _Trash"
 msgstr "ਰੱਦ� �ਾਲ�(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:941
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ਸਭ ��ਾ��� ਤ�� ਹ�ਾ� ਸ�ਨ�ਹ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:946
 msgid "_New Label"
 msgstr "ਨਵਾ� ਲ�ਬਲ(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "N_one"
 msgstr "��� ਨਹ��(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "ਪ��ਹ� ਸ�ਨ�ਹ� �ਹਲ�(_R)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "ਸਾਰ� ਪ�� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ਰ�� ਤ�ਰ ਤ� �ਹਲ� �ਰ�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "��ਣ� ਸ�ਨ�ਹ� �ਹਲ�(_e)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ਰ�� ਤ�ਰ ਤ� �ਹਲ� �ਰ�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "ਲ��ਵ�� ਸ�ਨ�ਹ� ਵ���(_N)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "�ਰ�� ਤ�ਰ ਤ� �ਹਲ� ਸ�ਨ�ਹ� ਵ���"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Cancel the current mail operation"
 msgstr "ਮ���ਦਾ ਮ�ਲ �ਾਰਵਾ� ਰੱਦ �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:983
 msgid "Collapse All _Threads"
 msgstr "ਸਭ ਥਰਿੱਡ ਸਮ���(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Collapse all message threads"
 msgstr "ਸਭ ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਸਮ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "E_xpand All Threads"
 msgstr "ਸਭ ਥਰਿੱਡ ਫ�ਲਾ�(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "Expand all message threads"
 msgstr "ਸਭ ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਫ�ਲਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "_Message Filters"
 msgstr "ਸ�ਨ�ਹਾ ਫਿਲ�ਰ(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Create or edit rules for filtering new mail"
 msgstr "ਨਵ�� ਮ�ਲ ਨ�ੰ ਫਿਲ�ਰ �ਰਨ ਲ� ਨਿਯਮ ਬਣਾ� �ਾ� ਸ�ਧ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
 msgid "Search F_olders"
 msgstr "ਫ�ਲਡਰ ���(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "Create or edit search folder definitions"
 msgstr "��� ਫ�ਲਡਰ ਪਰਿਭਾਸ਼ਾ ਨ�ੰ ਬਣਾ� �ਾ� ਸ�ਧ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "_Subscriptions..."
 msgstr "ਮ��ਬਰ�(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ਰਿਮ�� ਸਰਵਰ �ੱਤ� ਫ�ਲਡਰਾ� ਲ� ਮ��ਬਰ ਬਣ� �ਾ� ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1020
 msgid "F_older"
 msgstr "ਫ�ਲਡਰ(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
 msgid "_Label"
 msgstr "ਲ�ਬਲ(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
 msgid "_New Folder..."
 msgstr "ਨਵਾ� ਫ�ਲਡਰ(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "ਹ�ਾ� ਸ�ਨ�ਹ� �ਹਲ�(_D)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "ਹ�ਾ� ਸ�ਨ�ਹਿ�� ਵਿੱ� ਰ��ਾ ਵ��ਾ�ਣ ਦ� ਬ�ਾ� �ਹਲ� �ਰ�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Show Message _Preview"
 msgstr "ਸ�ਨ�ਹਾ �ਲ� ਵ���(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
 msgid "Show message preview pane"
 msgstr "ਸ�ਨ�ਹਾ �ਲ� ਵਿੰਡ� ਵ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#| msgid "Show deleted messages"
+msgid "Show _Deleted Messages"
+msgstr "ਹ�ਾ� �� ਸ�ਨ�ਹ� ਵ���(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#| msgid "Show deleted messages (with a strike-through) in the message-list."
+msgid "Show deleted messages with a line through them"
+msgstr "ਹ�ਾ� �� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ਨ�ਹਾ� '� ਲਾ�ਨ ਲਾ �� ਵ���"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "_Group By Threads"
 msgstr "ਥਰਿੱਡ ਨਾਲ �ਰ�ੱਪ(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
 msgid "Threaded message list"
 msgstr "ਮਸਲਾ ਸ�ਨ�ਹਾ ਲਿਸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
 msgid "Show message preview below the message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਹ�ਠਾ� ਸ�ਨ�ਹਾ �ਲ� ਵ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
 msgid "Show message preview alongside the message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਨਾਲ ਸ�ਨ�ਹਾ �ਲ� ਵ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "All Messages"
 msgstr "ਸਭ ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Important Messages"
 msgstr "�ਾਸ ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Last 5 Days' Messages"
 msgstr "��ਰ� ੫ ਦਿਨਾ� ਦ� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Messages Not Junk"
 msgstr "ਨਾ-�ੰ� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Messages with Attachments"
 msgstr "����ਮ��� ਸਮ�ਤ ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "No Label"
 msgstr "ਬਿਨ-ਲ�ਬਲ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Read Messages"
 msgstr "ਪ��ਹ� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Recent Messages"
 msgstr "ਤਾ�਼� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Unread Messages"
 msgstr "ਨਾ-ਪ��ਹ� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
 msgid "Subject or Addresses contain"
 msgstr "ਵਿਸ਼ਾ �ਾ� ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "All Accounts"
 msgstr "ਸਭ ��ਾ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Current Account"
 msgstr "ਮ���ਦਾ ��ਾ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "Current Folder"
 msgstr "ਮ���ਦਾ ਫ�ਲਡਰ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:936
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " %d ��ਣਿ�, "
 msgstr[1] " %d ��ਣ�, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:947
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d ਹ�ਾ��"
 msgstr[1] "%d ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:953
+#: ../modules/mail/e-mail-shell-view-private.c:960
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d �ੰ�"
 msgstr[1] "%d �ੰ�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:966
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ਡਰਾਫ�"
 msgstr[1] "%d ਡਰਾਫ�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d ਨਾ-ਭ��ਿ�"
 msgstr[1] "%d ਨਾ-ਭ���"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:978
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d ਭ��ਿ�"
 msgstr[1] "%d ਭ���"
 
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:990
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d �ਣ-ਰ�ਡ, "
 msgstr[1] "%d �ਣ-ਰ�ਡ, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:993
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -15931,86 +15919,107 @@ msgstr[1] "%d ��ੱਲ"
 msgid "All Account Search"
 msgstr "ਸਭ ��ਾ��� ���"
 
-#: ../modules/mail/e-mail-shell-view.c:685
+#: ../modules/mail/e-mail-shell-view.c:675
 msgid "Account Search"
 msgstr "��ਾ��� ���"
 
-#: ../modules/mail/e-mail-shell-view.c:873
+#: ../modules/mail/e-mail-shell-view.c:868
 msgid "Proxy _Logout"
 msgstr "ਪਰਾ�ਸ� ਲਾ����(_L)"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-account-prefs.c:130
+msgid "Evolution Account Assistant"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਾ��� ਸਹਾ��"
+
+#: ../modules/mail/em-account-prefs.c:179
+msgid "Account Editor"
+msgstr "��ਾ��� ਸੰਪਾਦ�"
+
+#: ../modules/mail/em-composer-prefs.c:498
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "ਯ�� ��ਤਾ"
+
+#: ../modules/mail/em-composer-prefs.c:502
 msgid "Language(s)"
 msgstr "ਭਾਸ਼ਾ"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Every time"
 msgstr "ਹਰ ਸਮ��"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per day"
 msgstr "ਦਿਨ ਵਿੱ� ��ਵਾਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:99
 msgid "Once per week"
 msgstr "ਹ�ਤ� ਵਿੱ� ��ਵਾਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:100
 msgid "Once per month"
 msgstr "ਮਹ�ਨ� ਵਿੱ� ��ਵਾਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:225
 msgid "Add Custom Junk Header"
 msgstr "�ਸ�ਮ �ੰ� ਹ�ੱਡਰ ਸ਼ਾਮਲ"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:233
 msgid "Header Name:"
 msgstr "ਹ�ੱਡਰ ਨਾ�:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:234
 msgid "Header Value Contains:"
 msgstr "ਹ�ੱਡਰ ਮ�ੱਲ ਰੱ�ਦਾ ਹ�:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:334
 msgid "Header"
 msgstr "ਹ�ੱਡਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:338
 msgid "Contains Value"
 msgstr "ਮ�ੱਲ ਰੱ�ਦਾ ਹ�"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
 #, 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:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:739 ../modules/mail/em-mailer-prefs.c:811
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s ਪਲੱ��ਨ �ਪਲੱਬਧ ਨਹ�� ਹ�। ��ੱ� �ਰ� �� �ਿ ਪ���� �ੰਸ�ਾਲ ਹ�।"
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:775
 msgid "No junk plugin available"
 msgstr "��� �ੰ� ਪਲੱ��ਨ ਨਹ�� ਹ�"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "��ਬਲ �ਾਲਮ(_ T):"
-
 #. 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:1153
+#: ../modules/mail/em-mailer-prefs.c:1167
 msgid "_Date header:"
 msgstr "ਮਿਤ� ਹ�ੱਡਰ(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1168
 msgid "Show _original header value"
 msgstr "�ਸਲ� ਹ�ੱਡਰ ਮ�ੱਲ ਵ���(_o)"
 
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "�ਾ�� �ਰ� �ਿ �� �ਵ�ਲ�ਸ਼ਨ ਡਿਫਾਲ� ਮ�ਲਰ ਹ�"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "ਹਰ ਵਾਰ �ਦ�� ਵ� �ਵ�ਲ�ਸ਼ਨ �ੱਲ ਤਾ� �ਾ�� �ਰ� �ਿ �ਹ ਡਿਫਾਲ� ਮ�ਲਰ ਹ� �ਾ� ਨਹ��।"
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+#| msgid "Do you want to make Evolution your default e-mail client?"
+msgid "Do you want to make Evolution your default email client?"
+msgstr "�� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਪਣਾ ਡਿਫਾਲ� �-ਮ�ਲ �ਲਾ�� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "ਹ�ਲ� ਪਾ�ਥਨ"
@@ -16027,6 +16036,51 @@ msgstr "ਪਾ�ਥਨ ��ਸ� ਪਲੱ��ਨ"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "ਪਾ�ਥਨ �-ਪਲੱ��ਨ ਲ�ਡਰ ਲ� ��ਸ� ਪਲੱ��ਨ।"
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:270
+#: ../widgets/misc/e-import-assistant.c:393
+msgid "Please select the information that you would like to import:"
+msgstr "�ਾਣ�ਾਰ�, �� ਵ� ਤ�ਸ�� �ੰਪ�ਰ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�, ਨ�ੰ ��ਣ� ��:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:302
+#: ../widgets/misc/e-import-assistant.c:549
+#, c-format
+msgid "From %s:"
+msgstr "%s ਤ��:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:410
+#| msgid "Importing files"
+msgid "Importing Files"
+msgstr "ਫਾ�ਲਾ� �ੰਪ�ਰ� ��ਤ��� �ਾ ਰਹ��� ਹਨ"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr "�ੰਪ�ਰ� �ਰਨਾ ਰੱਦ ��ਤਾ। �ਾਰ� ਰੱ�ਣ ਲ� \"�ੱ��\" �ਲਿੱ� �ਰ�।"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr "�ੰਪ�ਰ� ਪ�ਰਾ ਹ���। �ਾਰ� ਰੱ�ਣ ਲ� \"�ੱ��\" �ਲਿੱ� �ਰ�।"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+msgid "Evolution Setup Assistant"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ�ੱ��ੱਪ ਸਹਾ�� "
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+msgid "Welcome"
+msgstr "�� ��� ਨ�ੰ"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+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"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"�ਵ�ਲ�ਸ਼ਨ ਵਲ�� �� ���� ਨ�ੰ। �ੱ�� ��� ਸ�ਰ�ਨਾ� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਤ�ਹਾਡ� �-ਮ�ਲ ��ਾ���ਾ� ਨਾਲ ���ਨ ਵਿੱ�\n"
+"ਸਹਾ�� ਹ�ਣ���� �ਤ� ਹ�ਰ �ਪਲ���ਸ਼ਨਾ� ਤ�� ਫਾ�ਲਾ� �ੰਪ�ਰ� �ਰਨ ਵਿੱ� ਮੱਦਦ �ਰਨ��।\n"
+"\n"
+"�ਾਰ� ਰੱ�ਣ ਥ� \"�ੱ��\" ਬ�ਨ ਨ�ੰ ਦੱਬ� ��। "
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "ਲ��ਲ �ਡਰ�ੱਸ ਬ�ੱ� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�।"
@@ -16041,14 +16095,8 @@ msgid ""
 "body"
 msgstr "����ਮ��� ਰ�ਮਾ�ਡਰ ਪਲੱ��ਨ ਵਲ�� ਸ�ਨ�ਹਾ ਮ�ੱ� ਭਾ� ਵਿੱ� ��� ਲ� ਸ�ਹਾ� ਦ� ਲਿਸ�"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr "����ਮ��� ਰ�ਮਾ�ਡਰ ਪਲੱ��ਨ ਵਲ�� ਸ�ਨ�ਹਾ ਮ�ੱ� ਭਾ� ਵਿੱ� ��� ਲ� ਸ�ਹਾ� ਦ� ਲਿਸ�"
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:451
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "ਸ਼ਬਦ"
 
@@ -16088,23 +16136,23 @@ msgstr "ਲਾ�ਨ '� �ਡ��"
 msgid "Play audio attachments directly in mail messages."
 msgstr "ਮ�ਲ ਸ�ਨ�ਹਿ�� ਤ�� �ਡ�� ����ਮ��� ਸਿੱਧ��� �ਲਾ�।"
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "�ਵ�ਲ�ਸਨ ਬ���ੱਪ ਫਾ�ਲ ਦਾ ਨਾ� ��ਣ�"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "ਬ���ੱਪ �ਪਰੰਤ �ਵ�ਲ�ਸ਼ਨ ਮ��-�ਾਲ�(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr "ਰ�ਸ��ਰ �ਰਨ ਲ� �ਵ�ਲ�ਸ਼ਨ ਬ���ੱਪ ਫਾ�ਲ ਦਾ ਨਾ� ��ਣ�"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "ਮ��-ਪ�ਰਾਪਤ �ਰਨ �ਪਰੰਤ �ਵ�ਲ�ਸ਼ਨ ਮ�� �ਾਲ�(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16113,35 +16161,37 @@ msgstr ""
 "ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਪਣ� ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�। �ਹ ਸਭ ਮ�ਲਾ�, ��ਲੰਡਰ, �ਾਸ�, ਮ�ਮ�, ਸੰਪਰ� �ਦਿ "
 "ਨ�ੰ ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�। �ਹ ਤ�ਹਾਡ� ਨਿੱ�� ਸ��ਿੰ�, ਮ�ਲ ਫਿਲ�ਰ �ਦਿ ਵ� ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�।"
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "ਬ���ੱਪ ਫਾ�ਲ ਤ� �ਵ�ਲ�ਸ਼ਨ ਰ�ਸ��ਰ �ਰ�(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "ਰ�ਸ��ਰ �ਰਨ ਲ� �ਵ�ਲ�ਸ਼ਨ ��ਾ�ਵ ��ਣ� ��:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "ਰ�ਸ��ਰ �ਰਨ ਲ� �ੱ� ਫਾ�ਲ ��ਣ�"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ�"
 
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "ਬ���ੱਪ ਸ��ਿੰ�(_B)..."
+#: ../plugins/backup-restore/backup-restore.c:361
+#| msgid "_Backup Settings..."
+msgid "_Backup Evolution Settings..."
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ��ਿੰ� ਬ���ੱਪ(_B)..."
 
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ��ਾ�ਵ ਫਾ�ਲ ਵਿੱ� ਬ���ੱਪ ਲਵ�"
 
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "ਸ��ਿੰ� ਰ�ਸ��ਰ(_e)..."
+#: ../plugins/backup-restore/backup-restore.c:368
+#| msgid "R_estore Settings..."
+msgid "R_estore Evolution Settings..."
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ��ਿੰ� ਰ�ਸ��ਰ(_e)..."
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ��ਾ�ਵ ਫਾ�ਲ ਤ�� ਰ�ਸ��ਰ �ਰ�"
 
@@ -16189,8 +16239,9 @@ msgid "Restarting Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਮ��-�ਾਲ� ��ਤ� �ਾ ਰਹ� ਹ�"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
-msgstr "ਮ���ਦਾ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਬ���ੱਪ"
+#| msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
+msgstr "ਮ���ਦਾ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਬ���ੱਪ �ਰ�"
 
 #: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
@@ -16219,31 +16270,31 @@ msgid "Restoring from the folder %s"
 msgstr "ਫ�ਲਡਰ %s ਤ�� ਰ�ਸ��ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਬ���ੱਪ"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਰ�ਸ��ਰ"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "ਮ���ਦਾ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਬ���ੱਪ"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "�ਦ�� �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� ਡਾ�� ਦਾ ਬ���ੱਪ ਲ� ਰਹ� ਹ� ਤਾ� �ਦ�� ਤੱ� �ਡ��� ��।"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਰ�ਸ��ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਦ�� ਤੱ� ਤ�ਹਾਡ� ਡਾ�� ਨ�ੰ ਰ�-ਸ��ਰ �ਰਦ� ਹ�, �ਦ�� ਤੱ� �ਡ��� ��।"
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "�ਹ ਤ�ਹਾਡ� ��ਾ��� ਦ� ਡਾ�� ਦ� ਮਾਤਰਾ ਮ�ਤਾਬ� ��� ਸਮਾ� ਲ� ਸ�ਦਾ ਹ�।"
 
@@ -16265,74 +16316,79 @@ msgid "Are you sure you want to restore Evolution from the selected backup file?
 msgstr "�� ਤ�ਸ�� ��ਣ� ਬ���ੱਪ ਫਾ�ਲ ਤ�� �ਵ�ਲ�ਸ਼ਨ ਰ�-ਸ��ਰ �ਰਨ� �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding.  If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਬ���ੱਪ ਤਾ� ਹ� ਹ� ਸ�ਦਾ ਹ�, �� �ਵ�ਲ�ਸ਼ਨ �ੱਲ ਨਾ ਰਹ� ਹ�ਵ�। ਯ��ਨ� ਬਣਾ� �� ਤ�ਸ�� �ਾਰ� ਰੱ�ਣ ਤ�� "
-"ਪਹਿਲਾ� �ਪਣ��� ਸਭ �ਣ-ਸੰਭਾਲ��� ਵਿੰਡ� ਸੰਭਾਲ �ਤ� ਬੰਦ �ਰ ਦਿੱਤ��� ਹ�ਣ। �� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਬ���ੱਪ ਦ� "
-"ਬਾ�ਦ ���ਮ��ਿ� ਮ��-�ਾਲ� �ਰਨਾ �ਾਹ�ੰਦ� ਹ� ਤਾ� �ਾ�ਲ ਬ�ਨ ਯ�� �ਰ�।"
+#| msgid "Choose an action:"
+msgid "Close and Backup Evolution"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਬੰਦ �ਰ� ਤ� ਬ���ੱਪ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#| msgid "Cannot start Evolution"
+msgid "Close and Restore Evolution"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਬੰਦ �ਰ� ਤ� ਰ�ਸ��ਰ �ਰ�"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Insufficient Permissions"
 msgstr "�ਧ�ਰ� �ਧਿ�ਾਰ"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Invalid Evolution backup file"
 msgstr "�ਲਤ �ਵ�ਲ�ਸ਼ਨ ਬ���ੱਪ ਫਾ�ਲ"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid "Please select a valid backup file to restore."
 msgstr "ਰ�ਸ��ਰ �ਰਨ ਲ� �ੱ� ਠ�� ਬ���ੱਪ ਫਾ�ਲ ��ਣ� ��।"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
 msgstr "��ਣਿ� ਫ�ਲਡਰ ਲਿ�ਣਯ�� ਨਹ�� ਹ�।"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid ""
+"To backup 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
 msgid ""
-"This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
-"restore, please enable the toggle button."
+"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."
 msgstr ""
-"�ਹ ਤ�ਹਾਡ� ਮ���ਦਾ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ਨ�ੰ ਹ�ਾ ਦ�ਵ��ਾ �ਤ� ਤ�ਹਾਡ� ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ��ਾ। �ਵ�ਲ�ਸ਼ਨ "
-"ਰ�ਸ��ਰ ਤਾ� ਹ� ਸ਼�ਰ� ਹ� ਸ�ਦਾ ਹ�, �� �ਵ�ਲ�ਸ਼ਨ �ੱਲ ਨਾ ਰਹ� ਹ�ਵ�। ਯ��ਨ� ਬਣਾ� �ਿ ਤ�ਸ�� �ੱ�� ਵਧਣ ਤ�� "
-"ਪਹਿਲਾ� ਸਭ �ਣ-ਸੰਭਾਲ��� ਵਿੰਡ��਼ ਨ�ੰ ਪਹਿਲਾ� ਬੰਦ �ਰ ਦਿੱਤਾ ਹ�। �� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਰ�ਸ��ਰ ਦ� ਬਾ�ਦ "
-"���ਮ��ਿ� ਹ� ਮ��-�ਾਲ� �ਰਨਾ �ਾਹ�ੰਦ� ਹ�, ਤਾ� �ਹ ਬ�ਨ �ਾਲ� �ਰ�।"
+"�ਪਣ� ਡਾ�� �ਾ� ਸ��ਿੰ� ਨ�ੰ ਰ�ਸ��ਰ �ਰਨ ਲ�, ਤ�ਹਾਨ�ੰ ਪਹਿਲਾ� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਬੰਦ �ਰਨ� ਪਵ���। "
+"ਯ��ਨ� ਬਣਾ� �ਿ ਤ�ਸ�� �ਾਰ� ਰੱ�ਣ ਤ�� ਪਹਿਲਾ� ਨਾ-ਸੰਭਾਲਿ� ਡਾ�ਾ ਸੰਭਾਲ ��ੱ�� ਹ�। �ਸ ਨਾਲ "
+"ਤ�ਹਾਡਾ ਮ���ਦਾ ਸਭ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਤ� ਸ��ਿੰ� ਨ�ੰ ਹ�ਾ�� �ਾਵ��ਾ ਤ� ਤ�ਹਾਡ� ਬ���ੱਪ ਤ�� �ਨ�ਹਾ� "
+"ਨ�ੰ ਮ��-ਸ��ਰ ��ਤਾ �ਾਵ��ਾ।"
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "���ਮ��ਿ� ਸੰਪਰ�"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "ਪੱਤਰ ਭ��ਣ ਸਮ�� ��ਦ ਹ� �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ���ਰ� ਬਣਾ ਲਵ�(_A)"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "���ਮ��ਿ� ਸੰਪਰ�ਾ� ਲ� �ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "�ੱ�ਪ� ਸ�ਨ�ਹ� ਸੰਪਰ�"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "ਨਿਯਮਤ ਤ�ਰ �ੱਤ� ਪਿਡ�ਿਨ ਬੱਡ� ਸ��� ਨਾਲ ਸੰਪਰ� �ਾਣ�ਾਰ� �ਤ� �ਿੱਤਰਾ� ਨਾਲ ਸਿ�ਰ�ਨਾ��਼ �ਰਦ� ਰਹ�"
+#: ../plugins/bbdb/bbdb.c:745
+#| msgid "Synchronize contact info and images from Pidgin buddy list"
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "ਪਿਡ�ਿਨ ਬੱਡ� ਲਿਸ� ਤ�� ਸੰਪਰ� �ਾਣ�ਾਰ� ਤ� �ਿੱਤਰ ਸ��ਰ�ਨਾ��਼ �ਰ�(_S)"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "ਪਿਡ�ਿਨ ਬੱਡ� ਸ��� ਲ� �ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "ਬੱਡ� ਲਿਸ� ਨਾਲ ਸਿ�ਰ�ਨਾ��਼ �ਰ�(_b)"
 
@@ -16354,28 +16410,28 @@ msgstr ""
 "�ਾਣ�ਾਰ� �ਪਣ� �ਪ ਹ� ਭਰ ਦਿੱਤ� �ਾਵ���। ਤ�ਹਾਡ� ਬੱਡ� ਸ��� ਤ�� IM ਸੰਪਰ� �ਾਣ�ਾਰ� ਭਰ ਦਿੱਤ� "
 "�ਾਵ���।"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
 #, 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:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "%s ਸਵ�ਪ �ਰਨ ਦ�ਰਾਨ �ਲਤ�: %s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "ਬ���ਫਿਲ�ਰ �ਲਾ�ਡ ਪਰ�ਸ�ਸ �ਵਾਬ ਨਹ�� ਦ� ਰਿਹਾ, �ਿਲ (kill) ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "ਬ���ਫਿਲ�ਰ �ਲਾ�ਡ ਪਰ�ਸ�ਸ ਦ�ਲ ਦ� �ਡ�� �ਾਰ�, �ਤਮ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "ਬ���ਫਿਲ�ਰ ਲ� ਪਾ�ਪ ਫ�ਲ�ਹ ਹ�, �ਲਤ� ��ਡ: %d"
@@ -16407,15 +16463,15 @@ msgstr "Bogofilter ��ਣਾ�"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Bogfilter ਨਾਲ �ੰ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ �ਰ�।"
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr "ਪਰਮਾਣ�ਿਤਾ ਫ�ਲ�ਹ ਹ��। ਸਰਵਰ ਲ� ਢ�ੱ�ਵਾ� ਲਾ��ਨ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "ਦਿੱਤਾ URL ਲੱਭਿ� ਨਹ�� �ਾ ਸ�ਦਾ।"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16424,38 +16480,33 @@ msgstr ""
 "ਸਰਵਰ ਨ� �ਣ�ਾਣ ਡਾ�ਾ ਭ��ਿ� ਹ�।\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "�ਣ�ਾਣ� �ਲਤ�"
-
 #  FIXME: domain/code
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "ਸਰਵਰ �ਵਾਬ ਪਾਰਸ �ਰਨ ਲ� ਫ�ਲ�ਹ ਹ�।"
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "�ਵ���"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "ਯ��਼ਰ ਦਾ ��ਲੰਡਰ"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "ਸਰਵਰ URL ਲ�ਣ ਲ� ਫ�ਲ�ਹ ਹ�।"
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "ਯ��਼ਰ ਦਾ ��ਲੰਡਰ ���ਿ� �ਾ ਰਿਹਾ ਹ�..."
 
 #  FIXME: domain/code
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "ਯ��਼ਰ ��ਲੰਡਰ ਨਹ�� ਲੱਭਿ� �ਾ ਸ�ਿ�।"
 
@@ -16469,67 +16520,64 @@ msgstr "ਪਿ�ਲ� ��ਸ਼ਿਸ਼ ਫ�ਲ�ਹ ਹ�: %s"
 msgid "Previous attempt failed with code %d"
 msgstr "ਪਿ�ਲ� ��ਸ਼ਿਸ਼ ��ਡ %d ਨਾਲ ਫ�ਲ�ਹ ਹ��"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr "<b>%2$s</b> ਸਰਵਰ �ੱਤ� <b>%1$s</b> ਯ��਼ਰ ਲ� ਪਾਸਵਰਡ ਭਰ�"
+#| msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgid "Enter password for user %s on server %s"
+msgstr "%2$s ਸਰਵਰ �ੱਤ� %1$s ਯ��਼ਰ ਲ� ਪਾਸਵਰਡ ਦਿ�"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "URL '%s' ਲ� soup ਸ�ਨ�ਹਾ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
 msgstr "ਫ�ਲਡਰ ਸਮੱ�ਰ� ���� �ਾ ਰਹ� ਹ�..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
 msgstr "�ਪਲੱਬਧ ��ਲੰਡਰਾ� ਦ� ਲਿਸ�:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
 msgstr "ਸਹਿਯ��"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "ਥਰਿੱਡ ਬਣਾ�ਣ ਲ� ਫ�ਲ�ਹ: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "ਸਰਵਰ URL '%s' ਢ�ੱ�ਵਾ� URL ਨਹ�� ਹ�"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr "CalDAV ��ਲੰਡਰ ਲ� �ਲ�"
 
-#: ../plugins/caldav/caldav-source.c:66
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "_SSL ਵਰਤ��"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "��ਲੰਡਰ ਲ� ਸਰਵਰ ਦ� �ਲ�(_e)"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../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
 msgid "Re_fresh:"
 msgstr "ਮ��-ਤਾ�ਾ(_f):"
 
@@ -16541,31 +16589,31 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� CalDAV ਸਹਿਯ�� ਸ਼
 msgid "CalDAV Support"
 msgstr "CalDAV ਸਹਿਯ��"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "��ਣਾ� ਲ� ਪਸੰਦ(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "ਫਾ�ਲ ਨਾ�(_n):"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "��ਲੰਡਰ ਫਾ�ਲ ��ਣ�"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "��ਲ�ਹਣ ਸਮ��"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "ਫਾ�ਲ ਬਦਲਣ ਸਮ��"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "ਨਿਯਮਤ"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "��ਵਲ ਪ��ਹਨ ਲ� ਮ�ਬ�ਰ(_o)"
 
@@ -16577,11 +16625,11 @@ msgstr "ਲ��ਲ ��ਲੰਡਰ �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� 
 msgid "Local Calendars"
 msgstr "ਲ��ਲ ��ਲੰਡਰ"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "ਸ�ਰੱ�ਿ�ਤ ��ਨ��ਸ਼ਨ (_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "ਯ��਼ਰ ਨਾ�(_m):"
 
@@ -16629,26 +16677,26 @@ msgstr "ਮ�ਸਮ: ਸਾਫ਼ ਰਾਤ"
 msgid "Weather: Thunderstorms"
 msgstr "ਮ�ਸਮ: ਬਰ��ਲਾ ਤ�ਫਾਨ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "�ੱ� �ਿ�ਾਣਾ ��ਣ�"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "��ਾ�(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "ਮ��ਰਿ� (ਸ��ਲਸ��ਸ, ਸ��ਮ�, �ਦਿ)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "�ੰਪ�ਰਿਲ (ਫਾਰਨਹ���, �ੰ� �ਦਿ)"
 
@@ -16677,43 +16725,48 @@ msgstr "�ਦ�� ਵ� ਸੰਭਵ ਹ�ਵ� ਤਾ� ਸੰਪਰ�
 msgid "Map for contacts"
 msgstr "ਸੰਪਰ�ਾ� ਲ� ਮ�ਪ"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "�ਾ�� �ਰ� �ਿ �� �ਵ�ਲ�ਸ਼ਨ ਡਿਫਾਲ� ਮ�ਲਰ ਹ�"
+#: ../plugins/dbx-import/dbx-importer.c:232
+#| msgid "Select folder to import into"
+msgid "Select folder to import OE folder into"
+msgstr "OE ਫ�ਲਡਰ ਨ�ੰ �ੰਪ�ਰ� �ਰਨ ਲ� ਫ�ਲਡਰ ��ਣ�"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "ਹਰ ਵਾਰ �ਦ�� ਵ� �ਵ�ਲ�ਸ਼ਨ �ੱਲ ਤਾ� �ਾ�� �ਰ� �ਿ �ਹ ਡਿਫਾਲ� ਮ�ਲਰ ਹ� �ਾ� ਨਹ��।"
+#: ../plugins/dbx-import/dbx-importer.c:251
+#| msgid "Importing Outlook data"
+msgid "Importing Outlook Express data"
+msgstr "���ਲ�ੱ� ��ਸਪਰ�ਸ ਡਾ�ਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "�ੱਲਣ ਸਮ�� �ਾ�� �ਰ� �ਿ �� �ਵ�ਲ�ਸ਼ਨ ਡਿਫਾਲ� ਮ�ਲ �ਲਾ�� ਹ�।"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+#| msgid "Import Outlook messages from PST file"
+msgid "Import Outlook Express messages from DBX file"
+msgstr "DBX ਫਾ�ਲ ਤ�� ���ਲ�ੱ� ��ਸਪਰ�ਸ ਸ�ਨ�ਹ� �ੰਪ�ਰ� ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "ਡਿਫਾਲ� ਮ�ਲ �ਲਾ��"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+#| msgid "Outlook PST import"
+msgid "Outlook DBX import"
+msgstr "Outlook DBX �ੰਪ�ਰ�"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "�� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਪਣਾ ਮ�ਲ �-ਮ�ਲ �ਲਾ��� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#| msgid "Outlook personal folders (.pst)"
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "Outlook ��ਸਪਰ�ਸ 5/6 ਨਿੱ�� ਫ�ਲਡਰ (.dbx)"
 
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "ਡਿਫਾਲ� �ਡਰ�ੱਸ ਬ�ੱ� ਵਾ�� ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
 msgstr "�ਸ �ਡਰ�ੱਸ ਬ�ੱ� ਨਾਲ ���-ਪ�ਰਨ(_u)"
 
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "ਡਿਫਾਲ� ��ਲੰਡਰ ਵਾ�� ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "ਡਿਫਾਲ� �ਾਸ� ਵਾ�� ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "ਡਿਫਾਲ� ਮ�ਮ� ਲਿਸ� ਵਾ�� ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
@@ -16766,12 +16819,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 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:894
+#: ../plugins/email-custom-header/email-custom-header.c:830
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16779,12 +16832,12 @@ msgstr ""
 "�ੱ� �ਸ�ਮ ਹ�ੱਡਰ ��ੰ�� ਲ� ਮ�ੱਲ ਦ�ਣ ਲ� ਫਾਰਮ�� ਦਿ�:\n"
 "�ਸ�ਮ ਹ�ੱਡਰ ��ੰ�� ਮ�ੱਲਾ� ਲ� ਨਾ� \";\" ਨਾਲ ਵੱ� �ਰ�� ਦਿ�।"
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:884
 msgid "Key"
 msgstr "��"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:900
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "ਮ�ੱਲ"
 
@@ -16806,7 +16859,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:119
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
 msgstr "�ਦ��  ਵ� ਨਵ�� ਮ�ਲ ਲਿ�ਣ� ਸ਼�ਰ� ਹ�ਵ� ਤਾ� ���ਮ��ਿ� ਹ� �ਲਾ�"
 
@@ -16818,11 +16871,11 @@ msgstr "ਡਿਫਾਲ� ਬਾਹਰ� �ਡ��ਰ"
 msgid "The default command that must be used as the editor."
 msgstr "ਮ�ਲ �ਮਾ�ਡ, �� �ਿ �ਡ��ਰ ਵ��� ਵਰਤ� �ਾਣ� ਲਾ�਼ਮ� ਹ�।"
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
 msgid "Command to be executed to launch the editor: "
 msgstr "�ਡ��ਰ �ਾਲ� �ਰਨ ਲ� �ਲਾ�ਣ ਵਾਸਤ� �ਮਾ�ਡ:"
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16830,8 +16883,8 @@ msgstr ""
 "Emacs ਲ� \"xemacs\" ਵਰਤ��\n"
 "VI ਲ� \"gvim -f\" ਵਰਤ��"
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
 msgid "Compose in External Editor"
 msgstr "ਬਾਹਰ� ਸੰਪਾਦ� ਵਿੱ� ਲਿ��"
 
@@ -16905,7 +16958,7 @@ msgstr "�ਿਹਰਾ ਤਸਵ�ਰ ਮ�ਲ ਰ�ਪ ਵਿੱ� ਸ਼
 msgid "Load new _Face picture"
 msgstr "ਨਵ�� �ਿਹਰਾ ਤਸਵ�ਰ ਲ�ਡ �ਰ�(_F)"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
 msgstr "�ਿਹਰਾ ਸ਼ਾਮਲ(_F)"
 
@@ -16937,22 +16990,18 @@ 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:53
-#: ../plugins/google-account-setup/google-source.c:82
-msgid "Google"
-msgstr "���ਲ"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>ਸਰਵਰ</b>"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+#| msgid "_Server:"
+msgid "Server"
+msgstr "ਸਰਵਰ"
 
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "ਯ��਼ਰ %s ਨ�ੰ ਮ��ਬਰ� ਵਾਲ� ��ਲੰਡਰ ਦ� �ਸ�ਸ ਲਿਸ� ਲ� ਪਾਸਵਰਡ ਦਿ�।"
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16961,19 +17010,20 @@ msgstr ""
 "���ਲ ਸਰਵਰ ਤ�� ਡਾ�ਾ ਪ��ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:952
 msgid "Unknown error."
 msgstr "�ਣ�ਾਣ� �ਲਤ� ਹ�।"
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "��ਲੰਡਰ(_e):"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
-msgstr "ਲਿਸ� ਲ� �ਾ ਰਹ� ਹ�(_l)"
+#: ../plugins/google-account-setup/google-source.c:669
+#| msgid "Retrieve _list"
+msgid "Retrieve _List"
+msgstr "ਲਿਸ� ਲ� �ਾ ਰਹ� ਹ�(_L)"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
@@ -16983,7 +17033,7 @@ msgstr "���ਲ ��ਲੰਡਰ �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� 
 msgid "Google Calendars"
 msgstr "���ਲ ��ਲੰਡਰ"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "�ਾ�� ਲਿਸ�"
 
@@ -17015,12 +17065,12 @@ msgstr "��਼ਮਾ�ਸ� �ਰ��"
 msgid "Rese_nd Meeting..."
 msgstr "ਮ��ਿੰ� ਮ��-ਭ���(_n)..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
 msgid "Create folder"
 msgstr "ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:217
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17045,19 +17095,19 @@ msgstr ""
 "ਸਾ��ਾ ਫ�ਲਡਰ �ੰਸ�ਾਲ �ਰਨ ਲ� 'ਲਾ�� �ਰ�' ਦਬਾ�\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:229
 msgid "Install the shared folder"
 msgstr "ਸਾ��ਾ ਫ�ਲਡਰ �ੰਸ�ਾਲ �ਰ�"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:233
 msgid "Shared Folder Installation"
 msgstr "ਸਾ��ਾ ਫ�ਲਡਰ �ੰਸ�ਾਲ�ਸ਼ਨ"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "�ੰ� ਸ��ਿੰ�"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "�ੰ� ਪੱਤਰ ਸ��ਿੰ�"
@@ -17070,11 +17120,6 @@ msgstr "�ਮ�ਲ:"
 msgid "Junk List:"
 msgstr "�ੰ� ਲਿਸ�:"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "�ਯ��(_D)"
-
 #: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "ਯ��(_E)"
@@ -17093,7 +17138,7 @@ msgstr "ਹ�ਾ�(_R)"
 msgid "Message Retract"
 msgstr "ਸ�ਨ�ਹਾ ਹਾਲਤ"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -17101,7 +17146,7 @@ msgstr ""
 "�ੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਮ��-�ਾ��ਣ ਨਾਲ �ਸ ਨ�ੰ ਪ�ਰਾਪਤ-�ਰਤਾ ਦ� ਮ�ਲ ਬ�ਸ� ਤ�� ਮ��-�ਰ�ਸ ��ਤਾ �ਾਵ��ਾ। �� ਤ�ਸ�� �ਹ "
 "�ਰਨ ਲ� ਯ��ਨ� ਹ�?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "ਸ�ਨ�ਹਾ ਸਫ਼ਲਤਾ ਨਾਲ ਮ��-���ਿ� �ਿ�"
 
@@ -17225,25 +17270,26 @@ msgid "Would you like to decline it?"
 msgstr "�� ਤ�ਸ�� �ਸ ਲ� �ਨ�ਾਰ �ਰਦ� ਹ�?"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>ਯ��਼ਰ :</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "�ਸ�ਮਾ��਼ ਨ���ਫਿ��ਸ਼ਨ ਸ�ਨ�ਹਾ(_u)"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "ਸੰਪਰ�(_t)..."
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "ਸਾ�� ਫ�ਲਡਰ ਸ��ਨਾ"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../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
+#| msgid "Users"
+msgid "Users:"
+msgstr "ਯ��਼ਰ:"
+
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "ਸਾ�� ਨਹ��(_N)"
@@ -17301,50 +17347,58 @@ msgid "Proxy"
 msgstr "ਪਰਾ�ਸ�"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>��ਾ��� ਨਾ�</b>"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "��ਾ��� ਨਾ�"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "ਪਰਾ�ਸ� ਲਾ��ਨ"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../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:692
+#: ../plugins/groupwise-features/proxy.c:689
 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:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "���ਰ ��ਾ��� ਯ�� ਹ��� ਤਾ� ਹ� ਪਰਾ�ਸ� ��ਬ �ਪਲੱਬਧ ਹ�ਵ���।"
 
-#: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:701
+#. 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
+#| msgid "Proxy"
+msgctxt "GW"
+msgid "Proxy"
+msgstr "ਪਰਾ�ਸ�"
+
+#: ../plugins/groupwise-features/proxy.c:926
+#: ../plugins/groupwise-features/share-folder.c:691
 msgid "Add User"
 msgstr "ਯ��਼ਰ ਸ਼ਾਮਲ"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "ਤ�ਨ��� ਭ��ਣ ��ਣਾ�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
-#: ../plugins/groupwise-features/share-folder.c:736
+#: ../plugins/groupwise-features/share-folder-common.c:309
+#: ../plugins/groupwise-features/share-folder.c:726
 msgid "Users"
 msgstr "ਯ��਼ਰ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:310
 msgid "Enter the users and set permissions"
 msgstr "ਯ��਼ਰ ਦਿ� �ਤ� �ਧਿ�ਾਰ ਨਿਰਧਾਨ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:410
 msgid "Sharing"
 msgstr "ਸਾ��"
 
@@ -17352,68 +17406,60 @@ msgstr "ਸਾ��"
 msgid "Custom Notification"
 msgstr "�ਸ�ਮ ਨ���ਫਿ��ਸ਼ਨ"
 
-#: ../plugins/groupwise-features/share-folder.c:741
+#: ../plugins/groupwise-features/share-folder.c:731
 msgid "Add   "
 msgstr "ਸ਼ਾਮਲ   "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "ਸ�ਨ�ਹਾ ਹਾਲਤ"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "ਵਿਸ਼ਾ:"
 
 #  * From
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "ਵਲ��:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "ਲਿ�ਣ ਮਿਤ�:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "ਪ�ਰਾਪਤ �ਰਤਾ: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "ਡਿਲਵਰ ��ਤ�: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "��ਲ�ਹ�: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "ਮਨ�਼�ਰ ��ਤ�: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "ਹ�ਾ�: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "�ਨ�ਾਰ: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "ਪ�ਰਾ: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "�ਣ-ਡਿਲਵਰ: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਲ� ਹ�ਲਾ ਸਹਿਯ�� ਸ਼ਾਮਲ।"
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "ਹ�ਲਾ ਸਹਿਯ��"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "�ਨਲਾ�ਨ �ਿੱਤਰ"
@@ -17422,12 +17468,12 @@ msgstr "�ਨਲਾ�ਨ �ਿੱਤਰ"
 msgid "View image attachments directly in mail messages."
 msgstr "ਮ�ਲ ਸ�ਨ�ਹਿ�� ਵਿੱ� ਸਿੱਧ� �ਿੱਤਰ ����ਮ��� ਵ���।"
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:330
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:343
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP ਹ�ੱਡਰ"
@@ -17473,35 +17519,38 @@ msgstr "�ਪਣ� IMAP ��ਾ��� ਵਿੱ� ਸ�ਧਾਰ �ਰ
 msgid "IMAP Features"
 msgstr "IMAP ਫ��ਰ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#. Translators: The first '%s' is replaced with a calendar name,
+#. the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:485
 #, c-format
-msgid "Failed to load the calendar '%s'"
-msgstr "'%s' ��ਲੰਡਰ ਲ�ਡ �ਰਨ ਲ� ਫ�ਲ�ਹ"
+#| msgid "Failed to load the calendar '%s'"
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "��ਲੰਡਰ '%s' (%s) ਲ�ਡ �ਰਨ ਲ� ਫ�ਲ�ਹ ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:649
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "��ਲੰਡਰ '%s' ਵਿੱ� �ੱ� ਮ�ਲਾ�ਾਤ �ਸ ਮ��ਿੰ� ਨਾਲ ��ਰਾ ਰਹ� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:685
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' ��ਲੰਡਰ ਵਿੱ� ਮ�ਲਾ�ਾਤ ਮਿਲ� ਹ�"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:784
 msgid "Unable to find any calendars"
 msgstr "��� ਵ� ��ਲੰਡਰ ਲੱਭਣ ਲ� �ਸਫ਼ਲ ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this meeting in any calendar"
 msgstr "�ਿਸ� ਵ� ��ਲੰਡਰ ਵਿੱ� �ਹ ਮ��ਿੰ� ਲੱਭਣ ਲ� �ਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:795
 msgid "Unable to find this task in any task list"
 msgstr "�ਿਸ� �ੰਮ ਸ��� ਵਿੱ� �ਹ �ੰਮ ਲੱਭਣ ਲ� �ਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:799
 msgid "Unable to find this memo in any memo list"
 msgstr "�ਿਸ� ਮ�ਮ� ਸ��� ਵਿੱ� �ਹ �ੰਮ ਲੱਭਣ ਲ� �ਸਮਰੱਥ"
 
@@ -17638,501 +17687,555 @@ msgid ""
 "imported"
 msgstr "�ਹਨਾ� ਸਭ ���ਮਾ� ਤ� �ਾਰਵਾ� �ਰਨ ਲ਼�, ਫਾ�ਲ ਨ�ੰ ਸੰਭਾਲਣਾ ਪਵ��ਾ �ਤ� ��ਲੰਡਰ �ੰਪ�ਰ� �ਰਨਾ ਪਵ��ਾ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2452
 msgid "This meeting recurs"
 msgstr "�ਹ ਮ��ਿੰ� ਫ�ਰ ਹ�ਵ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2455
 msgid "This task recurs"
 msgstr "�ਹ �ੰਮ ਫ�ਰ ਹ�ਵ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2458
 msgid "This memo recurs"
 msgstr "�ਹ ਮ�ਮ� ਫ�ਰ ਹ�"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2692
 msgid "_Delete message after acting"
 msgstr "�ਾਰਵਾ� �ਪਰੰਤ ਸ�ਨ�ਹਾ ਹ�ਾ�(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2702
+#: ../plugins/itip-formatter/itip-formatter.c:2735
 msgid "Conflict Search"
 msgstr "�ਪਵਾਦ ���"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2717
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ਮ��ਿੰ� ��ਰਾ ਲੱਭਣ ਲ� ��ਲੰਡਰ ��ਣ�"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "�ੱ� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "�ੱ� %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "�ੱ� %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "ਭਲ� %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "ਭਲ� %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "ਭਲ� %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "ਭਲ� %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "<b>%s</b> ਦ� ਤ�ਰ �ੱਤ� �ਵਾਬ ਭ��� ��"
-
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
-#, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "<b>%s</b> ਦ� ਤ�ਰ �ੱਤ� ਲਿ�"
-
-#: ../plugins/itip-formatter/itip-view.c:362
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� �ੱ�� ਦਿੱਤ� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
-
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
-msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> ਨ� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
+#| msgid "Please respond on behalf of <b>%s</b>"
+msgid "Please respond on behalf of %s"
+msgstr "%s ਦ� ਤ�ਰ �ੱਤ� �ਵਾਬ ਭ��� ��"
 
 #: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> ਤ�ਹਾਡ� ਨਾਲ ਹ�ਠ ਦਿੱਤ� ਮ��ਿੰ� ਲ� �ਧਿ�ਰਿਤ ਹ�:"
-
-#: ../plugins/itip-formatter/itip-view.c:372
-#, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� ਮ��ਿੰ� ਵਿੱ� ਤ�ਹਾਡ� ਹਾ�ਰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�:"
+#| msgid "Received on behalf of <b>%s</b>"
+msgid "Received on behalf of %s"
+msgstr "%s ਦ� ਤ�ਰ �ੱਤ� ਲਿ�"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> ਨ� ਮ��ਿੰ� ਵਿੱ� ਤ�ਹਾਡ� ਹਾ�ਰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�:"
+#| msgid ""
+#| "<b>%s</b> through %s has published the following meeting information:"
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s ਨ� %s ਰਾਹ�� �ੱ�� ਦਿੱਤ� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> %s ਰਾਹ�� ਮ���ਦਾ ਮ��ਿੰ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�:"
+#| msgid "<b>%s</b> has published the following meeting information:"
+msgid "%s has published the following meeting information:"
+msgstr "%s ਨ� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> ਮ���ਦਾ ਮ��ਿੰ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�:"
+#| msgid "<b>%s</b> has delegated the following meeting to you:"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s ਤ�ਹਾਡ� ਨਾਲ ਹ�ਠ ਦਿੱਤ� ਮ��ਿੰ� ਲ� �ਧਿ�ਰਿਤ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr "<b>%s</b> ਰਾਹ�� %s ਹ�ਠ ਦਿੱਤ� ਮ��ਿੰ� ਬਾਰ� ਤਾ�਼ਾ �ਾਣ�ਾਰ� ਲ�ਣ� �ਾਹ�ੰਦਾ ਹ�:"
+#| msgid ""
+#| "<b>%s</b> through %s requests your presence at the following meeting:"
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s ਨ� %s ਰਾਹ�� ਮ��ਿੰ� ਵਿੱ� ਤ�ਹਾਡ� ਹਾ�਼ਰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> ਤਾ�� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨਾ �ਾਹ�ੰਦਾ ਹ�:"
+#| msgid "<b>%s</b> requests your presence at the following meeting:"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s ਨ� ਮ��ਿੰ� ਵਿੱ� ਤ�ਹਾਡ� ਹਾ�ਰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> ਰਾਹ�� %s ਨ� ਹ�ਠ ਦਿੱਤਾ ਮ��ਿੰ� �ਾਵਾਬ ਵਾਪਸ ਭ��ਿ� ਹ�:"
+#| msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s %s ਰਾਹ�� ਮ���ਦਾ ਮ��ਿੰ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> ਨ� �ੱ� ਮ��ਿੰ� ਵਾਪਸ� �ਵਾਬ ਭ��ਿ� ਹ�:"
+#| msgid "<b>%s</b> wishes to add to an existing meeting:"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s ਮ���ਦਾ ਮ��ਿੰ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> ਰਾਹ�� %s ਨ� ਹ�ਠ ਦਿੱਤ� ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� ਹ�:"
+#| msgid ""
+#| "<b>%s</b> through %s wishes to receive the latest information for the "
+#| "following meeting:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr "%s ਰਾਹ�� %s ਹ�ਠ ਦਿੱਤ� ਮ��ਿੰ� ਬਾਰ� ਤਾ�਼ਾ �ਾਣ�ਾਰ� ਲ�ਣ� �ਾਹ�ੰਦਾ ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> ਨ� �ੱ�� ਦਿੱਤ� ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� ਹ�।"
+#| msgid ""
+#| "<b>%s</b> wishes to receive the latest information for the following "
+#| "meeting:"
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s ਤਾ�� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨਾ �ਾਹ�ੰਦਾ ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> ਰਾਹ�� %s ਨ� ਹ�ਠ ਦਿੱਤ� ਮ��ਿੰ� ਬਦਲਾ� ਸ��ਾ� ਹਨ।"
+#| msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s ਰਾਹ�� %s ਨ� ਹ�ਠ ਦਿੱਤਾ ਮ��ਿੰ� �ਾਵਾਬ ਵਾਪਸ ਭ��ਿ� ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> ਨ� �ੱ� ਮ��ਿੰ� ਤਬਦ�ਲ� ਲ� ਸ��ਾ� ਦਿੱਤਾ ਹ�:"
+#| msgid "<b>%s</b> has sent back the following meeting response:"
+msgid "%s has sent back the following meeting response:"
+msgstr "%s ਨ� �ੱ� ਮ��ਿੰ� ਵਾਪਸ� �ਵਾਬ ਭ��ਿ� ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� �ੱ� ਮ��ਿੰ� ਵਿੱ� ਤਬਦ�ਲ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�:"
+#| msgid "<b>%s</b> through %s has canceled the following meeting:"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s ਰਾਹ�� %s ਨ� ਹ�ਠ ਦਿੱਤ� ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> ਨ� �ੱ� ਮ��ਿੰ� ਤਬਦ�ਲ� ਤ�� �ਨ�ਾਰ �ਰ ਦਿੱਤਾ ਹ�।"
+#| msgid "<b>%s</b> has canceled the following meeting."
+msgid "%s has canceled the following meeting."
+msgstr "%s ਨ� �ੱ�� ਦਿੱਤ� ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� ਹ�।"
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
-msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� �ੰਮ �ਾਣ�ਾਰ� ਪਰਾ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
+#| msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s ਰਾਹ�� %s ਨ� ਹ�ਠ ਦਿੱਤ� ਮ��ਿੰ� ਬਦਲਾ� ਸ��ਾ� ਹਨ।"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> ਨ� �ੰਮ �ਾਣ�ਾਰ� ਪਰਾ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
+#| msgid "<b>%s</b> has proposed the following meeting changes."
+msgid "%s has proposed the following meeting changes."
+msgstr "%s ਨ� �ੱ� ਮ��ਿੰ� ਤਬਦ�ਲ� ਲ� ਸ��ਾ� ਦਿੱਤਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> ਨ� �ੱ�� ਦਿੱਤ� �ੰਮ ਲ� %s ਲ� �ਿੰਮ�ਵਾਰ� ਦ� ਮ���ਦ�� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�:"
+#| msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s ਨ� %s ਰਾਹ�� �ੱ� ਮ��ਿੰ� ਵਿੱ� ਤਬਦ�ਲ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� ਤ�ਹਾਨ�ੰ �ੰਮ ਸ��ਪਿ� ਹ�:"
+#| msgid "<b>%s</b> has declined the following meeting changes."
+msgid "%s has declined the following meeting changes."
+msgstr "%s ਨ� �ੱ� ਮ��ਿੰ� ਤਬਦ�ਲ� ਤ�� �ਨ�ਾਰ �ਰ ਦਿੱਤਾ ਹ�।"
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> ਨ� ਤ�ਹਾਨ�ੰ �ੰਮ ਸ��ਪਿ� ਹ�:"
+#| msgid "<b>%s</b> through %s has published the following task:"
+msgid "%s through %s has published the following task:"
+msgstr "%s ਨ� %s ਰਾਹ�� �ੰਮ �ਾਣ�ਾਰ� ਪਰਾ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� ਮ���ਦਾ �ੰਮ ਸ਼ਾਮਲ ��ਤਾ ਹ�:"
+#| msgid "<b>%s</b> has published the following task:"
+msgid "%s has published the following task:"
+msgstr "%s ਨ� �ੰਮ �ਾਣ�ਾਰ� ਪਰਾ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> ਮ���ਦਾ �ੰਮ ਵਿੱ� ਸ਼ਾਮਲ �ਰਨਾ �ਾਹ�ੰਦਾ ਹ�:"
+#| msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s ਨ� �ੱ�� ਦਿੱਤ� �ੰਮ ਲ� %s ਲ� �ਿੰਮ�ਵਾਰ� ਦ� ਮ���ਦ�� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr "<b>%s</b> ਰਾਹ�� %s �ੱ�� ਦਿੱਤ� �ਸਾ�ਨ �ੰਮ ਬਾਰ� ਤਾ�਼ਾ �ਾਣ�ਾਰ� ਲ�ਣ� �ਾਹ�ੰਦਾ ਹ�:"
+#| msgid "<b>%s</b> through %s has assigned you a task:"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s ਨ� %s ਰਾਹ�� ਤ�ਹਾਨ�ੰ �ੰਮ ਸ��ਪਿ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr "<b>%s</b> �ਾਰ� �ੰਮ ਬਾਰ� ਤਾ�� �ਾਣ�ਾਰ� ਪਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦਾ ਹ�:"
+#| msgid "<b>%s</b> has assigned you a task:"
+msgid "%s has assigned you a task:"
+msgstr "%s ਨ� ਤ�ਹਾਨ�ੰ �ੰਮ ਸ��ਪਿ� ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> ਰਾਹ�� %s ਨ� �ੱ�� ਦਿੱਤਾ �ਸਾ�ਨ �ੰਮ �ਵਾਬ ਭ��ਿ� ਹ�:"
+#| msgid "<b>%s</b> through %s wishes to add to an existing task:"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s ਨ� %s ਰਾਹ�� ਮ���ਦਾ �ੰਮ ਸ਼ਾਮਲ ��ਤਾ ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> ਨ� �ਾਰ� �ੰਮ ਬਾਰ� �ਵਾਬ� ਸ�ਨ�ਹਾ ਭ��ਿ� ਹ�:"
+#| msgid "<b>%s</b> wishes to add to an existing task:"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s ਮ���ਦਾ �ੰਮ ਵਿੱ� ਸ਼ਾਮਲ �ਰਨਾ �ਾਹ�ੰਦਾ ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� �ੱ�� ਦਿੱਤਾ �ਾਰ� �ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
+#| msgid ""
+#| "<b>%s</b> through %s wishes to receive the latest information for the "
+#| "following assigned task:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr "%s ਰਾਹ�� %s �ੱ�� ਦਿੱਤ� �ਸਾ�ਨ �ੰਮ ਬਾਰ� ਤਾ�਼ਾ �ਾਣ�ਾਰ� ਲ�ਣ� �ਾਹ�ੰਦਾ ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> ਨ� �ੱ�� ਦਿੱਤਾ �ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
+#| msgid ""
+#| "<b>%s</b> wishes to receive the latest information for the following "
+#| "assigned task:"
+msgid "%s wishes to receive the latest information for the following assigned task:"
+msgstr "%s �ਾਰ� �ੰਮ ਬਾਰ� ਤਾ�� �ਾਣ�ਾਰ� ਪਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦਾ ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ਨ� %s �ੱ�� ਦਿੱਤ� �ੰਮ �ਸਾ�ਨਮਿੰ� ਬਦਲਾ� ਸ��ਾ� ਹਨ:"
+#| msgid ""
+#| "<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%s ਰਾਹ�� %s ਨ� �ੱ�� ਦਿੱਤਾ �ਸਾ�ਨ �ੰਮ �ਵਾਬ ਭ��ਿ� ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ਨ� �ਾਰ� �ੰਮ ਵਿੱ� ਤਬਦ�ਲ� ਲ� ਸ��ਾ� ਭ��� ਹਨ:"
+#| msgid "<b>%s</b> has sent back the following assigned task response:"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s ਨ� �ਾਰ� �ੰਮ ਬਾਰ� �ਵਾਬ� ਸ�ਨ�ਹਾ ਭ��ਿ� ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> ਨ� %s �ੱ�� ਦਿੱਤ� �ੰਮ ਤ�� �ਨ�ਾਰ �ਰ ਦਿੱਤਾ ਹ�:"
+#| msgid "<b>%s</b> through %s has canceled the following assigned task:"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s ਨ� %s ਰਾਹ�� �ੱ�� ਦਿੱਤਾ �ਾਰ� �ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> ਨ� �ੱ�� ਦਿੱਤ� �ਾਰ� �ੰਮ ਤ�� �ਨ�ਾਰ �ਰ ਦਿੱਤਾ ਹ�:"
+#| msgid "<b>%s</b> has canceled the following assigned task:"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s ਨ� �ੱ�� ਦਿੱਤਾ �ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:504
 #, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� ਮ�ਮ� �ਾਣ�ਾਰ� ਪਰਾ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
+#| msgid ""
+#| "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "%s ਨ� %s �ੱ�� ਦਿੱਤ� �ੰਮ �ਸਾ�ਨਮਿੰ� ਬਦਲਾ� ਸ��ਾ� ਹਨ:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> ਨ� ਮ�ਮ� �ਾਣ�ਾਰ� ਪਰਾ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
+#| msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s ਨ� �ਾਰ� �ੰਮ ਵਿੱ� ਤਬਦ�ਲ� ਲ� ਸ��ਾ� ਭ��� ਹਨ:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:510
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> %s ਰਾਹ�� ਮ���ਦਾ ਮ�ਮ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�:"
+#| msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s ਨ� %s �ੱ�� ਦਿੱਤ� �ੰਮ ਤ�� �ਨ�ਾਰ �ਰ ਦਿੱਤਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:512
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> ਮ���ਦਾ ਮ�ਮ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�:"
+#| msgid "<b>%s</b> has declined the following assigned task:"
+msgid "%s has declined the following assigned task:"
+msgstr "%s ਨ� �ੱ�� ਦਿੱਤ� �ਾਰ� �ੰਮ ਤ�� �ਨ�ਾਰ �ਰ ਦਿੱਤਾ ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> ਨ� %s ਰਾਹ�� ਹ�ਠ ਦਿੱਤਾ ਸਾ��ਾ ਮ�ਮ� ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
+#| msgid "<b>%s</b> through %s has published the following memo:"
+msgid "%s through %s has published the following memo:"
+msgstr "%s ਨ� %s ਰਾਹ�� ਮ�ਮ� �ਾਣ�ਾਰ� ਪਰਾ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:551
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> ਨ� �ੱ�� ਦਿੱਤਾ ਸਾ��ਾ ਮ�ਮ� ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
+#| msgid "<b>%s</b> has published the following memo:"
+msgid "%s has published the following memo:"
+msgstr "%s ਨ� ਮ�ਮ� �ਾਣ�ਾਰ� ਪਰਾ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:556
+#, c-format
+#| msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s %s ਰਾਹ�� ਮ���ਦਾ ਮ�ਮ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�:"
+
+#: ../plugins/itip-formatter/itip-view.c:558
+#, c-format
+#| msgid "<b>%s</b> wishes to add to an existing memo:"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s ਮ���ਦਾ ਮ�ਮ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�:"
+
+#: ../plugins/itip-formatter/itip-view.c:562
+#, c-format
+#| msgid "<b>%s</b> through %s has canceled the following shared memo:"
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s ਨ� %s ਰਾਹ�� ਹ�ਠ ਦਿੱਤਾ ਸਾ��ਾ ਮ�ਮ� ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
+
+#: ../plugins/itip-formatter/itip-view.c:564
+#, c-format
+#| msgid "<b>%s</b> has canceled the following shared memo:"
+msgid "%s has canceled the following shared memo:"
+msgstr "%s ਨ� �ੱ�� ਦਿੱਤਾ ਸਾ��ਾ ਮ�ਮ� ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
+
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
 msgstr "ਸਾਰਾ ਦਿਨ:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "ਦਿਨ ਸ਼�ਰ�:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "ਸ਼�ਰ� ਸਮਾ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "ਦਿਨ �ੰਤ:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "ਸਮਾਪਤ� ਸਮਾ�:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "��ਲੰਡਰ ��ਲ�ਹ�(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "ਨਾ-ਮਨ�਼�ਰ(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "ਮਨ�਼�ਰ(_A)"
-
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+#| msgid "Accept"
+msgid "A_ccept"
+msgstr "ਮਨ�਼�ਰ(_c)"
+
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "ਸਭ ਨਾ-ਮਨ�਼�ਰ(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "ਸਭ �ਰ�਼� ਮਨ�਼�ਰ(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "�ਰ�਼�(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
-msgstr "ਸਭ ਮਨ�਼�ਰ(_A)"
+#: ../plugins/itip-formatter/itip-view.c:855
+#| msgid "_Accept all"
+msgid "A_ccept all"
+msgstr "ਸਭ ਮਨ�਼�ਰ(_c)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "�ਾਣ�ਾਰ� ਭ���(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "ਦਰਸ਼� ਹਾਲਤ �ੱਪਡ��(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "�ੱਪਡ��(_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "�ਿੱਪਣ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "ਭ��ਣ ਵਾਲ� ਨ�ੰ �ਵਾਬ ਦਿ�(_r)"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "ਦਰਸ਼�ਾ� ਨ�ੰ �ੱਪਡ�� ਭ���(_u)"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "ਸਭ ਮ��ਿ�� �ੱਤ� ਲਾ��(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "�ਾ�ਮ ਫਰ� ਵਾ�� ਵ���(_f)"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "ਮ�ਨ�ੰ ਯਾਦ ਰੱ��(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "�ੰਹ�ਰਿ� ਰ�ਮਾ�ਡਰ(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "�ੰਮ(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "ਮ�ਮ�(_M):"
 
@@ -18145,16 +18248,17 @@ msgid "Itip Formatter"
 msgstr "Itip ਫਾਰਮ��ਰ"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr "&quot;{0}&quot; ਮ��ਿੰ� ਲ� ਡ�ਲ���� ਹ�। �� ਤ�ਸ�� ਡ�ਲ���� &quot;{1}&quot; ਨ�ੰ ���ਨਾ �ਾਹ�ੰਦ� ਹ�?"
+#| msgid ""
+#| "&quot;{0}&quot; has delegated the meeting. Do you want to add the "
+#| "delegate &quot;{1}&quot;?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr "'{0}' ਮ��ਿੰ� ਲ� ਡ�ਲ���� ਹ�। �� ਤ�ਸ�� ਡ�ਲ���� {1} ਨ�ੰ ���ਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "�ਹ ਮ��ਿੰ� ਲ� �ਧਿ�ਰਿਤ ਹ�"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "�ਹ �ਵਾਬ �ੱ� ਦਰਸ਼� ਵਲ�� ਨਹ�� ਹ�। �� ਭ��ਣ ਵਾਲ� �ੱ� ਦਰਸ਼� ਵਾ�� ਸ਼ਾਮਲ �ਰਨਾ ਹ�?"
 
@@ -18232,16 +18336,15 @@ msgstr "�� ���ਾਨ �ਪ�ਦਾ ਹ�ਣਾ �ਾਹ�ਦਾ 
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "�� ��ਵਲ �ਨ-ਬਾ�ਸ ਵਿ�ਲ� ਸ�ਨ�ਹਿ�� ਲ� ਹ� ਨ���ਫਾ� �ਰਨਾ ਹ�।"
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:369
 msgid "Evolution's Mail Notification"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਦਾ ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:391
 msgid "Mail Notification Properties"
 msgstr "ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ ਵਿਸ਼�ਸ਼ਤਾ"
 
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:527
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18256,67 +18359,69 @@ msgstr[1] ""
 "ਤ�ਹਾਨ�ੰ %2$s ਵਿੱ� %1$d ਨਵ�� ਸ�ਨ�ਹ�\n"
 "�� ਹਨ।"
 
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:539
 #, c-format
 msgid "From: %s"
 msgstr "ਵਲ��: %s"
 
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:552
 #, c-format
 msgid "Subject: %s"
 msgstr "ਵਿਸ਼ਾ: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:562
 #, 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:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:584
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "New email"
 msgstr "ਨਵ�� �ਮ�ਲ"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:652
 msgid "Show icon in _notification area"
 msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ���ਾਨ ਵ���(_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:680
 msgid "B_link icon in notification area"
 msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ���ਾਨ �ਪ�ਾ�(_l)"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:690
 msgid "Popup _message together with the icon"
 msgstr "���ਾਨ ਨਾਲ ਸ�ਨ�ਹਾ ਵ� ਪ�ਪ�ੱਪ �ਰ�(_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:877
 msgid "_Play sound when new messages arrive"
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ ��ਣ �ੱਤ� ਸਾ��ਡ �ਲਾ�(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:906
 msgid "_Beep"
 msgstr "ਬ�ਪ(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:919
 msgid "Use sound _theme"
 msgstr "ਸਾ��ਡ ਥ�ਮ ਵਰਤ��(_t)"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:938
 msgid "Play _file:"
 msgstr "ਫਾ�ਲ �ਲਾ�(_f):"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:949
 msgid "Select sound file"
 msgstr "ਸਾ��ਡ ਫਾ�ਲ ��ਣ�"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:1007
 msgid "Notify new messages for _Inbox only"
 msgstr "��ਵਲ �ਨ-ਬਾ�ਸ ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� ਨ���ਫਾ� �ਰ�(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:1016
 msgid "Generate a _D-Bus message"
 msgstr "ਡ�-ਬੱਸ ਸ�ਨ�ਹਾ ਬਣਾ�(_D)"
 
@@ -18329,26 +18434,26 @@ 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:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "%s ਵਲ�� ਮ�ਲ ਰਾਹ�� ਬਣਾ��"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr "��ਣਿ� ��ਲੰਡਰ ਵਿੱ� �ਵ��� '%s' ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। �� ਤ�ਸ�� ਪ�ਰਾਣ� �ਵ��� ਨ�ੰ ਸ�ਧਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr "��ਣ� �ਾਸ� ਲਿਸ� ਵਿੱ� �ਾਸ� '%s' ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। �� ਤ�ਸ�� ਪ�ਰਾਣ� �ਾਸ� ਨ�ੰ ਸ�ਧਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18357,14 +18462,20 @@ msgstr ""
 "��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਮ�ਮ� '%s' ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। �� ਤ�ਸ�� ਪ�ਰਾਣ� ਮ�ਮ� ਲਿਸ� ਨ�ੰ ਸ�ਧਣਾ �ਾਹ�ੰਦ� "
 "ਹ�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
 msgstr ""
 "��ਣ� ��ਲੰਡਰ ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� �ਵ��� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� �ਵ��� ਫ�ਰ ਵ� ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:521
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18372,7 +18483,10 @@ msgstr ""
 "��ਣ� �ਾਸ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� �ਾਸ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� �ਾਸ� ਫ�ਰ ਵ� "
 "ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:527
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18380,7 +18494,10 @@ msgstr ""
 "��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� ਮ�ਮ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� ਮ�ਮ� ਫ�ਰ ਵ� ਬਣਾ�ਣ� "
 "�ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18393,7 +18510,10 @@ msgstr[0] ""
 msgstr[1] ""
 "��ਣ� ��ਲੰਡਰ ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� �ਵ��� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� �ਵ��� ਫ�ਰ ਵ� ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:557
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18407,7 +18527,10 @@ msgstr[1] ""
 "��ਣ� �ਾਸ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� �ਾਸ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� �ਾਸ� ਫ�ਰ ਵ� "
 "ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:566
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18421,76 +18544,76 @@ msgstr[1] ""
 "��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� ਮ�ਮ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� ਮ�ਮ� ਫ�ਰ ਵ� ਬਣਾ�ਣ� "
 "�ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "[No Summary]"
 msgstr "[ਸੰ��ਪ ਨਹ��]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:636
 msgid "Invalid object returned from a server"
 msgstr "ਸਰਵਰ ਤ�� �ਲਤ �ਬ���� ਵਾਪਸ ਮਿਲਿ�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:707
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "ਪਰ�ਸ�ਸ �ਰਨ ਦ�ਰਾਨ �ਲਤ� ��: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:736
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:743
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr "��ਣਿ� ਸਰ�ਤ ਪ��ਹਨ ਲ� ਹ�, �ਸ�ਰ�� �ਵ��� ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�। ਹ�ਰ ਸਰ�ਤ ��ਣ� ��।"
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:746
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr "��ਣਿ� ਸਰ�ਤ ਪ��ਹਨ ਲ� ਹ�, �ਸ�ਰ�� �ੰਮ ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�। ਹ�ਰ ਸਰ�ਤ ��ਣ� ��।"
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:749
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr "��ਣਿ� ਸਰ�ਤ ਪ��ਹਨ ਲ� ਹ�, �ਸ�ਰ�� ਮ�ਮ� �ੱਥ� ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�। ਹ�ਰ ਸਰ�ਤ ��ਣ� ��।"
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:952
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "ਸਰ�ਤ ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1071
 msgid "Create an _Event"
 msgstr "�ਵ��� ਬਣਾ�(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1073
 msgid "Create a new event from the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵਾ� �ਵ��� ਬਣਾ�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1078
 msgid "Create a Mem_o"
 msgstr "ਮ�ਮ� ਬਣਾ�(_o)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1080
 msgid "Create a new memo from the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵਾ� ਮ�ਮ� ਬਣਾ�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1085
 msgid "Create a _Task"
 msgstr "�ਾਸ� ਬਣਾ�(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1087
 msgid "Create a new task from the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵ�� �ਾਸ� ਬਣਾ�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1095
 msgid "Create a _Meeting"
 msgstr "ਮ��ਿੰ� ਬਣਾ�(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1097
 msgid "Create a new meeting from the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵ�� ਮ��ਿੰ� ਬਣਾ�"
 
@@ -18498,55 +18621,55 @@ msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵ�� ਮ��ਿੰ
 msgid "Convert a mail message to a task."
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹ� ਨ�ੰ �ਾਸ� ਵਿੱ� ਬਦਲ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Archive"
 msgstr "ਲਿਸ� ��ਾ�ਵ ਲਵ�(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get an archive of the list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਲਿਸ� ਦ� ��ਾ�ਵ ����"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get List _Usage Information"
 msgstr "ਲਿਸ� ਵਰਤ�� �ਾਣ�ਾਰ� ਲਵ��(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਲਿਸ� ਦ� ਵਰਤ�� ਬਾਰ� �ਾਣ�ਾਰ� ਲਵ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Contact List _Owner"
 msgstr "ਸੰਪਰ� ਲਿਸ� ਮਾਲ�(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਸ��� ਦ� ਮਾਲ� ਨਾਲ ਸੰਪਰ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Post Message to List"
 msgstr "ਲਿਸ� ਲ� ਸ�ਨ�ਹ� ਭ���(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Subscribe to List"
 msgstr "ਲਿਸ� ਲ� ਮ��ਬਰ(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� ਮ��ਬਰ ਬਣ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "_Unsubscribe from List"
 msgstr "ਲਿਸ� ਤ�� ਮ��ਬਰ� ਹ�ਾ�(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "�ਸ ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� ਮ��ਬਰ� ਹ�ਾ�, �� ਸਬੰਧਿਤ ਹ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
 msgid "Mailing _List"
 msgstr "ਮ�ਲਿੰ� ਲਿਸ�(_L)"
 
@@ -18647,15 +18770,15 @@ msgstr ""
 "�ਸ ਨਾਲ ਮ���ਦਾ ਫ�ਲਡਰ ਵਿੱ� ਹ� ਸ�ਨ�ਹ� ਪ��ਹ� ਮਾਰ� �ਰਨਾ �ਾਹ�ੰਦ� ਹ� �ਾ� ਮ���ਦਾ ਫ�ਲਡਰ ਦ� ਨਾਲ ਸਭ �ਧ�ਨ-"
 "ਫ�ਲਡਰ ਵ�?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:194
 msgid "In Current Folder and _Subfolders"
 msgstr "ਮ���ਦਾ ਫ�ਲਡਰ �ਤ� ਸਬ-ਫ�ਲਡਰਾ� ਵਿੱ�(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:208
 msgid "In Current _Folder Only"
 msgstr "��ਵਲ ਮ���ਦਾ ਫ�ਲਡਰ ਵਿੱ�(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:437
 msgid "Mark Me_ssages as Read"
 msgstr "ਸ�ਨ�ਹਿ�� ਨ�ੰ ਪ��ਹ� ਹ�� ਬਣਾ�(_S)"
 
@@ -18714,39 +18837,39 @@ msgstr "ਪਲ�ਨ-���ਸ� ਪਸੰਦ"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹ� ਨ�ੰ ਪਲ��-���ਸ� ਵ���, �� �ਹ HTML ਸਮੱ�ਰ� ਵ� ਰੱ�ਦ� ਹ�ਵ�।"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "���ਰ HTML ਹ�ਵ� ਤਾ� ਵ���"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ��ਣਨ ਦਿ� �ਿ ਵ��ਾ�ਣ ਲ� �� ਸਭ ਤ�� ਵਧ�� ਹ�।"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "�� ਮ���ਦ ਹ�ਵ� ਤਾ� ਪਲ�ਨ ���ਸ� ਵ���"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "ਪਲ�ਨ ���ਸ� ਭਾ� ਵ���, �� ਮ���ਦ ਹ�ਵ�, ਨਹ�� ਤਾ� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਵ��ਾ�ਣ ਲ� ਵਧ�� ਢੰ� ��ਣਨ ਦਿ�।"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "ਹਮ�ਸ਼ਾ ਪਲ�ਨ ���ਸ� ਹ� ਵ���"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "ਹਮ�ਸ਼ਾ ਪਲ�ਨ ���ਸ� ਭਾ� ਵ��ਾ� �ਤ� ਹ�ਰ ਭਾ� ਤ�� ����ਮ��� ਬਣਾ�, �� ਮੰ�ਿ� ਹ�ਵ� ਤਾ�।"
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "ਦਬਾ� �� HTML ਭਾ� ����ਮ��� ਵ��� ਵ���(_u)"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "HT_ML ਮ�ਡ"
 
@@ -18770,31 +18893,35 @@ msgstr "Outlook PST �ੰਪ�ਰ�"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook ਨਿੱ�� ਫ�ਲਡਰ (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:295
 msgid "_Mail"
 msgstr "ਪੱਤਰ(_M)"
 
+#: ../plugins/pst-import/pst-importer.c:307
+msgid "Destination folder:"
+msgstr "ਨਿਯਤ ਫ�ਲਡਰ:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:313
 msgid "_Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ�(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:320
 msgid "A_ppointments"
 msgstr "ਮ�ਲਾ�ਾਤ(_p)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "�ੰਮ(_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:332
 msgid "_Journal entries"
 msgstr "�ਰਨਲ ���ਰ���(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:347
 msgid "Importing Outlook data"
 msgstr "���ਲ�ੱ� ਡਾ�ਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
@@ -18952,55 +19079,55 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "��ਲੰਡਰ ਪਬਲਿਸ਼ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: ��ਲੰਡਰ ਬ���ਡ ਹ�ਣ ਮ���ਦ ਨਹ�� ਰਿਹਾ।"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "ਨਵਾ� �ਿ�ਾਣਾ"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "�ਿ�ਾਣਾ ਸ�ਧ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin ਨਹ�� ਲੱਭਿ�, ��ਡ: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "ਪਾ�ਪ ਬਣਾ�ਣ ਲ� ਫ�ਲ�ਹ: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
 #, c-format
 msgid "Error after fork: %s"
 msgstr "ਫ�ਰ� ਬਾ�ਦ �ਲਤ�: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin �ਾ�ਲਡ ਪਰ�ਸ�ਸ �ਵਾਬ ਨਹ�� ਦਿੰਦਾ, �ਤਮ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "SpamAssassin �ਾ�ਲਡ ਪਰ�ਸ�ੱਸ ਦ�ਲ ਦ� �ਡ��, �ਤਮ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "SpamAssassin ਲ� ਪਾ�ਪ ਫ�ਲ�ਹ, �ਲਤ� ��ਡ: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin �ਪਲੱਬਧ ਨਹ�� ਹ�। �ਹ ਪਹਿਲਾ� �ੰਸ�ਾਲ �ਰ�।"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "�ਹ Spamassasin ਨ�ੰ ਹ�ਰ ਵ� ਭਰ�ਸ�ਯ�� ਬਣਾ�ਦਾ ਹ�, ਪਰ ਹ�ਲ� �ਰਦਾ ਹ�"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
 msgid "I_nclude remote tests"
 msgstr "ਰਿਮ�� �ਾ�� ਸ਼ਾਮਿਲ �ਰ�(_n)"
 
@@ -19117,77 +19244,26 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF ਫਾਰਮ�� (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "ਫਾਰਮ��(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "ਨਿਯਤ ਫਾ�ਲ ��ਣ�"
 
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "��ਣ� ��ਲੰਡਰ ਨ�ੰ ਡਿਸ� �ੱਤ� ਸੰਭਾਲ�"
 
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "��ਣ� ਮ�ਮ� ਲਿਸ� ਡਿਸ� �ੱਤ� ਸੰਭਾਲ�"
 
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
 msgstr "��ਣ� �ਾਸ� ਲਿਸ� ਡਿਸ� �ੱਤ� ਸੰਭਾਲ�"
 
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "�ਪਣ� ਸ਼�ਰ��ਤ� ��ਾ��� ਸ���ੱਪ ਰਾਹ�� ਤ�ਹਾਨ�ੰ ਮੱਦਦ।"
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "ਸ���ੱਪ ਸਹਾ��"
-
-#: ../plugins/startup-wizard/startup-wizard.c:110
-msgid "Evolution Setup Assistant"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ�ੱ��ੱਪ ਸਹਾ�� "
-
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Welcome"
-msgstr "�� ��� ਨ�ੰ"
-
-#: ../plugins/startup-wizard/startup-wizard.c:118
-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"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਵਲ�� �� ���� ਨ�ੰ। �ੱ�� ��� ਸ�ਰ�ਨਾ� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਤ�ਹਾਡ� �-ਮ�ਲ ��ਾ���ਾ� ਨਾਲ ���ਨ ਵਿੱ�\n"
-"ਸਹਾ�� ਹ�ਣ���� �ਤ� ਹ�ਰ �ਪਲ���ਸ਼ਨਾ� ਤ�� ਫਾ�ਲਾ� �ੰਪ�ਰ� �ਰਨ ਵਿੱ� ਮੱਦਦ �ਰਨ��।\n"
-"\n"
-"�ਾਰ� ਰੱ�ਣ ਥ� \"�ੱ��\" ਬ�ਨ ਨ�ੰ ਦੱਬ� ��। "
-
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
-msgid "Please select the information that you would like to import:"
-msgstr "�ਾਣ�ਾਰ�, �� ਵ� ਤ�ਸ�� �ੰਪ�ਰ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�, ਨ�ੰ ��ਣ� ��:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:168
-#: ../widgets/misc/e-import-assistant.c:542
-#, c-format
-msgid "From %s:"
-msgstr "%s ਤ��:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:185
-msgid "Importing files"
-msgstr "ਫਾ�ਲਾ� �ੰਪ�ਰ� ��ਤ��� �ਾ ਰਹ��� ਹਨ"
-
-#: ../plugins/startup-wizard/startup-wizard.c:248
-msgid "Importing data."
-msgstr "ਡਾ�ਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
-
-#: ../plugins/startup-wizard/startup-wizard.c:250
-msgid "Please wait"
-msgstr "�ਡ��� ��"
-
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Sort mail message threads by subject."
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹ� ਮਸਲਾ ਦ� ਵਿਸ਼� ਰਾਹ�� ਲ��ਬੱਧ �ਰ�।"
@@ -19201,7 +19277,7 @@ 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:56
+#: ../plugins/subject-thread/subject-thread.c:63
 msgid "F_all back to threading messages by subject"
 msgstr "ਥਰਿੱਡ ਸ�ਨ�ਹਿ�� ਵਾਸਤ� ਫਾਲਬ�� ਲ� ਵਿਸ਼ਾ(_a)"
 
@@ -19215,15 +19291,15 @@ msgstr "ਸ�ਨ�ਹਾ ਮ�ੱ� ਭਾ� ਵਿੱ� ��ਪਲ�
 msgid "Drafts based template plugin"
 msgstr "��ਪਲ�� ਪਲੱ��ਨ ਮ�ਤਾਬ� ਡਰਾਫ�"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:616
 msgid "No Title"
 msgstr "�ਾ��ਲ ਨਹ��"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:687
 msgid "Save as _Template"
 msgstr "��ਪਲ�� ਵਾ�� ਸੰਭਾਲ�(_T)"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:689
 msgid "Save as Template"
 msgstr "��ਪਲ�� ਵਾ�� ਸੰਭਾਲ�"
 
@@ -19243,27 +19319,27 @@ msgstr "�ਨ-ਲਾ�ਨ vCards"
 msgid "Show vCards directly in mail messages."
 msgstr "ਮ�ਲ ਸ�ਨ�ਹਿ�� ਵਿੱ� ਸਿੱਧ� vCard ਵ���।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:164
+#: ../plugins/vcard-inline/vcard-inline.c:249
 msgid "Show Full vCard"
 msgstr "ਪ�ਰਾ vCard ਵ���"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:167
 msgid "Show Compact vCard"
 msgstr "ਥ��ਾ vCard ਵ���"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:228
 msgid "There is one other contact."
 msgstr "�ੱ� ਹ�ਰ ਸੰਪਰ� ਹ�।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:237
 #, 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:254
+#: ../plugins/vcard-inline/vcard-inline.c:258
 msgid "Save in Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਸੰਭਾਲ�"
 
@@ -19279,11 +19355,11 @@ msgstr "WebDAV ਸੰਪਰ�"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "ifMatch �ਣਡਿੱਠਾ (_Apache < 2.2.8 ਦ� ਲ�� ਹ�)"
 
@@ -19439,7 +19515,7 @@ msgstr "ਬਾਹ� ਵ��ਾ� ਦਿੰਦ� ਹ�"
 msgid "Skip development warning dialog"
 msgstr "ਵਿ�ਾਸ ��ਤਾਵਨ� ਪ�ੱ��ਿੱ� ਡਾ�ਲਾ� �ੱਡ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:331
 msgid "Start in offline mode"
 msgstr "�ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
@@ -19589,143 +19665,46 @@ msgstr "ਵਿੰਡ� ਬ�ਨ ਸ�ਾ�ਲ"
 msgid "Window buttons are visible"
 msgstr "ਵਿੰਡ� ਬ�ਨ ਦਿੱ� ਹਨ।"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:520 ../shell/e-shell-content.c:521
 msgid "Searches"
 msgstr "���"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:563
 msgid "Save Search"
 msgstr "��� ਸੰਭਾਲ�"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld �ਿਬਾ"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * 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:883
+#: ../shell/e-shell-searchbar.c:921
 msgid "Sho_w:"
 msgstr "ਵ���(_w):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:952
 msgid "Sear_ch:"
 msgstr "���(_c):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1013
 msgid "i_n"
 msgstr " �ੰਦਰ(_n)"
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "��ਲਬਾਰ ਸ�ਾ�ਲ"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "ਸਵਿੱ�ਰ ਦਾ ��ਲਬਾਰ ਸ�ਾ�ਲ"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "��ਲਬਾਰ �ਪਲੱਬਧ"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "�� ਸਵਿੱ�ਰ �ਪਲੱਬਧ ਹ�ਵ�"
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "ਸਭ ਫਾ�ਲਾ� (*)"
 
-#: ../shell/e-shell-view.c:675
-msgid "Switcher Action"
-msgstr "ਸਵਿੱ�ਰ ��ਸ਼ਨ"
-
-#: ../shell/e-shell-view.c:676
-msgid "The switcher action for this shell view"
-msgstr "�ਹ ਸ਼�ੱਲ �ਲ� ਲ� ਸਵਿੱ�ਰ ��ਸ਼ਨ"
-
-#: ../shell/e-shell-view.c:691
-msgid "Page Number"
-msgstr "ਸਫ਼ਾ ਨੰਬਰ"
-
-#: ../shell/e-shell-view.c:692
-msgid "The notebook page number of the shell view"
-msgstr "ਸ਼�ੱਲ �ਲ� ਲ� ਨ��ਬ�ੱ� ਸਫ਼ਾ ਨੰਬਰ"
-
-#: ../shell/e-shell-view.c:708
-msgid "Search Rule"
-msgstr "��� ਨਿਯਮ"
-
-#: ../shell/e-shell-view.c:709
-msgid "Criteria for the current search results"
-msgstr "ਮ���ਦਾ ��� ਨਤ��ਿ�� ਲ� ਸ�ਮਾ"
-
-#: ../shell/e-shell-view.c:724
-msgid "The EShellBackend for this shell view"
-msgstr "�ਸ ਸ਼�ੱਲ �ਲ� ਲ� EShellBackend"
-
-#: ../shell/e-shell-view.c:739
-msgid "Shell Content Widget"
-msgstr "ਸ਼�ੱਲ ਸਮੱ�ਰ� ਵਿਦ��ੱ�"
-
-#: ../shell/e-shell-view.c:740
-msgid "The content widget appears in a shell window's right pane"
-msgstr "ਸ਼�ੱਲ ਵਿੰਡ� ਦ� ਸੱ�� ਬਾਹ� ਵਿੱ� ਸਮੱ�ਰ� ਵਿਦ��ੱ� �ਲ� ਦਿੰਦਾ ਹ�"
-
-#: ../shell/e-shell-view.c:756
-msgid "Shell Sidebar Widget"
-msgstr "ਸ਼�ੱਲ ਬਾਹ� ਵਿਦ��ੱ�"
-
-#: ../shell/e-shell-view.c:757
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "ਸ਼�ੱਲ ਵਿਦ��ੱ� ਦ� �ੱਬ� ਪਾਸ� ਵਿੱ� ਬਾਹ� ਵਿਦ��ੱ� ਦਿ�ਾ��ਦਾ ਹ��"
-
-#: ../shell/e-shell-view.c:772
-msgid "Shell Taskbar Widget"
-msgstr "ਸ�ੱਲ �ਾਸ�ਬਾਰ ਵਿਦ��ੱ�"
-
-#: ../shell/e-shell-view.c:773
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "�ਾਸ�-ਬਾਹ� ਵਿਦ��ੱ� ਸ਼�ੱਲ ਵਿੰਡ� ਦ� ਤਲ �ੱਤ� ਵ��ਾ� ਦਿੰਦਾ ਹ�"
-
-#: ../shell/e-shell-view.c:788
-msgid "Shell Window"
-msgstr "ਸ਼�ੱਲ ਵਿੰਡ�"
-
-#: ../shell/e-shell-view.c:789
-msgid "The window to which the shell view belongs"
-msgstr "ਵਿੰਡ�, �ਿਸ ਵਿੱ� ਸ਼�ੱਲ �ਲ� ਸ਼�ਰ� ਹ�ਵ���"
-
-#: ../shell/e-shell-view.c:805
-msgid "The key file holding widget state data"
-msgstr "��ੰ�� ਫਾ�ਲ, �� ਵਿਦ��ੱ� ਹਾਲਤ ਡਾ�ਾ ਰੱ�ਦ� ਹ�"
-
-#: ../shell/e-shell-view.c:820
-msgid "The title of the shell view"
-msgstr "ਸ਼�ੱਲ �ਲ� ਦਾ �ਾ��ਲ"
-
-#: ../shell/e-shell-view.c:834
-msgid "Current View ID"
-msgstr "ਮ���ਦਾ �ਲ� ID"
-
-#: ../shell/e-shell-view.c:835
-msgid "The current GAL view ID"
-msgstr "ਮ���ਦਾ GAL �ਲ� ID"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -19740,404 +19719,301 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�ੱਬਸਾ��"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Bug Buddy is not installed."
 msgstr "ਬੱ� ਬੱਡ� �ੰਸ�ਾਲ ਨਹ�� ਹ�।"
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1238
 msgid "Bug Buddy could not be run."
 msgstr "ਬੱ� ਬੱਡ� ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
 
-#: ../shell/e-shell-window-actions.c:1343
-msgid "GNOME Pilot is not installed."
-msgstr "�ਨ�ਮ ਪਾ�ਲ� �ੰਸ�ਾਲ ਨਹ�� ਹ�।"
-
-#: ../shell/e-shell-window-actions.c:1345
-msgid "GNOME Pilot could not be run."
-msgstr "�ਨ�ਮ ਪਾ�ਲ� ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
-
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1419
 msgid "Show information about Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਬਾਰ� �ਾਣ�ਾਰ� ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1438
 msgid "_Close Window"
 msgstr "ਵਿੰਡ� ਬੰਦ �ਰ�(_C)"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1445
 msgid "_Contents"
 msgstr "ਸਮੱ�ਰ�(_C)"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1447
 msgid "Open the Evolution User Guide"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਯ��਼ਰ �ਾ�ਡ ��ਲ�ਹ�"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1473
 msgid "Evolution _FAQ"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਸਵਾਲ-�ਵਾਬ(_F)"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1475
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "�ਮ ਪ�ੱ�� �ਾ�ਦ� ਸਵਾਲਾ� ਲ� ਵ�ੱਬ-ਪ��਼ ��ਲ�ਹ�"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1480
 msgid "_Forget Passwords"
 msgstr "ਪਾਸਵਰਡ ਭ�ੱਲ �ਾ�(_F)"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1482
 msgid "Forget all remembered passwords"
 msgstr "ਸਭ ਯਾਦ ਰੱ�� ਪਾਸਵਰਡ ਭ�ੱਲ �ਾ�"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1487
 msgid "I_mport..."
 msgstr "�ੰਪ�ਰ� �ਰ�(_m)..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1489
 msgid "Import data from other programs"
 msgstr "ਹ�ਰ �ਾਰ�ਾ� ਤ�� ਡਾ�ਾ �ੰਪ�ਰ� �ਰ�"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1494
 msgid "New _Window"
 msgstr "ਨਵ�� ਵਿੰਡ�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1496
 msgid "Create a new window displaying this view"
 msgstr "�ਸ �ਲ� ਨ�ੰ ਵ��ਾ�ਣ ਲ� ਨਵ�� ਵਿੰਡ� ਬਣਾ�"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1510
 msgid "Configure Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਸੰਰ�ਨਾ"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1515
 msgid "_Quick Reference"
 msgstr "ਤਰ�ੰਤ ਹਵਾਲਾ(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1517
 msgid "Show Evolution's shortcut keys"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਦ� ਸ਼ਾਰ��ੱ� ��ੰ���� ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1524
 msgid "Exit the program"
 msgstr "ਪਰ��ਰਾਮ ਬੰਦ �ਰ�"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1529
 msgid "_Advanced Search..."
 msgstr "ਤ�ਨ��� ���(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1531
 msgid "Construct a more advanced search"
 msgstr "ਹ�ਰ ਵ� ਤ�ਨ��� ��� ਬਣਾ�"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1538
 msgid "Clear the current search parameters"
 msgstr "ਮ���ਦਾ ��� ਪ�ਰਾਮ��ਰ ਸਾਫ਼ �ਰ�"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1543
 msgid "_Edit Saved Searches..."
 msgstr "ਸੰਭਾਲ� ��� ਵਿੱ� ਸ�ਧ(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1545
 msgid "Manage your saved searches"
 msgstr "�ਪਣ� ਸੰਭਾਲ� ��� ਦਾ ਪਰਬੰਧ �ਰ�"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1552
 msgid "Click here to change the search type"
 msgstr "��� �ਾ�ਪ ਬਦਲਣ ਲ� �ਲਿੱ� �ਰ�"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1557
 msgid "_Find Now"
 msgstr "ਹ�ਣ ���(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1559
 msgid "Execute the current search parameters"
 msgstr "ਮ���ਦਾ ��� ਪ�ਰਾਮ��ਰ �ਲਾ�"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1564
 msgid "_Save Search..."
 msgstr "��� ਸੰਭਾਲ�(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1566
 msgid "Save the current search parameters"
 msgstr "ਮ���ਦਾ ��� ਪ�ਰਾਮ��ਰ ਸੰਭਾਲ�"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1578
 msgid "Send / _Receive"
 msgstr "ਭ��� / ਲਵ�(_R)"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1580
 msgid "Send queued items and retrieve new items"
 msgstr "�ਤਾਰਬੱਧ ���ਮਾ� ਭ��� �ਤ� ਨਵ�� ���ਮਾ� ਪ�ਰਾਪਤ �ਰ�"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1585
 msgid "Submit _Bug Report..."
 msgstr "ਬੱ� �ਾਣ�ਾਰ� ਦਿ�(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1587
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ਬੱ� ਬੱਡ� ਵਰਤ �� ਬੱ� �ਾਣ�ਾਰ� ਭ���"
 
-#: ../shell/e-shell-window-actions.c:1598
-msgid "GNOME Pilot _Synchronization..."
-msgstr "�ਨ�ਮ ਪਾ�ਲ� ਸ��ਰ�ਨਾ��਼(_S)..."
-
-#: ../shell/e-shell-window-actions.c:1600
-msgid "Set up GNOME Pilot configuration"
-msgstr "�ਨ�ਮ ਪਾ�ਲ� ਸੰਰ�ਨਾ ਸ�ੱ��ੱਪ"
-
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1592
 msgid "_Work Offline"
 msgstr "�ਫ਼-ਲਾ�ਨ �ਾ�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1594
 msgid "Put Evolution into offline mode"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਰੱ��"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1599
 msgid "_Work Online"
 msgstr "�ਨ-ਲਾ�ਨ �ਾ�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1601
 msgid "Put Evolution into online mode"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਨਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਰੱ��"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1629
 msgid "Lay_out"
 msgstr "ਲ����(_o)"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1636
 msgid "_New"
 msgstr "ਨਵਾ�(_N)"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1643
 msgid "_Search"
 msgstr "���(_S)"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1650
 msgid "_Switcher Appearance"
 msgstr "ਸਵਿੱ�ਰ ਦਿੱ�(_S)"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1664
 msgid "_Window"
 msgstr "ਵਿੰਡ�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1693
 msgid "Show Side _Bar"
 msgstr "ਸਾ�ਡ-ਬਾਰ ਵ���(_B)"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show the side bar"
 msgstr "ਸਾ�ਡ-ਬਾਰ ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1701
 msgid "Show _Buttons"
 msgstr "ਬ�ਨ ਵ���(_B)"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show the switcher buttons"
 msgstr "ਸਵਿੱ�ਰ ਬ�ਨ ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1709
 msgid "Show _Status Bar"
 msgstr "ਹਾਲਤ ਪੱ�� ਵ���(_S)"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show the status bar"
 msgstr "ਹਾਲਤ ਪੱ�� ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1717
 msgid "Show _Tool Bar"
 msgstr "��ਲਬਾਰ ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1719
 msgid "Show the tool bar"
 msgstr "��ਲਬਾਰ ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1741
 msgid "_Icons Only"
 msgstr "���ਾਨ ਹ�(_I)"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1743
 msgid "Display window buttons with icons only"
 msgstr "ਵਿੰਡ� ਬ�ਨ ਨਾਲ ���ਾਨ ਹ� ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1748
 msgid "_Text Only"
 msgstr "ਸਿਰ� ���ਸ�(_T)"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1750
 msgid "Display window buttons with text only"
 msgstr "ਵਿੰਡ� ਬ�ਨ ਨਾਲ ���ਸ� ਹ� ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1755
 msgid "Icons _and Text"
 msgstr "���ਾਨ �ਤ� ���ਸ�(_a)"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Display window buttons with icons and text"
 msgstr "ਵਿੰਡ� ਬ�ਨਾ� ਨਾਲ ���ਾਨ �ਤ� ���ਸ� ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1762
 msgid "Tool_bar Style"
 msgstr "��ਲਬਾਰ ਸ�ਾ�ਲ(_b)"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1764
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "ਵਿੰਡ� ਬ�ਨ ਡ�ਸ��ਾਪ ��ਲਬਾਰ ਸ��ਿੰ� ਨਾਲ ਵ���"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Define Views..."
 msgstr "�ਲ� ਪ�ਰਭਾਸ਼ਿਤ �ਰ�..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Create or edit views"
 msgstr "ਵਿ� ਬਣਾ� �ਾ� ਸ�ਧ"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Save Custom View..."
 msgstr "�ਸ�ਮ �ਲ� ਸੰਭਾਲ�..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Save current custom view"
 msgstr "ਮ���ਦਾ �ਸ�ਮਾ��਼ ਵਿ� ਸੰਭਾਲ�"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1788
 msgid "C_urrent View"
 msgstr "ਮ���ਦਾ �ਲ�(_u)"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Custom View"
 msgstr "�ਸ�ਮ �ਲ�"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1800
 msgid "Current view is a customized view"
 msgstr "ਮ���ਦਾ �ਲ� �ੱ� �ਸ�ਮਾ��਼ �ਲ� ਹ�"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1810
 msgid "Change the page settings for your current printer"
 msgstr "�ਪਣ� ਮ���ਦਾ ਪਰਿੰ�ਰ ਲ� ਸਫ਼ਾ ਸ��ਿੰ� ਬਦਲ�"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2183
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ਲ� ਤਬਦ�ਲ"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2396
 msgid "Execute these search parameters"
 msgstr "�ਹ ��� ਪ�ਰਾਮ��ਰ �ਲਾ�"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:576
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - �ਵ�ਲ�ਸ਼ਨ"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:416
 msgid "New"
 msgstr "ਨਵਾ�"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "ਸਰ�ਰਮ ਸ਼�ੱਲ �ਲ�"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "ਸਰ�ਰਮ ਸ਼�ੱਲ �ਲ� ਦਾ ਨਾ�"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "ਸ਼�ੱਲ ਵਿੰਡ� ਦਾ EFocusTracker"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "��ਮ��ਰ�"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "ਸ਼�ਰ��ਤ� ਵਿੰਡ� ��ਮ��ਰ� ਲਾ�ਨ"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "ਸ�ਰੱ�ਿ�ਤ ਢੰ�"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "�� ਸ�ੱਲ ਵਿੰਡ� ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਵਿੱ� ਹ�"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "ਬਾਹ� ਵ���"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "�� ਸ਼�ੱਲ ਵਿੰਡ� ਦ� ਬਾਹ� ਵ��ਣ� ਹ�"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "ਸਵਿੱ�ਰ ਵ���"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "�� ਸ਼�ੱਲ ਵਿੰਡ� ਦ� ਸਵਿੱ�ਰ ਬ�ਨ ਵ��ਣ� ਹਨ"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "�ਾਸ�ਬਾਰ ਵ���"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "�� ਸ਼�ੱਲ ਵਿੰਡ� ਦ� �ਾਸ� ਬਾਰ ਵ��ਣ� ਹ�"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "�� ਸ਼�ੱਲ ਵਿੰਡ� ਦਾ ��ਲ ਬਾਰ ਵ��ਾ� ਦ�ਵ�"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "UI ਮ�ਨ��ਰ"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "ਸ਼�ੱਲ ਵਿੰਡ� GtkUIManager"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:226
 msgid "Preparing to go offline..."
 msgstr "�ਫਲਾ�ਨ �ਾਣ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:276
 msgid "Preparing to go online..."
 msgstr "�ਨਲਾ�ਨ �ਾਣ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:335
 msgid "Preparing to quit..."
 msgstr "ਬੰਦ �ਰਨ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "ਮ�ਡ��ਲ ਡਾ�ਰ���ਰ�"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "ਡਾ�ਰ���ਰ�, �ਿਸ ਵਿੱ��� �ਮ�ਡ��ਲ ਲ�ਡ ਹ�ੰਦ� ਹਨ"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "ਨ�ੱ�ਵਰ� �ਪਲੱਬਧ ਹ�"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "�� ਨ�ੱ�ਵਰ� �ਪਲੱਬਧ ਹ�ਵ�"
-
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "�ਨਲਾ�ਨ"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "�� ਸ਼�ੱਲ �ਨਲਾ�ਨ ਹ�"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:180
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20172,7 +20048,7 @@ msgstr ""
 "ਸਾਨ�ੰ �ਮ�ਦ ਹ� ਮਿੱਤਰ ਤ�ੰ ਸਾਡ� ਮ�ਹਨਤ ਦਾ �ਨੰਦ ਮਾਣ��ਾ �ਤ� �ਸ�� ਤ�ਰ� �ਸ ਸਹਿਯ�� ਦਾ\n"
 "ਤਹਿ ਦਿਲ�� ਧੰਨਵਾਦ �ਰਦ� ਹਾ�\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:204
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20180,59 +20056,55 @@ msgstr ""
 "ਧੰਨਵਾਦ\n"
 "�ਵ�ਲ�ਸ਼ਨ ��ਮ\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:211
 msgid "Do not tell me again"
 msgstr "ਮ�ਨ�ੰ ਮ�� ਨਾ ਦੱਸ�"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:327
 msgid "Start Evolution activating the specified component"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ੱ� �ਾਸ ਭਾ� ਦ� ਸਰ�ਰਮ� ਨਾਲ ਸ਼�ਰ� ਹ� ਰਹ� ਹ�"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:329
 msgid "Apply the given geometry to the main window"
 msgstr "ਦਿੱਤ� ��ਮ��ਰ� ਮ�ੱ� ਵਿੰਡ� �ੱਤ� ਲਾ�� �ਰ�"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:333
 msgid "Start in online mode"
 msgstr "�ਨਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:335
 msgid "Start in \"express\" mode"
 msgstr "\"��ਸਪ�ਰ�ਸ\" ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:338
 msgid "Forcibly shut down Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਧੱ�� ਨਾਲ ਬੰਦ �ਰ�"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ੧.੪ ਤ�� ਮ�ਬ�ਰ �ਰ�� ਵਾਪਿਸ"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:341
 msgid "Send the debugging output of all components to a file."
 msgstr "ਸਾਰ� ਭਾ�ਾ� ਦ� ਡ�ਬੱ� ���ਪ�ੱ� �ੱ� ਫਾ�ਲ ਵਿੱ� ਭ���।"
 
-#: ../shell/main.c:342
+#: ../shell/main.c:343
 msgid "Disable loading of any plugins."
 msgstr "��� ਪਲੱ�-�ਨ ਲ�ਡ ਤ�� ਰ�� ਹ�।"
 
-#: ../shell/main.c:344
+#: ../shell/main.c:345
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ਮ�ਲ, ਸੰਪਰ� �ਤ� �ੰਮ ਲ� �ਲ� ਪ�ਨ �ਯ�� �ਰ�।"
 
-#: ../shell/main.c:348
+#: ../shell/main.c:349
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "URI �ਾ� ਬਾ�� ਦ� �ਰ��ਮ��� ਵ��� ਦਿੱਤ� ਫਾ�ਲ ਨਾ� �ੰਪ�ਰ� �ਰ�"
 
-#: ../shell/main.c:350
+#: ../shell/main.c:351
 msgid "Request a running Evolution process to quit"
 msgstr "�ੱਲਦ� �ਵ�ਲਸ਼ਨ ਪਰ�ਸ�ਸ ਨ�ੰ ਬੰਦ �ਰਨ ਦ� ਮੰ�"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:475 ../shell/main.c:483
 msgid "- The Evolution PIM and Email Client"
 msgstr "- �ਵ�ਲ�ਸ਼ਨ PIM �ਤ� �-ਮ�ਲ �ਲਾ��"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:545
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20246,96 +20118,44 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "�� ਤ�ਸ�� ਸਭ ਯਾਦ ਰੱ�� ਹ�� ਪਾਸਵਰਡ ਭ�ੱਲਣ ਲ� ਤਿ�ਰ ਹ�?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "�ਾਰ�"
+#| msgid "Delete old data from version {0}?"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "ਵਰ�ਨ {0} ਤ�� ਸਿੱਧਾ �ੱਪ�ਰ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "ਵਰ�ਨ {0} ਦਾ ਪ�ਰਾਣਾ ਡਾ�ਾ ਹ�ਾ�?"
+#| msgid "Continue"
+msgid "Continue Anyway"
+msgstr "�ਿਵ�� ਵ� �ਾਰ� ਰੱ��"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "ਤ�ਹਾਡ� ਪਾਸਵਰਡ ਭ�ੱਲਣ ਨਾਲ ਸਭ ਪਾਸਵਰਡਾ� ਨ�ੰ ਸਾਫ਼ �ਰ ਦਿੱਤਾ �ਾਵ��ਾ। ਤ�ਹਾਨ�ੰ �ਦ�� �ਹਨਾ� ਦ� ਲ�� ਪ� ਤਾ� "
 "ਮ�� ਪ�ੱ�ਿ� �ਾਵ��ਾ।"
 
-#  shell:upgrade-nospace primary
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "�ੱਪ�ਰ�ਡ ਲ� ਲ���ਦ� ਡਿਸ� ਥਾ� ਨਹ�� ਹ�।"
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "�� ਪ�ਰਾਣਾ ਡਾ�ਾ ਹ�ਾ�ਣਾ ਹ�?"
+#| msgid "Quit"
+msgid "Quit Now"
+msgstr "ਹ�ਣ� ਬੰਦ �ਰ�"
 
-#  shell:upgrade-remove-1-4-confirm secondary
 #: ../shell/shell.error.xml.h:8
-msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
-"\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
-msgstr ""
-"ਡਾ�ਰ���ਰ� &quot;evolution&quot; ਦ� ਭਾ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�ਣ ਲ� ਤਿ�ਰ ਹਨ।\n"
-"\n"
-"�ਹ ਸਲਾਹ ਦਿੱਤ� �ਾਦ� ਹ� �ਿ ਤ�ਸ�� �ਪਣ� ਪੱਤਰ, ਸੰਪਰ� ਤ� ��ਲੰਡਰ ਡਾ�ਾ, �� ਵ� ਮ���ਦ ਹ�, ਦ� ��ਦ �ਾ�� "
-"�ਰ ਲਵ� �ਤ� �ਹ ਵ� �� �ਵ�ਲ�ਸ਼ਨ �ਸ ਪ�ਰਾਣ� ਡਾ�ਾ ਨਾਲ ਪਹਿਲਾ� ਠ�� �ੰਮ �ਰਦਾ ਸ�।\n"
-"\n"
-"�ੱ� ਵਾਰ ਹ�ਾ�ਣ ਬਾ�ਦ ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਦ� ਪ�ਰਾਣ� ਵਰ�ਨ ਨ�ੰ ਵਾਪਿਸ ਨਹ�� ਲਿ� ਸ�ਦ� ਹ�, �ਦ�� ਤੱ� ਤ�ਸ�� ��ਦ "
-"ਨਾ ਵਰਤ��।\n"
-
-#: ../shell/shell.error.xml.h:14
-msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
-msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਦ� ਪ�ਰਾਣ� ਵਰ�ਨ ਨ� ਡਾ�ਾ �ਿਸ� ਵੱ�ਰ� �ਿ�ਾਣ� �ੱਤ� ਸੰਭਾਲਿ� ਸ�।\n"
-"\n"
-"���ਰ ਤ�ਸ�� �ਹ ਡਾ�ਾ ਹ�ਾ�ਣ ਲ� ��ਣਿ� ਤਾ� &quot;evolution&quot; ਡਾ�ਰ���ਰ� ਨ�ੰ ਹਮ�ਸ਼ਾ ਲ� "
-"ਹ�ਾ ਦਿੱਤਾ �ਾਵ��ਾ। ���ਰ ਤ�ਸ�� �ਸ ਡਾ�ਾ ਨ�ੰ ਰੱ�ਣ ਲ� ��ਣਿ�, ਤਾ� ਤ�ਸ�� �ਪਣ� �ਿੰਮ�ਵਾਰ� �ੱਤ� &quot;"
-"evolution&quot;ਦ� ਭਾ� ਹ�ਾ ਸ�ਦ� ਹ�।\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "ਪ�ਰਾਣ� ਵਰ�ਨ �ੱਤ� �ੱਪ�ਰ�ਡ ਫ�ਲ�ਹ:"
 
-#: ../shell/shell.error.xml.h:19
-msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"ਤ�ਹਾਡ� ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ਦ� �ੱਪਡ�� ਨ�ੰ {0} ਡਿਸ� ਥਾ� ਦ� ਲ�� ਹ�, ਪਰ ਤ�ਹਾਡ� ��ਲ ਸਿਰਫ਼ {1} �ਪਲੱਬਧ "
-"ਹ�।\n"
-"\n"
-"ਤ�ਹਾਨ�ੰ �ਾਰ� ਰੱ�ਣ ਲ� �ਪਣ� �ਰ ਡਾ�ਰ���ਰ� ਵਿੱ� ਹ�ਰ ਥਾ� ਬਣਾ�ਣ ਦ� ਲ�� ਹ�।"
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "ਭ�ੱਲ�(_F)"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "ਡਾ�ਾ ਰੱ��(_K)"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "ਮ�ਨ�ੰ ਬਾ�ਦ ਵਿੱ� ਯਾਦ �ਰਵਾ�(_R)"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20427,7 +20247,7 @@ msgstr "ਸ਼�ਸ਼ਨ ਪਰਬੰਧ ��ਣਾ�:"
 msgid "Show session management options"
 msgstr "ਸ਼�ਸ਼ਨ ਪਰਬੰਧ ��ਣਾ� ਵ���"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20456,67 +20276,78 @@ msgstr ""
 "�ਿ��ਿ ਤ�ਸ�� ਸਰ��ਫਿ��� ਪ�ਰਮਾਣਿ�ਤਾ ਤ� ਭਰ�ਸਾ ਨਹ�� �ਰਦ�, ਸ� ਤ�ਸ� �ਸ ਸਰ��ਫਿ��� ਤ� ਭਰ�ਸਾ ਨਹ�� �ਰ "
 "ਸ�ਦ� ਹ�, �ਦ�� ਤੱ� �ਿ ਦਿ�ਾ�� ਨਾ �ਿ� ਹ�ਵ�"
 
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:148
+#: ../smime/gui/certificate-manager.c:460
+#: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
 msgstr "�ਯਾਤ �ਰਨ ਲ� ਸਰ��ਫਿ��� ��ਣ�..."
 
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
 msgstr "ਸਭ PKCS12 ਫਾ�ਲਾ�"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
 msgid "All files"
 msgstr "ਸਭ ਫਾ�ਲਾ�"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+#| msgid "Imported Certificate"
+msgid "Failed to import user's certificate"
+msgstr "ਯ��਼ਰ ਦਾ ਸਰ��ਫਿ��� �ੰਪ�ਰ� �ਰਨ ਲ� ਫ�ਲ�ਹ"
+
+#: ../smime/gui/certificate-manager.c:352
+#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:808
 msgid "Certificate Name"
 msgstr "ਸਰ��ਫਿ��� ਨਾ�"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
 msgid "Purposes"
 msgstr "ਮ�ਸਦ"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "�ਰਮ �ੰ�"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:378
 msgid "Expires"
 msgstr "ਮਿ�ਦ"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
 msgid "All email certificate files"
 msgstr "ਸਭ �ਮ�ਲ ਸਰ��ਫਿ��� ਫਾ�ਲਾ�"
 
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+#| msgid "Failed to delete contact"
+msgid "Failed to import contact's certificate"
+msgstr "ਸੰਪਰ� ਦ� ਸਰ��ਫਿ��� �ੰਪ�ਰ� �ਰਨ ਲ� ਫ�ਲ�ਹ"
+
+#: ../smime/gui/certificate-manager.c:583
 msgid "E-Mail Address"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ"
 
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
 msgid "All CA certificate files"
 msgstr "ਸਭ CA ਸਰ��ਫਿ��� ਫਾ�ਲਾ�"
 
-#: ../smime/gui/certificate-manager.c:1050
-msgid "Certificates"
-msgstr "ਸਰ��ਫਿ���"
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr "ਸਰ��ਫਿ�� �ਥਾਰ�� ਦਾ ਸਰ��ਫਿ��� �ੰਪ�ਰ� �ਰਨ ਲ� ਫ�ਲ�ਹ"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "ਸਰ��ਫਿ��� ਦਰਸ਼�: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "`%s' ਲ� ਪਾਸਵਰਡ ਭਰ�"
+#| msgid "Enter the password for `%s'"
+msgid "Enter the password for '%s'"
+msgstr "'%s' ਲ� ਪਾਸਵਰਡ ਦਿ�"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -20547,7 +20378,7 @@ msgstr ""
 "�ਸ ਨ� �ਾਰ� ��ਤਾ:\n"
 "  ਵਿਸ਼ਾ: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "ਸਰ��ਫਿ��� ��ਣ�"
 
@@ -20560,14 +20391,11 @@ msgid "Authorities"
 msgstr "ਪ�ਰਮਾਣ�ਤਾ"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "ਬ���ਪ"
+#| msgid "Backup All"
+msgid "Backup _All"
+msgstr "ਸਭ ਬ���ੱਪ ਲਵ�(_A)"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "ਸਭ ਦਾ ਬ���ੱਪ"
-
-#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20575,161 +20403,154 @@ msgstr ""
 "�ਿਸ� �ੰਮ ਲ� �ਸ CA ਤ� ਭਰ�ਸਾ �ਰਨ ਤ�� ਪਹਿਲਾ� ਤ�ਹਾਨ�ੰ �ਸ ਦਾ ਸਰ��ਫਿ��� ਵ�� ਲ�ਣਾ �ਾਹ�ਦਾ ਹ� �ਤ� �ਸ "
 "ਦ��� ਪਾਲਸ��� ਤ� ਹਦਾ�ਤਾ� �ਾ�� ਲਵ�।"
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "ਸਰ��ਫਿ��� ਪ�ਰਮਾਣਿ�ਤਾ �ਾ��"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "ਸਰ��ਫਿ��� ��ਤਰ"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "ਸਰ��ਫਿ��� ਲ��"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "ਸਰ��ਫਿ��� ਵ�ਰਵਾ"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "ਸਰ��ਫਿ��� ��ਬਲ"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "�ਮ ਨਾ� (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "ਸੰਪਰ� ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "�ਸ ਸਰ��ਫਿ��� ਦ� ਪਰ�ਮਾਣ�ਿਤਾ ਤ� ਭਰ�ਸਾ ਨਾ �ਰ�"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "ਸ�ਧ"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "�-ਮ�ਲ ਸਰ��ਫਿ��� ਪ�ਰਮਾਣ�ਿਤਾ ਸ��ਿੰ�"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "�-ਮ�ਲ ਪ�ਰਾਪਤ� ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "�-ਮ�ਲ ਦਸਤ�ਤ� ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "ਮਿ�ਦ"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "��ਤਰ ਮ�ੱਲ"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "ਫਿੰ�ਰਪਰਿੰ�"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "�ੰਪ�ਰ�"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "�ਾਰ� ��ਤਾ ਵਲ��"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "�ਾਰ� �ਰਨ ਦ� ਮਿਤ�"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "�ਸ ਨ�ੰ"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "MD੫ ਫਿੰ�ਰਪਰਿੰ�"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "ਸੰ�ਠਨ (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "ਸੰ�ਠਨ ��ਾ� (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 ਫਿੰ�ਰਪਰਿੰ�"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "SSL �ਲਾ�� ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "SSL ਸਰਵਰ ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "�ਸ ਸਰ��ਫਿ��� ਨ�ੰ �ੱ�� ਦਿੱਤ� ਵਰਤ�� ਲ� �ਾ��ਿ� ਹ�:"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "�ਸ ਸਰ��ਫਿ��� ਦ� ਪ�ਰਮਾਣ�ਿਤਾ ਤ� ਭਰ�ਸਾ"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "�ਸ CA ਤ� �-ਮ�ਲ ਯ��਼ਰਵਾ� ਦ� ਪ�ਾਣ ਲ� ਭਰ�ਸਾ ਰੱ��।"
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "�ਸ CA ਤ� ਸਾਫ�ਵ��ਰ ਵਿ�ਾਸਵਾਦ��� ਦ� ਪ�ਾਣ ਲ� ਭਰ�ਸਾ �ਰ�।"
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
-msgstr "�ਸ CA ਤ� ਵ�ੱਬ ਸਾ��ਾ� ਲ� ਭਰ�ਸਾ ਰੱ��।"
+#: ../smime/gui/smime-ui.ui.h:37
+#| msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify websites."
+msgstr "�ਸ CA �ੱਤ� ਵ�ੱਬ ਸਾ��ਾ� ਲ� ਭਰ�ਸਾ ਰੱ��।"
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "ਵ�ਧਤਾ"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "ਵ���"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "ਤ�ਹਾਡ� ��ਲ ਫਾ�ਲ ਤ� ਸਰ��ਫਿ��� ਹ�ਣ� ਹਨ, �� �ਿ �ਹਨਾ� ਸੰਸਥਾਵਾ� ਦ� ਹਨ �� ਤ�ਹਾਨ�ੰ ਪ�ਾਣਦ��� ਹਨ:"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "ਤ�ਹਾਡ� ��ਲ ਫਾ�ਲ ਤ� ਸਰ��ਫਿ��� ਹ�ਣ� ਹਨ, �� �ਿ �ਹਨਾ� ਸਰ��ਫਿ��� ਪ�ਰਮਾਣ�ਰਤਾ ਪ�ਾਣ �ਰਦ� ਹਨ:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "ਤ�ਹਾਡ� ��ਲ ਫਾ�ਲ ਤ� ਸਰ��ਫਿ��� ਹ�ਣ� ਹਨ, �� �ਿ �ਹਨਾ� ਲ��ਾ� ਦ� ਪ�ਾਣ �ਰਦ� ਹਨ:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "ਤ�ਹਾਡਾ ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+#| msgid "Backup"
+msgid "_Backup"
+msgstr "ਬ���ੱਪ(_B)"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "CA ਭਰ�ਸਾ ਸ�ਧ(_E)"
 
 #  XXX we shouldn't be popping up dialogs in this code.
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:711
+#: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
 msgstr "ਸਰ��ਫਿ��� ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
 
@@ -20772,127 +20593,148 @@ msgstr "PKCS #1 MD੫ RSA ���ਰਿਪਸ਼ਨ ਨਾਲ"
 
 #: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "PKCS #1 SHA-1 RSA ���ਰਿਪਸ਼ਨ ਨਾਲ"
+msgstr "PKCS #1 SHA-1 RSA �ੰ��ਰਿਪਸ਼ਨ ਨਾਲ"
+
+#: ../smime/lib/e-cert.c:639
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 RSA �ੰ��ਰਿਪਸ਼ਨ ਨਾਲ"
+
+#: ../smime/lib/e-cert.c:642
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 RSA �ੰ��ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:645
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 RSA �ੰ��ਰਿਪਸ਼ਨ ਨਾਲ"
+
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA ���ਰਿਪਸ਼ਨ"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "ਸਰ��ਫਿ��� ��ੰ�� ਵਰਤ��"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "ਨ�ੱ�ਸ��ਪ ਸਰ��ਫਿ��� �ਿਸਮ"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "ਸਰ��ਫਿ��� ਪ�ਰਮਾਣ�ਿਤਾ �� ਪ�ਾਣ�ਰਤਾ"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "��ਾ� ਪ�ਾਣ�ਰਤਾ (%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
 msgid "Algorithm Identifier"
 msgstr "�ਲ��ਰਿਥਮ ਪ�ਾਣ�ਰਤਾ"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
 msgid "Algorithm Parameters"
 msgstr "�ਲ��ਰਿਥਮ ਪ�ਰਾਮ��ਰ"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Info"
 msgstr "ਵਿਸ਼ਾ ਸਰਵ�ਨ� �� �ਾਣ�ਾਰ�"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Algorithm"
 msgstr "ਵਿਸ਼� ਦਾ ਸਰਵ�ਨ� �� �ਲ��ਰਿਥਮ"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
 msgid "Subject's Public Key"
 msgstr "ਵਿਸ਼� ਦ� ਸਰਵ�ਨ� ��"
 
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "�ਲਤ�: �ਾਰ� ਵਾਧ� ਲ� �ਸਫਲ"
 
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "�ਬ���� ਦਸਤ�ਤ"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
 msgstr "SSL ਸਰ��ਫਿ��� ਪ�ਰਮਾਣ�ਿਤਾ"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
 msgstr "�-ਮ�ਲ ਸਰ��ਫਿ��� ਪ�ਰਮਾਣ�ਿਤਾ"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
 msgid "Signing"
 msgstr "ਦਸਤ�ਤ"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
 msgid "Non-repudiation"
 msgstr "ਨਾ-�ਨ�ਾਰ"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
 msgid "Key Encipherment"
 msgstr "�� �ਨਸ�ਫ�ਰਮ���"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
 msgid "Data Encipherment"
 msgstr "ਡਾ�ਾ �ਨਸ�ਫ�ਰਮ���"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
 msgid "Key Agreement"
 msgstr "��ੰ�� ��ਰਾਰਨਾਮਾ"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ�"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
 msgstr "CRL ਦਸਤ�ਤ�"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
 msgid "Critical"
 msgstr "ਨਾ�਼��"
 
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "�ਾਤ� ਨਹ��"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
 msgid "Extensions"
 msgstr "ਵਾਧਾ"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1045
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ �ਲ��ਰਿਥਮ"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
 msgstr "�ਾਰ� �ਰਤਾ"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
 msgstr "�ਾਰ� �ਰਤਾ ਵਿਲੱ�ਣ ID"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
 msgid "Subject Unique ID"
 msgstr "ਵਿਸ਼ਾ ਵਿਲੱ�ਣ ID"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ ਮ�ੱਲ"
 
@@ -20981,11 +20823,11 @@ msgid "With _Status"
 msgstr "ਹਾਲਤ ਨਾਲ(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -21014,19 +20856,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "��ਣ(_S)"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "ਭੰਡਾਰ"
-
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%s ਲ� �ਲ� ਪਰਿਭਾਸ਼ਾ"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
 msgid "Define Views"
 msgstr "�ਲ� ਪਰਿਭਾਸ਼ਾ"
 
@@ -21039,11 +20876,7 @@ msgstr "\"%s\" ਲ� �ਲ� ਪਰਿਭਾਸ਼ਿਤ"
 msgid "Table"
 msgstr "��ਬਲ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "ਮ��ਾ"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
 msgid "Save Current View"
 msgstr "ਮ���ਦਾ �ਲ� ਸੰਭਾਲ�"
 
@@ -21055,11 +20888,7 @@ msgstr "ਨਵਾ� �ਲ� ਬਣਾ�(_C)"
 msgid "_Replace existing view"
 msgstr "ਮ���ਦਾ �ਲ� ਤਬਦ�ਲ(_R)"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "ਫ���ਰ�"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "ਨਵ�� �ਲ� ਬਣਾ�"
 
@@ -21079,22 +20908,10 @@ msgstr "�ਲ� ਦ� �ਿਸਮ:"
 msgid "De_fault"
 msgstr "ਮ�ਲ(_f)"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "��ਾ��� ਨਾ�"
-
 #: ../widgets/misc/e-account-tree-view.c:255
 msgid "Protocol"
 msgstr "ਪ�ਰ����ਾਲ"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "�ਾਰਵਾ�"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "����ਮ��� ਵਿਸ਼�ਸਤਾ"
@@ -21112,11 +20929,11 @@ msgstr "MIME �ਾ�ਪ:"
 msgid "_Suggest automatic display of attachment"
 msgstr "ਨੱਥ� ਦਾ ���ਮ��ਿ� �ਲ� ਲ� ਸ��ਾ�(_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "ਬ���ਰਾ��ਡ ਸ�ੱ� ਨਹ�� ��ਤ� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "ਬ���ਰਾ��ਡ ਬਣਾ�(_B)"
 
@@ -21134,13 +20951,13 @@ msgstr "...ਨ�ੰ ਭ���(_S)..."
 msgid "Send the selected attachments somewhere"
 msgstr "��ਣ� ����ਮ��� �ਿਤ� ਭ���"
 
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:495
+#: ../widgets/misc/e-attachment-tree-view.c:535
 msgid "Loading"
 msgstr "ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹ�..."
 
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:507
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Saving"
 msgstr "ਸੰਭਾਲ� �ਾ ਰਹ� ਹ�"
 
@@ -21149,13 +20966,10 @@ msgid "Hide Attachment _Bar"
 msgstr "ਨੱਥ� ਪੱ�� �ਹਲ�(_B)"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:613
 msgid "Show Attachment _Bar"
 msgstr "ਨੱਥ� ਪੱ�� ਵ��ਾ�(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "����ਮ��� ਪੱ�� ਵ���(_A)"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "����ਮ��� ਸ਼ਾਮਲ �ਰ�"
@@ -21172,32 +20986,42 @@ msgstr[1] "����ਮ���ਾ� ਸੰਭਾਲ�"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1808 ../widgets/misc/e-attachment.c:2348
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:346
 msgid "S_ave All"
 msgstr "ਸਭ ਸੰਭਾਲ�(_a)"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:372
 msgid "A_dd Attachment..."
 msgstr "����ਮ��� ਸ਼ਾਮਲ(_d)..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:396
 msgid "_Hide"
 msgstr "�ਹਲ�(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:403
+#| msgid "S_ave All"
+msgid "Hid_e All"
+msgstr "ਸਭ �ਹਲ�(_e)"
+
+#: ../widgets/misc/e-attachment-view.c:410
 msgid "_View Inline"
 msgstr "ਲਾ�ਨ '� ਵ���(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:417
+#| msgid "_View Inline"
+msgid "Vie_w All Inline"
+msgstr "ਸਭ ਲਾ�ਨ '� ਵ���(_w)"
+
+#: ../widgets/misc/e-attachment-view.c:734
 #, c-format
 msgid "Open with \"%s\""
 msgstr "\"%s\" ਨਾਲ ��ਲ�ਹ�"
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:737
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "�ਹ ����ਮ��� %s ਵਿੱ� ��ਲ�ਹ�"
@@ -21206,59 +21030,59 @@ msgstr "�ਹ ����ਮ��� %s ਵਿੱ� ��ਲ�ਹ�"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:1021
 msgid "Attached message"
 msgstr "���� ��ਤਾ ਸ�ਨ�ਹਾ"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
 msgid "A load operation is already in progress"
 msgstr "ਪਹਿਲਾ� ਹ� ਲ�ਡ �ਾਰਵਾ� �ਾਰ� ਹ�।"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
 msgid "A save operation is already in progress"
 msgstr "ਪਹਿਲਾ� ਸੰਭਾਲਣ �ਾਰਵਾ� �ਾਰ� ਹ�।"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1949
 #, c-format
 msgid "Could not load '%s'"
 msgstr "'%s' ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load the attachment"
 msgstr "����ਮ��� ਲ�ਡ ਨਹ�� ��ਤ� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2228
 #, c-format
 msgid "Could not open '%s'"
 msgstr "'%s' ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open the attachment"
 msgstr "����ਮ��� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2666
 msgid "Attachment contents not loaded"
 msgstr "����ਮ��� ਸਮੱ�ਰ� ਲ�ਡ ਨਹ�� ਹ�"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2742
 #, c-format
 msgid "Could not save '%s'"
 msgstr "'%s' ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2745
 #, 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:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
 msgstr "ਲਿੰ� ��ਲ�ਹਣ ਲ� �ੰ�ਰ�ਲ-�ਲਿੱ� �ਰ�"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1255
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21266,65 +21090,6 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "ਮਹ�ਨਾ ��ਲੰਡਰ"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "ਰੰ� ਭਰ�"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "GDK ਰੰ� ਭਰ�"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "ਸ�ਿਪਲ ਭਰ�"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "ਨਿ�ਨਤਮ ���ਾ�"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "ਨਿ�ਨਤਮ ���ਾ�"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "�ਾਲ� ਥਾ�"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�"
@@ -21337,91 +21102,88 @@ msgstr "ਵਰਤਣ ਲ� �ੱ�ਰ ਦਿ�"
 msgid "Other..."
 msgstr "ਹ�ਰ..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "ਮਿਤ� �ਤ� ਸਮਾ�"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "ਮਿਤ� ਦ�ਣ ਲ� ���ਸ� �ੰਦਰਾ�"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "��ਲੰਡਰ ਵ��ਾ�ਣ ਲ� �ਹ ਬ�ਨ ਦਬਾ�"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "ਸਮਾ� ��ਣਨ ਲ� ਲ��ਦਾ ਬ�ਸਾ"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "ਹ�ਣ�(_w)"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 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:698
+#: ../widgets/misc/e-dateedit.c:677
 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:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "�ਲਤ ਤਾਰ�� ਮ�ੱਲ"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "�ਲਤ ਸਮਾ� ਮ�ੱਲ"
 
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:246
 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:255
+#: ../widgets/misc/e-import-assistant.c:263
 msgid "F_ilename:"
 msgstr "ਫਾ�ਲ਼ ਨਾ�(_i):"
 
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:273
 msgid "Select a file"
 msgstr "�ੱ� ਫਾ�ਲ ��ਣ�"
 
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:287
+#: ../widgets/misc/e-import-assistant.c:462
 msgid "File _type:"
 msgstr "ਫਾ�ਲ �ਿਸਮ(_t):"
 
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:330
+#: ../widgets/misc/e-import-assistant.c:913
 msgid "Choose the destination for this import"
 msgstr "�ਸ �ਯਾਤ ਲ� ਨਿਯਤ ਸਥਾਨ ��ਣ�"
 
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:355
 msgid "Choose the type of importer to run:"
 msgstr "�ਲਾ�ਣ ਲ� �ਯਾਤ�ਾਰ ਦ� �ਿਸਮ ��ਣ�:"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:363
 msgid "Import data and settings from _older programs"
 msgstr "ਪ�ਰਾਣ� �ਾਰ� ਤ�� ਡਾ�ਾ �ਤ� ਸ��ਿੰ� �ਯਾਤ �ਰ�"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:371
 msgid "Import a _single file"
 msgstr "�ੱ� ��ਹ�ਰ� ਫਾ�ਲ �ਯਾਤ �ਰ�(_s)"
 
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr "ਫਾ�ਲ ਦ� �ਿਸਮ ��ਣ�, �� ਤ�ਸ�� ਲਿਸ� ਤ�� �ੰਪ�ਰ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�।"
-
-#: ../widgets/misc/e-import-assistant.c:516
+#: ../widgets/misc/e-import-assistant.c:523
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21431,17 +21193,40 @@ msgstr ""
 "iCalendar। ��� ਸ��ਿੰ�, �� �ਿ �ੰਪ�ਰ� ��ਤ� �ਾ ਸ�� ਨਹ�� ਲੱਭ� ਹ�। ���ਰ ਤ�ਸ�� �ਾਹ�ੰਦ� ਹ� ਤਾ� \"ਪਿੱ��"
 "\" ਬ�ਨ ਨ�ੰ ਦਬਾ �� ਮ�� ��ਸ਼ਿਸ �ਰ ਸ�ਦ� ਹ�।"
 
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:770
+#| msgid "_Import"
+msgid "_Cancel Import"
+msgstr "�ੰਪ�ਰ� �ਰਨਾ ਰੱਦ �ਰ�(_C)"
+
+#: ../widgets/misc/e-import-assistant.c:912
+#| msgid "Preview the message to be printed"
+msgid "Preview data to be imported"
+msgstr "�ੰਪ�ਰ� ��ਤ� �ਾਣ ਵਾਲ� ਡਾ�� ਦ� �ਲ� ਵ���"
+
+#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:931
+#: ../widgets/misc/e-import-assistant.c:1281
+#: ../widgets/misc/e-import-assistant.c:1347
+#: ../widgets/misc/e-import-assistant.c:1356
+msgid "Import Data"
+msgstr "�ਾਸ ਡਾ�ਾ"
+
+#: ../widgets/misc/e-import-assistant.c:926
+msgid "Select what type of file you want to import from the list."
+msgstr "ਫਾ�ਲ ਦ� �ਿਸਮ ��ਣ�, �� ਤ�ਸ�� ਲਿਸ� ਤ�� �ੰਪ�ਰ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�।"
+
+#: ../widgets/misc/e-import-assistant.c:1271
+#: ../widgets/misc/e-import-assistant.c:1305
 msgid "Evolution Import Assistant"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ੰਪ�ਰ� ਸਹਾ��"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1288
+#: ../widgets/misc/e-import-assistant.c:1335
 msgid "Import Location"
 msgstr "�ੰਪ�ਰ� �ਿ�ਾਣਾ"
 
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1299
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21451,32 +21236,27 @@ msgstr ""
 "�ਸ ਸਹਾ�� ਨਾਲ ਤ�ਸ� ਬਾਹਰ� ਫਾ�ਲਾ� �ਵ�ਲ�ਸ਼ਨ ਤ� �ੰਪ�ਰ� \n"
 "�ਰ ਸ�ਦ� ਹ�।"
 
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1313
 msgid "Importer Type"
 msgstr "�ੰਪ�ਰ�ਰ �ਿਸਮ"
 
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1321
 msgid "Select Information to Import"
 msgstr "�ੰਪ�ਰ� �ਰਨ ਲ� �ਾਣ�ਾਰ� ��ਣ�"
 
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1328
 msgid "Select a File"
 msgstr "ਫਾ�ਲ ��ਣ�"
 
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1342
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਫਾ�ਲ �ੰਪ�ਰ� �ਰਨ ਲ� \"ਲਾ�� �ਰ�\" �ੱਤ� �ਲਿੱ� �ਰ�।"
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "�ਾਸ ਡਾ�ਾ"
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "ਸੰਸਾਰ ਨ�ਸ਼ਾ"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21496,55 +21276,7 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�। 
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�। �ਸ ਬ�ਨ ਨ�ੰ �ਨਲਾ�ਨ �ਾਣ ਲ� ਵਰਤ��।"
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "ਬ�ਨ ਹਾਲਤ �ਨਲਾ�ਨ ਹ�"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "�ਿਤਿ�� ਸਥਿਤ�"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਹਰ��ੱ�ਲ ਹ�ਵ�।"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "ਲੰਬ�ਾਰ� ਸਥਿਤ�"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਵਰ���ਲ ਹ�ਵ�।"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "�ਨ�ਪਾਤ"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "੨�� ਬਾਹ� ��ਾਰ ਦਾ �ਨ�ਪਾਤ"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "ਸਥਿਰ ਮ��-��ਾਰ"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "੨�� ਬਾਹ� ��ਾਰ ਬਦਲਣ ਦ�ਰਾਨ ਸਥਿਰ ਰੱ��"
-
-#: ../widgets/misc/e-pilot-settings.c:95
-msgid "Sync with:"
-msgstr "ਸ��ਰ� �ਰ�:"
-
-#: ../widgets/misc/e-pilot-settings.c:103
-msgid "Sync Private Records:"
-msgstr "ਨਿੱ�� ਰਿ�ਾਰਡ ਸਿ�ਰ�ਨਾ��਼:"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "���ਾ�ਰ� ਸਿ�ਰ�ਨਾ��਼:"
-
-#: ../widgets/misc/e-preferences-window.c:218
+#: ../widgets/misc/e-preferences-window.c:276
 msgid "Evolution Preferences"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਸੰਦ"
 
@@ -21554,68 +21286,46 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਸੰਦ"
 msgid "Matches: %d"
 msgstr "ਮਿਲਦਾ: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "�ਹ ਪੱ�� ਬੰਦ �ਰ�"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "���(_d):"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "��� ਸਾਫ਼ �ਰ�"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "ਪਿੱ��(_P)"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "ਸ਼ਬਦ ਦ� ਪਿ�ਲ� ਮ���ਦ�� ਲੱਭ�"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "�ੱ��(_N)"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "ਸ਼ਬਦ ਦ� ��ਲ� ਮ���ਦ�� ਲੱਭ�"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "ਮਿਲਦ� ਸਭ(_c)"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 msgid "Reached bottom of page, continued from top"
 msgstr "ਪ��਼ ਦ� �ੰਤ �ੱਤ� ਪ�ੱ��, �ੱਤ� ਤ�� �ਾਰ� ਰੱ�ਿ�"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "ਪ��਼ ਦ� �ੱਤ� ਪ�ੱ��, ਹ�ਠਾ� ਤ�� ਫ�ਰ �ਾਰ�"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "�ਰਸਰ �ਤਾਰ"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "�ਰਸਰ �ਾਲਮ"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "��ਰਮਬੱਧ�"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "��ਣ ਢੰ�"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "�ਰਸਰ ਢੰ�"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "ਹ�ਾ�ਣ ਤ�(_l):"
@@ -21688,43 +21398,48 @@ msgstr "�ਦ�� ਮ��ੰਮਲ(_m):"
 msgid "When decli_ned:"
 msgstr "�ਦ�� �ਨ�ਾਰ ਹ�ਵ�(_n):"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "ਵਿੱ�(_t)"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "ਬਾ�ਦ(_A):"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+#| msgid "_After:"
+msgid "_After"
+msgstr "ਬਾ�ਦ(_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "ਸਭ �ਾਣ�ਾਰ�(_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "ਵਰ���ਰਨ(_C):"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "ਦ�ਰ ਸ�ਨ�ਹਾ ਵੰਡ(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "ਪਹ�ੰ��(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "ਮਿ�ਦ ਮਿਤ� ਸ�ੱ�(_S)"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "�ਦ-ਤੱ�(_U):"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+#| msgid "_Until:"
+msgid "_Until"
+msgstr "�ਦ ਤੱ�(_U)"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "�ਦ�� ਠ�� ਲੱ��(_W)"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "�ਦ�� ��ਲ�ਹਿ� �ਾਵ�(_W):"
 
@@ -21782,41 +21497,41 @@ msgstr "ਸ��ਰਿਪ� ਫਾ�ਲ �ੱਲਣਯ�� ਹ�ਣ� 
 msgid "Click here to go to URL"
 msgstr "URL �ੱਤ� �ਾਣ ਲ� �ੱਥ� ਦਬਾ�"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Copy Link Location"
 msgstr "ਲਿੰ� �ਿ�ਾਣ� ਦ� ਨ�ਲ(_C)"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:371
 msgid "Copy the link to the clipboard"
 msgstr "ਲਿੰ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Open Link in Browser"
 msgstr "ਲਿੰ� ਬਰਾ��਼ਰ ਵਿੱ� ��ਲ�ਹ�(_O)"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:381
 msgid "Open the link in a web browser"
 msgstr "ਲਿੰ� ਵ�ੱਬ ਬਰਾ��਼ਰ ਵਿੱ� ��ਲ�ਹ�"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:389
 msgid "_Copy Email Address"
 msgstr "�ਮ�ਲ �ਡਰ�ੱਸ �ਾਪ� �ਰ�(_C)"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
 msgid "Select all text and images"
 msgstr "ਸਭ ���ਸ� �ਤ� �ਿੱਤਰ ��ਣ�"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
+#: ../widgets/misc/e-web-view.c:854
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ਨ�ੰ �ਾਲ �ਰਨ ਲ� �ਲਿੱ� �ਰ�"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:856
 msgid "Click to hide/unhide addresses"
 msgstr "�ਡਰ�ੱਸ �ਹਲ�/ਵ��ਾ�ਣ ਲ� ਦਬਾ�"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ��ਲ�ਹਣ ਲ� �ਲਿੱ� �ਰ�"
@@ -21835,7 +21550,7 @@ msgstr "��ਲੰਡਰ: %s ਤ�� %s ਤੱ�"
 msgid "evolution calendar item"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ��ਾ�"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "ਪ�ਪ�ੱਪ ਲਿਸ�"
 
@@ -21853,7 +21568,7 @@ msgstr "��� ਨਹ��"
 msgid "OK"
 msgstr "ਠ�� ਹ�"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "ਸਮ�� ਦਾ ਫਾਰਮ�� �ੰ� ਦਾ ਹ�ਣਾ ਲਾ�ਮ� ਹ�: %s"
@@ -21862,48 +21577,12 @@ msgstr "ਸਮ�� ਦਾ ਫਾਰਮ�� �ੰ� ਦਾ ਹ�ਣਾ ਲ
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ਪ�ਰਤ�ਸ਼ਤ �ਾਸ ਤ�ਰ ਤ� ੦ ਤ� ੧੦੦ ਦ� ਦਰਮਿ�ਨ ਹ�ਣ� ਲਾ�ਮ� ਹ�"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "��ਣ� �ਾਲਮ"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "���ਦਰਿਤ �ਾਲਮ"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "ਨਾ-��ਣਿ� �ਾਲਮ"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "�ਾਲਮ ਵਿੰਨ�"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "�ਾਲਮ ਹ�ਠ ਲਾ�ਨ"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "���ਾ �ਾਲਮ"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "�ਾਲਮ ਰੰ�"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "BG ਰੰ� �ਾਲਮ"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "ਸ਼ਾਮਲ ਲ� �ਲਿੱ� �ਰ�"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "ਸਥਿਤ�"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(ਵੱਧਦਾ �ਰਮ)"
@@ -21920,12 +21599,12 @@ msgstr "ਨਾ ��ਰਮਬੱਧ"
 msgid "No grouping"
 msgstr "��� �ਰ�ੱਪਿੰ� ਨਹ��"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "��ਤਰ ਵ���"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "�ਪਲੱਬਧ ��ਤਰ"
 
@@ -21934,7 +21613,7 @@ msgid "A_vailable Fields:"
 msgstr "�ਪਲੱਬਧ ��ਤਰ(_v):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Ascending"
 msgstr "ਵੱਧਦਾ �ਰਮ"
 
@@ -21947,7 +21626,7 @@ msgid "Clear _All"
 msgstr "ਸਭ ਸਾਫ਼(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Descending"
 msgstr "�ੱ�ਦਾ �ਰਮ"
 
@@ -22007,7 +21686,7 @@ msgstr "�ਹ ਫ�ਲਡਰ ਲ��ਬੱਧ ਵ���(_S):"
 msgid "_Sort..."
 msgstr "ਲ��ਬੱਧ(_S)..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "�ਾਲਮ ਸ਼ਾਮਲ"
 
@@ -22019,247 +21698,114 @@ msgstr ""
 "�ਪਣ� ��ਬਲ ਵਿੱ� �ੱ� �ਾਲਮ ਨ�ੰ ���ਨ ਲ�, �ਸ\n"
 "ਨ�ੰ �ਸ ��ਾ �ੱਤ� ਸ�ੱ� ਦਿ�, �ਿੱਥ� ਤ�ਸ�� ਵ��ਣਾ �ਾਹ�ੰਦ� ਹ�।"
 
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d ���ਮ)"
-msgstr[1] "%s : %s (%d ���ਮਾ�)"
-
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. 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
+#, c-format
+#| msgid "%s : %s (%d item)"
+#| msgid_plural "%s : %s (%d items)"
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s: %s (%d ���ਮ)"
+msgstr[1] "%s: %s (%d ���ਮਾ�)"
+
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d ���ਮ)"
 msgstr[1] "%s (%d ���ਮਾ�)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "ਬਦਲਵਾ� �ਤਾਰ ਰੰ�"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "�ਿਤਿ�� �ਰਿੱਡ ਬਣਾ�"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "ਲੰਬ�ਾਰ� �ਰਿੱਡ ਬਣਾ�"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "ਫ��ਸ �ਿੱ��"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "�ਰਸਰ ਮ�ਡ"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "��ਣ ਮਾਡਲ"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "ਮ�ੱਢਲ� ਲੰਬਾ�"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "��ਸਾਰ �ਤਾਰ ��ਾ�"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "ਸਥਿਰ"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1546
 msgid "Customize Current View"
 msgstr "�ਸ�ਮਾ��਼ ਮ���ਦਾ �ਲ�"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "Sort _Ascending"
 msgstr "ਵੱਧਦਾ ��ਰਮ(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "Sort _Descending"
 msgstr "�ੱ�ਦਾ ��ਰਮ(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "_Unsort"
 msgstr "��ਰ-��ਰਮਬੱਧ(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1576
 msgid "Group By This _Field"
 msgstr "�ਸ ��ਤਰ ਨਾਲ �ਰ�ੱਪ(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Group By _Box"
 msgstr "ਬ�ਸ� ਨਾਲ �ਰ�ੱਪ(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Remove This _Column"
 msgstr "�ਹ �ਾਲਮ ਹ�ਾ�(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Add a C_olumn..."
 msgstr "�ਾਲਮ ਸ਼ਾਮਲ(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1590
 msgid "A_lignment"
 msgstr "��ਸਾਰ(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1593
 msgid "B_est Fit"
 msgstr "ਵਧ�� ਫਿੱ�(_e)"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1596
 msgid "Format Column_s..."
 msgstr "�ਾਲਮ ਫਾਰਮ��(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "Custo_mize Current View..."
 msgstr "�ਸ�ਮਾ��਼ ਮ���ਦਾ �ਲ�(_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1659
 msgid "_Sort By"
 msgstr "ਲ��ਬੱਧ(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1677
 msgid "_Custom"
 msgstr "�ਸ�ਮ(_C)"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "��ਬਲ ਹ�ੱਡਰ"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "��ਬਲ ਮਾਡਲ"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "�ਰਸਰ �ਤਾਰ"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "�ਰਮਬੱਧ �ਾਣ�ਾਰ�"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "ਹਮ�ਸ਼ਾ ����"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "ਸ਼ਾਮਿਲ ਲ� ਦਬਾ�"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "ਵਰ���ਲ �ਤਾਰ �ਾਲ� ਥਾ�"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "�ਤਾਰਾ� ਵਿੱ� ਵਰ���ਲ �ਾਲ� ਥਾ�। �ਸ ਨ�ੰ �ਤਾਰ ਦ� �ੱਤ� ਤ� ਹ�ਠਾ� ���ਿ� �ਾਵ��ਾ।"
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ETree ��ਬਲ �ਡਪ�ਰ"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "ਵਾਪਸ ���"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "ਲਾ�ਨਾ� �ਿੱ�� �ਤ� +/- ਫ�ਲਾ�"
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "ਫ�ਲਾ� ��ਾਰ"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "ਫ�ਲਾ� ਤ�ਰ ਦਾ ��ਾਰ"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "ਪ�ਪ�ੱਪ"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "ਪ�ਪ�ੱਪ �ੱ� �ਾ�ਲਡ"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "ਸ�ਧ"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "�ਸ ਸ�ੱਲ਼ ਸ�ਧਣਾ ਸ਼�ਰ�"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "ਤਬਦ�ਲ"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "ਸ�ੱਲ ਤਬਦ�ਲ"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "ਫ�ਲਾ�"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "�ਸ ਸ�ੱਲ ਵਿੱ� ETree ਰੱ�ਣ ਵਾਲ� �ਤਾਰ ਫ�ਲਾ�"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "ਸਮ���"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "�ਸ ਸ�ੱਲ ਵਿੱ� ETree ਰੱ�ਣ ਵਾਲ� �ਤਾਰ ਸਮ���"
 
@@ -22275,118 +21821,1231 @@ msgstr "ਦਬਾ�"
 msgid "sort"
 msgstr "ਲ��ਬੱਧ"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2533
 msgid "Select All"
 msgstr "ਸਭ ��ਣ�"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2545
 msgid "Input Methods"
 msgstr "�ੰਪ�ੱ� ਢੰ�"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "�ਵ��� ਪ�ਰ�ਸ��ਸਰ"
+#  addressbook:remove-addressbook secondary
+#  addressbook:generic-error primary
+#  addressbook:load-error secondary
+#  addressbook:search-error secondary
+#  mail:session-message-info secondary
+#  mail:session-message-info-cancel secondary
+#  mail:session-message-warning secondary
+#  mail:session-message-warning-cancel secondary
+#  mail:session-message-error secondary
+#  mail:session-message-error-cancel secondary
+#  mail:ask-session-password secondary
+#  mail:filter-load-error secondary
+#~ msgid "{0}"
+#~ msgstr "{0}"
+
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
+#~ msgid "Default Sync Address:"
+#~ msgstr "ਡਿਫਾਲ� ਸਮ�ਾਲ� �ਡਰ�ੱਸ:"
+
+#~ msgid "Could not load address book"
+#~ msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਲ�ਡ ਨਹ�� ��ਤ� �ਾ ਸ��"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "���ਸ�"
+#~ msgid "Could not read pilot's Address application block"
+#~ msgstr "ਪਾ�ਲ� ਦਾ �ਡਰ�ੱਸ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�"
 
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "���ਾ"
+#~ msgid "Web Log:"
+#~ msgstr "ਵ�ਬ ਲਾ�:"
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "ਵਿੰਨ�ਹ�"
+#~ msgid "_Web Log:"
+#~ msgstr "ਵ�ਬ ਲਾ�(_W):"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "�ੰ�ਰ"
+#~ msgid "Editable"
+#~ msgstr "ਸ�ਧਯ��"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "��ਸਾਰ"
+#~ msgid "Source Book"
+#~ msgstr "ਸਰ�ਤ �ਿਤਾਬ"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "�ਲਿੱਪ ���ਾ�"
+#~ msgid "Target Book"
+#~ msgstr "ਨਿਯਤ �ਿਤਾਬ"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "�ਲਿੱਪ ��ਾ�"
+#~ msgid "Is New Contact"
+#~ msgstr "ਨਵਾ� ਸੰਪਰ� ਹ�"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "�ਲਿੱਪ"
+#~ msgid "Writable Fields"
+#~ msgstr "ਲਿ�ਣਯ�� ��ਤਰ"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "�ਲਿੱਪ �ਤਰਭ�� ਭਰ�"
+#~ msgid "Required Fields"
+#~ msgstr "ਲ���ਦ� ��ਤਰ"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "X �ਫਸ�ੱ�"
+#~ msgid "Changed"
+#~ msgstr "ਤਬਦ�ਲ"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Y �ਫਸ�ੱ�"
+#~ msgid "Shell"
+#~ msgstr "ਸ਼�ੱਲ"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "���ਸ� ���ਾ�"
+#~ msgid "The EShell singleton"
+#~ msgstr "EShell ਸਿੰ�ਲ��ਨ"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "���ਸ� ��ਾ�"
+#~ msgid "Book"
+#~ msgstr "�ਿਤਾਬ"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "�ੰਡਾ�ਾਰ ਵਰਤ��"
+#~ msgid "Is New List"
+#~ msgstr "ਨਵ�� ਲਿਸ�"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "�ੰਡਾ�ਾਰ"
+#~ msgid "Query"
+#~ msgstr "�ਿ�ਰ�"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "ਲਾ�ਨ ਲਪ���"
+#~ msgid "Model"
+#~ msgstr "ਮਾਡਲ"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "�ੰਤਰਾਲ �ੱ�ਰ"
+#~ msgid "Shell View"
+#~ msgstr "ਸ਼�ੱਲ �ਲ�"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "�ਧਿ�ਤਮ ਲਾ�ਨਾ�"
+#~ msgid "Source"
+#~ msgstr "ਸਰ�ਤ"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "ਹਾਸ਼��� �ਿੱ��"
+#~ msgid "Width"
+#~ msgstr "���ਾ�"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "ਨਵ���-ਲਾ�ਨਾ� ਮਨ�਼�ਰ"
+#~ msgid "Height"
+#~ msgstr "��ਾ�"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "ਬ���ਰਾ��ਡ ਬਣਾ�"
+#~ msgid "Has Focus"
+#~ msgstr "���ਦਰਿਤ ਹ�"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "ਬ�ਨ ਬਣਾ�"
+#~ msgid "Field"
+#~ msgstr "��ਤਰ"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "�ਰਸਰ ਸਥਿਤ�"
+#~ msgid "Field Name"
+#~ msgstr "��ਤਰ ਨਾ�"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "IM ਪਰਸੰ�"
+#~ msgid "Text Model"
+#~ msgstr "���ਸ� ਮਾਡਲ"
 
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
+#~ msgid "Max field name length"
+#~ msgstr "ਨਾ� ਦ� �ਧਿ�ਤਮ ਲੰਬਾ�"
+
+#~ msgid "Column Width"
+#~ msgstr "�ਾਲਮ ���ਾ�"
+
+#~ msgid "Adapter"
+#~ msgstr "�ਡਪ�ਰ"
+
+#~ msgid "Selected"
+#~ msgstr "��ਣਿ�"
+
+#~ msgid "Has Cursor"
+#~ msgstr "�ਰਸਰ ਹ�"
+
+#~ msgid "Success"
+#~ msgstr "ਸਫਲਤਾ"
+
+#~ msgid "Backend busy"
+#~ msgstr "ਪਿੱ�ਾ ਰ��ਿ�"
+
+#~ msgid "Repository offline"
+#~ msgstr "ਰਿਪ�ਸ�ਰ� ਬੰਦ ਹ�"
+
+#~ msgid "Address Book does not exist"
+#~ msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਮ���ਦ ਨਹ�� ਹ�"
+
+#~ msgid "No Self Contact defined"
+#~ msgstr "��� ਸਵ� ਸੰਪਰ� ਸ��� ਪ�ਰਭਾਸ਼ਿਤ ਨਹ��"
+
+#~ msgid "Permission denied"
+#~ msgstr "�ਧਿ�ਾਰ ਨਹ� ਹ�"
+
+#~ msgid "Contact not found"
+#~ msgstr "ਸਬੰਧ ਨਹ� ਲੱਭਾ"
+
+#~ msgid "Contact ID already exists"
+#~ msgstr "ਸੰਪਰ� ID ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "ਪ�ਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
+
+#~ msgid "Could not cancel"
+#~ msgstr "ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
+
+#~ msgid "Authentication Failed"
+#~ msgstr "ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ"
+
+#~ msgid "Authentication Required"
+#~ msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲਾ�਼ਮ� ਹ�"
+
+#~ msgid "TLS not Available"
+#~ msgstr "TLS �ਪਲੱਬਧ ਨਹ� ਹ�"
+
+#~ msgid "No such source"
+#~ msgstr "�ੰ� ਦਾ ��� ਸਰ�ਤ ਨਹ��"
+
+#~ msgid "Not available in offline mode"
+#~ msgstr "�ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� �ਪਲੱਬਧ ਨਹ��"
+
+#~ msgid "Other error"
+#~ msgstr "ਹ�ਰ �ਲਤ�"
+
+#~ msgid "Invalid server version"
+#~ msgstr "�ਲਤ ਸਰਵਰ ਵਰ�ਨ"
+
+#~ msgid "Unsupported authentication method"
+#~ msgstr "ਨਾ-ਸਹਾ�� ਪਰਮਾਣ�ਿਤਾ ਢੰ�"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "��ਲੰਡਰ ਰਿਪ��਼�ਰ� �ਫਲਾ�ਨ ਹ�।"
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "{0} ਵਿੱ� �ਲਤ�"
+
+#~ msgid "No response from the server."
+#~ msgstr "ਸਰਵਰ ਤ�� ��� �ਵਾਬ ਨਹ�� ਹ�।"
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "��ਲੰਡਰ ਲ�ਡ �ਰਨ ਲ� �ਸਮਰੱਥ"
+
+#~ msgid "{0}."
+#~ msgstr "{0}"
+
+#~ msgid "Split Multi-Day Events:"
+#~ msgstr "ਬਹ�-ਦਿਨ �ਾਰਵਾ��� ਨ�ੰ ਵੱ� �ਰ�:"
+
+#~ msgid "Could not start evolution-data-server"
+#~ msgstr "evolution-data-server ਨ�ੰ ਸ਼�ਰ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
+
+#~ msgid "Could not read pilot's Calendar application block"
+#~ msgstr "ਪਾ�ਲ� ��ਲੰਡਰ �ਾਰ� ਭਾ� ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+
+#~ msgid "Could not read pilot's Memo application block"
+#~ msgstr "ਪਾ�ਲ� ਦਾ ਮ�ਮ� �ਾਰ� ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
+
+#~ msgid "Could not write pilot's Memo application block"
+#~ msgstr "ਪਾ�ਲ� ਦਾ ਮ�ਮ� �ਾਰ� ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
+
+#~ msgid "Default Priority:"
+#~ msgstr "ਮ�ਲ ਪਹਿਲ:"
+
+#~ msgid "Could not read pilot's ToDo application block"
+#~ msgstr "ਪਾ�ਲ� ਦਾ �ੰਮ �ਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
+
+#~ msgid "Could not write pilot's ToDo application block"
+#~ msgstr "ਪਾ�ਲ� ਦਾ �ਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
+
+#~ msgid "Check this to use system timezone in Evolution."
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸਿਸ�ਮ ਸਮਾ� ਵਰਤਣ ਲ� �ਹ ��ੱ� �ਰ�।"
+
+#~ msgid "Show week numbers in date navigator"
+#~ msgstr "ਮਿਤ� ਨ�ਵ����ਰ ਵਿੱ� ਹਫਤਾ �ੰ� ਵ���"
+
+#~ msgid "Whether to show week number in the Day and Work Week View."
+#~ msgstr "�� ਦਿਨ �ਤ� �ੰਮ ਹਫ਼ਤਾ �ਲ� ਵਿੱ� ਹਫ਼ਤਾ ਨੰਬਰ ਵ��ਾ�� �ਾਵ�।"
+
+#~ msgid "Show week n_umber in Day and Work Week View"
+#~ msgstr "ਦਿਨ �ਤ� �ੰਮ ਹਫ਼ਤਾ �ਲ� ਵਿੱ� ਹਫ਼ਤਾ �ਿਣਤ� ਵ��ਾ�(_u)"
+
+#~ msgid "Save"
+#~ msgstr "ਸੰਭਾਲ�"
+
+#~ msgid "The event could not be deleted due to a corba error"
+#~ msgstr "�ਹ ��ਨਾ ��ਰਬਾ �ਲਤ� �ਰ�� ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�"
+
+#~ msgid "The task could not be deleted due to a corba error"
+#~ msgstr "�ਹ �ੰਮ ��ਰਬਾ �ਲਤ� �ਰ�� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+
+#~ msgid "The memo could not be deleted due to a corba error"
+#~ msgstr "�ਹ ਮ�ਮ� ��ਰਬਾ �ਲਤ� �ਰ�� ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਿ�"
+
+#~ msgid "The item could not be deleted due to a corba error"
+#~ msgstr "�ਹ ��ਾ� ��ਰਬਾ �ਲਤ� �ਰ�� ਹ�ਾ� ਨਹ�� �ਾ ਸ�ਦ� ਹ�"
+
+#~ msgid "Appoint_ment"
+#~ msgstr "ਮ�ਲਾ�ਾਤ(_m)"
+
+#~ msgid "Attendee_s..."
+#~ msgstr "ਦਰਸ਼�(_s)..."
+
+#~ msgid "_Task"
+#~ msgstr "�ੰਮ(_T)"
+
+#~ msgid "Default Client"
+#~ msgstr "ਡਿਫਾਲ� �ਲਾ��"
+
+#~ msgid "Shell Settings"
+#~ msgstr "ਸ਼�ੱਲ ਸ��ਿੰ�"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "���-ਪ�ਰਤ� ਸ��ਿੰ�"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "ਦਰਸ਼�(_T)..."
+
+#~ msgid "0%"
+#~ msgstr "੦%"
+
+#~ msgid "10%"
+#~ msgstr "੧੦%"
+
+#~ msgid "20%"
+#~ msgstr "੨੦%"
+
+#~ msgid "30%"
+#~ msgstr "੩੦%"
+
+#~ msgid "40%"
+#~ msgstr "੪੦%"
+
+#~ msgid "50%"
+#~ msgstr "੫੦%"
+
+#~ msgid "60%"
+#~ msgstr "੬੦%"
+
+#~ msgid "70%"
+#~ msgstr "੭੦%"
+
+#~ msgid "80%"
+#~ msgstr "੮੦%"
+
+#~ msgid "90%"
+#~ msgstr "੯੦%"
+
+#~ msgid "100%"
+#~ msgstr "੧੦੦%"
+
+#~ msgid "_Select Today"
+#~ msgstr "�ੱ� ��ਣ�(_S)"
+
+#~ msgid "_From Field"
+#~ msgstr "ਵੱਲ�� ��ਤਰ(_F)"
+
+#~ msgid "Toggles whether the From chooser is displayed"
+#~ msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਵੱਲ�� ��ਣ�ਾਰ ਵ��ਿ� �ਾਵ�"
+
+#~ msgid "Show"
+#~ msgstr "ਵ���"
+
+#~ msgid "Hide"
+#~ msgstr "�ਹਲ�"
+
+#~ msgid "New Tab"
+#~ msgstr "ਨਵ�� ��ਬ"
+
+#~ msgid "address card"
+#~ msgstr "�ਡਰਸ �ਾਰਡ"
+
+#~ msgid "calendar information"
+#~ msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ�"
+
+#~ msgid "Name of the logger"
+#~ msgstr "ਲਾ�ਰ ਦਾ ਨਾ�"
+
+#~ msgid "Filename"
+#~ msgstr "ਫਾ�ਲ-ਨਾ�"
+
+#~ msgid "The filename of the module"
+#~ msgstr "ਮ�ਡ��ਲ ਦਾ ਫਾ�ਲ ਨਾ�"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "�ਦ�� ਪਲੱ��ਨ ਨ�ੰ �ਾਲ� ��ਤਾ �ਾਵ�"
+
+#~ msgid "Could not parse PGP message: Unknown error"
+#~ msgstr "PGP ਸ�ਨ�ਹ� ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
+
+#~ msgid "Focus Tracker"
+#~ msgstr "ਫ��ਸ �ਰ��ਰ"
+
+#~ msgid "Shell Module"
+#~ msgstr "ਸ਼�ੱਲ ਮ�ਡ��ਲ"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "ਮ�ਲ ਸ਼�ੱਲ ਬ����ਡ"
+
+#~ msgid "Show Deleted"
+#~ msgstr "ਹ�ਾ� ਵ���"
+
+#  forest green
+#~ msgid "To Do"
+#~ msgstr "�ਰਨ-ਲ�"
+
+#~ msgid "Later"
+#~ msgstr "ਬਾ�ਦ ਵਿੱ�"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "ਨਵਾ� ਫ�ਲਡਰ `%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "ਫ�ਲਡਰ `%s' ਨ�ੰ `%s' ਵਿੱ� �ਾਪ� �ਰਨ ਵਿੱ� �ਸਫਲ: %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "`%s' ਤ� �ਪਲੱਬਧ ਪੱਤਰ-ਬ�ਸਿ�� ਦ� �ਾ�� ਲ� �ਸਫਲ: %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ-ਬ�ਸਾ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� �ਵ�ਲ�ਸ਼ਨ ੧.੦ ਬਾ�ਦ ਤਬਦ�ਲ ਹ� �� ਹ�।\n"
+#~ "\n"
+#~ "�ਡ��� �� �ਦ�� ਤੱ� �ਿ ਤ�ਹਾਡ� ਫ�ਲਡਰ ਮਾ��ਰ�� ��ਤ� �ਾ ਰਹ� ਹਨ..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "POP3 ਸਰਵਰ ਤ� ਰੱ�ਿ� ਪ�ਰਾਣ� ਡਾ�� `%s' ਨ�ੰ ��ਲਣ ਵਿੱ� �ਸਫਲ: %s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "POP3 ਸਰਵਰ ਤ� ਰੱ�� ਡਾ�ਾ ਡਾ�ਰ���ਰ� `%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "POP3 ਸਰਵਰ ਤ� ਰੱ�ਿ� ਡਾ�ਾ `%s' ਦ� �ਾਪ� ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "ਲ��ਲ ਪੱਤਰ ਸੰਭਾਲ`%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "ਪ�ਰਾਣ� �ਵ�ਲ�ਸ਼ਨ ਦ� ਸ��ਿੰ� ਪ��ਹਨ ਤ�� �ਸਫਲ, `evolution/config.xmldb' ਮ���ਦ ਨਹ�� ਹ� �ਾ� "
+#~ "ਨਿ�ਾਰਾ ਹ� �� ਹ�।"
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "ਸ�ਮਿਤ ਸਾ��਼ ਦਾ ���ਸ� ਭਾ� ਵ��ਾ�ਣ �ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਮਨ��ਰ"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr "ਰ�ਡਰ ਸ�ਨ�ਹਾ ���ਸ� ਭਾ� ਨ�ੰ ਸ�ਮਿਤ ��ਾਰ ਦਿ�।"
+
+#~ msgid "Show \"From\" field when sending a mail message"
+#~ msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣ ਦ�ਰਾਨ \"ਵਲ��\" ��ਤਰ ਵ���"
+
+#~ msgid ""
+#~ "Show the \"From\" field when sending a mail message. This is controlled "
+#~ "from the View menu when a mail account is chosen."
+#~ msgstr ""
+#~ "�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"ਵਲ��\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
+#~ "�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+
+#~ msgid "Text message part limit"
+#~ msgstr "���ਸ� ਸ�ਨ�ਹਾ ਭਾ� ਸ�ਮਾ"
+
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<b>�ਾਪ ਪ�ਸ�ਿੰ� ��ਣ</b> (ਸਿਫਾਰਸ਼� ਨਹ�� ਹ�)"
+
+#~ msgid "    "
+#~ msgstr "     "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "�ਿ���ਿ \"{0}\""
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "�ਿ���ਿ \"{2}\"।"
+
+#~ msgid "Do not d_elete"
+#~ msgstr "ਨਾ ਹ�ਾ�(_e)"
+
+#  mail:vfolder-updated secondary
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "ਹ�ਠ ਲਿ�� ��� ਫ�ਲਡਰ:\n"
+#~ "{0}\n"
+#~ "ਹ�ਣ ਫ�ਲਡਰ ਹ�ਾ�ਣ ਲ� ਵਰਤਿ� �ਾਦਾ ਹ�:\n"
+#~ "    \"{1}\"\n"
+#~ "�ਤ� �ੱਪਡ�� ਹ�।"
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "ਹ�ਠ ਲਿ�� ਫਿਲ�ਰ ਨਿਯਮ ਹਨ:\n"
+#~ "{0}\n"
+#~ "ਹ�ਣ ਫ�ਲਡਰ ਹ�ਾ�ਣ ਲ� ਵਰਤਿ� �ਾਵ��ਾ:\n"
+#~ "    \"{1}&\"\n"
+#~ "�ਤ� �ੱਪਡ�� ��ਤਾ �ਿ� ਹ�।"
+
+#~ msgid "Shell Backend"
+#~ msgstr "ਸ�ੱਲ ਬ����ਡ"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr "�ਸ ਫ�ਲਡਰ ਵਿੱ� ��ਵਲ ਲ��ਵ�� ਸ�ਨ�ਹ� ਹ� ਹਨ। �ਹਨਾ� ਨ�ੰ ਵ��ਣ ਲ� ਵ���->ਲ��ਵ�� ਸ�ਨ�ਹ� ਵਰਤ��।"
+
+#~ msgid "Table column:"
+#~ msgstr "��ਬਲ �ਾਲਮ:"
+
+#~ msgid "Source List"
+#~ msgstr "ਸਰ�ਤ ਲਿਸ�"
+
+#~ msgid "The registry of address books"
+#~ msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਰ�ਿਸ�ਰ�"
+
+#~ msgid "Current View"
+#~ msgstr "ਮ���ਦਾ �ਲ�"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "ਮ���ਦਾ ��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� �ਲ�"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "�ਲ� ਵਿ�ਲਾ ਸੰਪਰ�"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "�ਲ� ਬਾਹ� ਵਿੱ� ਵ��ਾ�� �ਾ ਰਿਹਾ ਸੰਪਰ�"
+
+#~ msgid "Preview is Visible"
+#~ msgstr "�ਲ� ਵਿ�ਾ� ਦਿੰਦ� ਹ�"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "�� �ਲ� ਬਾਹ� ਵ��ਾ� ਦ�ਵ�"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "LDAP ਸਰਵਰ"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "���-ਪ�ਰਤ� ਸ��ਿੰ�"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution contact folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "�ਵ�ਲ�ਸ਼ਨ ਸੰਪਰ� ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� ਵਿੱ� �ਵ�ਲ�ਸ਼ਨ 1.x ਤ�� ਬਾ�ਦ ਤਬਦ�ਲ� � �� ਹ�।\n"
+#~ "\n"
+#~ "ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "ਮ�ਲਿੰ� ਸ��� ਸੰਪਰ� ਦਾ ਫਾਰਮ�� ਤਬਦ�ਲ ਹ� �ਿ� ਹ�।\n"
+#~ "\n"
+#~ "ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "�ਵ�ਲ�ਸ਼ਨ ਦਾ ਫ�ਨ ਨੰਬਰ ਸੰਭਾਲਣਾ ਦਾ ਢੰ� ਤਬਦ�ਲ ਹ� �ਿ� ਹ�\n"
+#~ "\n"
+#~ "ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "�ਵ�ਲ�ਸ਼ਨ ਦ� ਪਾਲਮ ਸਿ�ਰ�ਨਾ��਼ ਤਬਦ�ਲ ਲਾ� ਤ� ਫਾ�ਲ਼ �ਾ�ਾ ਤਬਦ�ਲ ਹ� �ਿ� ਹ�।\n"
+#~ "\n"
+#~ "ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "ਸਰ�ਤ ��ਣ�ਾਰ� ਵਿਦ��ੱ�"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "�ਹ ਵਿਦ��ੱ� �ਡਰ�ੱਸ-ਬ�ੱ� ਦ� �ਰ�ੱਪ ਵ��ਾ��ਦਾ ਹ�"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "vCard �ੰ� ਸੰਭਾਲ�..."
+
+#~ msgid "3268"
+#~ msgstr "੩੨੬੮"
+
+#~ msgid "389"
+#~ msgstr "੩੮੯"
+
+#~ msgid "636"
+#~ msgstr "੬੩੬"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "��ਲੰਡਰਾ� ਲ� ਰ�ਿਸ�ਰ�"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution calendar folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� ਵਿੱ� �ਵ�ਲ�ਸ਼ਨ 1.x ਤ�� ਬਾ�ਦ ਤਬਦ�ਲ� � �� ਹ�। \n"
+#~ "\n"
+#~ "�ਿਰਪਾ �ਰ�� ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ�, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
+
+#  FIXME: set proper domain/code
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr "evolution/config.xmldb ਤ�� ਪ�ਰਾਣ� ਸ��ਿੰ� ਪ�ਰਾਪਤ �ਰਨ ਤ�� �ਸਫਲ"
+
+#  FIXME: domain/code
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "��ਲੰਡਰ `%s' ਮਾ��ਰ�� �ਰਨ ਲ� �ਸਮਰੱਥ"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "ਡਾ�ਾ ਨ�ਵ����ਰ ਵਿਦ��ੱ�"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "�ਹ ਵਿਦ��ੱ� ਮਿੰਨ���ਰ ��ਲੰਡਰ ਵ��ਾ��ਦਾ ਹ�"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "ਡਿਫਾਲ� ��ਲੰਡਰ �ਲਾ��"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "��ਲੰਡਰ �ਪਰ�ਸ਼ਨ ਲ� ਡਿਫਾਲ� �ਲਾ��"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "�ਹ ਵਿਦ��ੱ� ��ਲੰਡਰਾ� ਦਾ �ਰ�ੱਪ ਵ��ਾ��ਦਾ ਹ�"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "ਮ�ਮ� ਲਿਸ�ਾ� ਦ� ਰ�ਿਸ�ਰ�"
+
+#~ msgid "The memo table model"
+#~ msgstr "ਮ�ਮ� ��ਬਲ ਮਾਡਲ"
+
+#~ msgid "Default Memo Client"
+#~ msgstr "ਡਿਫਾਲ� ਮ�ਮ� �ਲਾ��"
+
+#  mail:async-error-nodescribe primary
+#~ msgid "Default client for memo operations"
+#~ msgstr "ਮ�ਮ� �ਪਰ�ਸ਼ਨ ਲ� ਡਿਫਾਲ� �ਲਾ��"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "�ਹ ਵਿਦ��ੱ� ਮ�ਮ� ਲਿਸ� ਦਾ �ਰ�ੱਪ ਵ��ਾ��ਦਾ ਹ�"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "�ੰਮ ਲਿਸ� ਦ� ਰ�ਿ�ਰ�"
+
+#~ msgid "The task table model"
+#~ msgstr "�ਾਸ� ��ਬਲ ਮਾਡਲ"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "�ਵ�ਲ�ਸ਼ਨ 1.x ਤ�� �ਵ�ਲ�ਸ਼ਨ �ੰਮ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� ਤਬਦ�ਲ ਹ� ��ੱ�� ਹ�।\n"
+#~ "\n"
+#~ "�ਿਰਪਾ �ਰ�� �ਡ�� �ਰ�, �ਦ ਤੱ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� ਫ�ਲਡਰ ਨ�ੰ ਤਬਦ�ਲ �ਰ ਰਹ� ਹ�..."
+
+#  FIXME: domain/code
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "�ੰਮ `%s' ਮਾ��ਰ�� �ਰਨ ਲ� �ਸਮਰੱਥ"
+
+#~ msgid "Default Task Client"
+#~ msgstr "ਡਿਫਾਲ� �ਾਸ� �ਲਾ��"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "�ਾਸ� �ਪਰ�ਸ਼ਨ ਲ� ਡਿਫਾਲ� �ਲਾ��"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "�ਹ ਵਿਦ��ੱ� �ਾਸ� ਲਿਸ� ਦ� �ਰ�ੱਪ ਵ��ਾ��ਦਾ ਹ�"
+
+#~ msgid "Group by Threads"
+#~ msgstr "ਥਰਿੱਡ ਨਾਲ �ਰ�ੱਪ"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "�� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਮਾਮਲ� ਰਾਹ�� �ਰ�ੱਪ �ਰਨਾ ਹ�"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "ਪ��ਹ� ਸ�ਨ�ਹ� �ਹਲ�(_R)"
+
+#~ 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 "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ਰ�� ਤ�ਰ ਤ� �ਹਲ� �ਰ�"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "ਲ��ਵ�� ਸ�ਨ�ਹ� ਵ���(_N)"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "�ਰ�� ਤ�ਰ ਤ� �ਹਲ� ਸ�ਨ�ਹ� ਵ���"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "ਹ�ਾ� ਸ�ਨ�ਹ� �ਹਲ�(_D)"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr "ਹ�ਾ� ਸ�ਨ�ਹਿ�� ਵਿੱ� ਰ��ਾ ਵ��ਾ�ਣ ਦ� ਬ�ਾ� �ਹਲ� �ਰ�"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr "����ਮ��� ਰ�ਮਾ�ਡਰ ਪਲੱ��ਨ ਵਲ�� ਸ�ਨ�ਹਾ ਮ�ੱ� ਭਾ� ਵਿੱ� ��� ਲ� ਸ�ਹਾ� ਦ� ਲਿਸ�"
+
+#~ msgid ""
+#~ "Evolution backup can start only when Evolution is not running. Please "
+#~ "make sure that you save and close all your unsaved windows before "
+#~ "proceeding.  If you want Evolution to restart automatically after backup, "
+#~ "please enable the toggle button."
+#~ msgstr ""
+#~ "�ਵ�ਲ�ਸ਼ਨ ਬ���ੱਪ ਤਾ� ਹ� ਹ� ਸ�ਦਾ ਹ�, �� �ਵ�ਲ�ਸ਼ਨ �ੱਲ ਨਾ ਰਹ� ਹ�ਵ�। ਯ��ਨ� ਬਣਾ� �� ਤ�ਸ�� �ਾਰ� "
+#~ "ਰੱ�ਣ ਤ�� ਪਹਿਲਾ� �ਪਣ��� ਸਭ �ਣ-ਸੰਭਾਲ��� ਵਿੰਡ� ਸੰਭਾਲ �ਤ� ਬੰਦ �ਰ ਦਿੱਤ��� ਹ�ਣ। �� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ "
+#~ "ਬ���ੱਪ ਦ� ਬਾ�ਦ ���ਮ��ਿ� ਮ��-�ਾਲ� �ਰਨਾ �ਾਹ�ੰਦ� ਹ� ਤਾ� �ਾ�ਲ ਬ�ਨ ਯ�� �ਰ�।"
+
+#~ msgid ""
+#~ "This will delete all your current Evolution data and settings and restore "
+#~ "them from your backup. Evolution restore can start only when Evolution is "
+#~ "not running. Please make sure that you close all your unsaved windows "
+#~ "before you proceed. If you want Evolution to restart automatically "
+#~ "restart after restore, please enable the toggle button."
+#~ msgstr ""
+#~ "�ਹ ਤ�ਹਾਡ� ਮ���ਦਾ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ਨ�ੰ ਹ�ਾ ਦ�ਵ��ਾ �ਤ� ਤ�ਹਾਡ� ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ��ਾ। "
+#~ "�ਵ�ਲ�ਸ਼ਨ ਰ�ਸ��ਰ ਤਾ� ਹ� ਸ਼�ਰ� ਹ� ਸ�ਦਾ ਹ�, �� �ਵ�ਲ�ਸ਼ਨ �ੱਲ ਨਾ ਰਹ� ਹ�ਵ�। ਯ��ਨ� ਬਣਾ� �ਿ ਤ�ਸ�� �ੱ�� "
+#~ "ਵਧਣ ਤ�� ਪਹਿਲਾ� ਸਭ �ਣ-ਸੰਭਾਲ��� ਵਿੰਡ��਼ ਨ�ੰ ਪਹਿਲਾ� ਬੰਦ �ਰ ਦਿੱਤਾ ਹ�। �� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਰ�ਸ��ਰ ਦ� "
+#~ "ਬਾ�ਦ ���ਮ��ਿ� ਹ� ਮ��-�ਾਲ� �ਰਨਾ �ਾਹ�ੰਦ� ਹ�, ਤਾ� �ਹ ਬ�ਨ �ਾਲ� �ਰ�।"
+
+#~ msgid "Check whether Evolution is the default mail client on startup."
+#~ msgstr "�ੱਲਣ ਸਮ�� �ਾ�� �ਰ� �ਿ �� �ਵ�ਲ�ਸ਼ਨ ਡਿਫਾਲ� ਮ�ਲ �ਲਾ�� ਹ�।"
+
+#~ msgid "Default Mail Client"
+#~ msgstr "ਡਿਫਾਲ� ਮ�ਲ �ਲਾ��"
+
+#~ msgid "<b>Server</b>"
+#~ msgstr "<b>ਸਰਵਰ</b>"
+
+#~ msgid "<b>Users:</b>"
+#~ msgstr "<b>ਯ��਼ਰ :</b>"
+
+#~ msgid "<b>Account Name</b>"
+#~ msgstr "<b>��ਾ��� ਨਾ�</b>"
+
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਲ� ਹ�ਲਾ ਸਹਿਯ�� ਸ਼ਾਮਲ।"
+
+#~ msgid "Hula Support"
+#~ msgstr "ਹ�ਲਾ ਸਹਿਯ��"
+
+#~ msgid "_Accept"
+#~ msgstr "ਮਨ�਼�ਰ(_A)"
+
+#~ msgid "Guides you through your initial account setup."
+#~ msgstr "�ਪਣ� ਸ਼�ਰ��ਤ� ��ਾ��� ਸ���ੱਪ ਰਾਹ�� ਤ�ਹਾਨ�ੰ ਮੱਦਦ।"
+
+#~ msgid "Setup Assistant"
+#~ msgstr "ਸ���ੱਪ ਸਹਾ��"
+
+#~ msgid "Importing data."
+#~ msgstr "ਡਾ�ਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+
+#~ msgid "Please wait"
+#~ msgstr "�ਡ��� ��"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld �ਿਬਾ"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "��ਲਬਾਰ ਸ�ਾ�ਲ"
+
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "ਸਵਿੱ�ਰ ਦਾ ��ਲਬਾਰ ਸ�ਾ�ਲ"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "��ਲਬਾਰ �ਪਲੱਬਧ"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "�� ਸਵਿੱ�ਰ �ਪਲੱਬਧ ਹ�ਵ�"
+
+#~ msgid "Switcher Action"
+#~ msgstr "ਸਵਿੱ�ਰ ��ਸ਼ਨ"
+
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "�ਹ ਸ਼�ੱਲ �ਲ� ਲ� ਸਵਿੱ�ਰ ��ਸ਼ਨ"
+
+#~ msgid "Page Number"
+#~ msgstr "ਸਫ਼ਾ ਨੰਬਰ"
+
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr "ਸ਼�ੱਲ �ਲ� ਲ� ਨ��ਬ�ੱ� ਸਫ਼ਾ ਨੰਬਰ"
+
+#~ msgid "Search Rule"
+#~ msgstr "��� ਨਿਯਮ"
+
+#~ msgid "Criteria for the current search results"
+#~ msgstr "ਮ���ਦਾ ��� ਨਤ��ਿ�� ਲ� ਸ�ਮਾ"
+
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "�ਸ ਸ਼�ੱਲ �ਲ� ਲ� EShellBackend"
+
+#~ msgid "Shell Content Widget"
+#~ msgstr "ਸ਼�ੱਲ ਸਮੱ�ਰ� ਵਿਦ��ੱ�"
+
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr "ਸ਼�ੱਲ ਵਿੰਡ� ਦ� ਸੱ�� ਬਾਹ� ਵਿੱ� ਸਮੱ�ਰ� ਵਿਦ��ੱ� �ਲ� ਦਿੰਦਾ ਹ�"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "ਸ਼�ੱਲ ਬਾਹ� ਵਿਦ��ੱ�"
+
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr "ਸ਼�ੱਲ ਵਿਦ��ੱ� ਦ� �ੱਬ� ਪਾਸ� ਵਿੱ� ਬਾਹ� ਵਿਦ��ੱ� ਦਿ�ਾ��ਦਾ ਹ��"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "ਸ�ੱਲ �ਾਸ�ਬਾਰ ਵਿਦ��ੱ�"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr "�ਾਸ�-ਬਾਹ� ਵਿਦ��ੱ� ਸ਼�ੱਲ ਵਿੰਡ� ਦ� ਤਲ �ੱਤ� ਵ��ਾ� ਦਿੰਦਾ ਹ�"
+
+#~ msgid "Shell Window"
+#~ msgstr "ਸ਼�ੱਲ ਵਿੰਡ�"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "ਵਿੰਡ�, �ਿਸ ਵਿੱ� ਸ਼�ੱਲ �ਲ� ਸ਼�ਰ� ਹ�ਵ���"
+
+#~ msgid "The key file holding widget state data"
+#~ msgstr "��ੰ�� ਫਾ�ਲ, �� ਵਿਦ��ੱ� ਹਾਲਤ ਡਾ�ਾ ਰੱ�ਦ� ਹ�"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "ਸ਼�ੱਲ �ਲ� ਦਾ �ਾ��ਲ"
+
+#~ msgid "Current View ID"
+#~ msgstr "ਮ���ਦਾ �ਲ� ID"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr "ਮ���ਦਾ GAL �ਲ� ID"
+
+#~ msgid "GNOME Pilot is not installed."
+#~ msgstr "�ਨ�ਮ ਪਾ�ਲ� �ੰਸ�ਾਲ ਨਹ�� ਹ�।"
+
+#~ msgid "GNOME Pilot could not be run."
+#~ msgstr "�ਨ�ਮ ਪਾ�ਲ� ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
+
+#~ msgid "GNOME Pilot _Synchronization..."
+#~ msgstr "�ਨ�ਮ ਪਾ�ਲ� ਸ��ਰ�ਨਾ��਼(_S)..."
+
+#~ msgid "Set up GNOME Pilot configuration"
+#~ msgstr "�ਨ�ਮ ਪਾ�ਲ� ਸੰਰ�ਨਾ ਸ�ੱ��ੱਪ"
+
+#~ msgid "Active Shell View"
+#~ msgstr "ਸਰ�ਰਮ ਸ਼�ੱਲ �ਲ�"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "ਸਰ�ਰਮ ਸ਼�ੱਲ �ਲ� ਦਾ ਨਾ�"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "ਸ਼�ੱਲ ਵਿੰਡ� ਦਾ EFocusTracker"
+
+#~ msgid "Geometry"
+#~ msgstr "��ਮ��ਰ�"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "ਸ਼�ਰ��ਤ� ਵਿੰਡ� ��ਮ��ਰ� ਲਾ�ਨ"
+
+#~ msgid "Safe Mode"
+#~ msgstr "ਸ�ਰੱ�ਿ�ਤ ਢੰ�"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "�� ਸ�ੱਲ ਵਿੰਡ� ਸ�ਰੱ�ਿ�ਤ ਢੰ� ਵਿੱ� ਹ�"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "ਬਾਹ� ਵ���"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "�� ਸ਼�ੱਲ ਵਿੰਡ� ਦ� ਬਾਹ� ਵ��ਣ� ਹ�"
+
+#~ msgid "Switcher Visible"
+#~ msgstr "ਸਵਿੱ�ਰ ਵ���"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "�� ਸ਼�ੱਲ ਵਿੰਡ� ਦ� ਸਵਿੱ�ਰ ਬ�ਨ ਵ��ਣ� ਹਨ"
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "�ਾਸ�ਬਾਰ ਵ���"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "�� ਸ਼�ੱਲ ਵਿੰਡ� ਦ� �ਾਸ� ਬਾਰ ਵ��ਣ� ਹ�"
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "�� ਸ਼�ੱਲ ਵਿੰਡ� ਦਾ ��ਲ ਬਾਰ ਵ��ਾ� ਦ�ਵ�"
+
+#~ msgid "UI Manager"
+#~ msgstr "UI ਮ�ਨ��ਰ"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "ਸ਼�ੱਲ ਵਿੰਡ� GtkUIManager"
+
+#~ msgid "Module Directory"
+#~ msgstr "ਮ�ਡ��ਲ ਡਾ�ਰ���ਰ�"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "ਡਾ�ਰ���ਰ�, �ਿਸ ਵਿੱ��� �ਮ�ਡ��ਲ ਲ�ਡ ਹ�ੰਦ� ਹਨ"
+
+#~ msgid "Network Available"
+#~ msgstr "ਨ�ੱ�ਵਰ� �ਪਲੱਬਧ ਹ�"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "�� ਨ�ੱ�ਵਰ� �ਪਲੱਬਧ ਹ�ਵ�"
+
+#~ msgid "Online"
+#~ msgstr "�ਨਲਾ�ਨ"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "�� ਸ਼�ੱਲ �ਨਲਾ�ਨ ਹ�"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ੧.੪ ਤ�� ਮ�ਬ�ਰ �ਰ�� ਵਾਪਿਸ"
+
+#  shell:upgrade-nospace primary
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "�ੱਪ�ਰ�ਡ ਲ� ਲ���ਦ� ਡਿਸ� ਥਾ� ਨਹ�� ਹ�।"
+
+#~ msgid "Really delete old data?"
+#~ msgstr "�� ਪ�ਰਾਣਾ ਡਾ�ਾ ਹ�ਾ�ਣਾ ਹ�?"
+
+#  shell:upgrade-remove-1-4-confirm secondary
+#~ msgid ""
+#~ "The entire contents of the &quot;evolution&quot; directory are about to "
+#~ "be permanently removed.\n"
+#~ "\n"
+#~ "It is suggested you manually verify that all of your mail, contact, and "
+#~ "calendar data is present, and that this version of Evolution operates "
+#~ "correctly before deleting this old data.\n"
+#~ "\n"
+#~ "Once deleted, you cannot downgrade to the previous version of Evolution "
+#~ "without manual intervention.\n"
+#~ msgstr ""
+#~ "ਡਾ�ਰ���ਰ� &quot;evolution&quot; ਦ� ਭਾ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�ਣ ਲ� ਤਿ�ਰ ਹਨ।\n"
+#~ "\n"
+#~ "�ਹ ਸਲਾਹ ਦਿੱਤ� �ਾਦ� ਹ� �ਿ ਤ�ਸ�� �ਪਣ� ਪੱਤਰ, ਸੰਪਰ� ਤ� ��ਲੰਡਰ ਡਾ�ਾ, �� ਵ� ਮ���ਦ ਹ�, ਦ� ��ਦ "
+#~ "�ਾ�� �ਰ ਲਵ� �ਤ� �ਹ ਵ� �� �ਵ�ਲ�ਸ਼ਨ �ਸ ਪ�ਰਾਣ� ਡਾ�ਾ ਨਾਲ ਪਹਿਲਾ� ਠ�� �ੰਮ �ਰਦਾ ਸ�।\n"
+#~ "\n"
+#~ "�ੱ� ਵਾਰ ਹ�ਾ�ਣ ਬਾ�ਦ ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਦ� ਪ�ਰਾਣ� ਵਰ�ਨ ਨ�ੰ ਵਾਪਿਸ ਨਹ�� ਲਿ� ਸ�ਦ� ਹ�, �ਦ�� ਤੱ� ਤ�ਸ�� "
+#~ "��ਦ ਨਾ ਵਰਤ��।\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "�ਵ�ਲ�ਸ਼ਨ ਦ� ਪ�ਰਾਣ� ਵਰ�ਨ ਨ� ਡਾ�ਾ �ਿਸ� ਵੱ�ਰ� �ਿ�ਾਣ� �ੱਤ� ਸੰਭਾਲਿ� ਸ�।\n"
+#~ "\n"
+#~ "���ਰ ਤ�ਸ�� �ਹ ਡਾ�ਾ ਹ�ਾ�ਣ ਲ� ��ਣਿ� ਤਾ� &quot;evolution&quot; ਡਾ�ਰ���ਰ� ਨ�ੰ ਹਮ�ਸ਼ਾ ਲ� "
+#~ "ਹ�ਾ ਦਿੱਤਾ �ਾਵ��ਾ। ���ਰ ਤ�ਸ�� �ਸ ਡਾ�ਾ ਨ�ੰ ਰੱ�ਣ ਲ� ��ਣਿ�, ਤਾ� ਤ�ਸ�� �ਪਣ� �ਿੰਮ�ਵਾਰ� �ੱਤ� "
+#~ "&quot;evolution&quot;ਦ� ਭਾ� ਹ�ਾ ਸ�ਦ� ਹ�।\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "ਤ�ਹਾਡ� ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ਦ� �ੱਪਡ�� ਨ�ੰ {0} ਡਿਸ� ਥਾ� ਦ� ਲ�� ਹ�, ਪਰ ਤ�ਹਾਡ� ��ਲ ਸਿਰਫ਼ {1} �ਪਲੱਬਧ "
+#~ "ਹ�।\n"
+#~ "\n"
+#~ "ਤ�ਹਾਨ�ੰ �ਾਰ� ਰੱ�ਣ ਲ� �ਪਣ� �ਰ ਡਾ�ਰ���ਰ� ਵਿੱ� ਹ�ਰ ਥਾ� ਬਣਾ�ਣ ਦ� ਲ�� ਹ�।"
+
+#~ msgid "_Keep Data"
+#~ msgstr "ਡਾ�ਾ ਰੱ��(_K)"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "ਮ�ਨ�ੰ ਬਾ�ਦ ਵਿੱ� ਯਾਦ �ਰਵਾ�(_R)"
+
+#~ msgid "Edit"
+#~ msgstr "ਸ�ਧ"
+
+#~ msgid "Import"
+#~ msgstr "�ੰਪ�ਰ�"
+
+#~ msgid "View"
+#~ msgstr "ਵ���"
+
+#~ msgid "Collection"
+#~ msgstr "ਭੰਡਾਰ"
+
+#~ msgid "Instance"
+#~ msgstr "ਮ��ਾ"
+
+#~ msgid "Factory"
+#~ msgstr "ਫ���ਰ�"
+
+#~ msgid "Action"
+#~ msgstr "�ਾਰਵਾ�"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "GtkRadioAction"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "����ਮ��� ਪੱ�� ਵ���(_A)"
+
+#~ msgid "Fill color"
+#~ msgstr "ਰੰ� ਭਰ�"
+
+#~ msgid "GDK fill color"
+#~ msgstr "GDK ਰੰ� ਭਰ�"
+
+#~ msgid "Fill stipple"
+#~ msgstr "ਸ�ਿਪਲ ਭਰ�"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "ਨਿ�ਨਤਮ ���ਾ�"
+
+#~ msgid "Minimum Width"
+#~ msgstr "ਨਿ�ਨਤਮ ���ਾ�"
+
+#~ msgid "Spacing"
+#~ msgstr "�ਾਲ� ਥਾ�"
+
+#~ msgid "The button state is online"
+#~ msgstr "ਬ�ਨ ਹਾਲਤ �ਨਲਾ�ਨ ਹ�"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "�ਿਤਿ�� ਸਥਿਤ�"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਹਰ��ੱ�ਲ ਹ�ਵ�।"
+
+#~ msgid "Vertical Position"
+#~ msgstr "ਲੰਬ�ਾਰ� ਸਥਿਤ�"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "ਬਾਹ� ਦ� ਸਥਿਤ�, �ਦ�� ਸਥਿਤ� ਵਰ���ਲ ਹ�ਵ�।"
+
+#~ msgid "Proportion"
+#~ msgstr "�ਨ�ਪਾਤ"
+
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "੨�� ਬਾਹ� ��ਾਰ ਦਾ �ਨ�ਪਾਤ"
+
+#~ msgid "Fixed Resize"
+#~ msgstr "ਸਥਿਰ ਮ��-��ਾਰ"
+
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "੨�� ਬਾਹ� ��ਾਰ ਬਦਲਣ ਦ�ਰਾਨ ਸਥਿਰ ਰੱ��"
+
+#~ msgid "Sync with:"
+#~ msgstr "ਸ��ਰ� �ਰ�:"
+
+#~ msgid "Sync Private Records:"
+#~ msgstr "ਨਿੱ�� ਰਿ�ਾਰਡ ਸਿ�ਰ�ਨਾ��਼:"
+
+#~ msgid "Sync Categories:"
+#~ msgstr "���ਾ�ਰ� ਸਿ�ਰ�ਨਾ��਼:"
+
+#~ msgid "Cursor Row"
+#~ msgstr "�ਰਸਰ �ਤਾਰ"
+
+#~ msgid "Cursor Column"
+#~ msgstr "�ਰਸਰ �ਾਲਮ"
+
+#~ msgid "Sorter"
+#~ msgstr "��ਰਮਬੱਧ�"
+
+#~ msgid "Selection Mode"
+#~ msgstr "��ਣ ਢੰ�"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "�ਰਸਰ ਢੰ�"
+
+#~ msgid "Selected Column"
+#~ msgstr "��ਣ� �ਾਲਮ"
+
+#~ msgid "Focused Column"
+#~ msgstr "���ਦਰਿਤ �ਾਲਮ"
+
+#~ msgid "Unselected Column"
+#~ msgstr "ਨਾ-��ਣਿ� �ਾਲਮ"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "�ਾਲਮ ਵਿੰਨ�"
+
+#~ msgid "Underline Column"
+#~ msgstr "�ਾਲਮ ਹ�ਠ ਲਾ�ਨ"
+
+#~ msgid "Bold Column"
+#~ msgstr "���ਾ �ਾਲਮ"
+
+#~ msgid "Color Column"
+#~ msgstr "�ਾਲਮ ਰੰ�"
+
+#~ msgid "BG Color Column"
+#~ msgstr "BG ਰੰ� �ਾਲਮ"
+
+#~ msgid "State"
+#~ msgstr "ਸਥਿਤ�"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "ਬਦਲਵਾ� �ਤਾਰ ਰੰ�"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "�ਿਤਿ�� �ਰਿੱਡ ਬਣਾ�"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "ਲੰਬ�ਾਰ� �ਰਿੱਡ ਬਣਾ�"
+
+#~ msgid "Draw focus"
+#~ msgstr "ਫ��ਸ �ਿੱ��"
+
+#~ msgid "Cursor mode"
+#~ msgstr "�ਰਸਰ ਮ�ਡ"
+
+#~ msgid "Selection model"
+#~ msgstr "��ਣ ਮਾਡਲ"
+
+#~ msgid "Length Threshold"
+#~ msgstr "ਮ�ੱਢਲ� ਲੰਬਾ�"
+
+#~ msgid "Uniform row height"
+#~ msgstr "��ਸਾਰ �ਤਾਰ ��ਾ�"
+
+#~ msgid "Frozen"
+#~ msgstr "ਸਥਿਰ"
+
+#~ msgid "Table header"
+#~ msgstr "��ਬਲ ਹ�ੱਡਰ"
+
+#~ msgid "Table model"
+#~ msgstr "��ਬਲ ਮਾਡਲ"
+
+#~ msgid "Cursor row"
+#~ msgstr "�ਰਸਰ �ਤਾਰ"
+
+#~ msgid "Sort Info"
+#~ msgstr "�ਰਮਬੱਧ �ਾਣ�ਾਰ�"
+
+#~ msgid "Always search"
+#~ msgstr "ਹਮ�ਸ਼ਾ ����"
+
+#~ msgid "Use click to add"
+#~ msgstr "ਸ਼ਾਮਿਲ ਲ� ਦਬਾ�"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "ਵਰ���ਲ �ਤਾਰ �ਾਲ� ਥਾ�"
+
+#~ msgid ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+#~ msgstr "�ਤਾਰਾ� ਵਿੱ� ਵਰ���ਲ �ਾਲ� ਥਾ�। �ਸ ਨ�ੰ �ਤਾਰ ਦ� �ੱਤ� ਤ� ਹ�ਠਾ� ���ਿ� �ਾਵ��ਾ।"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "ETree ��ਬਲ �ਡਪ�ਰ"
+
+#~ msgid "Retro Look"
+#~ msgstr "ਵਾਪਸ ���"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "ਲਾ�ਨਾ� �ਿੱ�� �ਤ� +/- ਫ�ਲਾ�"
+
+#~ msgid "Expander Size"
+#~ msgstr "ਫ�ਲਾ� ��ਾਰ"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "ਫ�ਲਾ� ਤ�ਰ ਦਾ ��ਾਰ"
+
+#~ msgid "popup"
+#~ msgstr "ਪ�ਪ�ੱਪ"
+
+#~ msgid "edit"
+#~ msgstr "ਸ�ਧ"
+
+#~ msgid "toggle"
+#~ msgstr "ਤਬਦ�ਲ"
+
+#~ msgid "expand"
+#~ msgstr "ਫ�ਲਾ�"
+
+#~ msgid "Event Processor"
+#~ msgstr "�ਵ��� ਪ�ਰ�ਸ��ਸਰ"
+
+#~ msgid "Text"
+#~ msgstr "���ਸ�"
+
+#~ msgid "Bold"
+#~ msgstr "���ਾ"
+
+#~ msgid "Strikeout"
+#~ msgstr "ਵਿੰਨ�ਹ�"
+
+#~ msgid "Anchor"
+#~ msgstr "�ੰ�ਰ"
+
+#~ msgid "Justification"
+#~ msgstr "��ਸਾਰ"
+
+#~ msgid "Clip Width"
+#~ msgstr "�ਲਿੱਪ ���ਾ�"
+
+#~ msgid "Clip Height"
+#~ msgstr "�ਲਿੱਪ ��ਾ�"
+
+#~ msgid "Clip"
+#~ msgstr "�ਲਿੱਪ"
+
+#~ msgid "Fill clip rectangle"
+#~ msgstr "�ਲਿੱਪ �ਤਰਭ�� ਭਰ�"
+
+#~ msgid "X Offset"
+#~ msgstr "X �ਫਸ�ੱ�"
+
+#~ msgid "Y Offset"
+#~ msgstr "Y �ਫਸ�ੱ�"
+
+#~ msgid "Text width"
+#~ msgstr "���ਸ� ���ਾ�"
+
+#~ msgid "Text height"
+#~ msgstr "���ਸ� ��ਾ�"
+
+#~ msgid "Use ellipsis"
+#~ msgstr "�ੰਡਾ�ਾਰ ਵਰਤ��"
+
+#~ msgid "Ellipsis"
+#~ msgstr "�ੰਡਾ�ਾਰ"
+
+#~ msgid "Line wrap"
+#~ msgstr "ਲਾ�ਨ ਲਪ���"
+
+#~ msgid "Break characters"
+#~ msgstr "�ੰਤਰਾਲ �ੱ�ਰ"
+
+#~ msgid "Max lines"
+#~ msgstr "�ਧਿ�ਤਮ ਲਾ�ਨਾ�"
+
+#~ msgid "Draw borders"
+#~ msgstr "ਹਾਸ਼��� �ਿੱ��"
+
+#~ msgid "Allow newlines"
+#~ msgstr "ਨਵ���-ਲਾ�ਨਾ� ਮਨ�਼�ਰ"
+
+#~ msgid "Draw background"
+#~ msgstr "ਬ���ਰਾ��ਡ ਬਣਾ�"
+
+#~ msgid "Draw button"
+#~ msgstr "ਬ�ਨ ਬਣਾ�"
+
+#~ msgid "Cursor position"
+#~ msgstr "�ਰਸਰ ਸਥਿਤ�"
+
+#~ msgid "IM Context"
+#~ msgstr "IM ਪਰਸੰ�"
+
+#~ msgid "Handle Popup"
+#~ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 
 #~ msgid "search bar"
 #~ msgstr "��� ਪੱ��"
@@ -23253,13 +23912,6 @@ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 #~ msgstr ""
 #~ "���ਰ \"�ਲ�\" ਬਾਹ� �ਾਲ� ਹ�ਵ� ਤਾ� �ਹ ਨਾਲ-ਨਾਲ ਹ� ਵ��ਾ��ਾ, ਨਾ �ਿ ਲੰਬ�ਾਰ� ਰ�ਪ ਵਿੱ�।"
 
-#~ msgid ""
-#~ "It disables/enables the repeated prompts to ask if offline sync is "
-#~ "required before going into offline mode."
-#~ msgstr ""
-#~ "ਲ�ਾਤਾਰ ਪਰ��� �ਯ��/ਯ�� �ਰਦਾ ਹ�, �� �ਫਲਾ�ਨ ਸਿ�ਰ� (sync) �ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� �ਾਣ ਲ� "
-#~ "ਲਾ�਼ਮ� ਹ�ਵ�।"
-
 #~ msgid "Message Window default height"
 #~ msgstr "ਸ�ਨ�ਹਾ �ਰ��� ਦ� ਮ�ਲ ��ਾ�"
 
@@ -23987,10 +24639,6 @@ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 #~ msgid "Please restart Evolution for changes to take effect"
 #~ msgstr "�ਿਰਪਾ �ਰ�� ਪਰਭਾਵ� ਹ�ਣ ਲ� �ਵ�ਲ�ਸ਼ਨ ਮ��-�ਲਾ�"
 
-#  FIXME: This is just to get the shadow, is there a better way?
-#~ msgid "Please select a user."
-#~ msgstr "�ਿਰਪਾ �ਰ�� �ੱ� ਯ��਼ਰ ��ਣ�।"
-
 #~ msgid "Server rejected password because it is too weak."
 #~ msgstr "ਸਰਵਰ ਨ� ਪਾਸਵਰਡ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�, �ਿ��ਿ �ਹ ਬਹ�ਤ �ਮ�਼�ਰ ਹ�।"
 
@@ -24278,9 +24926,6 @@ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 #~ msgid "Click OK to close these connections and go offline"
 #~ msgstr "�ਹ ��ਨ��ਸ਼ਨ ਬੰਦ �ਰਨ ਲ� �ਤ� �ਫਲਾ�ਨ �ਾਣ ਲ� OK ਦਬਾ�"
 
-#~ msgid "_Import"
-#~ msgstr "�ਯਾਤ(_I)"
-
 #~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
 #~ msgstr "�ਨ�ਮ ਪਾ�ਲ� ਤ�ਹਾਡ� ਸਿਸ�ਮ ਤ� �ੰਸ�ਾਲ ਨਹ�� �ਾਪਦਾ ਹ�।"
 
@@ -24312,9 +24957,6 @@ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 #~ msgid "Import File"
 #~ msgstr "�ਯਾਤ ਫਾ�ਲ"
 
-#~ msgid "Cannot start Evolution"
-#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਮ��-�ਾਲ� ਨਹ�� ਹ� ਸ�ਦ�"
-
 #~ msgid "Evolution can not start."
 #~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ਼�ਰ� ਨਹ�� ਹ� ਸ�ਦ� ਹ�।"
 
@@ -25452,9 +26094,6 @@ msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 #~ msgid "Orientation"
 #~ msgstr "ਸਥਿਤ�"
 
-#~ msgid "Page"
-#~ msgstr "ਸਫਾ"
-
 #~ msgid "Page Setup:"
 #~ msgstr "ਸ�ਾ ਨਿਰਧਾਰਨ:"