[evolution] update for Punjabi



commit 45625d0ce9212bd65fc67f6bed38bcd72754f8bd
Author: A S Alam <aalam users sf net>
Date:   Fri Sep 3 08:01:53 2010 +0530

    update for Punjabi

 po/pa.po | 2183 +++++++++++++++++++++++++++-----------------------------------
 1 files changed, 958 insertions(+), 1225 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index b000f0a..949244a 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:533
+#: ../shell/main.c:532
 # 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,8 +10,8 @@ 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-08-12 05:37+0000\n"
-"PO-Revision-Date: 2010-08-16 19:51+0530\n"
+"POT-Creation-Date: 2010-09-02 08:22+0000\n"
+"PO-Revision-Date: 2010-09-03 07:59+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
 "MIME-Version: 1.0\n"
@@ -86,7 +86,6 @@ 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)"
 
@@ -239,14 +238,13 @@ 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:2021 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:123
+#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:117
+#: ../shell/main.c:122
 msgid "Birthday"
 msgstr "�ਨਮ-ਦਿਨ"
 
 #. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-#| msgid "Blog"
 msgid "Blog:"
 msgstr "ਬਲ��:"
 
@@ -266,9 +264,9 @@ msgid "Contact"
 msgstr "ਸੰਪਰ�"
 
 #: ../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:2584
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:589
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2583
 msgid "Contact Editor"
 msgstr "ਸਬੰਧ ਸੰਪਾਦ�"
 
@@ -291,7 +289,7 @@ msgid "Full _Name..."
 msgstr "ਪ�ਰਾ ਨਾ�(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "�ਰ"
@@ -334,7 +332,7 @@ msgid "Notes"
 msgstr "ਨ��"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
 #: ../calendar/gui/e-calendar-view.c:1725
@@ -358,12 +356,11 @@ msgid "Web Addresses"
 msgstr "ਵ�ੱਬ �ਡਰ�ੱਸ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
-#| msgid "Web Addresses"
 msgid "Web addresses"
 msgstr "ਵ�ੱਬ �ਡਰ�ੱਸ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Work"
@@ -386,7 +383,6 @@ msgid "_Birthday:"
 msgstr "�ਨਮ-ਦਿਨ(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-#| msgid "Blog"
 msgid "_Blog:"
 msgstr "ਬਲ��(_B):"
 
@@ -471,74 +467,74 @@ msgstr "�ਿੱਥ�(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "�ਿਪ/ਡਾ� ��ਡ(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "�ਾਬਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "ਯਾਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "�ਡ�-�ਡ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "�ਰ�ੱਪਵਾ��਼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "ਸ�ਾ�ਪ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:352
 msgid "Error adding contact"
 msgstr "ਸ਼ਾਮਿਲ ਸੰਪਰ� �ਲਤ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
 msgid "Error modifying contact"
 msgstr "ਸੰਪਰ� ਸ��� �ਲਤ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
 msgid "Error removing contact"
 msgstr "ਹ�ਾ�ਣ ਸੰਪਰ� �ਲਤ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ਸਬੰਧ ਸੰਪਾਦ� - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2987
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
 msgid "Please select an image for this contact"
 msgstr "�ਸ ਸੰਪਰ� ਲ� �ਿੱਤਰ ��ਣ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
 msgid "_No image"
 msgstr "��� �ਿੱਤਰ ਨਹ��(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -546,23 +542,23 @@ msgstr ""
 "ਸੰਪਰ� ਡਾ�ਾ �ਲਤ ਹ�:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' �ੱ� �ਲਤ ਫਾਰਮ�� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ਦਾ �ਲਤ ਫਾਰਮ�� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' �ਾਲ� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
 msgid "Invalid contact."
 msgstr "�ਲਤ ਸੰਬੰਧ"
 
@@ -652,7 +648,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:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:657
 msgid "Contact List Editor"
 msgstr "ਸੰਪਰ� ਸ��� ਸੰਪਾਦ�"
 
@@ -677,24 +673,24 @@ msgstr "��ਣ�(_S)..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "ਲਿਸ� ਵਿੱ� ਹ�ਠਾ� ਸੰਪਰ� ਤ�� �-ਮ�ਲ ਲਿ�� �ਾ� ਸ�ੱ��।(_T)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
 msgid "Contact List Members"
 msgstr "ਸੰਪਰ� ਸ��� ਮ��ਬਰ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:911
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1328
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
 msgid "_Members"
 msgstr "ਮ��ਬਰ(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 msgid "Error adding list"
 msgstr "ਸ਼ਾਮਿਲ ਸ��� �ਲਤ�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1180
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
 msgid "Error modifying list"
 msgstr "ਸ�ਧ ਸ��� �ਲਤ�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1194
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
 msgid "Error removing list"
 msgstr "ਹ�ਾ�ਣ ਸ��� �ਲਤ�"
 
@@ -753,7 +749,7 @@ 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:904
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
 #: ../modules/calendar/e-cal-shell-view-actions.c:1687
 #: ../modules/calendar/e-memo-shell-view-actions.c:768
 #: ../modules/calendar/e-task-shell-view-actions.c:967
@@ -761,12 +757,12 @@ msgid "Any field contains"
 msgstr "��� ��ਤਰ ਸ਼ਾਮਿਲ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
 msgid "Email begins with"
 msgstr "�-ਮ�ਲ �ਸ ਨਾਲ �ਰੰਭ �ਰ�"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:918
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
 msgid "Name contains"
 msgstr "ਨਾ� ਰੱ�ਦਾ ਹ�"
 
@@ -806,7 +802,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "�ਲਿੱਪਬ�ਰਡ ਤ�� ਸੰਪਰ� ��ਪ�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:644
-#: ../modules/addressbook/e-book-shell-view-actions.c:729
+#: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਹ�ਾ�"
 
@@ -1137,17 +1133,17 @@ msgid "Copy _Email Address"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ ਨ�ਲ(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:391
+#: ../widgets/misc/e-web-view.c:396
 msgid "Copy the email address to the clipboard"
 msgstr "�ਮ�ਲ �ਡਰ�ੱਸ �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:396
+#: ../widgets/misc/e-web-view.c:401
 msgid "_Send New Message To..."
 msgstr "�ਸ ਨ�ੰ ਨਵਾ� ਸ�ਨ�ਹਾ ਭ���(_S)..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:398
+#: ../widgets/misc/e-web-view.c:403
 msgid "Send a mail message to this address"
 msgstr "�ਸ �ਡਰ�ੱਸ ਨ�ੰ ਮ�ਲ ਸ�ਨ�ਹਾ ਭ���"
 
@@ -1191,7 +1187,7 @@ msgstr "ਵ�ਡਿ� �ੱਲਬਾਤ"
 #: ../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
+#: ../widgets/misc/e-send-options.c:499
 msgid "Calendar"
 msgstr "��ਲੰਡਰ"
 
@@ -1231,10 +1227,10 @@ msgstr "ਵ�ਬ ਲਾ�"
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
 #: ../capplet/settings/mail-capplet-shell.c:350
-#: ../modules/addressbook/e-book-shell-backend.c:115
+#: ../modules/addressbook/e-book-shell-backend.c:116
 #: ../modules/addressbook/e-book-shell-migrate.c:138
 #: ../modules/calendar/e-cal-shell-backend.c:127
-#: ../modules/calendar/e-cal-shell-migrate.c:151
+#: ../modules/calendar/e-cal-shell-migrate.c:156
 #: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:112
@@ -1256,12 +1252,12 @@ msgid "Blog"
 msgstr "Blog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:848
+#: ../widgets/misc/e-web-view.c:853
 #, c-format
 msgid "Click to mail %s"
 msgstr "ਪੱਤਰ %s ਲ� ਦਬਾ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 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 "
@@ -1271,7 +1267,7 @@ msgstr ""
 "ਤਿ�ਰ ਨਾ ��ਤ� �� ਹ�ਵ� �ਾ� ਹਾਲ� ਡਾ�ਨਲ�ਡ ਨਾ ਹ�� ਹ�ਵ�। �ਿਰਪਾ �ਰ�� �ਨਲਾ�ਨ ਢੰ� ਨਾਲ �ਾਲ� ਹ�ਣ "
 "�ਪਰੰਤ �ਡਰ�ੱਸ-ਬ�ੱ� ਡਾ�ਨਲ�ਡ �ਰ� ਤਾ� �ਸ ਨ�ੰ ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਸ��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:81
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1280,7 +1276,7 @@ msgstr ""
 "�ਹ �ਡਰ�ੱਸ-ਬ�ੱ� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��। �ਿਰਪਾ �ਰ�� �ਾ�� �ਰ� �ਿ �ਹ ਮਾਰ� %s ਹ� �ਤ� ਤ�ਹਾਡ� ��ਲ "
 "�ਧਿ�ਾਰ ਹਨ।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:93
+#: ../addressbook/gui/widgets/eab-gui-util.c:92
 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."
@@ -1288,7 +1284,7 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਦ� �ਸ ਵਰ�ਨ ਵਿੱ� LDAP ਮੱਦਦ ਸ਼ਾਮਿਲ ਨਹ�� ਹ�। ���ਰ ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� LDAP ਮੱਦਦ �ਾਹ�ੰਦ� ਹ�, "
 "ਤ�ਹਾਨ�ੰ �ਵ�ਲ�ਸ਼ਨ ਪ���� LDAP-enabled �ੰਸ�ਾਲ �ਰਨਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1296,11 +1292,11 @@ msgstr ""
 "�ਸ �ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ��ਲ�ਹਣ ਵਿੱ� �ਸਫਲ। �ਸ ਦਾ �ਰਥ �ਹ ਹ� �ਿ �ਾ� ਤਾ� ਤ�ਸ�� �ਲਤ URI ਸ਼ਾਮਿਲ ��ਤਾ ਹ� "
 "�ਾ� ਸਰਵਰ ਪਹ�ੰ� ਤ�� ਬਾਹਰ ਹ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:109
 msgid "Detailed error message:"
 msgstr "ਵ�ਰਵ� ਸਮ�ਤ �ਲਤ� ਸ�ਨ�ਹਾ:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:133
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1312,7 +1308,7 @@ msgstr ""
 "�ਾ� �ਡਰ�ੱਸ-ਬ�ੱ� ਲ� ਡਾ�ਰ���ਰ� ਸਰਵਰ ਪਸੰਦ ਨਤ��ਾ� ਸਮਾ� ਵਧਾ\n"
 "ਦਿ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:141
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 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"
@@ -1325,52 +1321,49 @@ msgstr ""
 "ਦਿ�"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
 #, 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"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 #, 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"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
 #, 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:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Select Address Book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:287
+#: ../addressbook/gui/widgets/eab-gui-util.c:286
 msgid "list"
 msgstr "ਸ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:414
+#: ../addressbook/gui/widgets/eab-gui-util.c:425
 msgid "Move contact to"
 msgstr "ਸੰਪਰ� ਭ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:416
+#: ../addressbook/gui/widgets/eab-gui-util.c:427
 msgid "Copy contact to"
 msgstr "ਸੰਪਰ� ਦ� ਨ�ਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:419
+#: ../addressbook/gui/widgets/eab-gui-util.c:430
 msgid "Move contacts to"
 msgstr "ਸੰਪਰ� ਭ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:421
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
 msgid "Copy contacts to"
 msgstr "ਸੰਪਰ� ਦ� ਨ�ਲ"
 
@@ -1430,7 +1423,6 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ vCard �ੰਪ�ਰ�ਰ"
 #. * 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 ਪ��਼"
 
@@ -1518,7 +1510,7 @@ msgid "Enter password for %s (user %s)"
 msgstr "%s (ਯ��਼ਰ %s) ਲ� ਪਾਸਵਰਡ ਭਰ�"
 
 #: ../addressbook/util/addressbook.c:230
-#: ../calendar/common/authentication.c:55
+#: ../calendar/common/authentication.c:53
 #: ../plugins/caldav/caldav-browse-server.c:813
 #: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
@@ -1545,26 +1537,20 @@ 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 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 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."
@@ -1652,7 +1638,6 @@ msgstr "�� ਤ�ਸ�� �ਹ �ੰਮ ਹ�ਾ� ਬਾਰ� ਤਿ
 
 #  mail:ask-send-no-subject primary
 #: ../calendar/calendar.error.xml.h:26
-#| 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 "�� ਤ�ਸ�� ਮ�ਲਾ�ਾਤ ਨ�ੰ ਸੰ��ਪ �ਾਣ�ਾਰ� ਬਿਨਾ� ਹ� ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
@@ -1663,7 +1648,6 @@ 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?"
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "�� ਤ�ਸ�� �ੰਮ ਨ�ੰ ਸੰ��ਪ �ਾਣ�ਾਰ� ਬਿਨਾ� ਹ� ਸੰਭਾਲਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
@@ -1905,7 +1889,7 @@ msgstr "ਤ�ਹਾਡ� �ੰਮ �ਵ�ਲ�ਸ਼ਨ ਦ� ਮ�� �
 msgid "_Discard Changes"
 msgstr "ਤਬਦ�ਲ��� ਰੱਦ(_D)"
 
-#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:271
 msgid "_Save"
 msgstr "ਸੰਭਾਲ�(_S)"
 
@@ -1966,20 +1950,10 @@ msgid "_Dismiss"
 msgstr "ਮਨਸ��(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../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:1608
-#: ../widgets/menus/gal-define-views.ui.h:5
-msgid "_Edit"
-msgstr "ਸ�ਧ(_E)"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "ਬ��ਾਰ(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../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
@@ -1987,12 +1961,12 @@ msgstr "ਬ��ਾਰ(_S)"
 msgid "hours"
 msgstr "�ੰ��"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 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/alarm-notify/alarm-notify.ui.h:9
 #: ../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
@@ -2413,7 +2387,6 @@ msgid "Show type field in the event/task/meeting editor"
 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 "ਦਿਨ �ਲ�, �ੰਮ ਹਫ਼ਤਾ �ਲ� �ਤ� ਮਿਤ� ਨ�ਵ����ਰ ਵਿੱ� ਹਫ਼ਤਾ �ਿਣਤ� ਵ���"
 
@@ -2617,7 +2590,6 @@ msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� �ਿਸਮ ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
-#| msgid "Whether to show week numbers in the date navigator."
 msgid "Whether to show week numbers in various places in the Calendar."
 msgstr "�� ��ਲੰਡਰ '� �� ਥਾਵਾ� ਵਿੱ� ਹਫ਼ਤਾ ਨੰਬਰ ਵ��ਾ�ਣਾ ਹ�।"
 
@@ -2697,7 +2669,7 @@ msgstr "��ਪਤ"
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:514
+#: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "ਵ�ਰਵਾ"
@@ -2939,12 +2911,10 @@ msgid "Selected Calendars for Alarms"
 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:790
-#| msgid "Date only:"
 msgid "_Date only:"
 msgstr "��ਵਲ ਮਿਤ�(_D):"
 
@@ -3019,7 +2989,7 @@ msgstr "ਸ਼�ੱ�ਰਵਾਰ"
 #: ../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/itip-formatter/itip-formatter.c:2678
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -3043,7 +3013,7 @@ msgstr "ਸ�ਮਵਾਰ"
 #. * part of "Include threads: None"
 #. Translators: Used in send options dialog
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
+#: ../filter/e-filter-rule.c:749 ../widgets/misc/e-send-options.ui.h:12
 msgid "None"
 msgstr "��� ਨਹ�"
 
@@ -3086,7 +3056,6 @@ msgid "Show a _reminder"
 msgstr "ਯਾਦਪੱਤਰ ਵ��ਾ�(_r)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
-#| msgid "Show week _numbers in date navigator"
 msgid "Show week _numbers"
 msgstr "ਹਫ਼ਤਾ ਨੰਬਰ ਵ���(_n)"
 
@@ -3122,7 +3091,7 @@ msgstr "ਵ�ਰਵਾਰ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:592
+#: ../widgets/misc/e-dateedit.c:595
 msgid "Time"
 msgstr "ਸਮਾ�"
 
@@ -3249,7 +3218,7 @@ msgstr "�ਿਸਮ(_T):"
 #: ../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
+#: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "ਨਾ�(_N):"
 
@@ -3397,21 +3366,21 @@ msgstr "ਮ���ਦਾ ਵਿੰਡ� ਬੰਦ �ਰਨ ਲ� ਦਬਾ
 
 #: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
 #: ../shell/e-shell-window-actions.c:1454
-#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
+#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
+#: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1066
 msgid "Copy the selection"
 msgstr "��ਣ� ਦ� ਨ�ਲ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
 #: ../shell/e-shell-window-actions.c:1461
-#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:1055
+#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
+#: ../widgets/misc/e-web-view.c:1060
 msgid "Cut the selection"
 msgstr "��ਣ� �ੱ��"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1004
 #: ../shell/e-shell-window-actions.c:1468
-#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
 msgstr "��ਣ� ਹ�ਾ�"
 
@@ -3421,8 +3390,8 @@ msgstr "�ਪਲੱਬਧ ਮੱਦਦ ਵ��ਣ ਲ� �ੱਥ� ਦਬ
 
 #: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
 #: ../shell/e-shell-window-actions.c:1503
-#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:1067
+#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
+#: ../widgets/misc/e-web-view.c:1072
 msgid "Paste the clipboard"
 msgstr "�ਲਿੱਪਬ�ਰਡ �ਿਪ�ਾ�"
 
@@ -3432,7 +3401,7 @@ msgstr "ਮ���ਦਾ ਵਿੰਡ� ਸੰਭਾਲਣ ਲ� ਦਬਾ
 
 #: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
 #: ../shell/e-shell-window-actions.c:1573
-#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
+#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
 msgstr "ਸਾਰਾ ���ਸ� ��ਣ�"
 
@@ -3440,9 +3409,18 @@ msgstr "ਸਾਰਾ ���ਸ� ��ਣ�"
 msgid "_Classification"
 msgstr "ਵਰ���ਰਨ(_C)"
 
+#: ../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:1608
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "ਸ�ਧ(_E)"
+
 #: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
 #: ../shell/e-shell-window-actions.c:1615
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../widgets/misc/e-signature-editor.c:220
 msgid "_File"
 msgstr "ਫਾ�ਲ(_F)"
 
@@ -3456,7 +3434,7 @@ msgid "_Insert"
 msgstr "ਸ਼ਾਮਿਲ(_i)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../composer/e-composer-actions.c:312
+#: ../composer/e-composer-actions.c:315
 msgid "_Options"
 msgstr "��ਣ(_O)"
 
@@ -3466,7 +3444,7 @@ msgid "_View"
 msgstr "ਵ���(_V)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1105
-#: ../composer/e-composer-actions.c:240
+#: ../composer/e-composer-actions.c:243
 msgid "_Attachment..."
 msgstr "ਨੱਥ�(_a)..."
 
@@ -3552,7 +3530,7 @@ msgid "Recent _Documents"
 msgstr "ਤਾ�਼ਾ ਦਸਤਾਵ��਼(_D)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1743
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:431
 msgid "Attach"
 msgstr "ਨੱਥ�"
 
@@ -3588,35 +3566,30 @@ msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "ਹ�ਰ ਸਭ ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਦ� ਪੱਤਰ-ਬ�ਸ� ਵਿੱ� �ਹ ��ਾ� ਹ�ਾ�ਣ� ਹ�?(_D)"
 
 #: ../calendar/gui/dialogs/delete-comp.c:217
-#| msgid "P_ercent complete:"
 msgid "_Retract comment"
 msgstr "�ਿੱਪਣ� ਰ��ਰ�ਸ(_R)"
 
 #. 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"
 
 #. 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
 #, 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"
 
@@ -3639,28 +3612,24 @@ 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"
 
 #. 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"
 
 #. 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"
 
 #. 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"
 
@@ -3728,7 +3697,7 @@ msgstr "ਵ�ਹਲਾ/ਰ��ਿ�(_F)"
 msgid "Query free / busy information for the attendees"
 msgstr "�ਸ ��ਲੰਡਰ ਲ� ਵ�ਹਲਾ / ਰ��ਿ� �ਾਣ�ਾਰ� ਪਤਾ �ਰ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2610
 msgid "Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ"
 
@@ -3739,7 +3708,6 @@ msgid "Attendees"
 msgstr "ਦਰਸ਼�"
 
 #: ../calendar/gui/dialogs/event-editor.c:578
-#| msgid "Print this message"
 msgid "Print this event"
 msgstr "�ਹ �ਵ��� ਪਰਿੰ� �ਰ�"
 
@@ -3902,7 +3870,7 @@ msgstr "�ਲਾਰਮ(_A)"
 #: ../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
+#: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "ਵ�ਰਵਾ(_D):"
 
@@ -3912,7 +3880,6 @@ msgid "_Location:"
 msgstr "�ਿ�ਾਣਾ(_L):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:20
-#| msgid "Summary:"
 msgid "_Summary:"
 msgstr "ਸੰ��ਪ(_S):"
 
@@ -3934,12 +3901,11 @@ msgstr "ਲ�"
 msgid "until"
 msgstr "�ਦ�� ਤੱ�"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2614
 msgid "Memo"
 msgstr "ਮ�ਮ�"
 
 #: ../calendar/gui/dialogs/memo-editor.c:156
-#| msgid "Print the list of memos"
 msgid "Print this memo"
 msgstr "�ਹ ਮ�ਮ� ਪਰਿੰ� �ਰ�"
 
@@ -3960,10 +3926,10 @@ msgstr "ਮ�ਮ� ਪ�ਰ� ਤਰ�ਹਾ� ਸ�ਧਿ� ਨਹ�
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' ਵਿੱ� ਮ�ਮ� ��ਲਣ ਤ�� �ਸਮਰੱਥ"
 
-#: ../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
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
+#: ../em-format/em-format.c:1043 ../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
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "ਵੱਲ"
 
@@ -4217,7 +4183,7 @@ msgstr "ਵ�ਬ ਪ��਼"
 #: ../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
+#: ../calendar/gui/print.c:2697 ../mail/em-sync-stream.c:151
 #: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
 #, c-format
 msgid "Canceled"
@@ -4231,7 +4197,7 @@ msgstr "ਰੱਦ ��ਤਾ"
 #: ../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
+#: ../calendar/gui/print.c:2694 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "ਸਮਾਪਤ"
@@ -4251,7 +4217,7 @@ msgstr "��ਤਮ"
 #: ../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
+#: ../calendar/gui/print.c:2691
 msgid "In Progress"
 msgstr "ਤਰੱ�� ਵਿੱ� ਹ�"
 
@@ -4278,7 +4244,7 @@ msgstr "ਸਧਾਰਨ"
 #: ../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
+#: ../calendar/gui/print.c:2688 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "ਸ਼�ਰ� ਨਹ�� ਹ�"
 
@@ -4335,8 +4301,8 @@ msgstr "�ੰਮ ਦ� ਹਾਲਤ ਵ�ਰਵ� ਲ� ਤਬਦ�ਲ ਲ
 msgid "_Send Options"
 msgstr "ਭ��ਣ ��ਣ(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
-#: ../widgets/misc/e-send-options.c:502
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2612
+#: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "�ਾਸ�"
 
@@ -4345,7 +4311,6 @@ msgid "Task Details"
 msgstr "�ੰਮ ਵ�ਰਵਾ"
 
 #: ../calendar/gui/dialogs/task-editor.c:373
-#| msgid "Print the list of tasks"
 msgid "Print this task"
 msgstr "�ਹ �ੰਮ ਪਰਿੰ� �ਰ�"
 
@@ -4467,7 +4432,7 @@ msgstr "%s, %s ਤ�"
 msgid "%s for an unknown trigger type"
 msgstr "�ਣ�ਾਣ ਤਬਦ�ਲ� �ਿਸਮ ਲ�  %s"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:668
 msgid "Untitled"
 msgstr "ਬਿਨਾ� ਨਾ�"
 
@@ -4580,7 +4545,7 @@ msgstr "ਨਹ�"
 #: ../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/itip-formatter/itip-formatter.c:2345
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "�ਣ�ਾਣ"
@@ -4633,7 +4598,7 @@ msgstr "ਸ਼�ਰ��ਤ� ਮਿਤ�"
 #: ../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:572
+#: ../widgets/misc/e-attachment-tree-view.c:582
 msgid "Type"
 msgstr "�ਿਸਮ"
 
@@ -4667,7 +4632,7 @@ msgstr "��ਾ� �ੱਪਡ�� ��ਤ� �ਾ ਰਹ� ਹ�"
 #: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2331
+#: ../plugins/itip-formatter/itip-formatter.c:2333
 msgid "Accepted"
 msgstr "ਮਨ�਼�ਰ"
 
@@ -4675,7 +4640,7 @@ msgstr "ਮਨ�਼�ਰ"
 #: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2337
+#: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "Declined"
 msgstr "�ਨ�ਾਰ"
 
@@ -4689,7 +4654,7 @@ msgstr "�ਰ��"
 #: ../calendar/gui/e-calendar-view.c:1723
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2340
+#: ../plugins/itip-formatter/itip-formatter.c:2342
 msgid "Delegated"
 msgstr "ਪ�ਰਤ�ਨਿਧ�"
 
@@ -4714,7 +4679,7 @@ msgid "Organizer: %s"
 msgstr "ਪ�ਰਬੰਧ�: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
+#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2646
 #, c-format
 msgid "Location: %s"
 msgstr "�ਿ�ਾਣਾ: %s"
@@ -4813,7 +4778,6 @@ msgid "Week %d"
 msgstr "ਹਫ਼ਤਾ %d"
 
 #: ../calendar/gui/e-itip-control.c:761
-#| msgid "Recurring"
 msgid "Recurring:"
 msgstr "�ਵਿਰਤ�:"
 
@@ -4920,9 +4884,6 @@ msgstr "�ਣ�ਾਣਾ ਵਿ��ਤ�"
 
 #  Describe what the user can do
 #: ../calendar/gui/e-itip-control.c:1145
-#| msgid ""
-#| "<br> Please review the following information, and then select an action "
-#| "from the menu below."
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
@@ -4930,13 +4891,13 @@ msgstr " �ਿਰਪਾ �ਰ�� ਹ�ਠ ਦਿੱਤ� �ਾਣ�ਾ
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2318
+#: ../plugins/itip-formatter/itip-formatter.c:2320
 msgctxt "cal-itip"
 msgid "None"
 msgstr "��� ਨਹ��"
 
 #: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2334
+#: ../plugins/itip-formatter/itip-formatter.c:2336
 msgid "Tentatively Accepted"
 msgstr "�ਰ�� ਮਨ�਼�ਰ"
 
@@ -4952,7 +4913,6 @@ msgstr "�ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ �ਿ� ਹ�, ਪਰ ਤ
 
 #: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-#| msgid "<b>%s</b> has published meeting information."
 msgid "%s has published meeting information."
 msgstr "%s ਨ� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
 
@@ -4962,13 +4922,11 @@ msgstr "ਮ��ਿੰ� ਬਾਰ� �ਾਣ�ਾਰ�"
 
 #: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-#| 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:1378
 #, c-format
-#| msgid "<b>%s</b> requests your presence at a meeting."
 msgid "%s requests your presence at a meeting."
 msgstr "%s ਨ� ਮ��ਿੰ� ਵਿੱ� ਤ�ਹਾਡ� ਹਾ�਼ਰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
@@ -4979,7 +4937,6 @@ msgstr "ਮ��ਿੰ� ਸ��ਾ�"
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-#| msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgid "%s wishes to be added to an existing meeting."
 msgstr "%s �ੱ� ਮ���ਦਾ ਮ��ਿੰ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�।"
 
@@ -4989,7 +4946,6 @@ msgstr "ਮ��ਿੰ� �ੱਪਡ��"
 
 #: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-#| msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgid "%s wishes to receive the latest meeting information."
 msgstr "%s ਨਵ�� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦ� ਹ�।"
 
@@ -4999,7 +4955,6 @@ msgstr "ਮ��ਿੰ� �ੱਪਡ�� ਮੰ�"
 
 #: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-#| msgid "<b>%s</b> has replied to a meeting request."
 msgid "%s has replied to a meeting request."
 msgstr "%s ਨ� �ੱ� ਮ��ਿੰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
@@ -5009,7 +4964,6 @@ msgstr "ਮ��ਿੰ� �ਵਾਬ"
 
 #: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-#| msgid "<b>%s</b> has canceled a meeting."
 msgid "%s has canceled a meeting."
 msgstr "%s ਨ� �ੱ� ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� ਹ�।"
 
@@ -5020,7 +4974,6 @@ msgstr "ਮ��ਿੰ� ਰੱਦ"
 #: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
 #: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-#| msgid "<b>%s</b> has sent an unintelligible message."
 msgid "%s has sent an unintelligible message."
 msgstr "%s ਨ� �ੱ� ਨਾ ਬ�ਸਮ� ਸ�ਨ�ਹਾ ਭ��ਿ� ਹ�।"
 
@@ -5030,7 +4983,6 @@ msgstr "�ਲਤ ਮ��ਿੰ� ਸ�ਨ�ਹਾ"
 
 #: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-#| msgid "<b>%s</b> has published task information."
 msgid "%s has published task information."
 msgstr "%s ਨ� �ੰਮ �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
 
@@ -5040,13 +4992,11 @@ msgstr "�ੰਮ �ਾਣ�ਾਰ�"
 
 #: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-#| 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:1455
 #, c-format
-#| msgid "<b>%s</b> requests you perform a task."
 msgid "%s requests you perform a task."
 msgstr "%s ਤ�ਹਾਨ�ੰ �ੱ� �ੰਮ ਲ� �ਹਿ ਰਿਹਾ ਹ�।"
 
@@ -5057,7 +5007,6 @@ msgstr "�ੰਮ ਸ��ਾ�"
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-#| msgid "<b>%s</b> wishes to be added to an existing task."
 msgid "%s wishes to be added to an existing task."
 msgstr "%s ਨ� �ੱ� �ਾਰ� �ੰਮ ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�ਣ ਦ� �ੱ�ਾ �ਤਾ� ਹ�।"
 
@@ -5067,7 +5016,6 @@ msgstr "�ੰਮ �ੱਪਡ��"
 
 #: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-#| msgid "<b>%s</b> wishes to receive the latest task information."
 msgid "%s wishes to receive the latest task information."
 msgstr "%s ਤਾ�਼� �ੰਮ �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦਾ ਹ�।"
 
@@ -5077,7 +5025,6 @@ msgstr "�ੰਮ �ੱਪਡ�� ਬ�ਨਤ�"
 
 #: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-#| msgid "<b>%s</b> has replied to a task assignment."
 msgid "%s has replied to a task assignment."
 msgstr "%s ਨ� �ਾਰ� �ੰਮ ਲ� �ਵਾਬ ਭ��ਿ� ਹ�।"
 
@@ -5087,7 +5034,6 @@ msgstr "�ੰਮ �ਵਾਬ"
 
 #: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-#| msgid "<b>%s</b> has canceled a task."
 msgid "%s has canceled a task."
 msgstr "%s ਨ� �ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�।"
 
@@ -5101,7 +5047,6 @@ msgstr "�ਲਤ �ੰਮ ਸ�ਨ�ਹਾ"
 
 #: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-#| msgid "<b>%s</b> has published free/busy information."
 msgid "%s has published free/busy information."
 msgstr "%s ਨ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
 
@@ -5111,7 +5056,6 @@ msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ�"
 
 #: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-#| msgid "<b>%s</b> requests your free/busy information."
 msgid "%s requests your free/busy information."
 msgstr "%s ਨ� ਤ�ਹਾਡ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਲ� ਬ�ਨਤ� ਭ��� ਹ�।"
 
@@ -5121,7 +5065,6 @@ msgstr "ਵ�ਹਲਾ/ਰ��ਿ� ਬ�ਨਤ�"
 
 #: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-#| msgid "<b>%s</b> has replied to a free/busy request."
 msgid "%s has replied to a free/busy request."
 msgstr "%s ਨ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� �ਵਾਬ ਭ��ਿ� ਹ�।"
 
@@ -5224,8 +5167,8 @@ msgid "Send Latest Information"
 msgstr "ਤਾ�� �ਾਣ�ਾਰ� ਭ���"
 
 #: ../calendar/gui/e-itip-control.c:2465
-#: ../modules/mail/e-mail-shell-view-actions.c:976
-#: ../widgets/misc/e-activity-proxy.c:298
+#: ../modules/mail/e-mail-shell-view-actions.c:1036
+#: ../widgets/misc/e-activity-proxy.c:300
 msgid "Cancel"
 msgstr "ਰੱਦ �ਰ�"
 
@@ -5496,11 +5439,10 @@ msgstr "�ੱ� ਮ�ਮ� ਸ਼ਾਮਿਲ �ਰਨ ਲ� ਦਬਾ�"
 #.
 #: ../calendar/gui/e-task-table.c:539
 #, c-format
-#| msgid "%d %b"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2072
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
@@ -5697,7 +5639,7 @@ msgstr "ਮਹ�ਨ� ਦ� ��ਲੰਡਰ ਦਿੱ�"
 msgid "calendar view for one or more weeks"
 msgstr "�ੱ� �ਾ� ਵਧ�ਰ� ਹਫਤਿ�� ਲ� ��ਲੰਡਰ �ਲ�"
 
-#: ../calendar/gui/gnome-cal.c:2287
+#: ../calendar/gui/gnome-cal.c:2291
 msgid "Purging"
 msgstr "ਸ�ਧਿ� �ਾ ਰਿਹਾ ਹ�"
 
@@ -6033,71 +5975,71 @@ msgstr "ਸ਼"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:2429
+#: ../calendar/gui/print.c:2449
 msgid " to "
 msgstr " ਵੱਲ "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2457
 msgid " (Completed "
 msgstr " (ਸਮਾਪਤ "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:2441
+#: ../calendar/gui/print.c:2461
 msgid "Completed "
 msgstr "ਸਮਾਪਤ "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2469
 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
+#: ../calendar/gui/print.c:2474
 msgid "Due "
 msgstr "ਬਾ�� "
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2637
 #, c-format
 msgid "Summary: %s"
 msgstr "ਸੰ��ਪ: %s"
 
-#: ../calendar/gui/print.c:2639
+#: ../calendar/gui/print.c:2661
 msgid "Attendees: "
 msgstr "ਦਰਸ਼�:"
 
-#: ../calendar/gui/print.c:2682
+#: ../calendar/gui/print.c:2704
 #, c-format
 msgid "Status: %s"
 msgstr "ਹਾਲਤ: %s"
 
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2719
 #, c-format
 msgid "Priority: %s"
 msgstr "ਪਹਿਲ: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2737
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ਪ�ਰਤ�ਸ਼ਤ ਪ�ਰਾ: %i"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2748
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2739
+#: ../calendar/gui/print.c:2761
 #, c-format
 msgid "Categories: %s"
 msgstr "���ਾ�ਰ�: %s"
 
-#: ../calendar/gui/print.c:2750
+#: ../calendar/gui/print.c:2772
 msgid "Contacts: "
 msgstr "ਸੰਪਰ�: "
 
@@ -6124,7 +6066,7 @@ msgstr "ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ�"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1835
 msgid "Opening calendar"
 msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
@@ -6141,7 +6083,6 @@ msgid "Reminder!"
 msgstr "ਯਾਦ-ਪੱਤਰ!"
 
 #: ../calendar/importers/icalendar-importer.c:662
-#| msgid "vCalendar files (.vcf)"
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar ਫਾ�ਲਾ� (.vcs)"
 
@@ -6159,81 +6100,68 @@ 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 "ਵਰ���ਰਨ"
@@ -6242,14 +6170,12 @@ msgstr "ਵਰ���ਰਨ"
 #. 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 "�ਿ�ਾਣਾ"
@@ -6258,42 +6184,36 @@ msgstr "�ਿ�ਾਣਾ"
 #. 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"
@@ -6301,7 +6221,6 @@ 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 "ਪ�ਰਬੰਧ�"
@@ -6309,20 +6228,17 @@ 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 "�ਿਸਮ"
@@ -7883,141 +7799,141 @@ msgstr "ਪ�ਰਸ਼ਾਤ/ਯਾਪ�"
 msgid "Save as..."
 msgstr "�ੰ� ਸੰਭਾਲ�..."
 
-#: ../composer/e-composer-actions.c:242
-#: ../widgets/misc/e-attachment-view.c:374
+#: ../composer/e-composer-actions.c:245
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "Attach a file"
 msgstr "�ੱ� ਫਾ�ਲ ਸ਼ਾਮਿਲ �ਰ�"
 
-#: ../composer/e-composer-actions.c:247
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:250
+#: ../widgets/misc/e-signature-editor.c:206
 msgid "_Close"
 msgstr "ਬੰਦ �ਰ�(_C)"
 
-#: ../composer/e-composer-actions.c:249
+#: ../composer/e-composer-actions.c:252
 msgid "Close the current file"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਬੰਦ �ਰ�"
 
-#: ../composer/e-composer-actions.c:254
+#: ../composer/e-composer-actions.c:257
 msgid "_Print..."
 msgstr "ਪਰਿੰ� �ਰ�(_P)..."
 
-#: ../composer/e-composer-actions.c:261
+#: ../composer/e-composer-actions.c:264
 msgid "Print Pre_view"
 msgstr "�ਪਾ� �ਲ�(_v)"
 
-#: ../composer/e-composer-actions.c:270
+#: ../composer/e-composer-actions.c:273
 msgid "Save the current file"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-actions.c:275
+#: ../composer/e-composer-actions.c:278
 msgid "Save _As..."
 msgstr "�ੰ� ਸੰਭਾਲ�(_A)..."
 
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:280
 msgid "Save the current file with a different name"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਨ�ੰ ਵੱ�ਰ� ਨਾ� ਨਾਲ ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-actions.c:282
+#: ../composer/e-composer-actions.c:285
 msgid "Save as _Draft"
 msgstr "ਡਰਾਫ� ਵਾ�� ਸੰਭਾਲ�(_D)"
 
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:287
 msgid "Save as draft"
 msgstr "ਡਰਾਫ� ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:293
+#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
 msgid "S_end"
 msgstr "ਭ���(_e)"
 
-#: ../composer/e-composer-actions.c:291
+#: ../composer/e-composer-actions.c:294
 msgid "Send this message"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਭ���"
 
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:299
 msgid "New _Message"
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ(_M)"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:301
 msgid "Open New Message window"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਾ ਵਿੰਡ� ��ਲ�ਹ�"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:308
 msgid "Character _Encoding"
 msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�(_E)"
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:325
 msgid "PGP _Encrypt"
 msgstr "PGP �ੰ��ਰਿਪ�(_E)"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:327
 msgid "Encrypt this message with PGP"
 msgstr "�ਸ ਸ�ਨ�ਹ� ਨ�ੰ PGP ਨਾਲ �ੰ��ਰਿਪ� �ਰ�"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:333
 msgid "PGP _Sign"
 msgstr "PGP ਦਸਤ�ਤ(_S)"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:335
 msgid "Sign this message with your PGP key"
 msgstr "�ਪਣ� PGP �� ਨਾਲ �ਸ ਸ�ਨ�ਹ� ਤ� ਦਸਤ�ਤ �ਰ�"
 
-#: ../composer/e-composer-actions.c:338
+#: ../composer/e-composer-actions.c:341
 msgid "_Prioritize Message"
 msgstr "ਦਰ�ਾ ਸ�ਨ�ਹਾ(_P)"
 
-#: ../composer/e-composer-actions.c:340
+#: ../composer/e-composer-actions.c:343
 msgid "Set the message priority to high"
 msgstr "ਸ�ਨ�ਹ� ਦਾ ਦਰ�ਾ ਵਧਾ�"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:349
 msgid "Re_quest Read Receipt"
 msgstr "ਪ��ਹਨ ਰਸ�ਦ ਦ� ਮੰ�(_q)"
 
-#: ../composer/e-composer-actions.c:348
+#: ../composer/e-composer-actions.c:351
 msgid "Get delivery notification when your message is read"
 msgstr "�ਦ�� ਤ�ਹਾਡਾ ਸ�ਨ�ਹਾ ਪ�ਿ� �ਾਵ� ਤਾ� ਪ�ਰਾਪਤ� ਸ��ਨਾ ਲਵ�"
 
-#: ../composer/e-composer-actions.c:354
+#: ../composer/e-composer-actions.c:357
 msgid "S/MIME En_crypt"
 msgstr "S/MIME �ੰ��ਰਿਪ�(_C)"
 
-#: ../composer/e-composer-actions.c:356
+#: ../composer/e-composer-actions.c:359
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "�ਸ ਸ�ਨ�ਹ� ਨ�ੰ �ਪਣ� S/MIME ��ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਨਾਲ ��ਰਿਪ� �ਰ�"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:365
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ਸਾ�ਨ(_n)"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:367
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "�ਪਣ� S/MIME ਦਸਤ�ਤ ਸਰ��ਫਿ��� ਨਾਲ �ਸ ਸ�ਨ�ਹ� ਤ� ਦਸਤ�ਤ �ਰ�"
 
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:373
 msgid "_Bcc Field"
 msgstr "_Bcc ��ਤਰ"
 
-#: ../composer/e-composer-actions.c:372
+#: ../composer/e-composer-actions.c:375
 msgid "Toggles whether the BCC field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ BCC ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:381
 msgid "_Cc Field"
 msgstr "_Cc ��ਤਰ"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:383
 msgid "Toggles whether the CC field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ CC ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:389
 msgid "_Reply-To Field"
 msgstr "�ਵਾਬ ��ਤਰ(_R)"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:391
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ �ਵਾਬ ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:434
 msgid "Save Draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�"
 
@@ -8071,36 +7987,36 @@ msgstr "ਵਿਸ਼ਾ(_u):"
 msgid "Si_gnature:"
 msgstr "ਦਸਤ�ਤ(_g):"
 
-#: ../composer/e-composer-name-header.c:137
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਲ� �ੱਥ� �ਲਿੱ� �ਰ�"
 
-#: ../composer/e-composer-post-header.c:126
+#: ../composer/e-composer-post-header.c:130
 msgid "Click here to select folders to post to"
 msgstr "ਭ��ਣ ਲ� ਫ�ਲਡਰ ��ਣਨ ਲ� �ੱਥ� �ਲਿੱ� �ਰ�"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:215
 msgid "Undo the last action"
 msgstr "ਪਿ�ਲ� �ਾਰਵਾ� ਵਾਪਸ ਲਵ�"
 
-#: ../composer/e-composer-private.c:215
+#: ../composer/e-composer-private.c:219
 msgid "Redo the last undone action"
 msgstr "��ਰ� ਵਾਪਸ ��ਤ� �ਾਰਵਾ� ਨ�ੰ ਮ��-�ਰ�"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:223
 msgid "Search for text"
 msgstr "���ਸ� ����"
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:227
 msgid "Search for and replace text"
 msgstr "���ਸ� ਦ� ��� �ਰ� �ਤ� ਬਦਲ�"
 
-#: ../composer/e-composer-private.c:313
+#: ../composer/e-composer-private.c:317
 msgid "Save draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:199
+#: ../composer/e-msg-composer.c:196
 #: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਮ�� ਨਾ ਵ���(_D)।"
@@ -8117,22 +8033,19 @@ msgid ""
 "account"
 msgstr "ਬਾਹਰ �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਨ�ੰ ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਸ ��ਾ��� ਲ� ��� ���ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਨਹ�� ਹ�"
 
-#: ../composer/e-msg-composer.c:1465
+#: ../composer/e-msg-composer.c:1460
 msgid "Unable to reconstruct message from autosave file"
 msgstr "���ਸ�ਵ ਫਾ�ਲ ਤ�� ਸ�ਨ�ਹਾ ਫ�ਰ ਬਣਾ�ਣ ਲ� �ਸਮਰੱਥ"
 
-#: ../composer/e-msg-composer.c:1533 ../composer/e-msg-composer.c:1817
+#: ../composer/e-msg-composer.c:1530 ../composer/e-msg-composer.c:1876
 msgid "Compose Message"
 msgstr "ਸ�ਨ�ਹਾ ਲਿ��"
 
-#: ../composer/e-msg-composer.c:3538
-#| msgid ""
-#| "<b>(The composer contains a non-text message body, which cannot be "
-#| "edited.)</b>"
+#: ../composer/e-msg-composer.c:3535
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "ਲ��ਣ ਵਿੱ� ��� ਨਾ-���ਸ� ਭਾ� ਹ�, �ਿਸ ਨ�ੰ ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../composer/e-msg-composer.c:4144
+#: ../composer/e-msg-composer.c:4150
 msgid "Untitled Message"
 msgstr "�਼�ਰ-�ਾ��ਲ ਸ�ਨ�ਹਾ"
 
@@ -8219,8 +8132,6 @@ 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."
 msgstr "ਫਾ�ਲ `{0}' ਨਿਯਮਿਤ ਫਾ�ਲ ਨਹ�� ਹ� �ਤ� ਸ�ਨ�ਹ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
@@ -8241,7 +8152,6 @@ 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."
 msgid "You cannot attach the file n{0}' to this message."
 msgstr "ਤ�ਸ�� �ਸ ਸ�ਨ�ਹ� ਨਾਲ n{0}' ਫਾ�ਲ ਸ਼ਾਮਿਲ ਨਹ�� �ਰ ਸ�ਦ� ਹ�।"
 
@@ -8265,24 +8175,24 @@ msgstr "ਪ�ਰਾਪਤ(_R)"
 msgid "_Save Draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�(_S)"
 
-#: ../capplet/anjal-settings-main.c:199
+#: ../capplet/anjal-settings-main.c:198
 msgid "Run Anjal in a window"
 msgstr "�ੰ�ਾਲ ਵਿੰਡ� ਵਿੱ� �ਲਾ�"
 
-#: ../capplet/anjal-settings-main.c:200
+#: ../capplet/anjal-settings-main.c:199
 msgid "Make Anjal the default email client"
 msgstr "�ੰ�ਾਲ ਨ�ੰ ਡਿਫਾਲ� �ਮ�ਲ �ਲਾ�� ਬਣਾ�"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:207
+#: ../capplet/anjal-settings-main.c:206
 msgid "ID of the socket to embed in"
 msgstr "ਵਿ�� ਸ਼ਾਮਲ �ਰਨ ਲ� ਸਾ�� ਦਾ ID"
 
-#: ../capplet/anjal-settings-main.c:208
+#: ../capplet/anjal-settings-main.c:207
 msgid "socket"
 msgstr "ਸਾ��"
 
-#: ../capplet/anjal-settings-main.c:221
+#: ../capplet/anjal-settings-main.c:220
 msgid "Anjal email client"
 msgstr "�ੰ�ਾਲ �ਮ�ਲ �ਲਾ��"
 
@@ -8299,7 +8209,6 @@ msgid "The email address you have entered is invalid."
 msgstr "ਤ�ਹਾਡ� ਵਲ�� ਦਿੱਤਾ �ਮ�ਲ �ਡਰ�ੱਸ ਢ�ੱ�ਵਾ� ਨਹ�� ਹ�।"
 
 #: ../capplet/settings/mail-account-view.c:77
-#| msgid "Please enter your email address."
 msgid "Please enter your password."
 msgstr "�ਪਣਾ ਪਾਸਵਰਡ ਦਿ� ��।"
 
@@ -8315,7 +8224,6 @@ msgid "Google"
 msgstr "���ਲ"
 
 #: ../capplet/settings/mail-account-view.c:464
-#| msgid "Personal"
 msgid "Personal details:"
 msgstr "ਨਿੱ�� ਵ�ਰਵਾ:"
 
@@ -8328,12 +8236,10 @@ msgid "Email address:"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ:"
 
 #: ../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>"
 
@@ -8359,7 +8265,6 @@ msgid "never"
 msgstr "�ਦ� ਨਹ��"
 
 #: ../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>"
 
@@ -8408,7 +8313,7 @@ msgstr ""
 "ਮ�ਲਾ� ਲ�ਣ��� ਸ਼�ਰ� �ਰ��।"
 
 #: ../capplet/settings/mail-account-view.c:608
-#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2219
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2222
 #: ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "ਪ�ਾਣ"
@@ -8461,7 +8366,7 @@ msgid "Back - Receiving options"
 msgstr "ਪਿੱ�� - ਲ�ਣ ��ਣਾ�"
 
 #: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2985 ../mail/mail-config.ui.h:34
+#: ../mail/em-account-editor.c:2988 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "ਮ�ਲ"
 
@@ -8482,12 +8387,10 @@ msgid "Back - Sending"
 msgstr "ਪਿੱ�� - ਭ��ਣਾ"
 
 #: ../capplet/settings/mail-account-view.c:719
-#| 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 "�ਵ�ਲ�ਸ਼ਨ ਨਾਲ ���ਲ ��ਲੰਡਰ ਸ���ੱਪ"
 
@@ -8496,12 +8399,10 @@ 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 "�ਵ�ਲ�ਸ਼ਨ ਨਾਲ ਯਾਹ� ��ਲੰਡਰ ਸ���ੱਪ"
 
@@ -8511,28 +8412,27 @@ msgid ""
 "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:"
+#: ../capplet/settings/mail-account-view.c:1049
 msgid "Password:"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: ../capplet/settings/mail-account-view.c:1091
+#: ../capplet/settings/mail-account-view.c:1117
 #: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "��ਬ ਬੰਦ �ਰ�"
 
-#: ../capplet/settings/mail-account-view.c:1101
+#: ../capplet/settings/mail-account-view.c:1127
 msgid "Account Wizard"
 msgstr "��ਾ��� ਸਹਾ��"
 
@@ -8547,10 +8447,10 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਾ��� ਸਹਾ��"
 #: ../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-backend.c:96
 #: ../modules/addressbook/e-book-shell-migrate.c:130
 #: ../modules/calendar/e-cal-shell-backend.c:102
-#: ../modules/calendar/e-cal-shell-migrate.c:141
+#: ../modules/calendar/e-cal-shell-migrate.c:146
 #: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:92
@@ -8568,7 +8468,6 @@ msgid "Add a new account"
 msgstr "ਨਵਾ� ��ਾ��� ਸ਼ਾਮਲ"
 
 #: ../capplet/settings/mail-settings-view.c:184
-#| msgid "Account Management"
 msgid "Account management"
 msgstr "��ਾ��� ਪਰਬੰਧ"
 
@@ -8610,25 +8509,25 @@ msgid "Email Settings"
 msgstr "�ਮ�ਲ ਸ��ਿੰ�"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:224
+#: ../e-util/e-activity.c:228
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (ਰੱਦ �ਰ�)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:231
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (ਸਮਾਪਤ)"
 
 #. Translators: This is an activity whose percent
 #. * complete is unknown.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:235
 #, c-format
 msgid "%s..."
 msgstr "%s..."
 
-#: ../e-util/e-activity.c:236
+#: ../e-util/e-activity.c:240
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ਸਮਾਪਤ)"
@@ -8642,7 +8541,7 @@ msgid "Evolution Warning"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਤਾਵਨ�"
 
 #  setup a dummy error
-#: ../e-util/e-alert.c:649
+#: ../e-util/e-alert.c:652
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "�ੰਦਰ�ਨ� �ਲਤ�, �ਣ�ਾਣ �ਲਤ� '%s' ਬ�ਨਤ�"
@@ -8744,7 +8643,6 @@ msgstr "�ੱਲ�ਹ"
 #. 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"
 msgid "%d day from now"
 msgid_plural "%d days from now"
 msgstr[0] "ਹ�ਣ ਤ�� %d ਦਿਨ"
@@ -8753,7 +8651,6 @@ msgstr[1] "ਹ�ਣ ਤ�� %d ਦਿਨ"
 #. 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"
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ਦਿਨ ਪਹਿਲਾ�"
@@ -8857,7 +8754,7 @@ msgstr "ਪਰਿ�ਿੰ� ਸਿਸ�ਮ ਨ� �ਲਤ� ਬਾਰ� 
 msgid "The printing system did not report any additional details about the error."
 msgstr "ਪਰਿੰ�ਿੰ� ਸਿਸ�ਮ ਨ� �ਲਤ� ਬਾਰ� ਹ�ਰ �ਾਣ�ਾਰ� ਨਹ�� ਦਿੱਤ� ਹ�।"
 
-#: ../e-util/e-signature.c:731
+#: ../e-util/e-signature.c:707
 msgid "Autogenerated"
 msgstr "ਸਵ�-ਨਿਰਮਤ"
 
@@ -8908,106 +8805,105 @@ msgstr "GConf �ਲਤ�: %s"
 msgid "All further errors shown only on terminal."
 msgstr "ਹ�ਰ ਬਾ�� ਸਭ �ਲਤ��� ��ਵਲ �ਰਮ�ਨਲ �ੱਤ� ਹ� ਵ���।"
 
-#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1024
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "ਵਲ��"
 
-#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1025
-#: ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "�ਸ ਨ�ੰ �ਵਾਬ"
 
-#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1027
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1044
 #: ../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
+#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1028
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1045
 #: ../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
+#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:406 ../em-format/em-format.c:1029
+#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1046
 #: ../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:83
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
 #: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "ਵਿਸ਼ਾ"
 
 #  pseudo-header
 #. pseudo-header
-#: ../em-format/em-format-quote.c:417 ../mail/em-format-html.c:2472
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../em-format/em-format-quote.c:421 ../mail/em-format-html.c:2472
+#: ../modules/mail/em-mailer-prefs.c:1120
 msgid "Mailer"
 msgstr "ਮ�ਲਰ"
 
-#: ../em-format/em-format-quote.c:492 ../mail/em-composer-utils.c:1190
+#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1301
 msgid "-------- Forwarded Message --------"
 msgstr "-------- �ੱ�� ਭ��� ਸ�ਨ�ਹ� --------"
 
-#: ../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
+#: ../em-format/em-format.c:1047 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:527
+#: ../widgets/misc/e-dateedit.c:549
 msgid "Date"
 msgstr "ਮਿਤ�"
 
-#: ../em-format/em-format.c:1031 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:1048 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "�ਬਰਸਾਰ ਸਮ�ਹ"
 
-#: ../em-format/em-format.c:1032 ../modules/mail/em-mailer-prefs.c:86
+#: ../em-format/em-format.c:1049 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "ਫ�ਸ"
 
-#: ../em-format/em-format.c:1411
+#: ../em-format/em-format.c:1432
 #, c-format
 msgid "%s attachment"
 msgstr "%s ਨੱਥ�"
 
-#: ../em-format/em-format.c:1472
+#: ../em-format/em-format.c:1504
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ਸ�ਨ�ਹਾ S/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../em-format/em-format.c:1627 ../em-format/em-format.c:1803
+#: ../em-format/em-format.c:1662 ../em-format/em-format.c:1846
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ਸ�ਨ�ਹਾ MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�, ਸਰ�ਤ ਦ� ਤ�ਰ ਤ� ਹ� ਵ��ਾ�� �ਾ ਰਿਹਾ ਹ�।"
 
-#: ../em-format/em-format.c:1635
+#: ../em-format/em-format.c:1672
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ਬਹ�ਭਾ�/���ਰਿਪਸ਼ਨ ਲ� ਨਾ-ਸਹਾ�� �ੰ��ਰਿਪਸ਼ਨ �ਿਸਮ"
 
-#: ../em-format/em-format.c:1648
+#: ../em-format/em-format.c:1688
 msgid "Could not parse PGP/MIME message"
 msgstr "ਸ�ਨ�ਹਾ PGP/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../em-format/em-format.c:1649
+#: ../em-format/em-format.c:1689
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ਸ�ਨ�ਹਾ PGP/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../em-format/em-format.c:1827
+#: ../em-format/em-format.c:1871
 msgid "Unsupported signature format"
 msgstr "ਨਾ-ਸਹਾ�� ਦਸਤ�ਤ ਫਾਰਮ��"
 
-#: ../em-format/em-format.c:1837 ../em-format/em-format.c:1997
+#: ../em-format/em-format.c:1881 ../em-format/em-format.c:2041
 msgid "Error verifying signature"
 msgstr "ਦਸਤ�ਤ �ਾ�� ਦ�ਰਾਨ �ਲਤ�"
 
-#: ../em-format/em-format.c:1838 ../em-format/em-format.c:1985
-#: ../em-format/em-format.c:1998
+#: ../em-format/em-format.c:1882 ../em-format/em-format.c:2029
+#: ../em-format/em-format.c:2042
 msgid "Unknown error verifying signature"
 msgstr "ਦਸਤ�ਤ �ਾ�� ਦ�ਰਾਨ �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../em-format/em-format.c:2082
-#| msgid "Could not parse PGP message"
+#: ../em-format/em-format.c:2129
 msgid "Could not parse PGP message: "
 msgstr "PGP ਸ�ਨ�ਹਾ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: "
 
-#: ../em-format/em-format.c:2088 ../plugins/caldav/caldav-browse-server.c:203
+#: ../em-format/em-format.c:2135 ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
@@ -9111,86 +9007,86 @@ msgid_plural "%d years in the future"
 msgstr[0] "��ਣ ਵਾਲਾ ੧ ਸਾਲ"
 msgstr[1] "��ਣ ਵਾਲ� %d ਸਾਲ"
 
-#: ../filter/e-filter-datespec.c:119
+#: ../filter/e-filter-datespec.c:122
 msgid "<click here to select a date>"
 msgstr "<ਮਿਤ� ��ਣਨ ਲ� �ਥ� �ਲਿੱ� �ਰ�>"
 
-#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
-#: ../filter/e-filter-datespec.c:144
+#: ../filter/e-filter-datespec.c:125 ../filter/e-filter-datespec.c:136
+#: ../filter/e-filter-datespec.c:147
 msgid "now"
 msgstr "ਹ�ਣ"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:129
+#: ../filter/e-filter-datespec.c:132
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:272
+#: ../filter/e-filter-datespec.c:275
 msgid "Select a time to compare against"
 msgstr "ਮ�ਲ �ਰਨ ਲ� ਸਮਾ� ��ਣ�"
 
-#: ../filter/e-filter-file.c:184
+#: ../filter/e-filter-file.c:188
 msgid "Choose a File"
 msgstr "ਫਾ�ਲ ��ਣ�"
 
-#: ../filter/e-filter-rule.c:659
+#: ../filter/e-filter-rule.c:663
 msgid "R_ule name:"
 msgstr "ਨਿਯਮ ਨਾ�(_u):"
 
-#: ../filter/e-filter-rule.c:689
+#: ../filter/e-filter-rule.c:693
 msgid "Find items that meet the following conditions"
 msgstr "���ਮਾ� ਲੱਭ�, �� �ਿ ਹ�ਠ ਦਿੱਤ� ਸ�ਮਾਵਾ� ਨ�ੰ ਪ�ਰ� �ਰਦ� ਹ�ਵ�"
 
-#: ../filter/e-filter-rule.c:723
-msgid "A_dd Condition"
-msgstr "ਸ਼ਰਤ ਸ਼ਾਮਲ(_d)"
-
-#: ../filter/e-filter-rule.c:732
+#: ../filter/e-filter-rule.c:718
 msgid "If all conditions are met"
 msgstr "���ਰ ਸਭ ਸ�ਮਾ ਮ�ਲ �ਾਣ ਤਾ�"
 
-#: ../filter/e-filter-rule.c:733
+#: ../filter/e-filter-rule.c:719
 msgid "If any conditions are met"
 msgstr "���ਰ ��� ਵ� ਸ�ਮਾ ਮ�ਲ �ਾਵ�"
 
-#: ../filter/e-filter-rule.c:736
+#: ../filter/e-filter-rule.c:722
 msgid "_Find items:"
 msgstr "��ਾ� ���(_F):"
 
-#: ../filter/e-filter-rule.c:760
+#: ../filter/e-filter-rule.c:750
 msgid "All related"
 msgstr "ਸਭ ਸੰਬੰਧਿਤ"
 
-#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:751 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "�ਵਾਬ"
 
-#: ../filter/e-filter-rule.c:762
+#: ../filter/e-filter-rule.c:752
 msgid "Replies and parents"
 msgstr "�ਵਾਬ ਤ� ਮ�ੱਢਲ�"
 
-#: ../filter/e-filter-rule.c:763
+#: ../filter/e-filter-rule.c:753
 msgid "No reply or parent"
 msgstr "��� �ਵਾਬ �ਾ� ਮ�ੱਢਲਾ ਨਹ��"
 
-#: ../filter/e-filter-rule.c:766
+#: ../filter/e-filter-rule.c:756
 msgid "I_nclude threads"
 msgstr "ਸ਼ਾਮਲ ਥਰਿੱਡ(_n)"
 
-#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../filter/e-filter-rule.c:779
+msgid "A_dd Condition"
+msgstr "ਸ਼ਰਤ ਸ਼ਾਮਲ(_d)"
+
+#: ../filter/e-filter-rule.c:1128 ../filter/filter.ui.h:2
 #: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "� ਰਹ�"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1128 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "ਬਾਹਰ�"
 
-#: ../filter/e-rule-editor.c:265
+#: ../filter/e-rule-editor.c:268
 msgid "Add Rule"
 msgstr "ਨਿਯਮ ����ਹ�"
 
-#: ../filter/e-rule-editor.c:352
+#: ../filter/e-rule-editor.c:355
 msgid "Edit Rule"
 msgstr "ਨਿਯਮ ਸ�ਧ"
 
@@ -9311,27 +9207,26 @@ msgstr "ਸਮਾ� �� ਤ�ਸ�� ਨਿਰਧਾਰਿਤ ��ਤ
 msgid "years"
 msgstr "ਸਾਲ"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
 #: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
-#: ../widgets/misc/e-attachment-paned.c:123
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:129
+#: ../widgets/misc/e-attachment-paned.c:134
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "����ਮ���"
 msgstr[1] "����ਮ���"
 
-#: ../mail/e-mail-attachment-bar.c:586
-#: ../widgets/misc/e-attachment-paned.c:581
+#: ../mail/e-mail-attachment-bar.c:611
+#: ../widgets/misc/e-attachment-paned.c:599
 msgid "Icon View"
 msgstr "���ਾਨ �ਲ�"
 
-#: ../mail/e-mail-attachment-bar.c:587
-#: ../widgets/misc/e-attachment-paned.c:582
+#: ../mail/e-mail-attachment-bar.c:612
+#: ../widgets/misc/e-attachment-paned.c:600
 msgid "List View"
 msgstr "ਲਿਸ� �ਲ�"
 
 #: ../mail/e-mail-browser.c:265
-#| msgid "Subject"
 msgid "(No Subject)"
 msgstr "(��� ਵਿਸ਼ਾ ਨਹ��)"
 
@@ -9381,7 +9276,7 @@ msgid "_Later"
 msgstr "ਬਾ�ਦ '�(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:478
+#: ../modules/mail/e-mail-shell-view-actions.c:505
 msgid "Add Label"
 msgstr "ਲ�ਬਲ ਸ਼ਾਮਲ"
 
@@ -9411,26 +9306,26 @@ 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
+#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2759
+#: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Inbox"
 msgstr "��ਣ-ਬ�ਸਾ"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:693
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:688
 msgid "Drafts"
 msgstr "ਡਰਾਫ�"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:703
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:700
 msgid "Outbox"
 msgstr "ਬਾਹਰ�-ਬ�ਸਾ"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:705
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:702
 msgid "Sent"
 msgstr "ਭ���"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:696
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:573
+#: ../plugins/templates/templates.c:578
 msgid "Templates"
 msgstr "��ਪਲ��"
 
@@ -9464,13 +9359,11 @@ msgstr ""
 
 #: ../mail/e-mail-migrate.c:739
 #, c-format
-#| msgid "Unable to create local mail folders at `%s': %s"
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "`%s' �ੱਤ� ਮ�ਲ ਲ��ਲ ਫ�ਲਡਰ ਬਣਾ�ਣ ਵਿੱ� �ਸਮਰੱਥ: %s"
 
 #  FIXME: This is just to get the shadow, is there a better way?
 #: ../mail/e-mail-notebook-view.c:563
-#| msgid "Please select a user."
 msgid "Please select a folder"
 msgstr "ਫ�ਲਡਰ ��ਣ� ��"
 
@@ -9482,34 +9375,33 @@ msgstr "ਫ�ਲਡਰ ��ਣ� ��"
 msgid "Do not ask me again"
 msgstr "ਮ�ਨ�ੰ ਮ�� ਨਾ ਪ�ੱ��।"
 
-#: ../mail/e-mail-reader.c:274 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:276 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../mail/e-mail-reader.c:274 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:276 ../mail/em-folder-utils.c:402
 msgid "C_opy"
 msgstr "�ਾਪ� �ਰ�(_o)"
 
-#: ../mail/e-mail-reader.c:648 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:689 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���"
 
-#: ../mail/e-mail-reader.c:648 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:689 ../mail/em-folder-utils.c:402
 msgid "_Move"
 msgstr "ਭ���(_M)"
 
 #. 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"
+#: ../mail/e-mail-reader.c:954 ../mail/e-mail-reader.c:1070
+#: ../mail/e-mail-reader.c:1111
 msgid "_Do not ask me again."
 msgstr "ਮ�ਨ�ੰ ਫ�ਰ ਨਾ ਪ�ੱ��(_D)।"
 
-#: ../mail/e-mail-reader.c:1065
+#: ../mail/e-mail-reader.c:1116
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਲ� �ਵਾਬ ਦਿ�: ਹਮ�ਸ਼ਾ �ਣਡਿੱਠਾ(_A)"
 
-#: ../mail/e-mail-reader.c:1155
+#: ../mail/e-mail-reader.c:1206
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ਸ�ਨ�ਹਾ ਸੰਭਾਲ�"
@@ -9521,540 +9413,533 @@ 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:1176
+#: ../mail/e-mail-reader.c:1227
 #: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "ਸ�ਨ�ਹਾ"
 msgstr[1] "ਸ�ਨ�ਹ�"
 
-#: ../mail/e-mail-reader.c:1441
+#: ../mail/e-mail-reader.c:1492
 msgid "A_dd Sender to Address Book"
 msgstr "ਭ��ਣ ਵਾਲਾ �ਡਰ�ੱਸ ਸ��� ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�(_d)"
 
-#: ../mail/e-mail-reader.c:1443
+#: ../mail/e-mail-reader.c:1494
 msgid "Add sender to address book"
 msgstr "ਭ��ਣ ਵਾਲਾ �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਸ਼ਾਮਿਲ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1448
+#: ../mail/e-mail-reader.c:1499
 msgid "Check for _Junk"
 msgstr "�ੰ� ਲ� �ਾ��(_J)"
 
-#: ../mail/e-mail-reader.c:1450
+#: ../mail/e-mail-reader.c:1501
 msgid "Filter the selected messages for junk status"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਬ��ਾਰ ਸਥਿਤ� ਲ� �ਾ���"
 
-#: ../mail/e-mail-reader.c:1455
+#: ../mail/e-mail-reader.c:1506
 msgid "_Copy to Folder..."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ�(_C)..."
 
-#: ../mail/e-mail-reader.c:1457
+#: ../mail/e-mail-reader.c:1508
 msgid "Copy selected messages to another folder"
 msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ �ੱ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../mail/e-mail-reader.c:1462
+#: ../mail/e-mail-reader.c:1513
 msgid "_Delete Message"
 msgstr "ਸ�ਨ�ਹਾ ਹ�ਾ�(_D)"
 
-#: ../mail/e-mail-reader.c:1464
+#: ../mail/e-mail-reader.c:1515
 msgid "Mark the selected messages for deletion"
 msgstr "��ਣ� ਸ�ਨਹਿ�� ਨ�ੰ ਹ�ਾ�ਣ ਲ� ��ਣ�"
 
-#: ../mail/e-mail-reader.c:1469
+#: ../mail/e-mail-reader.c:1520
 msgid "Filter on Mailing _List..."
 msgstr "ਮ�ਲਿੰ� ਲਿਸ� �ੱਤ� ਫਿਲ�ਰ(_L)..."
 
-#: ../mail/e-mail-reader.c:1471
+#: ../mail/e-mail-reader.c:1522
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਨਾਲ ਸੰਬੰਧਿਤ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1476
+#: ../mail/e-mail-reader.c:1527
 msgid "Filter on _Recipients..."
 msgstr "ਸ�ਨ�ਹ��� ਤ� ਫਿਲ�ਰ(_R)..."
 
-#: ../mail/e-mail-reader.c:1478
+#: ../mail/e-mail-reader.c:1529
 msgid "Create a rule to filter messages to these recipients"
 msgstr "�ਹਨਾ� ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਨ�ੰ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1483
+#: ../mail/e-mail-reader.c:1534
 msgid "Filter on Se_nder..."
 msgstr "ਭ��ਣ ਵਾਲਿ�� ਤ� ਫਿਲ�ਰ(_n)..."
 
-#: ../mail/e-mail-reader.c:1485
+#: ../mail/e-mail-reader.c:1536
 msgid "Create a rule to filter messages from this sender"
 msgstr "�ਹਨਾ� ਭ��ਣ�ਰਨ ਵਾਲਿ�� ਨ�ੰ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1490
+#: ../mail/e-mail-reader.c:1541
 msgid "Filter on _Subject..."
 msgstr "ਵਿਸ਼� ਤ� ਫਿਲ�ਰ(_S)..."
 
-#: ../mail/e-mail-reader.c:1492
+#: ../mail/e-mail-reader.c:1543
 msgid "Create a rule to filter messages with this subject"
 msgstr "�ਸ ਵਿਸ਼� ਨਾਲ ਸੰਬੰਧਿਤ ਸ�ਨ�ਹ� ਵੱ� �ਰਨ ਲ� �ੱ� ਨਿਯਮ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1497
+#: ../mail/e-mail-reader.c:1548
 msgid "A_pply Filters"
 msgstr "ਫਿਲ�ਰ ਲ�ਾ�(_p)"
 
-#: ../mail/e-mail-reader.c:1499
+#: ../mail/e-mail-reader.c:1550
 msgid "Apply filter rules to the selected messages"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਤ� ਫਿਲ�ਰ ਨਿਯਮ ਲਾ�� �ਰ�"
 
-#: ../mail/e-mail-reader.c:1504
+#: ../mail/e-mail-reader.c:1555
 msgid "_Find in Message..."
 msgstr "ਸ�ਨ�ਹ� '� ���(_F)..."
 
-#: ../mail/e-mail-reader.c:1506
+#: ../mail/e-mail-reader.c:1557
 msgid "Search for text in the body of the displayed message"
 msgstr "ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ਵਿੱ� ���ਸ� ਦ� ���"
 
-#: ../mail/e-mail-reader.c:1511
+#: ../mail/e-mail-reader.c:1562
 msgid "_Clear Flag"
 msgstr "ਨਿਸ਼ਾਨ ਸਾਫ਼(_C)"
 
-#: ../mail/e-mail-reader.c:1513
+#: ../mail/e-mail-reader.c:1564
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਤ�� ਧਿ�ਨ-ਰੱ�� ਨਿਸ਼ਾਨ ਹ�ਾ�"
 
-#: ../mail/e-mail-reader.c:1518
+#: ../mail/e-mail-reader.c:1569
 msgid "_Flag Completed"
 msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_F)"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1571
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਪ�ਰਾ ਹ�ਣ ਲ� ਧਿ�ਨ-ਰੱ�� ਨਿਸ਼ਾਨ ਸ�ੱ� �ਰ�"
 
-#: ../mail/e-mail-reader.c:1525
+#: ../mail/e-mail-reader.c:1576
 msgid "Follow _Up..."
 msgstr "�ੱ�� ��ਲ�ਹ�(_U)..."
 
-#: ../mail/e-mail-reader.c:1527
+#: ../mail/e-mail-reader.c:1578
 msgid "Flag the selected messages for follow-up"
 msgstr "ਧਿ�ਨ ਰੱ�ਣ ਲ� ��ਣ� ਸ�ਨ�ਹ� ਨਿਸ਼ਾਨਬੱਧ"
 
-#: ../mail/e-mail-reader.c:1532
+#: ../mail/e-mail-reader.c:1583
 msgid "_Attached"
 msgstr "����(_A)"
 
-#: ../mail/e-mail-reader.c:1534 ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1585 ../mail/e-mail-reader.c:1592
 msgid "Forward the selected message to someone as an attachment"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ ���� �ਰ�� �ਿਸ� ਨ�ੰ �ੱ�� ਭ���"
 
-#: ../mail/e-mail-reader.c:1539
+#: ../mail/e-mail-reader.c:1590
 msgid "Forward As _Attached"
 msgstr "���� �ਰ�� �ੱ�� ਭ���(_A)"
 
-#: ../mail/e-mail-reader.c:1546
+#: ../mail/e-mail-reader.c:1597
 msgid "_Inline"
 msgstr "ਲਾ�ਨ ਵਿੱ�(_I)"
 
-#: ../mail/e-mail-reader.c:1548 ../mail/e-mail-reader.c:1555
+#: ../mail/e-mail-reader.c:1599 ../mail/e-mail-reader.c:1606
 msgid "Forward the selected message in the body of a new message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ ਨਵ�� ਸ�ਨ�ਹ� ਦ� ਵਿੱ� ਮ�ੱ� ਭਾ� ਵਾ�� �ੱ�� ਭ���"
 
-#: ../mail/e-mail-reader.c:1553
+#: ../mail/e-mail-reader.c:1604
 msgid "Forward As _Inline"
 msgstr "�ਨਲਾ�ਨ ਵਾ�� �ੱ�� ਭ���(_I)"
 
-#: ../mail/e-mail-reader.c:1560
+#: ../mail/e-mail-reader.c:1611
 msgid "_Quoted"
 msgstr "ਹਵਾਲਾ(_Q)"
 
-#: ../mail/e-mail-reader.c:1562 ../mail/e-mail-reader.c:1569
+#: ../mail/e-mail-reader.c:1613 ../mail/e-mail-reader.c:1620
 msgid "Forward the selected message quoted like a reply"
 msgstr "��ਣ� ਸ�ਨ�ਹ� �ਿਸ� ਵੱਲ ਹਵਾਲਾ �ੱ� �ਵਾਬ ਦ� ਤਰ�ਹਾ� �ਰ�� ਭ���"
 
-#: ../mail/e-mail-reader.c:1567
+#: ../mail/e-mail-reader.c:1618
 msgid "Forward As _Quoted"
 msgstr "ਹਵਾਲ� ਵਾ�� ਭ���(_Q)"
 
-#: ../mail/e-mail-reader.c:1574
+#: ../mail/e-mail-reader.c:1625
 msgid "_Load Images"
 msgstr "�ਿੱਤਰ ਲ�ਡ(_L)"
 
-#: ../mail/e-mail-reader.c:1576
+#: ../mail/e-mail-reader.c:1627
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML ਮ�ਲ ਵਿੱ� ਸ�ਨ�ਹ� ਲ�ਡ �ਰਨ ਲ� ਮ�ਬ�ਰ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1581
+#: ../mail/e-mail-reader.c:1632
 msgid "_Important"
 msgstr "�ਾਸ(_I)"
 
-#: ../mail/e-mail-reader.c:1583
+#: ../mail/e-mail-reader.c:1634
 msgid "Mark the selected messages as important"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ �ਾਸ ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1588
+#: ../mail/e-mail-reader.c:1639
 msgid "_Junk"
 msgstr "�ੰ�(_J)"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1641
 msgid "Mark the selected messages as junk"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ �ੰ� ਵ��� ਨਿਸ਼ਾਨਬੱਧ"
 
-#: ../mail/e-mail-reader.c:1595
+#: ../mail/e-mail-reader.c:1646
 msgid "_Not Junk"
 msgstr "�ੰ� ਨਹ��(_N)"
 
-#: ../mail/e-mail-reader.c:1597
+#: ../mail/e-mail-reader.c:1648
 msgid "Mark the selected messages as not being junk"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ੰ�-ਨਹ�� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1653
 msgid "_Read"
 msgstr "ਪ��ਹ�(_R)"
 
-#: ../mail/e-mail-reader.c:1604
+#: ../mail/e-mail-reader.c:1655
 msgid "Mark the selected messages as having been read"
 msgstr "��ਣ� ਸ�ਨਹਿ�� ਨ�ੰ ਪ��ਹ� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1609
+#: ../mail/e-mail-reader.c:1660
 msgid "Uni_mportant"
 msgstr "ਨਾ-�ਾਸ(_m)"
 
-#: ../mail/e-mail-reader.c:1611
+#: ../mail/e-mail-reader.c:1662
 msgid "Mark the selected messages as unimportant"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ ਨਾ-�਼ਰ�ਰ� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1616
+#: ../mail/e-mail-reader.c:1667
 msgid "_Unread"
 msgstr "ਨਾ-ਪ��ਹ�(_U)"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1669
 msgid "Mark the selected messages as not having been read"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਨਾ-ਪ��ਹ� ਨਿਸ਼ਾਨਬੱਧ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1623
+#: ../mail/e-mail-reader.c:1674
 msgid "_Edit as New Message..."
 msgstr "ਨਵਾ� ਸ�ਨ�ਹ� ਵਿੱ� ਸ�ਧ(_E)..."
 
-#: ../mail/e-mail-reader.c:1625
+#: ../mail/e-mail-reader.c:1676
 msgid "Open the selected messages in the composer for editing"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਸ�ਧ ਲ� ਰ��ਤਾ (�ੰਪ��਼ਰ) ਵਿੱ� ��ਲ�ਹ�"
 
-#: ../mail/e-mail-reader.c:1630
+#: ../mail/e-mail-reader.c:1681
 msgid "Compose _New Message"
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ ਲਿ��(_N)"
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1683
 msgid "Open a window for composing a mail message"
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ ਲਿ�ਣ ਲ� ਵਿੰਡ� ��ਲ�ਹ�"
 
-#: ../mail/e-mail-reader.c:1637
+#: ../mail/e-mail-reader.c:1688
 msgid "_Open in New Window"
 msgstr "ਨਵ�� �ਰ��� '� ��ਲ�ਹ�(_O)"
 
-#: ../mail/e-mail-reader.c:1639
+#: ../mail/e-mail-reader.c:1690
 msgid "Open the selected messages in a new window"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਵ�� �ਰ��� ਵਿੱ� ��ਲ�ਹ�"
 
-#: ../mail/e-mail-reader.c:1644
+#: ../mail/e-mail-reader.c:1695
 msgid "_Move to Folder..."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)..."
 
-#: ../mail/e-mail-reader.c:1646
+#: ../mail/e-mail-reader.c:1697
 msgid "Move selected messages to another folder"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਭ���"
 
-#: ../mail/e-mail-reader.c:1651
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1702
 msgid "_Switch to Folder"
 msgstr "ਫ�ਲਡਰ �ੱਤ� �ਾ�(_S)"
 
-#: ../mail/e-mail-reader.c:1653
-#| msgid "Install the shared folder"
+#: ../mail/e-mail-reader.c:1704
 msgid "Display the parent folder"
 msgstr "ਮ�ੱਢਲਾ ਫ�ਲਡਰ ਵ���"
 
-#: ../mail/e-mail-reader.c:1658
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1709
 msgid "Switch to _next tab"
 msgstr "��ਲ� ��ਬ �ੱਤ� �ਾ�(_n)"
 
-#: ../mail/e-mail-reader.c:1660
+#: ../mail/e-mail-reader.c:1711
 msgid "Switch to the next tab"
 msgstr "��ਲ� ��ਬ �ੱਤ� �ਾ�"
 
-#: ../mail/e-mail-reader.c:1665
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1716
 msgid "Switch to _previous tab"
 msgstr "ਪਿ�ਲ� ��ਬ �ੱਤ� �ਾ�(_p)"
 
-#: ../mail/e-mail-reader.c:1667
+#: ../mail/e-mail-reader.c:1718
 msgid "Switch to the previous tab"
 msgstr "ਪਿ�ਲ� ��ਬ �ੱਤ� �ਾ�"
 
-#: ../mail/e-mail-reader.c:1672
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:1723
 msgid "Cl_ose current tab"
 msgstr "ਮ���ਦਾ ��ਬ ਬੰਦ �ਰ�(_o)"
 
-#: ../mail/e-mail-reader.c:1674
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:1725
 msgid "Close current tab"
 msgstr "ਮ���ਦਾ ��ਬ ਬੰਦ �ਰ�"
 
-#: ../mail/e-mail-reader.c:1679
+#: ../mail/e-mail-reader.c:1730
 msgid "_Next Message"
 msgstr "�ੱ�� ਸ�ਨ�ਹਾ(_N)"
 
-#: ../mail/e-mail-reader.c:1681
+#: ../mail/e-mail-reader.c:1732
 msgid "Display the next message"
 msgstr "��ਲਾ ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1686
+#: ../mail/e-mail-reader.c:1737
 msgid "Next _Important Message"
 msgstr "ਨਵਾ� �ਾਸ ਸ�ਨ�ਹਾ(_I)"
 
-#: ../mail/e-mail-reader.c:1688
+#: ../mail/e-mail-reader.c:1739
 msgid "Display the next important message"
 msgstr "��ਲਾ �ਰ�ਰ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1693
+#: ../mail/e-mail-reader.c:1744
 msgid "Next _Thread"
 msgstr "�ੱ�� ਮਸਲਾ(_T)"
 
-#: ../mail/e-mail-reader.c:1695
+#: ../mail/e-mail-reader.c:1746
 msgid "Display the next thread"
 msgstr "�ੱ�� ਨਾ-ਪ��ਹਿ� ਮਸਲਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1700
+#: ../mail/e-mail-reader.c:1751
 msgid "Next _Unread Message"
 msgstr "�ੱ�� ਨਾ-ਪ��ਹਿ� ਸ�ਨ�ਹਾ(_U)"
 
-#: ../mail/e-mail-reader.c:1702
+#: ../mail/e-mail-reader.c:1753
 msgid "Display the next unread message"
 msgstr "��ਲਾ ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1707
+#: ../mail/e-mail-reader.c:1758
 msgid "_Previous Message"
 msgstr "ਪਿੱ�� ਸ�ਨ�ਹਾ(_P)"
 
-#: ../mail/e-mail-reader.c:1709
+#: ../mail/e-mail-reader.c:1760
 msgid "Display the previous message"
 msgstr "ਪਿ�ਲਾ ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1714
+#: ../mail/e-mail-reader.c:1765
 msgid "Pr_evious Important Message"
 msgstr "�ਾਸ ਸ�ਨ�ਹਾ ਵ��ਾ�(_e)"
 
-#: ../mail/e-mail-reader.c:1716
+#: ../mail/e-mail-reader.c:1767
 msgid "Display the previous important message"
 msgstr "ਪਿ�ਲਾ �ਰ�ਰ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1721
+#: ../mail/e-mail-reader.c:1772
 msgid "P_revious Unread Message"
 msgstr "ਪਿੱ�� ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ(_r)"
 
-#: ../mail/e-mail-reader.c:1723
+#: ../mail/e-mail-reader.c:1774
 msgid "Display the previous unread message"
 msgstr "ਪਿ�ਲਾ ਨਾ-ਪ�ਿ� ਸ�ਨ�ਹਾ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1730
+#: ../mail/e-mail-reader.c:1781
 msgid "Print this message"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਪਰਿੰ� �ਰ�"
 
-#: ../mail/e-mail-reader.c:1737
+#: ../mail/e-mail-reader.c:1788
 msgid "Preview the message to be printed"
 msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਦ� �ਲ�"
 
-#: ../mail/e-mail-reader.c:1742
+#: ../mail/e-mail-reader.c:1793
 msgid "Re_direct"
 msgstr "ਵਾਪਸ(_d)"
 
-#: ../mail/e-mail-reader.c:1744
+#: ../mail/e-mail-reader.c:1795
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "��ਣ� ਸ�ਨ�ਹ� �ਿਸ� ਵੱਲ ਭ���"
 
-#: ../mail/e-mail-reader.c:1749 ../mail/mail.error.xml.h:91
+#: ../mail/e-mail-reader.c:1800 ../mail/mail.error.xml.h:91
 #: ../modules/calendar/e-cal-shell-view-actions.c:1459
-#: ../modules/mail/e-mail-attachment-handler.c:139
+#: ../modules/mail/e-mail-attachment-handler.c:151
 msgid "Reply to _All"
 msgstr "ਸਭ ਨ�ੰ �ਵਾਬ(_A)"
 
-#: ../mail/e-mail-reader.c:1751
+#: ../mail/e-mail-reader.c:1802
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਸਾਰ� ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� ਲ� �ਵਾਬ ਲਿ��"
 
-#: ../mail/e-mail-reader.c:1756 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:1807 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "ਲਿਸ� ਨ�ੰ �ਵਾਬ(_L)"
 
-#: ../mail/e-mail-reader.c:1758
+#: ../mail/e-mail-reader.c:1809
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਸ��� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
 
-#: ../mail/e-mail-reader.c:1763
-#: ../modules/mail/e-mail-attachment-handler.c:146
+#: ../mail/e-mail-reader.c:1814
+#: ../modules/mail/e-mail-attachment-handler.c:158
 msgid "_Reply to Sender"
 msgstr "ਭ��ਣ ਵਾਲ� ਨ�ੰ �ਵਾਬ(_R)"
 
-#: ../mail/e-mail-reader.c:1765
+#: ../mail/e-mail-reader.c:1816
 msgid "Compose a reply to the sender of the selected message"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਭ��ਣ ਵਾਲ� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
 
-#: ../mail/e-mail-reader.c:1770
+#: ../mail/e-mail-reader.c:1821
 msgid "_Save as mbox..."
 msgstr "mbox ਵਾ�� ਸੰਭਾਲ�(_S)..."
 
-#: ../mail/e-mail-reader.c:1772
+#: ../mail/e-mail-reader.c:1823
 msgid "Save selected messages as an mbox file"
 msgstr "��ਣ� ਸ�ਨ�ਹਿ�� ਨ�ੰ mbox ਫਾ�ਲ ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../mail/e-mail-reader.c:1777
+#: ../mail/e-mail-reader.c:1828
 msgid "Search Folder from Mailing _List..."
 msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਤ�� ��� ਫ�ਲਡਰ(_L)..."
 
-#: ../mail/e-mail-reader.c:1779
+#: ../mail/e-mail-reader.c:1830
 msgid "Create a search folder for this mailing list"
 msgstr "�ਸ ਮ�ਲਿੰ� ਲਿਸ� ਤ�� �ੱ� ��� ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1784
+#: ../mail/e-mail-reader.c:1835
 msgid "Search Folder from Recipien_ts..."
 msgstr "ਪਰਾਪਤ �ਰਤਾ ਤ�� ��� ਫ�ਲਡਰ(_t)..."
 
-#: ../mail/e-mail-reader.c:1786
+#: ../mail/e-mail-reader.c:1837
 msgid "Create a search folder for these recipients"
 msgstr "�ਹਨਾ� ਸ�ਨ�ਹ��� ਤ�� �ੱ� ��� ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1791
+#: ../mail/e-mail-reader.c:1842
 msgid "Search Folder from Sen_der..."
 msgstr "ਭ��ਣ ਵਾਲ� ਤ�� ��� ਫ�ਲਡਰ(_d)..."
 
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:1844
 msgid "Create a search folder for this sender"
 msgstr "�ਸ ਭ��ਣ ਵਾਲ� ਤ�� �ੱ� ��� ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1798
+#: ../mail/e-mail-reader.c:1849
 msgid "Search Folder from S_ubject..."
 msgstr "ਵਿਸ਼� ਤ�� ��� ਫ�ਲਡਰ(_u)..."
 
-#: ../mail/e-mail-reader.c:1800
+#: ../mail/e-mail-reader.c:1851
 msgid "Create a search folder for this subject"
 msgstr "�ਸ ਵਿਸ਼� ਲ� �ੱ� ��� ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1805
+#: ../mail/e-mail-reader.c:1856
 msgid "_Message Source"
 msgstr "ਸ�ਨ�ਹਾ ਸਰ�ਤ(_M)"
 
-#: ../mail/e-mail-reader.c:1807
+#: ../mail/e-mail-reader.c:1858
 msgid "Show the raw email source of the message"
 msgstr "ਸ�ਨ�ਹ� ਦ� �ੱ�� �-ਮ�ਲ ਸਰ�ਤ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1819
+#: ../mail/e-mail-reader.c:1870
 msgid "_Undelete Message"
 msgstr "ਨਾ-ਹ�ਾ�� ਸ�ਨ�ਹਾ(_U)"
 
-#: ../mail/e-mail-reader.c:1821
+#: ../mail/e-mail-reader.c:1872
 msgid "Undelete the selected messages"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਾ-ਹ�ਾ� ਬਣਾ�"
 
-#: ../mail/e-mail-reader.c:1826
+#: ../mail/e-mail-reader.c:1877
 msgid "_Normal Size"
 msgstr "�ਮ ��ਾਰ(_N)"
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:1879
 msgid "Reset the text to its original size"
 msgstr "���ਸ� ਨ�ੰ �ਸਲ� ��ਾਰ ਮ�ਤਾਬ� ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1833
+#: ../mail/e-mail-reader.c:1884
 msgid "_Zoom In"
 msgstr "�਼�ਮ �ੰਦਰ(_Z)"
 
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:1886
 msgid "Increase the text size"
 msgstr "���ਸ� ��ਾਰ ਵਧਾ�"
 
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:1891
 msgid "Zoom _Out"
 msgstr "�਼�ਮ ਬਾਹਰ(_O)"
 
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:1893
 msgid "Decrease the text size"
 msgstr "���ਸ� ��ਾਰ ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:1900
 msgid "Create R_ule"
 msgstr "ਨਿਯਮ ਬਣਾ�(_u)"
 
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:1907
 msgid "Ch_aracter Encoding"
 msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�(_A)"
 
-#: ../mail/e-mail-reader.c:1863
+#: ../mail/e-mail-reader.c:1914
 msgid "F_orward As"
 msgstr "�ੱ�� ਭ��� �ਸ ਵਾ��(_O)"
 
-#: ../mail/e-mail-reader.c:1870
-#| msgid "_Reply"
+#: ../mail/e-mail-reader.c:1921
 msgid "_Group Reply"
 msgstr "�ਰ�ੱਪ �ਵਾਬ(_G)"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:1928
 msgid "_Go To"
 msgstr "�ਾ�(_G)"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:1935
 msgid "Mar_k As"
 msgstr "ਨਿਸ਼ਾਨਬੱਧ(_k)"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:1942
 msgid "_Message"
 msgstr "ਸ�ਨ�ਹਾ(_M)"
 
-#: ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:1949
 msgid "_Zoom"
 msgstr "�਼�ਮ(_Z)"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1974
 msgid "Mark for Follo_w Up..."
 msgstr "ਪਿੱ�ਾ ��� ਲ� ਨਿਸ਼ਾਨਬੱਧ(_w)..."
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:1982
 msgid "Mark as _Important"
 msgstr "�ਾਸ ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_I)"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1986
 msgid "Mark as _Junk"
 msgstr "ਰੱਦ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_J)"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1990
 msgid "Mark as _Not Junk"
 msgstr "ਰੱਦ� ਨਹ�� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_N)"
 
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:1994
 msgid "Mar_k as Read"
 msgstr "ਪ��ਹ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_k)"
 
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:1998
 msgid "Mark as Uni_mportant"
 msgstr "ਨਾ-�ਾਸ ਨਿਸ਼ਾਨਬੱਧ ਬਣਾ�(_m)"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark as _Unread"
 msgstr "ਨਾ-ਪ��ਹ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_U)"
 
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:2038
 msgid "_Caret Mode"
 msgstr "��ਪਤ-ਲ��ਣ ਢੰ�(_C)"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:2040
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ਵਿੱ� �ਰਸਰ �ਪ�ਦ� ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2046
 msgid "All Message _Headers"
 msgstr "ਸਭ ਸ�ਨ�ਹ� ਹ�ੱਡਰ(_H)"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2048
 msgid "Show messages with all email headers"
 msgstr "ਸ�ਨ�ਹ� ਸਭ �-ਮ�ਲ ਹ�ੱਡਰਾ� ਨਾਲ ਵ��ਾ�"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2269
 msgid "Unable to retrieve message"
 msgstr "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਲ� �ਸਫਲ"
 
-#: ../mail/e-mail-reader.c:2278 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2329 ../mail/mail-ops.c:1891
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "ਸ�ਨ�ਹਾ '%s' ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
@@ -10062,62 +9947,54 @@ 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:2838 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:2893 ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:537
 #: ../plugins/google-account-setup/google-source.c:659
-#: ../widgets/misc/e-account-tree-view.c:234
+#: ../widgets/misc/e-account-tree-view.c:240
 msgid "Default"
 msgstr "ਡਿਫਾਲ�"
 
-#: ../mail/e-mail-reader.c:3007
-#: ../modules/mail/e-mail-attachment-handler.c:132
+#: ../mail/e-mail-reader.c:3041
+#: ../modules/mail/e-mail-attachment-handler.c:144
 msgid "_Forward"
 msgstr "�ੱ�� ਭ���(_F)"
 
-#: ../mail/e-mail-reader.c:3008
+#: ../mail/e-mail-reader.c:3042
 msgid "Forward the selected message to someone"
 msgstr "��ਣ� ਸ�ਨ�ਹ� �ੱ�� ਭ���"
 
-#. 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"
+#: ../mail/e-mail-reader.c:3061
 msgid "Group Reply"
 msgstr "�ਰ�ੱਪ �ਵਾਬ"
 
-#: ../mail/e-mail-reader.c:3027
-#| msgid "Compose a reply to the mailing list of the selected message"
+#: ../mail/e-mail-reader.c:3062
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "ਮ�ਲਿੰ� ਲਿਸ� ਨ�ੰ �ਵਾਬ �ਾ� ਸਭ ਪ�ਰਾਪਤ-�ਰਤਾਵਾ� ਨ�ੰ"
 
-#: ../mail/e-mail-reader.c:3072 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3107 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "ਹ�ਾ�"
 
-#: ../mail/e-mail-reader.c:3104
+#: ../mail/e-mail-reader.c:3140
 #: ../modules/calendar/e-cal-shell-view-actions.c:1305
-#: ../widgets/misc/e-calendar.c:193
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "�ੱ��"
 
-#: ../mail/e-mail-reader.c:3108
+#: ../mail/e-mail-reader.c:3144
 #: ../modules/calendar/e-cal-shell-view-actions.c:1298
-#: ../widgets/misc/e-calendar.c:169
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "ਪਿੱ��"
 
-#: ../mail/e-mail-reader.c:3118 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:3154 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "�ਵਾਬ"
 
-#: ../mail/e-mail-reader.c:3730
+#: ../mail/e-mail-reader.c:3722
 #, c-format
-#| msgid "Folder"
 msgid "Folder '%s'"
 msgstr "'%s' ਫ�ਲਡਰ"
 
@@ -10127,7 +10004,7 @@ 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:508 ../mail/mail-config.ui.h:77
+#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:77
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "��� �ੰ��ਰਿਪਸ਼ਨ ਨਹ��"
@@ -10135,7 +10012,7 @@ msgstr "��� �ੰ��ਰਿਪਸ਼ਨ ਨਹ��"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:136
+#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:136
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS �ੰ��ਰਿਪਸ਼ਨ"
@@ -10143,17 +10020,17 @@ 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:516 ../mail/mail-config.ui.h:105
+#: ../mail/em-account-editor.c:520 ../mail/mail-config.ui.h:105
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL �ੰ��ਰਿਪਸ਼ਨ"
 
-#: ../mail/em-account-editor.c:603
+#: ../mail/em-account-editor.c:607
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ�"
 
-#: ../mail/em-account-editor.c:610
+#: ../mail/em-account-editor.c:614
 #, c-format
 msgid ""
 "\n"
@@ -10167,34 +10044,34 @@ msgstr ""
 "�ਤ� ਮਨ�਼�ਰ �ਰਨ ਲ� �ਾ�� ਬ�ਸ� ਤ� �ਲਿੱ� �ਰ�\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:897 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:901 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../mail/em-account-editor.c:981
+#: ../mail/em-account-editor.c:985
 msgid "Never"
 msgstr "�ਦ� ਨਹ��"
 
-#: ../mail/em-account-editor.c:982
+#: ../mail/em-account-editor.c:986
 msgid "Always"
 msgstr "ਹਮ�ਸ਼ਾ"
 
-#: ../mail/em-account-editor.c:983
+#: ../mail/em-account-editor.c:987
 msgid "Ask for each message"
 msgstr "ਹਰ ਸ�ਨ�ਹ� ਲ� ਪ�ੱ��"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1720 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1723 ../widgets/misc/e-account-tree-view.c:128
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../mail/em-account-editor.c:2095
+#: ../mail/em-account-editor.c:2098
 msgid "Mail Configuration"
 msgstr "ਮ�ਲ ਸੰਰ�ਨਾ"
 
-#: ../mail/em-account-editor.c:2096
+#: ../mail/em-account-editor.c:2099
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10204,7 +10081,7 @@ msgstr ""
 "\n"
 "ਸ਼�ਰ� �ਰਨ ਲ� \"�ੱ��\" ਦਬਾ�।"
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2102
 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 "
@@ -10213,20 +10090,20 @@ msgstr ""
 "ਹ�ਠਾ� �ਪਣਾ ਨਾ� �ਤ� �-ਮ�ਲ �ਡਰ�ੱਸ ਦਿ� ��। ਹ�ਠਾ� \"��ਣਵਾ�\" ��ਤਰ ਭਰਨ ਦ� ਲ�� ਨਹ�� ਹ�, �ਦ�� ਤੱ� �ਿ "
 "ਤ�ਸ�� �-ਮ�ਲ ਰਾਹ� ਭ��� �ਾਣ ਵਾਲ� �ਾਣ�ਾਰ� ਵਿੱ� ਸ਼ਾਮਿਲ ਨਾ �ਰ �ਾਹ�।"
 
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2258
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2261
 #: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
 msgstr "�-ਮ�ਲ ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2105
 msgid "Please configure the following account settings."
 msgstr "ਹ�ਠ ਦਿੱਤ� ��ਾ��� ਸ��ਿੰ� ਦ� ਸੰਰ�ਨਾ �ਰ� ��।"
 
-#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2740
+#: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2743
 msgid "Sending Email"
 msgstr "�-ਮ�ਲ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2108
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10234,11 +10111,11 @@ msgstr ""
 "�ਸ ਢੰ� ਦ� �ਾਣ�ਾਰ� ਦਿ� ��, �ਿਸ ਰਾਹ�� ਤ�ਸ�� ਪੱਤਰ ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�। ���ਰ ਤ�ਸ�� ਯ��ਨ� ਨਹ�� ਹ� "
 "ਤਾ� �ਪਣ� ਸਿਸ�ਮ ਪਰਸ਼ਾਸ਼� �ਾ� �ੰ�ਰਨ�ੱ� ਸਰਵਿਸ ਪ�ਰਬੰਧ� ਨਾਲ ਸੰਪਰ� �ਰ�।"
 
-#: ../mail/em-account-editor.c:2107
+#: ../mail/em-account-editor.c:2110
 msgid "Account Management"
 msgstr "��ਾ��� ਪਰਬੰਧ"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2111
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10246,11 +10123,11 @@ msgstr ""
 "�ੱ�� ਦਿੱਤ� ਥਾ� ਵਿੱ� �ਸ ��ਾ��� ਬਾਰ� ਵਰਣਨ �ਰਦ� �ਾਣ�ਾਰ� ਦਿ� ��। �ਹ ਨਾ� ਸਿਰ� \n"
 "ਵ��ਾ�ਣ ਲ� ਹ� ਵਰਤ� �ਾਵ���।"
 
-#: ../mail/em-account-editor.c:2112
+#: ../mail/em-account-editor.c:2115
 msgid "Done"
 msgstr "ਸਮਾਪਤ"
 
-#: ../mail/em-account-editor.c:2113
+#: ../mail/em-account-editor.c:2116
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10264,53 +10141,52 @@ msgstr ""
 "\n"
 "�ਪਣਾ ਸ��ਿੰ� ਲਾ�� �ਰਨ ਲ� \"ਲਾ�� �ਰ�\" ਦਬਾ�।"
 
-#: ../mail/em-account-editor.c:2554
+#: ../mail/em-account-editor.c:2557
 msgid "Check for _new messages every"
 msgstr "�ੰਨ� �ੰਤਰਾਲ ਬਾ�ਦ ਪੱਤਰ ��ੱ� �ਰ�(_n)"
 
-#: ../mail/em-account-editor.c:2562
+#: ../mail/em-account-editor.c:2565
 msgid "minu_tes"
 msgstr "ਮਿੰ�(_t)"
 
-#: ../mail/em-account-editor.c:2838
-#| msgid "Please select an image for this contact"
+#: ../mail/em-account-editor.c:2841
 msgid "Please select a folder from the current account."
 msgstr "ਮ���ਦਾ ��ਾ��� ਤ�� ਫ�ਲਡਰ ��ਣ� ��।"
 
-#: ../mail/em-account-editor.c:3108 ../mail/mail-config.ui.h:112
+#: ../mail/em-account-editor.c:3111 ../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:3153 ../mail/em-account-editor.c:3221
+#: ../mail/em-account-editor.c:3156 ../mail/em-account-editor.c:3224
 msgid "Receiving Options"
 msgstr "ਪ�ਰਾਪਤ� ��ਣ"
 
-#: ../mail/em-account-editor.c:3154 ../mail/em-account-editor.c:3222
+#: ../mail/em-account-editor.c:3157 ../mail/em-account-editor.c:3225
 msgid "Checking for New Messages"
 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:1539
+#: ../mail/em-composer-utils.c:1734
 #, 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:1587
+#: ../mail/em-composer-utils.c:1782
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ ਵਿਸ਼�ਸ਼ਤਾ: \"%s\""
 
-#: ../mail/em-composer-utils.c:1991
+#: ../mail/em-composer-utils.c:2191
 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:2038
+#: ../mail/em-composer-utils.c:2238
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10318,15 +10194,15 @@ msgstr ""
 "${AbbrevWeekdayName} , ${Year}-${Month}-${Day}, ${24Hour}:${Minute} ਵ�� "
 "${TimeZone}, ${Sender} ਨ� ਲਿ�ਿ�:"
 
-#: ../mail/em-composer-utils.c:2182
+#: ../mail/em-composer-utils.c:2382
 msgid "-----Original Message-----"
 msgstr "--------�ਸਲ� ਸ�ਨ�ਹਾ--------"
 
-#: ../mail/em-composer-utils.c:2372
+#: ../mail/em-composer-utils.c:2594
 msgid "Posting destination"
 msgstr "ਭ��ਣ ਲ� ਨਿਯਤ"
 
-#: ../mail/em-composer-utils.c:2373
+#: ../mail/em-composer-utils.c:2595
 msgid "Choose folders to post the message to."
 msgstr "ਸ�ਨ�ਹ� ਭ��ਣ ਲ� ਫ�ਲਡਰ ��ਣ�"
 
@@ -10642,7 +10518,7 @@ msgstr "��� ਫ�ਲਡਰ"
 msgid "UNMATCHED"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../mail/em-folder-tree-model.c:768 ../mail/em-folder-tree-model.c:1111
+#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
 msgid "Loading..."
 msgstr "ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�...."
 
@@ -10719,7 +10595,6 @@ msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 #: ../mail/em-folder-utils.c:533
 #: ../plugins/groupwise-features/share-folder-common.c:136
 #, c-format
-#| msgid "Creating folder `%s'"
 msgid "Creating folder '%s'"
 msgstr "'%s' ਫ�ਲਡਰ ਬਣਾ�� �ਾ ਰਿਹਾ ਹ�"
 
@@ -10890,7 +10765,6 @@ msgstr "ਸ�ਨ�ਹਾ ਫਾਰਮ�� ��ਤਾ �ਾ ਰਿਹਾ 
 
 #: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
 #, c-format
-#| msgid "Retrieving `%s'"
 msgid "Retrieving '%s'"
 msgstr "'%s' ਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
@@ -10931,14 +10805,12 @@ msgstr "�ਣ�ਾਣ� ਬਾਹਰ� ਡਾ�ਾ (\"%s\" �ਿਸਮ) 
 #. different from the one listed in From field.
 #: ../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 "No summary available."
 msgid "No HTML stream available"
 msgstr "��� HTML ਸ�ਰ�ਮ �ਪਲੱਬਧ ਨਹ��"
 
@@ -10969,7 +10841,6 @@ msgstr "��� ਸਰਵਰ ��ਣਿ� ਨਹ�� �ਿ�"
 #. 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 ਸ�ਨ�ਹ� �ੱ� ਸਮ�� ਹ� ��ਲ�ਹਣ� �ਾਹ�ੰਦ� ਹ�?"
@@ -10977,7 +10848,6 @@ 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)।"
 
@@ -11287,15 +11157,14 @@ msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
 msgstr ""
+"��ਵਲ �ਹ� ਸ�ਨ�ਹ� ਵ��ਾ�ਣ ਲ� ਯ�� �ਰਦਾ ਹ�, �ਿੰਨ�ਹਾ� ਦ� ਲਿਮ� "
+"'message_text_part_limit' ��ੰ�� '� ਸ�ੱ� ��ਤ� ਤ�� ਵੱਧ ਨਹ�� ਹ�।"
 
 #: ../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 "ਸਭ ਫ�ਲਡਰਾ� ਲ� ਰਲਦ� ਸ�ਨ�ਹਾ ਲਿਸ� �ਲ� ਸ��ਿੰ� ਵਰਤਣ ਲ� �ਾਲ� �ਰ�।"
 
@@ -11324,7 +11193,7 @@ msgstr "ਫਿਲ�ਰ �ਰਨ ਦ� ਬਾ�ਦ ���ਬਾ�ਸ ਸ
 
 #: ../mail/evolution-mail.schemas.in.h:71
 msgid "Group Reply replies to list"
-msgstr ""
+msgstr "�ਰ�ੱਪ �ਵਾਬ ਲਿਸ� ਨ�ੰ �ਵਾਬ"
 
 #: ../mail/evolution-mail.schemas.in.h:72
 msgid "Height of the message-list pane"
@@ -11448,6 +11317,9 @@ msgid ""
 "which you happened to receive the copy of the message to which you're "
 "replying."
 msgstr ""
+"�ਮ \"ਸਭ ਨ�ੰ �ਵਾਬ\" ਰਵੱ�� ਦ� ਬ�ਾ�, �ਹ ��ਣ ਯ��ਨ� ਬਣਾ��ਦ� ਹ� �ਿ '�ਰ�ੱਪ �ਵਾਬ' ��ਲਬਾਰ ਬ�ਨ "
+"��ਵਲ ਮ�ਲਿੰ� ਲਿਸ� ਰਾਹ�� �ਵਾਬ ਦ�ਣ ਦ� ��ਸ਼ਿਸ਼ �ਰ�, �ਿਸ ਤ�� ਤ�ਸ�� �ਵਾਬ ਦ� ਰਹ� ਸ�ਨ�ਹ� ਦ� �ਾਪ� ਨ�ੰ ਪ�ਰਾਪਤ "
+"��ਤਾ ਹ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
@@ -11459,7 +11331,6 @@ msgstr ""
 "ਸ�ਨ�ਹ� ਨ�ੰ ਪੱ�� ਤ�ਰ �ੱਤ� ਹ�ਾ�� �ਾਵ��ਾ, ਨਾ �ਿ ��ਵਲ ��� ਨਤ��ਿ�� ਵਿੱ���।"
 
 #: ../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 "
@@ -11468,13 +11339,10 @@ 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."
@@ -11486,14 +11354,15 @@ msgid ""
 "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:93
-#| msgid "Last time empty trash was run"
 msgid "Last time Empty Trash was run"
 msgstr "��ਰ� ਵਾਰ ਰੱਦ� �ਾਲ� �ਰਨ ਦਾ ਸਮਾ�"
 
@@ -11604,7 +11473,6 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "ਸ�ਨ�ਹਾ \"�ਲ�\" ਵਿੱ� ਨਿਸ਼ਾਨ ਦਿ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:118
-#| msgid "Message Display"
 msgid "Message text limit for display"
 msgstr "ਵ��ਾ�ਣ ਲ� ਸ�ਨ�ਹਾ ���ਸ� ਲਿਮ�"
 
@@ -11649,17 +11517,14 @@ msgid "Prompt when deleting messages in search folder"
 msgstr "ਪ�ੱ��, �ਦ�� ��� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨ�ਹ� ਹ�ਾ�ਣ� ਹ�ਣ"
 
 #: ../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 "ਪ�ੱ��, �ਦ�� �� ਪ�ਰਾਪਤ-�ਰਤਾਵਾ� ਨ�ੰ �ਵਾਬ ਦਿੱਤਾ �ਾ ਰਿਹਾ ਹ�ਵ�"
 
@@ -11872,6 +11737,12 @@ msgid ""
 "it will do that. It works by comparing the Reply-To: header with a List-"
 "Post: header, if there is one."
 msgstr ""
+"��� ਮ�ਲਿੰ� ਲਿਸ�ਾ� �ਵਾਬ-ਦਿ�(Reply-To:) ਹ�ੱਡਰ ਨ�ੰ ਯ��਼ਰ ਨ�ੰ �ਵਾਬ ਮ�ਲਿੰ� ਲਿਸ� �ੱਤ� ਭ��ਣ "
+"ਲ� ਸ�ੱ� ��ਤ��� ਹ�ੰਦ��� ਹਨ, ਭਾਵ�� �ਿ �ਹ �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਪ�ਰਾ�ਵ�� �ਵਾਬ ਦ�ਣ ਲ� ਪ�ੱ�ਦ��� ਹਨ। "
+"�ਹ ��ਣ ਸ�ੱ� �ਰਨ ਨਾਲ �ਵਾਬ-ਦਿ�: ਹ�ੱਡਰ ਨ�ੰ �ਣਡਿੱਠਾ �ਰਨ ਦ� ��ਸ਼ਿਸ਼ ��ਤ� �ਾਵ���, "
+"ਤਾ� �ਿ �ਵ�ਲ�ਸ਼ਨ ��� ਹ� �ਰ ਸ��, �ਿਵ�� ਤ�ਸ�� �ਾਹ�ੰਦ� ਹ�। �� ਤ�ਸ�� ਪ�ਰਾ�ਵ�� �ਵਾਬ ��ਸ਼ਨ ��ਣਿ� ਤਾ�, "
+"�ਹ ਪ�ਰਾ�ਵ�� �ਵਾਬ ਦ�ਵ��ਾ, �ਦ�� �ਿ ਤ�ਸ�� 'ਲਿਸ� ਨ�ੰ �ਵਾਬ' ��ਸ਼ਨ ��ਣਿ� ਤਾ� �ਹ ��� ਹ� �ਰ���। "
+"�ਹ �ਵਾਬ-ਦਿ�: ਹ�ੱਡਰ ਨ�ੰ ਲਿਸ�-ਪ�ਸ�: ਹ�ੱਡਰ ਨਾਲ ਤ�ਲਨਾ �ਰ�� �ੰਮ �ਰਦਾ ਹ�, �� ��� ਹ�ਵ� ਤਾ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:174
 msgid "Spell check inline"
@@ -11902,12 +11773,10 @@ msgid "The default plugin for Junk hook"
 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: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 ਤ�� ਲ� �� ਦਿਨਾ� �।"
 
@@ -11937,9 +11806,6 @@ msgid ""
 msgstr "ਤਿੰਨ ਸੰਭਵ ਮ�ੱਲ ਹਨ। �ਲਤ��� ਲ� \"0\"। ��ਤਾਵਨ� ਲ� \"1\"। ਡ�ਬੱ� ਸ�ਨ�ਹਾ ਲ� \"2\"।"
 
 #: ../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 message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
@@ -12107,6 +11973,8 @@ msgid ""
 "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"
@@ -12121,9 +11989,9 @@ msgid "Importing Elm data"
 msgstr "�ਲਨ ਡਾ�ਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:951
+#: ../modules/mail/e-mail-shell-view.c:964
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-#: ../widgets/misc/e-send-options.c:499
+#: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
 msgstr "ਪੱਤਰ"
 
@@ -12137,7 +12005,6 @@ msgstr "Elm ਤ�� ਪੱਤਰ �ਯਾਤ ਹ�।"
 
 #: ../mail/importers/evolution-mbox-importer.c:116
 #: ../plugins/dbx-import/dbx-importer.c:226
-#| msgid "Destination folder:"
 msgid "_Destination folder:"
 msgstr "ਨਿਯਤ ਫ�ਲਡਰ(_D):"
 
@@ -12152,26 +12019,22 @@ msgstr "ਫ�ਲਡਰ ��ਣ�"
 msgid "Select folder to import into"
 msgstr "�ਯਾਤ �ਰਨ ਲ� ਫ�ਲਡਰ ��ਣ�"
 
-#. Translators: Column header for a message subject
-#: ../mail/importers/evolution-mbox-importer.c:372
-#| msgid "Subject"
+#: ../mail/importers/evolution-mbox-importer.c:382
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "ਵਿਸ਼ਾ"
 
-#. Translators: Column header for a message From address
-#: ../mail/importers/evolution-mbox-importer.c:376
-#| msgid "From"
+#: ../mail/importers/evolution-mbox-importer.c:387
 msgctxt "mboxImp"
 msgid "From"
 msgstr "ਵਲ��"
 
-#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../mail/importers/evolution-mbox-importer.c:431
 #: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "ਬਰ�ਸ�ਲ� ਪੱਤਰ-ਬ�ਸਾ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:413
+#: ../mail/importers/evolution-mbox-importer.c:432
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "ਬਰ�ਸ�ਲ� ਪੱਤਰ-ਬ�ਸਾ ਫਾਰਮ�� ਫ�ਲਡਰ �ਯਾਤ�ਾਰ"
 
@@ -12185,7 +12048,6 @@ msgstr "ਪੱਤਰ-ਬ�ਸਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ
 #: ../plugins/pst-import/pst-importer.c:452
 #: ../plugins/pst-import/pst-importer.c:558
 #, c-format
-#| msgid "Importing `%s'"
 msgid "Importing '%s'"
 msgstr "`%s' �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
@@ -12250,7 +12112,12 @@ msgid_plural ""
 "%s have been updated, because they used just removed folder\n"
 "\"%s\"."
 msgstr[0] ""
+"ਫਿਲ�ਰ ਨਿਯਮ \"%s\" �ੱਪਡ�� ��ਤਾ �ਿ� ਹ�, �ਹ ਹ�ਾ� �� ਫ�ਲਡਰ\n"
+"\"%s\" ਨ�ੰ ਵਰਤਦਾ ਹ�।"
 msgstr[1] ""
+"�ੱ�� ਦਿੱਤ� ਫਿਲ�ਰ ਨਿਯਮ \n"
+"%s �ੱਪਡ�� ��ਤ� �� ਹ�, �ਹ ਹ�ਾ� �� ਫ�ਲਡਰ\n"
+"\"%s\" ਨ�ੰ ਵਰਤਦ� ਸਨ।"
 
 #. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
@@ -12379,12 +12246,10 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ਬਾਹਰ �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਡਿ���ਲ ਸਾ�ਨ �ਰ� (ਡਿਫਾਲ�)(_s)"
 
 #: ../mail/mail-config.ui.h:39
-#| msgid "Displayed Message _Headers"
 msgid "Displayed Message Headers"
 msgstr "ਸ�ਨ�ਹਾ ਹ�ੱਡਰ ਵ��ਾ�� �ਾ ਰਿਹਾ ਹ�"
 
 #: ../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)"
 
@@ -12466,7 +12331,7 @@ msgstr "ਹਵਾਲ� ਨ�ੰ �ਭਾਰ�(_q)"
 
 #: ../mail/mail-config.ui.h:63
 msgid "Ignore Reply-To: for mailing lists"
-msgstr ""
+msgstr "ਮ�ਲਿੰ� ਲਿਸ�ਾ� ਲ� �ਵਾਬ-ਦਿ�: �ਣਡਿੱਠਾ"
 
 #: ../mail/mail-config.ui.h:64
 msgid "Inline"
@@ -12561,15 +12426,13 @@ msgstr "ਪਰਿੰ� ��ਤ� ਫ���"
 
 #: ../mail/mail-config.ui.h:91
 msgid "Prompt when mailing list redirects private reply back to list"
-msgstr ""
+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)"
 
@@ -12658,7 +12521,6 @@ msgid "Select HTML variable width font for printing"
 msgstr "ਪਰਿ�ਿੰ� ਲ� HTML �ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 
 #: ../mail/mail-config.ui.h:118
-#| msgid "Select Folder"
 msgid "Select Junk Folder"
 msgstr "�ੰ� ਫ�ਲਡਰ ��ਣ�"
 
@@ -12667,7 +12529,6 @@ msgid "Select Sent Folder"
 msgstr "ਭ��� ਫ�ਲਡਰ ��ਣ�"
 
 #: ../mail/mail-config.ui.h:120
-#| msgid "Select Drafts Folder"
 msgid "Select Trash Folder"
 msgstr "ਰੱਦ� ਫ�ਲਡਰ ��ਣ�"
 
@@ -12700,7 +12561,6 @@ msgid "Server _Type:"
 msgstr "ਸਰਵਰ �ਾ�ਪ(_T): "
 
 #: ../mail/mail-config.ui.h:128
-#| msgid "Sig_ning certificate:"
 msgid "Si_gning algorithm:"
 msgstr "ਸਾ�ਨਿੰ� �ਲ��ਰਿਥਮ(_g):"
 
@@ -12721,7 +12581,6 @@ msgid "Signatures"
 msgstr "ਦਸਤ�ਤ"
 
 #: ../mail/mail-config.ui.h:133
-#| msgid "Sig_ning certificate:"
 msgid "Signing _algorithm:"
 msgstr "ਸਾ�ਨਿੰ� �ਲ��ਰਿਥਮ(_a):"
 
@@ -12755,7 +12614,6 @@ msgstr ""
 
 #. 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 "�ੱਤ� �ਵਾਬ ਦ�ਣ ��ਣ"
 
@@ -12815,7 +12673,6 @@ msgid "_Forward style:"
 msgstr "�ੱ�� ਭ��ਣ ਸ�ਾ�ਲ(_F):"
 
 #: ../mail/mail-config.ui.h:157
-#| msgid "Current Folder"
 msgid "_Junk Folder:"
 msgstr "�ੰ� ਫ�ਲਡਰ(_J):"
 
@@ -12895,7 +12752,6 @@ msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ਵੱਲ / Cc / Bcc ਹ�ੱਡਰ ਨ�ੰ ਸ�ੰ���(_S) "
 
 #: ../mail/mail-config.ui.h:180
-#| msgid "Drafts _Folder:"
 msgid "_Trash Folder:"
 msgstr "ਰੱਦ� ਫ�ਲਡਰ(_T):"
 
@@ -12953,7 +12809,6 @@ msgid "Co_mpleted"
 msgstr "ਮ��ੰਮਲ(_m)"
 
 #: ../mail/mail-dialogs.ui.h:6
-#| msgid "collapse"
 msgid "Collapse _all"
 msgstr "ਸਭ ਸਮ���(_a)"
 
@@ -12966,7 +12821,6 @@ msgid "Do Not Forward"
 msgstr "�ੱ�� ਨਾ ਭ���"
 
 #: ../mail/mail-dialogs.ui.h:9
-#| msgid "E_xpand All Threads"
 msgid "E_xpand all"
 msgstr "ਸਭ ਫ�ਲਾ�(_x)"
 
@@ -13070,9 +12924,6 @@ msgstr "ਬਾਹਰ� ਫਿਲ�ਰ ਲਾ�� �ਰਨ ਤ�� �ਸ
 
 #: ../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."
@@ -13082,7 +12933,6 @@ msgstr ""
 
 #: ../mail/mail-ops.c:654
 #, c-format
-#| msgid "Failed to append to local `Sent' folder: %s"
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ਲ��ਲ `ਭ���/Sent' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� ਫ�ਲ�ਹ: %s"
 
@@ -13100,11 +12950,11 @@ msgstr "%2$d ਵਿੱ��� %1$d ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ 
 msgid "Failed to send %d of %d messages"
 msgstr "ਸ�ਨ�ਹ� %2$d ਵਿੱ��� %1$d ਭ��ਣ ਵਿੱ� �ਸਫ਼ਲ"
 
-#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
+#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:783
 msgid "Canceled."
 msgstr "ਰੱਦ ��ਤਾ।"
 
-#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:785
 msgid "Complete."
 msgstr "ਸਮਾਪਤ"
 
@@ -13202,9 +13052,6 @@ msgstr[1] "ਸ�ਨ�ਹ� %d ਸੰਭਾਲ� �ਾ ਰਹ� ਹਨ"
 
 #: ../mail/mail-ops.c:2192
 #, c-format
-#| msgid ""
-#| "Error saving messages to: %s:\n"
-#| " %s"
 msgid "Error saving messages to: %s:\n"
 msgstr "ਸ�ਨ�ਹ� ਸੰਭਾਲਣ ਵਿੱ� �ਲਤ�: %s:\n"
 
@@ -13222,7 +13069,6 @@ msgstr ""
 " %s"
 
 #: ../mail/mail-ops.c:2310
-#| msgid "Could not write data: %s"
 msgid "Could not write data: "
 msgstr "ਡਾ�ਾ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�: "
 
@@ -13245,27 +13091,27 @@ msgstr "�ਫਲਾ�ਨ ਲ� ��ਾ��� '%s' ਤਿ�ਰ ��ਤ
 msgid "Checking Service"
 msgstr "ਸਰਵਿਸ �ਾ��� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/mail-send-recv.c:184
+#: ../mail/mail-send-recv.c:188
 msgid "Canceling..."
 msgstr "ਰੱਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../mail/mail-send-recv.c:424
+#: ../mail/mail-send-recv.c:440
 msgid "Send & Receive Mail"
 msgstr "ਪੱਤਰ ਭ��� �ਤ� ਲਵ�"
 
-#: ../mail/mail-send-recv.c:441
+#: ../mail/mail-send-recv.c:457
 msgid "Cancel _All"
 msgstr "ਸਭ ਰੱਦ(_A)"
 
-#: ../mail/mail-send-recv.c:551
+#: ../mail/mail-send-recv.c:569
 msgid "Updating..."
 msgstr "�ੱਪਡ�� �ਾਰ�..."
 
-#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
+#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:649
 msgid "Waiting..."
 msgstr "�ਡ�� �ਾਰ�..."
 
-#: ../mail/mail-send-recv.c:866
+#: ../mail/mail-send-recv.c:896
 #, c-format
 msgid "Checking for new mail"
 msgstr "ਨਵਾ� ਪੱਤਰ ਲ� �ਾ�� �ਾਰ�"
@@ -13305,13 +13151,11 @@ msgstr "ਵਰਤਣ ਲ� ��� ��ਾ��� ਨਹ�� ਲੱਭ
 
 #: ../mail/mail-tools.c:128
 #, c-format
-#| msgid "Could not create spool directory `%s': %s"
 msgid "Could not create spool directory '%s': %s"
 msgstr "ਸਪ�ਲ ਡਾ�ਰ���ਰ� '%s' ਬਣਾ� ਨਹ�� �ਾ ਸ�� ਹ�: %s"
 
 #: ../mail/mail-tools.c:161
 #, c-format
-#| msgid "Trying to movemail a non-mbox source `%s'"
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "�ੱ� non-mbox ਸਰ�ਤ `%s' ਤ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਾਰ�"
 
@@ -13326,7 +13170,6 @@ msgstr "�ੱ�� ਭ��ਿ� ਸ�ਨ�ਹਾ"
 
 #: ../mail/mail-tools.c:318
 #, c-format
-#| msgid "Invalid folder: `%s'"
 msgid "Invalid folder: '%s'"
 msgstr "�ਲਤ ਫ�ਲਡਰ: '%s'"
 
@@ -13360,7 +13203,12 @@ msgid_plural ""
 "%s have been updated, because they used just removed folder\n"
 "\"%s\"."
 msgstr[0] ""
+"��� ਫ�ਲਡਰ \"%s\" �ੱਪਡ�� ��ਤਾ �ਿ� ਹ�, �ਹ ਹ�ਾ� �� ਫ�ਲਡਰ\n"
+"\"%s\" ਨ�ੰ ਵਰਤਦਾ ਹ�।"
 msgstr[1] ""
+"�ੱ�� ਦਿੱਤ� ��� ਫ�ਲਡਰ\n"
+"%s �ੱਪਡ�� ��ਤ� �� ਹ�, �ਹ ਹ�ਾ� �� ਫ�ਲਡਰ\n"
+"\"%s\" ਨ�ੰ ਵਰਤਦ� ਸਨ।"
 
 #: ../mail/mail-vfolder.c:1182
 msgid "Edit Search Folder"
@@ -13371,17 +13219,14 @@ 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 "\"�ੰ� ਨਹ�� ਰਿਪ�ਰ� �ਰ�\" ਫ�ਲ�ਹ ਹ�"
 
@@ -13518,7 +13363,6 @@ msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "ਫ�ਲਡਰ \"{0}\" ਨ�ੰ \"{1}\" ਵਿੱ� ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
 #: ../mail/mail.error.xml.h:32
-#| msgid "Cannot open source \"{1}\""
 msgid "Cannot open source \"{1}\"."
 msgstr "ਸਰ�ਤ \"{1}\" ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।"
 
@@ -13579,17 +13423,14 @@ 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 Send"
 msgid "Do _Not Send"
 msgstr "ਨਾ ਭ���(_N)"
 
 #: ../mail/mail.error.xml.h:48
-#| msgid "_Do not Synchronize"
 msgid "Do _Not Synchronize"
 msgstr "ਸ��ਰ�ਨਾ��਼ ਨਾ �ਰ�(_N)"
 
@@ -13643,15 +13484,10 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "���ਰ ਤ�ਸ�� �ਾਰ� ਰੱ�ਿ� ਤਾ� ਤ�ਸ�� �ਹਨਾ� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਮ��-ਪ�ਰਾਪਤ ਨਹ�� �ਰ ਸ�ਦ� ਹ�।"
 
 #: ../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 "
 "will be deleted permanently."
-msgstr ""
-"���ਰ ਤ�ਸ�� ਫ�ਲਡਰ ਹ�ਾ ਦਿੱਤਾ ਤਾ�, �ਸ �ਤ� �ਸ ਦ� ਸਬ-ਫ�ਲਡਰਾ� ਦ� ਸਾਰ� ਭਾ� ਹਮ�ਸ਼ਾ ਲ� "
-"ਹ�ਾ ਦਿੱਤ� �ਾਣ��।"
+msgstr "���ਰ ਤ�ਸ�� ਫ�ਲਡਰ ਹ�ਾ ਦਿੱਤਾ ਤਾ�, �ਸ �ਤ� �ਸ ਦ� ਸਬ-ਫ�ਲਡਰਾ� ਦ� ਸਾਰ� ਭਾ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦਿੱਤ� �ਾਣ��।"
 
 #: ../mail/mail.error.xml.h:63
 msgid "If you delete the folder, all of its contents will be deleted permanently."
@@ -13773,7 +13609,6 @@ msgid "Really delete folder \"{0}\"?"
 msgstr "\"{0}\" ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�ਣਾ ਹ�?"
 
 #: ../mail/mail.error.xml.h:90
-#| msgid "_Private"
 msgid "Reply _Privately"
 msgstr "ਨਿੱ�� �ਵਾਬ(_P)"
 
@@ -13786,7 +13621,6 @@ msgid "Send private reply?"
 msgstr "ਪ�ਰਾ�ਵ�� �ਵਾਬ ਭ��ਣਾ ਹ�?"
 
 #: ../mail/mail.error.xml.h:95
-#| msgid "Sender or Recipients"
 msgid "Send reply to all recipients?"
 msgstr "ਸਭ ਪ�ਰਾਪਤ-�ਰਤਾਵਾ� ਨ�ੰ �ਵਾਬ ਭ��ਣਾ ਹ�?"
 
@@ -13880,9 +13714,6 @@ msgid ""
 msgstr "�ਸ ਨਾਲ ��ਣ� ਫ�ਲਡਰ �ਤ� �ਸ ਦ� �ਧ�ਨ-ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਬਣਾ ਦਿੱਤ� �ਾਣ��।"
 
 #: ../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 "�ਸ ਨਾਲ ��ਣ� ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਬਣਾ ਦਿੱਤ� �ਾਣ��।"
 
@@ -13926,6 +13757,8 @@ msgid ""
 "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 ""
@@ -13933,9 +13766,10 @@ msgid ""
 "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?"
@@ -13943,8 +13777,8 @@ 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."
@@ -13999,7 +13833,7 @@ msgid "_Discard changes"
 msgstr "ਤਬਦ�ਲ��� ਰੱਦ(_D)"
 
 #: ../mail/mail.error.xml.h:137
-#: ../modules/mail/e-mail-shell-view-actions.c:827
+#: ../modules/mail/e-mail-shell-view-actions.c:887
 msgid "_Empty Trash"
 msgstr "ਰੱਦ� �ਾਲ�(_E)"
 
@@ -14012,12 +13846,10 @@ msgid "_Open Messages"
 msgstr "ਸ�ਨ�ਹ� ��ਲ�ਹ�(_O)"
 
 #: ../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)"
 
@@ -14092,17 +13924,17 @@ msgid "Select all visible messages"
 msgstr "ਸਾਰ� ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ��ਣ�"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4402 ../mail/message-list.c:4809
+#: ../mail/message-list.c:4412 ../mail/message-list.c:4820
 msgid "Generating message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਬਣਾ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/message-list.c:4633
+#: ../mail/message-list.c:4643
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "��� ਸ�ਨ�ਹਾ ਤ�ਹਾਡ� ��� ਮ�ਤਾਬ� ਨਹ�� ਹ�। �ਾ� ਤਾ� ��� -> ��� ਮ�ਨ� ���ਮ ਰਾਹ�� ਸਾਫ਼ �ਰ� �ਾ� ਬਦਲ� ��।"
 
-#: ../mail/message-list.c:4635
+#: ../mail/message-list.c:4645
 msgid "There are no messages in this folder."
 msgstr "�ਸ ਫ�ਲਡਰ ਵਿੱ� ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�।"
 
@@ -14131,7 +13963,7 @@ msgid "Sent Messages"
 msgstr "ਭ��� ਸ�ਨ�ਹ�"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:560
+#: ../widgets/misc/e-attachment-tree-view.c:570
 msgid "Size"
 msgstr "��ਾਰ"
 
@@ -14140,27 +13972,27 @@ msgid "Subject - Trimmed"
 msgstr "ਵਿਸ਼ਾ - ���ਾ ��ਤਾ"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1218
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Body contains"
 msgstr "ਪੱਤਰ '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1225
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Message contains"
 msgstr "ਸ�ਨ�ਹ� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1232
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "Recipients contain"
 msgstr "ਸ�ਨ�ਹ��� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1239
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "Sender contains"
 msgstr "ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1246
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "Subject contains"
 msgstr "ਵਿਸ਼� '� ਹ�"
 
@@ -14194,7 +14026,6 @@ msgstr ""
 "��ਨ��ਸ਼ਨ �ਣ-ਸ�ਰੱ�ਿ�ਤ ਵ� ਹ� ਸ�ਦਾ ਹ� �ਤ� ਤ�ਸ�� ਸ�ਰੱ�ਿ� ਲ� �ਤਰਾ ਬਣ ਸ�ਦ� ਹ�।"
 
 #: ../modules/addressbook/addressbook-config.c:602
-#| msgid "Use in _Birthday & Anniversaries calendar"
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "�ਨਮਦਿਨ ਤ� ਵਰ�ਹ�-�ੰਢ ��ਲੰਡਰ '� ਵਰਤ��(_s)"
 
@@ -14334,7 +14165,7 @@ 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
+#: ../modules/mail/em-mailer-prefs.c:1141
 msgid "_Table column:"
 msgstr "��ਬਲ �ਾਲਮ(_ T):"
 
@@ -14347,275 +14178,275 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "���-ਪ�ਰਾ ��ਤ� ਸੰਪਰ� ਦਾ �ਡਰ�ੱਸ ਹਮ�ਸਾ� ਵ���"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:97
+#: ../modules/addressbook/e-book-shell-backend.c:98
 #: ../modules/addressbook/e-book-shell-migrate.c:148
 msgid "On LDAP Servers"
 msgstr "LDAP ਸਰਵਰਾ� �ੱਤ�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:267
+#: ../modules/addressbook/e-book-shell-backend.c:280
 msgctxt "New"
 msgid "_Contact"
 msgstr "ਸੰਪਰ�(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-backend.c:282
+#: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact"
 msgstr "ਨਵਾ� ਸੰਪਰ� ਬਣਾ�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:274
+#: ../modules/addressbook/e-book-shell-backend.c:287
 msgctxt "New"
 msgid "Contact _List"
 msgstr "ਸੰਪਰ� ਲਿਸ�(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-backend.c:289
+#: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "Create a new contact list"
 msgstr "ਨਵ�� ਸੰਪਰ� ਸ��� ਬਣਾ�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:284
+#: ../modules/addressbook/e-book-shell-backend.c:297
 msgctxt "New"
 msgid "Address _Book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ�(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-backend.c:299
+#: ../modules/addressbook/e-book-shell-view-actions.c:703
 msgid "Create a new address book"
 msgstr "�ੱ� ਸ�ਨ�ਹਾ �ਿਤਾਬ ਬਣਾ�"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-backend.c:316
 #: ../modules/addressbook/e-book-shell-view.c:401
 #: ../modules/calendar/e-cal-shell-backend.c:104
 #: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "ਸੰਪਰ�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:312
+#: ../modules/addressbook/e-book-shell-backend.c:325
 msgid "Certificates"
 msgstr "ਸਰ��ਫਿ���"
 
 #. 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
+#: ../modules/addressbook/e-book-shell-view-actions.c:549
 msgid "Save as vCard"
 msgstr "vCard ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Co_py All Contacts To..."
 msgstr "ਸਭ ਸੰਪਰ�ਾ� ਦ� �ੱਥ� �ਾਪ� (_p)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:666
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
 msgid "Copy the contacts of the selected address book to another"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਸੰਪਰ� ਦ� �ਾਪ� ਹ�ਰ ਨ�ੰ ਭ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "D_elete Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਹ�ਾ�(_e)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:673
+#: ../modules/addressbook/e-book-shell-view-actions.c:689
 msgid "Delete the selected address book"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਹ�ਾ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Mo_ve All Contacts To..."
 msgstr "ਸਭ ਸੰਪਰ�ਾ� ਨ�ੰ ਭ���(_v)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:696
 msgid "Move the contacts of the selected address book to another"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਸੰਪਰ�ਾ� ਨ�ੰ ਹ�ਰਾ� ਵਿੱ� ਭ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "_New Address Book"
 msgstr "ਨਵ�� �ਡਰ�ੱਸ-ਬ�ੱ�(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Address _Book Properties"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿਸ਼�ਸ਼ਤਾ (_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:710
 msgid "Show properties of the selected address book"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਵਿਸ਼�ਸ਼ਤਾ ਵ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 #: ../modules/calendar/e-cal-shell-view-actions.c:1354
 #: ../modules/calendar/e-memo-shell-view-actions.c:620
 #: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:971
 msgid "_Rename..."
 msgstr "ਨਾ� ਬਦਲ�(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:717
 msgid "Rename the selected address book"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦਾ ਨਾ� ਬਦਲ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "S_ave Address Book as vCard"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� vC_ard ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:724
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "��ਣ� �ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਸੰਪਰ�ਾ� ਨ�ੰ vCard ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
+#: ../modules/addressbook/e-book-shell-view-actions.c:731
 msgid "Stop loading"
 msgstr "ਲ�ਡ �ਰਨਾ ਰ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "_Copy Contact To..."
 msgstr "ਸੰਪਰ�ਾ� �ੱਥ� �ਾਪ� �ਰ�(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
+#: ../modules/addressbook/e-book-shell-view-actions.c:738
 msgid "Copy selected contacts to another address book"
 msgstr "��ਣ� ਸੰਪਰ� ਹ�ਰ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "_Delete Contact"
 msgstr "ਸੰਪਰ� ਹ�ਾ�(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "_Find in Contact..."
 msgstr "ਸੰਪਰ� ਵਿੱ� ���(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:752
 msgid "Search for text in the displayed contact"
 msgstr "ਦਿੱਸ ਰਹ� ਸੰਪਰ� ਵਿੱ� ���ਸ� ਦ� ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "_Forward Contact..."
 msgstr "ਸੰਪਰ� ਨ�ੰ �ੱ�� ਭ���(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:759
 msgid "Send selected contacts to another person"
 msgstr "��ਣ� ਸੰਪਰ� ਹ�ਰ ਵਿ��ਤ� ਨ�ੰ ਭ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "_Move Contact To..."
 msgstr "ਸੰਪਰ� �ੱਥ� ਭ���(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:766
 msgid "Move selected contacts to another address book"
 msgstr "��ਣ� ਸੰਪਰ� ਹ�ਰ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਭ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "_New Contact..."
 msgstr "ਨਵਾ� ਸੰਪਰ�(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "New Contact _List..."
 msgstr "ਨਵ�� ਸੰਪਰ� ਲਿਸ�(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
 msgid "_Open Contact"
 msgstr "ਸੰਪਰ� ��ਲ�ਹ�(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:787
 msgid "View the current contact"
 msgstr "ਮ���ਦਾ ਸੰਪਰ� ਵ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 msgid "_Send Message to Contact..."
 msgstr "ਸੰਪਰ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:794
 msgid "Send a message to the selected contacts"
 msgstr "ਸ�ਨ�ਹਾ ��ਣ� ਸੰਪਰ�ਾ� ਵਿੱ� ਭ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
 #: ../modules/calendar/e-cal-shell-view-actions.c:1496
 #: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "�ਾਰਵਾ�(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:808
 #: ../modules/calendar/e-memo-shell-view-actions.c:657
 #: ../modules/calendar/e-task-shell-view-actions.c:809
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:1094
 msgid "_Preview"
 msgstr "�ਲ�(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/addressbook/e-book-shell-view-actions.c:817
 #: ../modules/calendar/e-cal-shell-view-actions.c:1513
 #: ../modules/calendar/e-memo-shell-view-actions.c:670
 #: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "ਹ�ਾ�(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:805
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "_Properties"
 msgstr "ਵਿਸ਼�ਸਤਾ(_P)"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:814
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "_Save as vCard..."
 msgstr "vCard ਵਾ�� ਸੰਭਾਲ�(_S)...."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:858
 msgid "Contact _Preview"
 msgstr "ਸੰਪਰ� �ਲ�(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
 msgid "Show contact preview window"
 msgstr "ਸੰਪਰ� �ਲ� ਵਿੰਡ� ਵ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
 #: ../modules/calendar/e-memo-shell-view-actions.c:727
 #: ../modules/calendar/e-task-shell-view-actions.c:891
-#: ../modules/mail/e-mail-shell-view-actions.c:1128
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "_Classic View"
 msgstr "��ਸਾਲ� �ਲ�(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:865
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 msgid "Show contact preview below the contact list"
 msgstr "ਸ�ਨ�ਹਾ ਲਿਸ� ਦ� ਹ�ਠਾ� ਸੰਪਰ� �ਲ� ਵ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
 #: ../modules/calendar/e-task-shell-view-actions.c:898
-#: ../modules/mail/e-mail-shell-view-actions.c:1135
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "_Vertical View"
 msgstr "ਲੰਬ�ਾਰ� �ਲ�(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:872
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 msgid "Show contact preview alongside the contact list"
 msgstr "ਸੰਪਰ� ਲਿਸ� ਦ� ਨਾਲ ਸੰਪਰ� �ਲ� ਵ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 #: ../modules/calendar/e-cal-shell-view-actions.c:1656
 #: ../modules/calendar/e-memo-shell-view-actions.c:744
 #: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "��� ���ਾ�ਰ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 #: ../modules/calendar/e-cal-shell-view-actions.c:1670
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
 #: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
 #: ../modules/calendar/e-cal-shell-view-actions.c:1680
 #: ../modules/calendar/e-memo-shell-view-actions.c:761
 #: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1211
-#: ../shell/e-shell-content.c:459
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../shell/e-shell-content.c:462
 msgid "Advanced Search"
 msgstr "ਤ�ਨ��� ���"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Print all shown contacts"
 msgstr "ਸਭ ਦਿ�ਾ� ਦਿੰਦ� ਸੰਪਰ� ਪਰਿੰ� �ਰ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Preview the contacts to be printed"
 msgstr "ਪਰਿੰ� �ਾਣ ਵਾਲ� ਸੰਪਰ�ਾ� ਦ� �ਲ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Print selected contacts"
 msgstr "��ਣ� ਸੰਪਰ� ਪਰਿੰ� �ਰ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
 msgid "Save selected contacts as a vCard"
 msgstr "��ਣ� ਸੰਪਰ� VCard ਵ��� ਸੰਭਾਲ�"
 
@@ -14639,22 +14470,22 @@ msgstr "ਲਿਸ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_S)"
 msgid "_Send Message to Contact"
 msgstr "ਸੰਪਰ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_S)"
 
-#: ../modules/addressbook/eab-composer-util.c:137
+#: ../modules/addressbook/eab-composer-util.c:143
 msgid "Multiple vCards"
 msgstr "�� vCards"
 
-#: ../modules/addressbook/eab-composer-util.c:145
+#: ../modules/addressbook/eab-composer-util.c:151
 #, c-format
 msgid "vCard for %s"
 msgstr "%s ਲ� vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:157
-#: ../modules/addressbook/eab-composer-util.c:184
+#: ../modules/addressbook/eab-composer-util.c:163
+#: ../modules/addressbook/eab-composer-util.c:190
 #, c-format
 msgid "Contact information"
 msgstr "ਸੰਪਰ� �ਾਣ�ਾਰ�"
 
-#: ../modules/addressbook/eab-composer-util.c:186
+#: ../modules/addressbook/eab-composer-util.c:192
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s ਲ� ਸੰਪਰ� �ਾਣ�ਾਰ�"
@@ -14779,7 +14610,7 @@ msgstr "�ੰਮ �ੰਪ�ਰ�(_m)"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:106
-#: ../modules/calendar/e-cal-shell-migrate.c:176
+#: ../modules/calendar/e-cal-shell-migrate.c:181
 #: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:94
@@ -14797,52 +14628,52 @@ msgstr "ਮ�ਸਮ"
 msgid "Birthdays & Anniversaries"
 msgstr "�ਨਮ-ਦਿਨ ਤ� ਵਰ�-�ੰਢ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:396
+#: ../modules/calendar/e-cal-shell-backend.c:406
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:398
+#: ../modules/calendar/e-cal-shell-backend.c:408
 #: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:403
+#: ../modules/calendar/e-cal-shell-backend.c:413
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "ਸਾਰ� ਦਿਨ ਦ� ਮ�ਲਾ�ਾਤ(_p)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:415
 msgid "Create a new all-day appointment"
 msgstr "ਨਵ�� ਸਾਰਾ-ਦਿਨ ਮ�ਲਾ�ਾਤ ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:410
+#: ../modules/calendar/e-cal-shell-backend.c:420
 msgctxt "New"
 msgid "M_eeting"
 msgstr "ਮ��ਿੰ�(_e)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:412
+#: ../modules/calendar/e-cal-shell-backend.c:422
 msgid "Create a new meeting request"
 msgstr "ਨਵ�� ਮ��ਿੰ� ਲ� ਬ�ਨਤ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:420
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "��ਲੰਡਰ(_n)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:422
+#: ../modules/calendar/e-cal-shell-backend.c:432
 #: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "ਨਵਾ� ��ਲੰਡਰ ਬਣਾ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:2667
+#: ../modules/calendar/e-cal-shell-backend.c:717
+#: ../plugins/itip-formatter/itip-formatter.c:2669
 msgid "Calendar and Tasks"
 msgstr "��ਲੰਡਰ ਤ� �ੰਮ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:169
-#: ../modules/calendar/e-memo-shell-sidebar.c:163
-#: ../modules/calendar/e-task-shell-sidebar.c:163
+#: ../modules/calendar/e-cal-shell-sidebar.c:171
+#: ../modules/calendar/e-memo-shell-sidebar.c:165
+#: ../modules/calendar/e-task-shell-sidebar.c:165
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14851,21 +14682,20 @@ msgstr ""
 "%s �ੱਤ� �ਲਤ�\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:237
+#: ../modules/calendar/e-cal-shell-sidebar.c:239
 msgid "Loading calendars"
 msgstr "��ਲੰਡਰ ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:664
-#| msgid "_New Calendar"
+#: ../modules/calendar/e-cal-shell-sidebar.c:674
 msgid "_New Calendar..."
 msgstr "ਨਵਾ� ��ਲੰਡਰ(_N)..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:681
+#: ../modules/calendar/e-cal-shell-sidebar.c:691
 msgid "Calendar Selector"
 msgstr "��ਲੰਡਰ ��ਣ�ਾਰ "
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1022
+#: ../modules/calendar/e-cal-shell-sidebar.c:1032
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s ਤ�� ��ਲੰਡਰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
@@ -15162,7 +14992,7 @@ msgid "New _Memo"
 msgstr "ਨਵਾ� ਮ�ਮ�(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-memo-shell-backend.c:279
+#: ../modules/calendar/e-memo-shell-backend.c:281
 #: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Create a new memo"
 msgstr "�ੱ� ਨਵਾ� ਮ�ਮ� ਬਣਾ�"
@@ -15228,7 +15058,7 @@ msgid "New _Task"
 msgstr "ਨਵਾ� �ੰਮ(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:277
+#: ../modules/calendar/e-task-shell-backend.c:280
 #: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "ਨਵਾ� �ੰਮ ਬਣਾ�"
@@ -15254,40 +15084,40 @@ msgstr "iCalendar ਵਾ�� ਸੰਭਾਲ�(_S)..."
 msgid "Print the selected task"
 msgstr "��ਣ� �ਾਸ� ਪਰਿੰ� �ਰ�"
 
-#: ../modules/calendar/e-memo-shell-backend.c:277
+#: ../modules/calendar/e-memo-shell-backend.c:279
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ਮ�ਮ�(_o)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:284
+#: ../modules/calendar/e-memo-shell-backend.c:286
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "ਸਾ��ਾ ਮ�ਮ�(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:286
+#: ../modules/calendar/e-memo-shell-backend.c:288
 msgid "Create a new shared memo"
 msgstr "ਨਵਾ� ਸਾ��ਾ ਮ�ਮ� ਬਣਾ�"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:296
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "ਮ�ਮ� ਲਿਸ�(_s)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:296
+#: ../modules/calendar/e-memo-shell-backend.c:298
 #: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo list"
 msgstr "ਨਵ�� ਮ�ਮ� ਸ��� ਬਣਾ�"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:231
+#: ../modules/calendar/e-memo-shell-sidebar.c:233
 msgid "Loading memos"
 msgstr "ਮ�ਮ� ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:603
+#: ../modules/calendar/e-memo-shell-sidebar.c:613
 msgid "Memo List Selector"
 msgstr "ਮ�ਮ� ਲਿਸ� ��ਣ�ਾਰ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:908
+#: ../modules/calendar/e-memo-shell-sidebar.c:918
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s �ੱਤ� ਮ�ਮ� ��ਲ ਰਿਹਾ ਹ�"
@@ -15378,40 +15208,40 @@ msgstr "ਮ�ਮ� ਹ�ਾ�"
 msgid "Delete Memo"
 msgstr "ਮ�ਮ� ਹ�ਾ�"
 
-#: ../modules/calendar/e-task-shell-backend.c:275
+#: ../modules/calendar/e-task-shell-backend.c:278
 msgctxt "New"
 msgid "_Task"
 msgstr "�ੰਮ(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:282
+#: ../modules/calendar/e-task-shell-backend.c:285
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "ਦਿੱਤਾ �ੰਮ(_d)"
 
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:287
 msgid "Create a new assigned task"
 msgstr "ਨਵਾ� �ੰਮ ਬਣਾ�"
 
-#: ../modules/calendar/e-task-shell-backend.c:292
+#: ../modules/calendar/e-task-shell-backend.c:295
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "�ਾਸ� ਲਿਸ�(_k)"
 
-#: ../modules/calendar/e-task-shell-backend.c:294
+#: ../modules/calendar/e-task-shell-backend.c:297
 #: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "ਨਵ�� �ੰਮ ਸ��� ਬਣਾ�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:231
+#: ../modules/calendar/e-task-shell-sidebar.c:233
 msgid "Loading tasks"
 msgstr "�ੰਮ ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:603
+#: ../modules/calendar/e-task-shell-sidebar.c:613
 msgid "Task List Selector"
 msgstr "�ਾਸ� ਲਿਸ� ��ਣ�ਾਰ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:908
+#: ../modules/calendar/e-task-shell-sidebar.c:918
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s ਤ� �ੰਮ ��ਲ�ਹ ਰਿਹਾ ਹ�"
@@ -15545,7 +15375,7 @@ msgid "Delete Task"
 msgstr "�ਾਸ� ਹ�ਾ�"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:333
+#: ../modules/mail/e-mail-attachment-handler.c:345
 #, c-format
 msgid "%d attached messages"
 msgstr "%d ਸ�ਨ�ਹ� ���� ��ਤ�"
@@ -15557,453 +15387,451 @@ msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:173
 msgid "Compose a new mail message"
 msgstr "�ੱ� ਨਵਾ� ਪੱਤਰ ਸ�ਨ�ਹਾ ਲਿ��"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "ਪੱਤਰ ਫ�ਲਡਰ(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:183
 msgid "Create a new mail folder"
 msgstr "ਨਵਾ� ਪੱਤਰ ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../modules/mail/e-mail-shell-backend.c:478
+#: ../modules/mail/e-mail-shell-backend.c:489
 msgid "Mail Accounts"
 msgstr "ਪੱਤਰ ��ਾ���"
 
-#: ../modules/mail/e-mail-shell-backend.c:486
+#: ../modules/mail/e-mail-shell-backend.c:497
 msgid "Mail Preferences"
 msgstr "ਪੱਤਰ ਪਸੰਦ"
 
-#: ../modules/mail/e-mail-shell-backend.c:494
+#: ../modules/mail/e-mail-shell-backend.c:505
 msgid "Composer Preferences"
 msgstr "�ੰਪ��਼ਰ ਪਸੰਦ"
 
-#: ../modules/mail/e-mail-shell-backend.c:502
+#: ../modules/mail/e-mail-shell-backend.c:513
 msgid "Network Preferences"
 msgstr "ਨ�ੱ�ਵਰ� ਪਸੰਦ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:820
-#: ../modules/mail/e-mail-shell-view.c:870
+#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view.c:883
 msgid "_Disable Account"
 msgstr "��ਾ��� �ਯ��(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:822
+#: ../modules/mail/e-mail-shell-view-actions.c:882
 msgid "Disable this account"
 msgstr "�ਹ ��ਾ��� �ਯ��"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:829
+#: ../modules/mail/e-mail-shell-view-actions.c:889
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "ਸਭ ਫ�ਲਡਰਾ� ਤ�� ਸਭ ਹ�ਾ� ਸ�ਨ�ਹ� ਪੱ�� ਤ�ਰ �ੱਤ� ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:834
+#: ../modules/mail/e-mail-shell-view-actions.c:894
 msgid "C_reate Search Folder From Search..."
 msgstr "��� ਤ�� ��� ਫ�ਲਡਰ ਬਣਾ�(_r)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:841
+#: ../modules/mail/e-mail-shell-view-actions.c:901
 msgid "_Download Messages for Offline Usage"
 msgstr "�ਫਲਾ�ਨ ਲ� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ �ਰ�(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:843
+#: ../modules/mail/e-mail-shell-view-actions.c:903
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "�ਫਲਾ�ਨ ਵਰਤ�� ਲ� ਮਾਰ� ��ਤ� ��ਾ��� �ਤ� ਫ�ਲਡਰ ਲ� ਸ�ਨ�ਹ� ਡਾ�ਨਲ�ਡ �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:848
+#: ../modules/mail/e-mail-shell-view-actions.c:908
 msgid "Fl_ush Outbox"
 msgstr "���ਬਾ�ਸ ਫਲੱਸ਼(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:915
 msgid "_Copy Folder To..."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:917
 msgid "Copy the selected folder into another folder"
 msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ �ੱ� ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:924
 msgid "Permanently remove this folder"
 msgstr "�ਹ ਫ�ਲਡਰ ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:929
 msgid "E_xpunge"
 msgstr "ਮਿ�ਾ�(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:871
+#: ../modules/mail/e-mail-shell-view-actions.c:931
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ਸਭ ਹ�ਾ� ਸ�ਨ�ਹ� �ਸ ਫ�ਲਡਰ ਵਿੱ��� ਹ�ਾ ਦਿ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:936
 msgid "Mar_k All Messages as Read"
 msgstr "ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਬਣਾ�(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:938
 msgid "Mark all messages in the folder as read"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਮਾਰ� �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:943
 msgid "_Move Folder To..."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:885
+#: ../modules/mail/e-mail-shell-view-actions.c:945
 msgid "Move the selected folder into another folder"
 msgstr "��ਣ� ਫ�ਲਡਰ ਨ�ੰ ਹ�ਰ ਫ�ਲਡਰ ਵਿੱ� ਭ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:950
 msgid "_New..."
 msgstr "ਨਵਾ�(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:952
 msgid "Create a new folder for storing mail"
 msgstr "ਸੰਭਾਲ� ਪੱਤਰਾ� ਤ�� ਨਵਾ� ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:959
 msgid "Change the properties of this folder"
 msgstr "�ਸ ਫ�ਲਡਰ ਦ��� ਵਿਸ਼�ਸਤਾਵਾ� ਬਦਲ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:966
 msgid "Refresh the folder"
 msgstr "ਫ�ਲਡਰ ਤਾ�਼ਾ �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:973
 msgid "Change the name of this folder"
 msgstr "�ਸ ਫ�ਲਡਰ ਦਾ ਨਾ� ਬਦਲ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Select Message _Thread"
 msgstr "ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਵ���(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:980
 msgid "Select all messages in the same thread as the selected message"
 msgstr "�ੱ�� ਮਸਲ� ਦ� ਸਾਰ� ਸ�ਨ�ਹ� ��ਣ� ਸ�ਨ�ਹ� ਬਣਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Select Message S_ubthread"
 msgstr "ਸ�ਨ�ਹਾ ਸਬ-ਥਰਿੱਡ ��ਣ�(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:987
 msgid "Select all replies to the currently selected message"
 msgstr "ਮ���ਦਾ ਸ�ਨ�ਹ� ਲ� ਸਭ �ਵਾਬ ��ਣ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:932
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "_Unsubscribe"
 msgstr "ਮ��ਬਰ� ਹ�ਾ�(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:994
 msgid "Unsubscribe from the selected folder"
 msgstr "��ਣ� ਫ�ਲਡਰ ਤ�� ਮ��ਬਰ ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:939
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Empty _Trash"
 msgstr "ਰੱਦ� �ਾਲ�(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:1001
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ਸਭ ��ਾ��� ਤ�� ਹ�ਾ� ਸ�ਨ�ਹ� ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "_New Label"
 msgstr "ਨਵਾ� ਲ�ਬਲ(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:1015
 msgid "N_one"
 msgstr "��� ਨਹ��(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
 msgid "Cancel the current mail operation"
 msgstr "ਮ���ਦਾ ਮ�ਲ �ਾਰਵਾ� ਰੱਦ �ਰ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:1043
 msgid "Collapse All _Threads"
 msgstr "ਸਭ ਥਰਿੱਡ ਸਮ���(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:1045
 msgid "Collapse all message threads"
 msgstr "ਸਭ ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਸਮ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:1050
 msgid "E_xpand All Threads"
 msgstr "ਸਭ ਥਰਿੱਡ ਫ�ਲਾ�(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:992
+#: ../modules/mail/e-mail-shell-view-actions.c:1052
 msgid "Expand all message threads"
 msgstr "ਸਭ ਸ�ਨ�ਹਾ ਥਰਿੱਡ ਫ�ਲਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
+#: ../modules/mail/e-mail-shell-view-actions.c:1057
 msgid "_Message Filters"
 msgstr "ਸ�ਨ�ਹਾ ਫਿਲ�ਰ(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:999
+#: ../modules/mail/e-mail-shell-view-actions.c:1059
 msgid "Create or edit rules for filtering new mail"
 msgstr "ਨਵ�� ਮ�ਲ ਨ�ੰ ਫਿਲ�ਰ �ਰਨ ਲ� ਨਿਯਮ ਬਣਾ� �ਾ� ਸ�ਧ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
 msgid "Search F_olders"
 msgstr "ਫ�ਲਡਰ ���(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
+#: ../modules/mail/e-mail-shell-view-actions.c:1066
 msgid "Create or edit search folder definitions"
 msgstr "��� ਫ�ਲਡਰ ਪਰਿਭਾਸ਼ਾ ਨ�ੰ ਬਣਾ� �ਾ� ਸ�ਧ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
 msgid "_Subscriptions..."
 msgstr "ਮ��ਬਰ�(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ਰਿਮ�� ਸਰਵਰ �ੱਤ� ਫ�ਲਡਰਾ� ਲ� ਮ��ਬਰ ਬਣ� �ਾ� ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1020
+#: ../modules/mail/e-mail-shell-view-actions.c:1080
 msgid "F_older"
 msgstr "ਫ�ਲਡਰ(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1027
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "_Label"
 msgstr "ਲ�ਬਲ(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "_New Folder..."
 msgstr "ਨਵਾ� ਫ�ਲਡਰ(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/mail/e-mail-shell-view-actions.c:1151
 msgid "Show Message _Preview"
 msgstr "ਸ�ਨ�ਹਾ �ਲ� ਵ���(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Show message preview pane"
 msgstr "ਸ�ਨ�ਹਾ �ਲ� ਵਿੰਡ� ਵ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
-#| msgid "Show deleted messages"
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 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."
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
 msgid "Show deleted messages with a line through them"
 msgstr "ਹ�ਾ� �� ਸ�ਨ�ਹਿ�� ਨ�ੰ �ਨ�ਹਾ� '� ਲਾ�ਨ ਲਾ �� ਵ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1107
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "_Group By Threads"
 msgstr "ਥਰਿੱਡ ਨਾਲ �ਰ�ੱਪ(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1109
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
 msgid "Threaded message list"
 msgstr "ਮਸਲਾ ਸ�ਨ�ਹਾ ਲਿਸ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1130
+#: ../modules/mail/e-mail-shell-view-actions.c:1190
 msgid "Show message preview below the message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਹ�ਠਾ� ਸ�ਨ�ਹਾ �ਲ� ਵ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1137
+#: ../modules/mail/e-mail-shell-view-actions.c:1197
 msgid "Show message preview alongside the message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਦ� ਨਾਲ ਸ�ਨ�ਹਾ �ਲ� ਵ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
 msgid "All Messages"
 msgstr "ਸਭ ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Important Messages"
 msgstr "�ਾਸ ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Last 5 Days' Messages"
 msgstr "��ਰ� ੫ ਦਿਨਾ� ਦ� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Messages Not Junk"
 msgstr "ਨਾ-�ੰ� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Messages with Attachments"
 msgstr "����ਮ��� ਸਮ�ਤ ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "No Label"
 msgstr "ਬਿਨ-ਲ�ਬਲ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Read Messages"
 msgstr "ਪ��ਹ� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Recent Messages"
 msgstr "ਤਾ�਼� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Unread Messages"
 msgstr "ਨਾ-ਪ��ਹ� ਸ�ਨ�ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Subject or Addresses contain"
 msgstr "ਵਿਸ਼ਾ �ਾ� ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
 msgid "All Accounts"
 msgstr "ਸਭ ��ਾ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1270
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
 msgid "Current Account"
 msgstr "ਮ���ਦਾ ��ਾ���"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1277
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
 msgid "Current Folder"
 msgstr "ਮ���ਦਾ ਫ�ਲਡਰ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:936
+#: ../modules/mail/e-mail-shell-view-private.c:990
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " %d ��ਣਿ�, "
 msgstr[1] " %d ��ਣ�, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:947
+#: ../modules/mail/e-mail-shell-view-private.c:1001
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d ਹ�ਾ��"
 msgstr[1] "%d ਹ�ਾ�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:953
-#: ../modules/mail/e-mail-shell-view-private.c:960
+#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1014
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d �ੰ�"
 msgstr[1] "%d �ੰ�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:966
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ਡਰਾਫ�"
 msgstr[1] "%d ਡਰਾਫ�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d ਨਾ-ਭ��ਿ�"
 msgstr[1] "%d ਨਾ-ਭ���"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d ਭ��ਿ�"
 msgstr[1] "%d ਭ���"
 
-#: ../modules/mail/e-mail-shell-view-private.c:990
+#: ../modules/mail/e-mail-shell-view-private.c:1044
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d �ਣ-ਰ�ਡ, "
 msgstr[1] "%d �ਣ-ਰ�ਡ, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:993
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d ��ੱਲ"
 msgstr[1] "%d ��ੱਲ"
 
-#: ../modules/mail/e-mail-shell-view.c:548
+#: ../modules/mail/e-mail-shell-view.c:559
 msgid "All Account Search"
 msgstr "ਸਭ ��ਾ��� ���"
 
-#: ../modules/mail/e-mail-shell-view.c:675
+#: ../modules/mail/e-mail-shell-view.c:686
 msgid "Account Search"
 msgstr "��ਾ��� ���"
 
-#: ../modules/mail/e-mail-shell-view.c:868
+#: ../modules/mail/e-mail-shell-view.c:881
 msgid "Proxy _Logout"
 msgstr "ਪਰਾ�ਸ� ਲਾ����(_L)"
 
-#: ../modules/mail/em-account-prefs.c:130
+#: ../modules/mail/em-account-prefs.c:133
 msgid "Evolution Account Assistant"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਾ��� ਸਹਾ��"
 
-#: ../modules/mail/em-account-prefs.c:179
+#: ../modules/mail/em-account-prefs.c:182
 msgid "Account Editor"
 msgstr "��ਾ��� ਸੰਪਾਦ�"
 
-#: ../modules/mail/em-composer-prefs.c:498
+#: ../modules/mail/em-composer-prefs.c:505
 #: ../plugins/plugin-manager/plugin-manager.c:349
 #: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
+#: ../widgets/misc/e-account-tree-view.c:211
 msgid "Enabled"
 msgstr "ਯ�� ��ਤਾ"
 
-#: ../modules/mail/em-composer-prefs.c:502
+#: ../modules/mail/em-composer-prefs.c:509
 msgid "Language(s)"
 msgstr "ਭਾਸ਼ਾ"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "ਹਰ ਸਮ��"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "ਦਿਨ ਵਿੱ� ��ਵਾਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "ਹ�ਤ� ਵਿੱ� ��ਵਾਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:100
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "ਮਹ�ਨ� ਵਿੱ� ��ਵਾਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:201
 msgid "Add Custom Junk Header"
 msgstr "�ਸ�ਮ �ੰ� ਹ�ੱਡਰ ਸ਼ਾਮਲ"
 
-#: ../modules/mail/em-mailer-prefs.c:233
+#: ../modules/mail/em-mailer-prefs.c:209
 msgid "Header Name:"
 msgstr "ਹ�ੱਡਰ ਨਾ�:"
 
-#: ../modules/mail/em-mailer-prefs.c:234
+#: ../modules/mail/em-mailer-prefs.c:210
 msgid "Header Value Contains:"
 msgstr "ਹ�ੱਡਰ ਮ�ੱਲ ਰੱ�ਦਾ ਹ�:"
 
-#: ../modules/mail/em-mailer-prefs.c:334
+#: ../modules/mail/em-mailer-prefs.c:310
 msgid "Header"
 msgstr "ਹ�ੱਡਰ"
 
-#: ../modules/mail/em-mailer-prefs.c:338
+#: ../modules/mail/em-mailer-prefs.c:314
 msgid "Contains Value"
 msgstr "ਮ�ੱਲ ਰੱ�ਦਾ ਹ�"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:707 ../modules/mail/em-mailer-prefs.c:778
 #, 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:739 ../modules/mail/em-mailer-prefs.c:811
+#: ../modules/mail/em-mailer-prefs.c:715 ../modules/mail/em-mailer-prefs.c:787
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s ਪਲੱ��ਨ �ਪਲੱਬਧ ਨਹ�� ਹ�। ��ੱ� �ਰ� �� �ਿ ਪ���� �ੰਸ�ਾਲ ਹ�।"
 
-#: ../modules/mail/em-mailer-prefs.c:775
+#: ../modules/mail/em-mailer-prefs.c:751
 msgid "No junk plugin available"
 msgstr "��� �ੰ� ਪਲੱ��ਨ ਨਹ�� ਹ�"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1167
+#: ../modules/mail/em-mailer-prefs.c:1143
 msgid "_Date header:"
 msgstr "ਮਿਤ� ਹ�ੱਡਰ(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1168
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Show _original header value"
 msgstr "�ਸਲ� ਹ�ੱਡਰ ਮ�ੱਲ ਵ���(_o)"
 
@@ -16016,7 +15844,6 @@ msgid "Every time Evolution starts, check whether or not it is the default maile
 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 "�� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਪਣਾ ਡਿਫਾਲ� �-ਮ�ਲ �ਲਾ�� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
@@ -16036,40 +15863,39 @@ msgstr "ਪਾ�ਥਨ ��ਸ� ਪਲੱ��ਨ"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "ਪਾ�ਥਨ �-ਪਲੱ��ਨ ਲ�ਡਰ ਲ� ��ਸ� ਪਲੱ��ਨ।"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:270
-#: ../widgets/misc/e-import-assistant.c:393
+#: ../modules/startup-wizard/evolution-startup-wizard.c:275
+#: ../widgets/misc/e-import-assistant.c:396
 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
+#: ../modules/startup-wizard/evolution-startup-wizard.c:307
+#: ../widgets/misc/e-import-assistant.c:552
 #, 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"
+#: ../modules/startup-wizard/evolution-startup-wizard.c:318
+#: ../modules/startup-wizard/evolution-startup-wizard.c:415
 msgid "Importing Files"
 msgstr "ਫਾ�ਲਾ� �ੰਪ�ਰ� ��ਤ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+#: ../modules/startup-wizard/evolution-startup-wizard.c:393
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "�ੰਪ�ਰ� �ਰਨਾ ਰੱਦ ��ਤਾ। �ਾਰ� ਰੱ�ਣ ਲ� \"�ੱ��\" �ਲਿੱ� �ਰ�।"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+#: ../modules/startup-wizard/evolution-startup-wizard.c:411
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "�ੰਪ�ਰ� ਪ�ਰਾ ਹ���। �ਾਰ� ਰੱ�ਣ ਲ� \"�ੱ��\" �ਲਿੱ� �ਰ�।"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+#: ../modules/startup-wizard/evolution-startup-wizard.c:471
 msgid "Evolution Setup Assistant"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ�ੱ��ੱਪ ਸਹਾ�� "
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
 msgid "Welcome"
 msgstr "�� ��� ਨ�ੰ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+#: ../modules/startup-wizard/evolution-startup-wizard.c:482
 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"
@@ -16096,7 +15922,7 @@ msgid ""
 msgstr "����ਮ��� ਰ�ਮਾ�ਡਰ ਪਲੱ��ਨ ਵਲ�� ਸ�ਨ�ਹਾ ਮ�ੱ� ਭਾ� ਵਿੱ� ��� ਲ� ਸ�ਹਾ� ਦ� ਲਿਸ�"
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:409
+#: ../plugins/templates/templates.c:410
 msgid "Keywords"
 msgstr "ਸ਼ਬਦ"
 
@@ -16178,7 +16004,6 @@ msgid "Restore from backup"
 msgstr "ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ�"
 
 #: ../plugins/backup-restore/backup-restore.c:361
-#| msgid "_Backup Settings..."
 msgid "_Backup Evolution Settings..."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ��ਿੰ� ਬ���ੱਪ(_B)..."
 
@@ -16187,7 +16012,6 @@ msgid "Backup Evolution data and settings to an archive file"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ��ਾ�ਵ ਫਾ�ਲ ਵਿੱ� ਬ���ੱਪ ਲਵ�"
 
 #: ../plugins/backup-restore/backup-restore.c:368
-#| msgid "R_estore Settings..."
 msgid "R_estore Evolution Settings..."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ��ਿੰ� ਰ�ਸ��ਰ(_e)..."
 
@@ -16239,7 +16063,6 @@ msgid "Restarting Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਮ��-�ਾਲ� ��ਤ� �ਾ ਰਹ� ਹ�"
 
 #: ../plugins/backup-restore/backup.c:255
-#| msgid "Backup current Evolution data"
 msgid "Back up current Evolution data"
 msgstr "ਮ���ਦਾ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਬ���ੱਪ �ਰ�"
 
@@ -16316,12 +16139,10 @@ 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 "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 "�ਵ�ਲ�ਸ਼ਨ ਬੰਦ �ਰ� ਤ� ਰ�ਸ��ਰ �ਰ�"
 
@@ -16346,6 +16167,8 @@ 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 ""
@@ -16354,10 +16177,9 @@ msgid ""
 "all your current Evolution data and settings and restore them from your "
 "backup."
 msgstr ""
-"�ਪਣ� ਡਾ�� �ਾ� ਸ��ਿੰ� ਨ�ੰ ਰ�ਸ��ਰ �ਰਨ ਲ�, ਤ�ਹਾਨ�ੰ ਪਹਿਲਾ� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਬੰਦ �ਰਨ� ਪਵ���। "
-"ਯ��ਨ� ਬਣਾ� �ਿ ਤ�ਸ�� �ਾਰ� ਰੱ�ਣ ਤ�� ਪਹਿਲਾ� ਨਾ-ਸੰਭਾਲਿ� ਡਾ�ਾ ਸੰਭਾਲ ��ੱ�� ਹ�। �ਸ ਨਾਲ "
-"ਤ�ਹਾਡਾ ਮ���ਦਾ ਸਭ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਤ� ਸ��ਿੰ� ਨ�ੰ ਹ�ਾ�� �ਾਵ��ਾ ਤ� ਤ�ਹਾਡ� ਬ���ੱਪ ਤ�� �ਨ�ਹਾ� "
-"ਨ�ੰ ਮ��-ਸ��ਰ ��ਤਾ �ਾਵ��ਾ।"
+"�ਪਣ� ਡਾ�� �ਾ� ਸ��ਿੰ� ਨ�ੰ ਰ�ਸ��ਰ �ਰਨ ਲ�, ਤ�ਹਾਨ�ੰ ਪਹਿਲਾ� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਬੰਦ �ਰਨ� ਪਵ���। ਯ��ਨ� ਬਣਾ� "
+"�ਿ ਤ�ਸ�� �ਾਰ� ਰੱ�ਣ ਤ�� ਪਹਿਲਾ� ਨਾ-ਸੰਭਾਲਿ� ਡਾ�ਾ ਸੰਭਾਲ ��ੱ�� ਹ�। �ਸ ਨਾਲ ਤ�ਹਾਡਾ ਮ���ਦਾ ਸਭ �ਵ�ਲ�ਸ਼ਨ "
+"ਡਾ�ਾ ਤ� ਸ��ਿੰ� ਨ�ੰ ਹ�ਾ�� �ਾਵ��ਾ ਤ� ਤ�ਹਾਡ� ਬ���ੱਪ ਤ�� �ਨ�ਹਾ� ਨ�ੰ ਮ��-ਸ��ਰ ��ਤਾ �ਾਵ��ਾ।"
 
 #: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -16379,7 +16201,6 @@ msgstr "�ੱ�ਪ� ਸ�ਨ�ਹ� ਸੰਪਰ�"
 
 #. Enable Gaim Checkbox
 #: ../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)"
 
@@ -16522,7 +16343,6 @@ msgstr "ਪਿ�ਲ� ��ਸ਼ਿਸ਼ ��ਡ %d ਨਾਲ ਫ�ਲ
 
 #: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-#| 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 ਯ��਼ਰ ਲ� ਪਾਸਵਰਡ ਦਿ�"
 
@@ -16726,27 +16546,22 @@ msgid "Map for contacts"
 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/dbx-import/dbx-importer.c:251
-#| msgid "Importing Outlook data"
 msgid "Importing Outlook Express data"
 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/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
-#| msgid "Outlook PST import"
 msgid "Outlook DBX import"
 msgstr "Outlook DBX �ੰਪ�ਰ�"
 
 #: ../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)"
 
@@ -16837,7 +16652,7 @@ msgid "Key"
 msgstr "��"
 
 #: ../plugins/email-custom-header/email-custom-header.c:900
-#: ../plugins/templates/templates.c:415
+#: ../plugins/templates/templates.c:416
 msgid "Values"
 msgstr "ਮ�ੱਲ"
 
@@ -16992,7 +16807,6 @@ msgstr "ਫਾ�ਲ, �� ਤ�ਸ�� ��ਣ� ਹ�, ਢ�ੱ�
 
 #: ../plugins/google-account-setup/google-contacts-source.c:274
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
-#| msgid "_Server:"
 msgid "Server"
 msgstr "ਸਰਵਰ"
 
@@ -17021,7 +16835,6 @@ msgid "Cal_endar:"
 msgstr "��ਲੰਡਰ(_e):"
 
 #: ../plugins/google-account-setup/google-source.c:669
-#| msgid "Retrieve _list"
 msgid "Retrieve _List"
 msgstr "ਲਿਸ� ਲ� �ਾ ਰਹ� ਹ�(_L)"
 
@@ -17286,7 +17099,6 @@ msgid "The participants will receive the following notification.\n"
 msgstr "ਦਰਸ਼�ਾ� ਹ�ਠ ਦਿੱਤ� ਸ��ਨਾ ਪ�ਰਾਪਤ �ਰਨ��।\n"
 
 #: ../plugins/groupwise-features/properties.ui.h:9
-#| msgid "Users"
 msgid "Users:"
 msgstr "ਯ��਼ਰ:"
 
@@ -17347,7 +17159,7 @@ msgid "Proxy"
 msgstr "ਪਰਾ�ਸ�"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:224
+#: ../widgets/misc/e-account-tree-view.c:230
 msgid "Account Name"
 msgstr "��ਾ��� ਨਾ�"
 
@@ -17375,7 +17187,6 @@ msgstr "���ਰ ��ਾ��� ਯ�� ਹ��� ਤਾ� ਹ�
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/proxy.c:700
-#| msgid "Proxy"
 msgctxt "GW"
 msgid "Proxy"
 msgstr "ਪਰਾ�ਸ�"
@@ -17523,7 +17334,6 @@ msgstr "IMAP ਫ��ਰ"
 #. the second '%s' with an error message
 #: ../plugins/itip-formatter/itip-formatter.c:485
 #, c-format
-#| msgid "Failed to load the calendar '%s'"
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "��ਲੰਡਰ '%s' (%s) ਲ�ਡ �ਰਨ ਲ� ਫ�ਲ�ਹ ਹ�"
 
@@ -17651,67 +17461,67 @@ msgstr "calendar.ics"
 msgid "Save Calendar"
 msgstr "��ਲੰਡਰ ਸੰਭਾਲ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1597
 msgid "The calendar attached is not valid"
 msgstr "ਨੱਥ� ��ਲੰਡਰ ਠ�� ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ��ਲੰਡਰ ਹ�ਣ ਦਾ ਦਾ�ਵਾ ਤਾ� ਹ�, ਪਰ ��ਲੰਡਰ ਠ�� ����ਲੰਡਰ (iCalendar) ਨਹ�� ਹ�।"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1638
+#: ../plugins/itip-formatter/itip-formatter.c:1666
+#: ../plugins/itip-formatter/itip-formatter.c:1775
 msgid "The item in the calendar is not valid"
 msgstr "��ਲੰਡਰ ਵਿੱ� ���ਮ ਠ�� ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1776
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ��ਲੰਡਰ ਤਾ� ਹ�, ਪਰ ��ਲੰਡਰ ਵਿੱ� ��� ��ਨਾ, �ੰਮ �ਾ� ਵ�ਹਲਾ/ਰ��ਿ�� �ਾਣ�ਾਰ� ਨਹ� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1680
 msgid "The calendar attached contains multiple items"
 msgstr "ਨੱਥ� ��ਲੰਡਰ ਵਿੱ� �� ���ਮਾ� ਹਨ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "�ਹਨਾ� ਸਭ ���ਮਾ� ਤ� �ਾਰਵਾ� �ਰਨ ਲ਼�, ਫਾ�ਲ ਨ�ੰ ਸੰਭਾਲਣਾ ਪਵ��ਾ �ਤ� ��ਲੰਡਰ �ੰਪ�ਰ� �ਰਨਾ ਪਵ��ਾ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2452
+#: ../plugins/itip-formatter/itip-formatter.c:2454
 msgid "This meeting recurs"
 msgstr "�ਹ ਮ��ਿੰ� ਫ�ਰ ਹ�ਵ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2455
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "This task recurs"
 msgstr "�ਹ �ੰਮ ਫ�ਰ ਹ�ਵ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2458
+#: ../plugins/itip-formatter/itip-formatter.c:2460
 msgid "This memo recurs"
 msgstr "�ਹ ਮ�ਮ� ਫ�ਰ ਹ�"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2692
+#: ../plugins/itip-formatter/itip-formatter.c:2694
 msgid "_Delete message after acting"
 msgstr "�ਾਰਵਾ� �ਪਰੰਤ ਸ�ਨ�ਹਾ ਹ�ਾ�(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2702
-#: ../plugins/itip-formatter/itip-formatter.c:2735
+#: ../plugins/itip-formatter/itip-formatter.c:2704
+#: ../plugins/itip-formatter/itip-formatter.c:2737
 msgid "Conflict Search"
 msgstr "�ਪਵਾਦ ���"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2717
+#: ../plugins/itip-formatter/itip-formatter.c:2719
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ਮ��ਿੰ� ��ਰਾ ਲੱਭਣ ਲ� ��ਲੰਡਰ ��ਣ�"
 
@@ -17851,7 +17661,6 @@ msgstr "%A, %B %e, %Y %l:%M:%S %p"
 #: ../plugins/itip-formatter/itip-view.c:455
 #: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
-#| msgid "Please respond on behalf of <b>%s</b>"
 msgid "Please respond on behalf of %s"
 msgstr "%s ਦ� ਤ�ਰ �ੱਤ� �ਵਾਬ ਭ��� ��"
 
@@ -17859,59 +17668,46 @@ msgstr "%s ਦ� ਤ�ਰ �ੱਤ� �ਵਾਬ ਭ��� ��"
 #: ../plugins/itip-formatter/itip-view.c:457
 #: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
-#| 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> 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:376
 #, c-format
-#| 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:381
 #, c-format
-#| 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:384
 #, c-format
-#| 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:386
 #, c-format
-#| 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 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> 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 wishes to receive the latest information for the "
-#| "following meeting:"
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
@@ -17919,107 +17715,86 @@ msgstr "%s ਰਾਹ�� %s ਹ�ਠ ਦਿੱਤ� ਮ��ਿੰ� ਬ
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-#| 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 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 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 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 canceled the following meeting."
 msgid "%s has canceled the following meeting."
 msgstr "%s ਨ� �ੱ�� ਦਿੱਤ� ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� ਹ�।"
 
 #: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
-#| 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:418
 #, c-format
-#| 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:422
 #, c-format
-#| 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:424
 #, c-format
-#| 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> 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:464
 #, c-format
-#| msgid "<b>%s</b> has published the following task:"
 msgid "%s has published the following task:"
 msgstr "%s ਨ� �ੰਮ �ਾਣ�ਾਰ� ਪਰਾ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
-#| 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:472
 #, c-format
-#| 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:474
 #, c-format
-#| 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 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> 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 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:"
@@ -18027,95 +17802,76 @@ msgstr "%s ਰਾਹ�� %s �ੱ�� ਦਿੱਤ� �ਸਾ�ਨ �
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-#| 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 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 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 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 canceled the following assigned task:"
 msgid "%s has canceled the following assigned task:"
 msgstr "%s ਨ� �ੱ�� ਦਿੱਤਾ �ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
 
 #: ../plugins/itip-formatter/itip-view.c:504
 #, c-format
-#| 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:506
 #, c-format
-#| 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:510
 #, c-format
-#| 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:512
 #, c-format
-#| 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:549
 #, c-format
-#| 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:551
 #, c-format
-#| msgid "<b>%s</b> has published the following memo:"
 msgid "%s has published the following memo:"
 msgstr "%s ਨ� ਮ�ਮ� �ਾਣ�ਾਰ� ਪਰਾ�ਾਸ਼ਿਤ ��ਤ� ਹ�:"
 
 #: ../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 ਨ� �ੱ�� ਦਿੱਤਾ ਸਾ��ਾ ਮ�ਮ� ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
 
@@ -18161,7 +17917,6 @@ msgstr "ਨਾ-ਮਨ�਼�ਰ(_D)"
 #: ../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)"
 
@@ -18181,7 +17936,6 @@ msgid "_Tentative"
 msgstr "�ਰ�਼�(_T)"
 
 #: ../plugins/itip-formatter/itip-view.c:855
-#| msgid "_Accept all"
 msgid "A_ccept all"
 msgstr "ਸਭ ਮਨ�਼�ਰ(_c)"
 
@@ -18248,9 +18002,6 @@ 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;?"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "'{0}' ਮ��ਿੰ� ਲ� ਡ�ਲ���� ਹ�। �� ਤ�ਸ�� ਡ�ਲ���� {1} ਨ�ੰ ���ਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
@@ -18621,55 +18372,55 @@ msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵ�� ਮ��ਿੰ
 msgid "Convert a mail message to a task."
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹ� ਨ�ੰ �ਾਸ� ਵਿੱ� ਬਦਲ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
 msgid "Get List _Archive"
 msgstr "ਲਿਸ� ��ਾ�ਵ ਲਵ�(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get an archive of the list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਲਿਸ� ਦ� ��ਾ�ਵ ����"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
 msgid "Get List _Usage Information"
 msgstr "ਲਿਸ� ਵਰਤ�� �ਾਣ�ਾਰ� ਲਵ��(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਲਿਸ� ਦ� ਵਰਤ�� ਬਾਰ� �ਾਣ�ਾਰ� ਲਵ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
 msgid "Contact List _Owner"
 msgstr "ਸੰਪਰ� ਲਿਸ� ਮਾਲ�(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਸ��� ਦ� ਮਾਲ� ਨਾਲ ਸੰਪਰ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
 msgid "_Post Message to List"
 msgstr "ਲਿਸ� ਲ� ਸ�ਨ�ਹ� ਭ���(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
 msgid "_Subscribe to List"
 msgstr "ਲਿਸ� ਲ� ਮ��ਬਰ(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� ਮ��ਬਰ ਬਣ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:326
 msgid "_Unsubscribe from List"
 msgstr "ਲਿਸ� ਤ�� ਮ��ਬਰ� ਹ�ਾ�(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "�ਸ ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� ਮ��ਬਰ� ਹ�ਾ�, �� ਸਬੰਧਿਤ ਹ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:335
 msgid "Mailing _List"
 msgstr "ਮ�ਲਿੰ� ਲਿਸ�(_L)"
 
@@ -19291,15 +19042,15 @@ msgstr "ਸ�ਨ�ਹਾ ਮ�ੱ� ਭਾ� ਵਿੱ� ��ਪਲ�
 msgid "Drafts based template plugin"
 msgstr "��ਪਲ�� ਪਲੱ��ਨ ਮ�ਤਾਬ� ਡਰਾਫ�"
 
-#: ../plugins/templates/templates.c:616
+#: ../plugins/templates/templates.c:621
 msgid "No Title"
 msgstr "�ਾ��ਲ ਨਹ��"
 
-#: ../plugins/templates/templates.c:687
+#: ../plugins/templates/templates.c:715
 msgid "Save as _Template"
 msgstr "��ਪਲ�� ਵਾ�� ਸੰਭਾਲ�(_T)"
 
-#: ../plugins/templates/templates.c:689
+#: ../plugins/templates/templates.c:717
 msgid "Save as Template"
 msgstr "��ਪਲ�� ਵਾ�� ਸੰਭਾਲ�"
 
@@ -19319,27 +19070,27 @@ msgstr "�ਨ-ਲਾ�ਨ vCards"
 msgid "Show vCards directly in mail messages."
 msgstr "ਮ�ਲ ਸ�ਨ�ਹਿ�� ਵਿੱ� ਸਿੱਧ� vCard ਵ���।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:164
-#: ../plugins/vcard-inline/vcard-inline.c:249
+#: ../plugins/vcard-inline/vcard-inline.c:181
+#: ../plugins/vcard-inline/vcard-inline.c:266
 msgid "Show Full vCard"
 msgstr "ਪ�ਰਾ vCard ਵ���"
 
-#: ../plugins/vcard-inline/vcard-inline.c:167
+#: ../plugins/vcard-inline/vcard-inline.c:184
 msgid "Show Compact vCard"
 msgstr "ਥ��ਾ vCard ਵ���"
 
-#: ../plugins/vcard-inline/vcard-inline.c:228
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "There is one other contact."
 msgstr "�ੱ� ਹ�ਰ ਸੰਪਰ� ਹ�।"
 
-#: ../plugins/vcard-inline/vcard-inline.c:237
+#: ../plugins/vcard-inline/vcard-inline.c:254
 #, 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:258
+#: ../plugins/vcard-inline/vcard-inline.c:275
 msgid "Save in Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਸੰਭਾਲ�"
 
@@ -19515,7 +19266,7 @@ msgstr "ਬਾਹ� ਵ��ਾ� ਦਿੰਦ� ਹ�"
 msgid "Skip development warning dialog"
 msgstr "ਵਿ�ਾਸ ��ਤਾਵਨ� ਪ�ੱ��ਿੱ� ਡਾ�ਲਾ� �ੱਡ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:331
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:330
 msgid "Start in offline mode"
 msgstr "�ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
@@ -19665,11 +19416,11 @@ msgstr "ਵਿੰਡ� ਬ�ਨ ਸ�ਾ�ਲ"
 msgid "Window buttons are visible"
 msgstr "ਵਿੰਡ� ਬ�ਨ ਦਿੱ� ਹਨ।"
 
-#: ../shell/e-shell-content.c:520 ../shell/e-shell-content.c:521
+#: ../shell/e-shell-content.c:523 ../shell/e-shell-content.c:524
 msgid "Searches"
 msgstr "���"
 
-#: ../shell/e-shell-content.c:563
+#: ../shell/e-shell-content.c:566
 msgid "Save Search"
 msgstr "��� ਸੰਭਾਲ�"
 
@@ -19677,19 +19428,19 @@ msgstr "��� ਸੰਭਾਲ�"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:921
+#: ../shell/e-shell-searchbar.c:924
 msgid "Sho_w:"
 msgstr "ਵ���(_w):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:952
+#: ../shell/e-shell-searchbar.c:955
 msgid "Sear_ch:"
 msgstr "���(_c):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1013
+#: ../shell/e-shell-searchbar.c:1016
 msgid "i_n"
 msgstr " �ੰਦਰ(_n)"
 
@@ -19996,24 +19747,24 @@ msgstr "�ਹ ��� ਪ�ਰਾਮ��ਰ �ਲਾ�"
 msgid "%s - Evolution"
 msgstr "%s - �ਵ�ਲ�ਸ਼ਨ"
 
-#: ../shell/e-shell-window.c:416
+#: ../shell/e-shell-window.c:419
 msgid "New"
 msgstr "ਨਵਾ�"
 
-#: ../shell/e-shell.c:226
+#: ../shell/e-shell.c:229
 msgid "Preparing to go offline..."
 msgstr "�ਫਲਾ�ਨ �ਾਣ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../shell/e-shell.c:276
+#: ../shell/e-shell.c:279
 msgid "Preparing to go online..."
 msgstr "�ਨਲਾ�ਨ �ਾਣ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../shell/e-shell.c:335
+#: ../shell/e-shell.c:338
 msgid "Preparing to quit..."
 msgstr "ਬੰਦ �ਰਨ ਲ� ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:180
+#: ../shell/main.c:179
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20048,7 +19799,7 @@ msgstr ""
 "ਸਾਨ�ੰ �ਮ�ਦ ਹ� ਮਿੱਤਰ ਤ�ੰ ਸਾਡ� ਮ�ਹਨਤ ਦਾ �ਨੰਦ ਮਾਣ��ਾ �ਤ� �ਸ�� ਤ�ਰ� �ਸ ਸਹਿਯ�� ਦਾ\n"
 "ਤਹਿ ਦਿਲ�� ਧੰਨਵਾਦ �ਰਦ� ਹਾ�\n"
 
-#: ../shell/main.c:204
+#: ../shell/main.c:203
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20056,55 +19807,55 @@ msgstr ""
 "ਧੰਨਵਾਦ\n"
 "�ਵ�ਲ�ਸ਼ਨ ��ਮ\n"
 
-#: ../shell/main.c:211
+#: ../shell/main.c:210
 msgid "Do not tell me again"
 msgstr "ਮ�ਨ�ੰ ਮ�� ਨਾ ਦੱਸ�"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:326
 msgid "Start Evolution activating the specified component"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ੱ� �ਾਸ ਭਾ� ਦ� ਸਰ�ਰਮ� ਨਾਲ ਸ਼�ਰ� ਹ� ਰਹ� ਹ�"
 
-#: ../shell/main.c:329
+#: ../shell/main.c:328
 msgid "Apply the given geometry to the main window"
 msgstr "ਦਿੱਤ� ��ਮ��ਰ� ਮ�ੱ� ਵਿੰਡ� �ੱਤ� ਲਾ�� �ਰ�"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:332
 msgid "Start in online mode"
 msgstr "�ਨਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
-#: ../shell/main.c:335
+#: ../shell/main.c:334
 msgid "Start in \"express\" mode"
 msgstr "\"��ਸਪ�ਰ�ਸ\" ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
-#: ../shell/main.c:338
+#: ../shell/main.c:337
 msgid "Forcibly shut down Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਧੱ�� ਨਾਲ ਬੰਦ �ਰ�"
 
-#: ../shell/main.c:341
+#: ../shell/main.c:340
 msgid "Send the debugging output of all components to a file."
 msgstr "ਸਾਰ� ਭਾ�ਾ� ਦ� ਡ�ਬੱ� ���ਪ�ੱ� �ੱ� ਫਾ�ਲ ਵਿੱ� ਭ���।"
 
-#: ../shell/main.c:343
+#: ../shell/main.c:342
 msgid "Disable loading of any plugins."
 msgstr "��� ਪਲੱ�-�ਨ ਲ�ਡ ਤ�� ਰ�� ਹ�।"
 
-#: ../shell/main.c:345
+#: ../shell/main.c:344
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ਮ�ਲ, ਸੰਪਰ� �ਤ� �ੰਮ ਲ� �ਲ� ਪ�ਨ �ਯ�� �ਰ�।"
 
-#: ../shell/main.c:349
+#: ../shell/main.c:348
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "URI �ਾ� ਬਾ�� ਦ� �ਰ��ਮ��� ਵ��� ਦਿੱਤ� ਫਾ�ਲ ਨਾ� �ੰਪ�ਰ� �ਰ�"
 
-#: ../shell/main.c:351
+#: ../shell/main.c:350
 msgid "Request a running Evolution process to quit"
 msgstr "�ੱਲਦ� �ਵ�ਲਸ਼ਨ ਪਰ�ਸ�ਸ ਨ�ੰ ਬੰਦ �ਰਨ ਦ� ਮੰ�"
 
-#: ../shell/main.c:475 ../shell/main.c:483
+#: ../shell/main.c:474 ../shell/main.c:482
 msgid "- The Evolution PIM and Email Client"
 msgstr "- �ਵ�ਲ�ਸ਼ਨ PIM �ਤ� �-ਮ�ਲ �ਲਾ��"
 
-#: ../shell/main.c:545
+#: ../shell/main.c:544
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20118,12 +19869,10 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "�� ਤ�ਸ�� ਸਭ ਯਾਦ ਰੱ�� ਹ�� ਪਾਸਵਰਡ ਭ�ੱਲਣ ਲ� ਤਿ�ਰ ਹ�?"
 
 #: ../shell/shell.error.xml.h:2
-#| msgid "Delete old data from version {0}?"
 msgid "Cannot upgrade directly from version {0}"
 msgstr "ਵਰ�ਨ {0} ਤ�� ਸਿੱਧਾ �ੱਪ�ਰ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ"
 
 #: ../shell/shell.error.xml.h:3
-#| msgid "Continue"
 msgid "Continue Anyway"
 msgstr "�ਿਵ�� ਵ� �ਾਰ� ਰੱ��"
 
@@ -20133,6 +19882,8 @@ msgid ""
 "a workaround you might try first upgrading to Evolution 2, and then "
 "upgrading to Evolution 3."
 msgstr ""
+"�ਵ�ਲ�ਸ਼ਨ {0} ਵਰ�ਨ ਤ�� ਸਿੱਧ� �ੱਪ�ਰ�ਡ ਲ� ਹ�ਣ ਸਹਾ�� ਨਹ�� ਰਹ� ਹ�। ਪਰ ���ਾ� ਹ�, ਤ�ਸ�� ਪਹਿਲਾ� �ਵ�ਲ�ਸ਼ਨ ੨ "
+"ਲ� �ੱਪ�ਰ�ਡ �ਰਨ ਦ� ��ਸ਼ਿਸ਼ �ਰ� ਤ� ਫ�ਰ �ਵ�ਲ�ਸ਼ਨ ੩ ਲ�।"
 
 #: ../shell/shell.error.xml.h:5
 msgid ""
@@ -20143,7 +19894,6 @@ msgstr ""
 "ਮ�� ਪ�ੱ�ਿ� �ਾਵ��ਾ।"
 
 #: ../shell/shell.error.xml.h:7
-#| msgid "Quit"
 msgid "Quit Now"
 msgstr "ਹ�ਣ� ਬੰਦ �ਰ�"
 
@@ -20293,7 +20043,6 @@ msgid "All files"
 msgstr "ਸਭ ਫਾ�ਲਾ�"
 
 #: ../smime/gui/certificate-manager.c:182
-#| msgid "Imported Certificate"
 msgid "Failed to import user's certificate"
 msgstr "ਯ��਼ਰ ਦਾ ਸਰ��ਫਿ��� �ੰਪ�ਰ� �ਰਨ ਲ� ਫ�ਲ�ਹ"
 
@@ -20322,7 +20071,6 @@ msgid "All email certificate files"
 msgstr "ਸਭ �ਮ�ਲ ਸਰ��ਫਿ��� ਫਾ�ਲਾ�"
 
 #: ../smime/gui/certificate-manager.c:502
-#| msgid "Failed to delete contact"
 msgid "Failed to import contact's certificate"
 msgstr "ਸੰਪਰ� ਦ� ਸਰ��ਫਿ��� �ੰਪ�ਰ� �ਰਨ ਲ� ਫ�ਲ�ਹ"
 
@@ -20345,7 +20093,6 @@ msgstr "ਸਰ��ਫਿ��� ਦਰਸ਼�: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-#| msgid "Enter the password for `%s'"
 msgid "Enter the password for '%s'"
 msgstr "'%s' ਲ� ਪਾਸਵਰਡ ਦਿ�"
 
@@ -20391,7 +20138,6 @@ msgid "Authorities"
 msgstr "ਪ�ਰਮਾਣ�ਤਾ"
 
 #: ../smime/gui/smime-ui.ui.h:3
-#| msgid "Backup All"
 msgid "Backup _All"
 msgstr "ਸਭ ਬ���ੱਪ ਲਵ�(_A)"
 
@@ -20516,7 +20262,6 @@ msgid "Trust this CA to identify software developers."
 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 �ੱਤ� ਵ�ੱਬ ਸਾ��ਾ� ਲ� ਭਰ�ਸਾ ਰੱ��।"
 
@@ -20541,7 +20286,6 @@ msgid "Your Certificates"
 msgstr "ਤ�ਹਾਡਾ ਸਰ��ਫਿ���"
 
 #: ../smime/gui/smime-ui.ui.h:43
-#| msgid "Backup"
 msgid "_Backup"
 msgstr "ਬ���ੱਪ(_B)"
 
@@ -20596,17 +20340,14 @@ msgid "PKCS #1 SHA-1 With RSA Encryption"
 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:645
-#| msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 RSA �ੰ��ਰਿਪਸ਼ਨ ਨਾਲ"
 
@@ -20904,124 +20645,122 @@ msgstr "�ਲ� ਦ� �ਿਸਮ"
 msgid "Type of view:"
 msgstr "�ਲ� ਦ� �ਿਸਮ:"
 
-#: ../widgets/misc/e-account-manager.c:348
+#: ../widgets/misc/e-account-manager.c:351
 msgid "De_fault"
 msgstr "ਮ�ਲ(_f)"
 
-#: ../widgets/misc/e-account-tree-view.c:255
+#: ../widgets/misc/e-account-tree-view.c:261
 msgid "Protocol"
 msgstr "ਪ�ਰ����ਾਲ"
 
-#: ../widgets/misc/e-attachment-dialog.c:305
+#: ../widgets/misc/e-attachment-dialog.c:307
 msgid "Attachment Properties"
 msgstr "����ਮ��� ਵਿਸ਼�ਸਤਾ"
 
-#: ../widgets/misc/e-attachment-dialog.c:328
+#: ../widgets/misc/e-attachment-dialog.c:330
 msgid "_Filename:"
 msgstr "ਫਾ�ਲਨਾ�(_F):"
 
-#: ../widgets/misc/e-attachment-dialog.c:363
+#: ../widgets/misc/e-attachment-dialog.c:365
 msgid "MIME Type:"
 msgstr "MIME �ਾ�ਪ:"
 
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:525
 msgid "_Suggest automatic display of attachment"
 msgstr "ਨੱਥ� ਦਾ ���ਮ��ਿ� �ਲ� ਲ� ਸ��ਾ�(_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:97
+#: ../widgets/misc/e-attachment-handler-image.c:100
 msgid "Could not set as background"
 msgstr "ਬ���ਰਾ��ਡ ਸ�ੱ� ਨਹ�� ��ਤ� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment-handler-image.c:149
+#: ../widgets/misc/e-attachment-handler-image.c:152
 msgid "Set as _Background"
 msgstr "ਬ���ਰਾ��ਡ ਬਣਾ�(_B)"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#: ../widgets/misc/e-attachment-handler-sendto.c:90
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "����ਮ��� ਭ��� ਨਹ�� �ਾ ਸ��"
 msgstr[1] "����ਮ���ਾ� ਭ����� ਨਹ�� �ਾ ਸ����"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#: ../widgets/misc/e-attachment-handler-sendto.c:132
 msgid "_Send To..."
 msgstr "...ਨ�ੰ ਭ���(_S)..."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#: ../widgets/misc/e-attachment-handler-sendto.c:134
 msgid "Send the selected attachments somewhere"
 msgstr "��ਣ� ����ਮ��� �ਿਤ� ਭ���"
 
-#: ../widgets/misc/e-attachment-icon-view.c:495
-#: ../widgets/misc/e-attachment-tree-view.c:535
+#: ../widgets/misc/e-attachment-icon-view.c:506
+#: ../widgets/misc/e-attachment-tree-view.c:545
 msgid "Loading"
 msgstr "ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹ�..."
 
-#: ../widgets/misc/e-attachment-icon-view.c:507
-#: ../widgets/misc/e-attachment-tree-view.c:547
+#: ../widgets/misc/e-attachment-icon-view.c:518
+#: ../widgets/misc/e-attachment-tree-view.c:557
 msgid "Saving"
 msgstr "ਸੰਭਾਲ� �ਾ ਰਹ� ਹ�"
 
-#: ../widgets/misc/e-attachment-paned.c:87
+#: ../widgets/misc/e-attachment-paned.c:98
 msgid "Hide Attachment _Bar"
 msgstr "ਨੱਥ� ਪੱ�� �ਹਲ�(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../widgets/misc/e-attachment-paned.c:100
+#: ../widgets/misc/e-attachment-paned.c:631
 msgid "Show Attachment _Bar"
 msgstr "ਨੱਥ� ਪੱ�� ਵ��ਾ�(_B)"
 
-#: ../widgets/misc/e-attachment-store.c:538
+#: ../widgets/misc/e-attachment-store.c:513
 msgid "Add Attachment"
 msgstr "����ਮ��� ਸ਼ਾਮਲ �ਰ�"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:516
 msgid "A_ttach"
 msgstr "����(_t)"
 
-#: ../widgets/misc/e-attachment-store.c:604
+#: ../widgets/misc/e-attachment-store.c:579
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "����ਮ��� ਸੰਭਾਲ�"
 msgstr[1] "����ਮ���ਾ� ਸੰਭਾਲ�"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1808 ../widgets/misc/e-attachment.c:2348
+#: ../widgets/misc/e-attachment-store.c:608
+#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:346
+#: ../widgets/misc/e-attachment-view.c:351
 msgid "S_ave All"
 msgstr "ਸਭ ਸੰਭਾਲ�(_a)"
 
-#: ../widgets/misc/e-attachment-view.c:372
+#: ../widgets/misc/e-attachment-view.c:377
 msgid "A_dd Attachment..."
 msgstr "����ਮ��� ਸ਼ਾਮਲ(_d)..."
 
-#: ../widgets/misc/e-attachment-view.c:396
+#: ../widgets/misc/e-attachment-view.c:401
 msgid "_Hide"
 msgstr "�ਹਲ�(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:403
-#| msgid "S_ave All"
+#: ../widgets/misc/e-attachment-view.c:408
 msgid "Hid_e All"
 msgstr "ਸਭ �ਹਲ�(_e)"
 
-#: ../widgets/misc/e-attachment-view.c:410
+#: ../widgets/misc/e-attachment-view.c:415
 msgid "_View Inline"
 msgstr "ਲਾ�ਨ '� ਵ���(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:417
-#| msgid "_View Inline"
+#: ../widgets/misc/e-attachment-view.c:422
 msgid "Vie_w All Inline"
 msgstr "ਸਭ ਲਾ�ਨ '� ਵ���(_w)"
 
-#: ../widgets/misc/e-attachment-view.c:734
+#: ../widgets/misc/e-attachment-view.c:739
 #, c-format
 msgid "Open with \"%s\""
 msgstr "\"%s\" ਨਾਲ ��ਲ�ਹ�"
 
-#: ../widgets/misc/e-attachment-view.c:737
+#: ../widgets/misc/e-attachment-view.c:742
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "�ਹ ����ਮ��� %s ਵਿੱ� ��ਲ�ਹ�"
@@ -21030,48 +20769,48 @@ 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:1021
+#: ../widgets/misc/e-attachment.c:997
 msgid "Attached message"
 msgstr "���� ��ਤਾ ਸ�ਨ�ਹਾ"
 
-#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
 msgid "A load operation is already in progress"
 msgstr "ਪਹਿਲਾ� ਹ� ਲ�ਡ �ਾਰਵਾ� �ਾਰ� ਹ�।"
 
-#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
+#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
 msgid "A save operation is already in progress"
 msgstr "ਪਹਿਲਾ� ਸੰਭਾਲਣ �ਾਰਵਾ� �ਾਰ� ਹ�।"
 
-#: ../widgets/misc/e-attachment.c:1949
+#: ../widgets/misc/e-attachment.c:1928
 #, c-format
 msgid "Could not load '%s'"
 msgstr "'%s' ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../widgets/misc/e-attachment.c:1952
+#: ../widgets/misc/e-attachment.c:1931
 #, c-format
 msgid "Could not load the attachment"
 msgstr "����ਮ��� ਲ�ਡ ਨਹ�� ��ਤ� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2228
+#: ../widgets/misc/e-attachment.c:2207
 #, c-format
 msgid "Could not open '%s'"
 msgstr "'%s' ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2210
 #, c-format
 msgid "Could not open the attachment"
 msgstr "����ਮ��� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2666
+#: ../widgets/misc/e-attachment.c:2645
 msgid "Attachment contents not loaded"
 msgstr "����ਮ��� ਸਮੱ�ਰ� ਲ�ਡ ਨਹ�� ਹ�"
 
-#: ../widgets/misc/e-attachment.c:2742
+#: ../widgets/misc/e-attachment.c:2721
 #, c-format
 msgid "Could not save '%s'"
 msgstr "'%s' ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2724
 #, c-format
 msgid "Could not save the attachment"
 msgstr "����ਮ��� ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
@@ -21082,108 +20821,108 @@ msgid "Ctrl-click to open a link"
 msgstr "ਲਿੰ� ��ਲ�ਹਣ ਲ� �ੰ�ਰ�ਲ-�ਲਿੱ� �ਰ�"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1255
+#: ../widgets/misc/e-calendar-item.c:1258
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:217
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "ਮਹ�ਨਾ ��ਲੰਡਰ"
 
-#: ../widgets/misc/e-charset-combo-box.c:93
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�"
 
-#: ../widgets/misc/e-charset-combo-box.c:117
+#: ../widgets/misc/e-charset-combo-box.c:120
 msgid "Enter the character set to use"
 msgstr "ਵਰਤਣ ਲ� �ੱ�ਰ ਦਿ�"
 
-#: ../widgets/misc/e-charset-combo-box.c:336
+#: ../widgets/misc/e-charset-combo-box.c:339
 msgid "Other..."
 msgstr "ਹ�ਰ..."
 
-#: ../widgets/misc/e-dateedit.c:502
+#: ../widgets/misc/e-dateedit.c:505
 msgid "Date and Time"
 msgstr "ਮਿਤ� �ਤ� ਸਮਾ�"
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:526
 msgid "Text entry to input date"
 msgstr "ਮਿਤ� ਦ�ਣ ਲ� ���ਸ� �ੰਦਰਾ�"
 
-#: ../widgets/misc/e-dateedit.c:545
+#: ../widgets/misc/e-dateedit.c:548
 msgid "Click this button to show a calendar"
 msgstr "��ਲੰਡਰ ਵ��ਾ�ਣ ਲ� �ਹ ਬ�ਨ ਦਬਾ�"
 
-#: ../widgets/misc/e-dateedit.c:591
+#: ../widgets/misc/e-dateedit.c:594
 msgid "Drop-down combination box to select time"
 msgstr "ਸਮਾ� ��ਣਨ ਲ� ਲ��ਦਾ ਬ�ਸਾ"
 
-#: ../widgets/misc/e-dateedit.c:663
+#: ../widgets/misc/e-dateedit.c:666
 msgid "No_w"
 msgstr "ਹ�ਣ�(_w)"
 
-#: ../widgets/misc/e-dateedit.c:669
+#: ../widgets/misc/e-dateedit.c:672
 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:677
+#: ../widgets/misc/e-dateedit.c:680
 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:1682 ../widgets/misc/e-dateedit.c:1914
+#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
 msgctxt "date"
 msgid "None"
 msgstr "��� ਨਹ��"
 
-#: ../widgets/misc/e-dateedit.c:1809
+#: ../widgets/misc/e-dateedit.c:1812
 msgid "Invalid Date Value"
 msgstr "�ਲਤ ਤਾਰ�� ਮ�ੱਲ"
 
-#: ../widgets/misc/e-dateedit.c:1853
+#: ../widgets/misc/e-dateedit.c:1856
 msgid "Invalid Time Value"
 msgstr "�ਲਤ ਸਮਾ� ਮ�ੱਲ"
 
-#: ../widgets/misc/e-import-assistant.c:246
+#: ../widgets/misc/e-import-assistant.c:249
 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:263
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
 msgstr "ਫਾ�ਲ਼ ਨਾ�(_i):"
 
-#: ../widgets/misc/e-import-assistant.c:273
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "�ੱ� ਫਾ�ਲ ��ਣ�"
 
-#: ../widgets/misc/e-import-assistant.c:287
-#: ../widgets/misc/e-import-assistant.c:462
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
 msgstr "ਫਾ�ਲ �ਿਸਮ(_t):"
 
-#: ../widgets/misc/e-import-assistant.c:330
-#: ../widgets/misc/e-import-assistant.c:913
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:916
 msgid "Choose the destination for this import"
 msgstr "�ਸ �ਯਾਤ ਲ� ਨਿਯਤ ਸਥਾਨ ��ਣ�"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "�ਲਾ�ਣ ਲ� �ਯਾਤ�ਾਰ ਦ� �ਿਸਮ ��ਣ�:"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "ਪ�ਰਾਣ� �ਾਰ� ਤ�� ਡਾ�ਾ �ਤ� ਸ��ਿੰ� �ਯਾਤ �ਰ�"
 
-#: ../widgets/misc/e-import-assistant.c:371
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
 msgstr "�ੱ� ��ਹ�ਰ� ਫਾ�ਲ �ਯਾਤ �ਰ�(_s)"
 
-#: ../widgets/misc/e-import-assistant.c:523
+#: ../widgets/misc/e-import-assistant.c:526
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21194,39 +20933,37 @@ msgstr ""
 "\" ਬ�ਨ ਨ�ੰ ਦਬਾ �� ਮ�� ��ਸ਼ਿਸ �ਰ ਸ�ਦ� ਹ�।"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:770
-#| msgid "_Import"
+#: ../widgets/misc/e-import-assistant.c:773
 msgid "_Cancel Import"
 msgstr "�ੰਪ�ਰ� �ਰਨਾ ਰੱਦ �ਰ�(_C)"
 
-#: ../widgets/misc/e-import-assistant.c:912
-#| msgid "Preview the message to be printed"
+#: ../widgets/misc/e-import-assistant.c:915
 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
+#: ../widgets/misc/e-import-assistant.c:921
+#: ../widgets/misc/e-import-assistant.c:934
+#: ../widgets/misc/e-import-assistant.c:1284
+#: ../widgets/misc/e-import-assistant.c:1350
+#: ../widgets/misc/e-import-assistant.c:1359
 msgid "Import Data"
 msgstr "�ਾਸ ਡਾ�ਾ"
 
-#: ../widgets/misc/e-import-assistant.c:926
+#: ../widgets/misc/e-import-assistant.c:929
 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
+#: ../widgets/misc/e-import-assistant.c:1274
+#: ../widgets/misc/e-import-assistant.c:1308
 msgid "Evolution Import Assistant"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ੰਪ�ਰ� ਸਹਾ��"
 
-#: ../widgets/misc/e-import-assistant.c:1288
-#: ../widgets/misc/e-import-assistant.c:1335
+#: ../widgets/misc/e-import-assistant.c:1291
+#: ../widgets/misc/e-import-assistant.c:1338
 msgid "Import Location"
 msgstr "�ੰਪ�ਰ� �ਿ�ਾਣਾ"
 
-#: ../widgets/misc/e-import-assistant.c:1299
+#: ../widgets/misc/e-import-assistant.c:1302
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21236,27 +20973,27 @@ msgstr ""
 "�ਸ ਸਹਾ�� ਨਾਲ ਤ�ਸ� ਬਾਹਰ� ਫਾ�ਲਾ� �ਵ�ਲ�ਸ਼ਨ ਤ� �ੰਪ�ਰ� \n"
 "�ਰ ਸ�ਦ� ਹ�।"
 
-#: ../widgets/misc/e-import-assistant.c:1313
+#: ../widgets/misc/e-import-assistant.c:1316
 msgid "Importer Type"
 msgstr "�ੰਪ�ਰ�ਰ �ਿਸਮ"
 
-#: ../widgets/misc/e-import-assistant.c:1321
+#: ../widgets/misc/e-import-assistant.c:1324
 msgid "Select Information to Import"
 msgstr "�ੰਪ�ਰ� �ਰਨ ਲ� �ਾਣ�ਾਰ� ��ਣ�"
 
-#: ../widgets/misc/e-import-assistant.c:1328
+#: ../widgets/misc/e-import-assistant.c:1331
 msgid "Select a File"
 msgstr "ਫਾ�ਲ ��ਣ�"
 
-#: ../widgets/misc/e-import-assistant.c:1342
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਫਾ�ਲ �ੰਪ�ਰ� �ਰਨ ਲ� \"ਲਾ�� �ਰ�\" �ੱਤ� �ਲਿੱ� �ਰ�।"
 
-#: ../widgets/misc/e-map.c:624
+#: ../widgets/misc/e-map.c:557
 msgid "World Map"
 msgstr "ਸੰਸਾਰ ਨ�ਸ਼ਾ"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:559
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21276,57 +21013,57 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�। 
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�। �ਸ ਬ�ਨ ਨ�ੰ �ਨਲਾ�ਨ �ਾਣ ਲ� ਵਰਤ��।"
 
-#: ../widgets/misc/e-preferences-window.c:276
+#: ../widgets/misc/e-preferences-window.c:278
 msgid "Evolution Preferences"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਸੰਦ"
 
 #  message-search popup match count string
-#: ../widgets/misc/e-search-bar.c:77
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "ਮਿਲਦਾ: %d"
 
-#: ../widgets/misc/e-search-bar.c:554
+#: ../widgets/misc/e-search-bar.c:557
 msgid "Close the find bar"
 msgstr "�ਹ ਪੱ�� ਬੰਦ �ਰ�"
 
-#: ../widgets/misc/e-search-bar.c:562
+#: ../widgets/misc/e-search-bar.c:565
 msgid "Fin_d:"
 msgstr "���(_d):"
 
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Clear the search"
 msgstr "��� ਸਾਫ਼ �ਰ�"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:600
 msgid "_Previous"
 msgstr "ਪਿੱ��(_P)"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:606
 msgid "Find the previous occurrence of the phrase"
 msgstr "ਸ਼ਬਦ ਦ� ਪਿ�ਲ� ਮ���ਦ�� ਲੱਭ�"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:616
 msgid "_Next"
 msgstr "�ੱ��(_N)"
 
-#: ../widgets/misc/e-search-bar.c:619
+#: ../widgets/misc/e-search-bar.c:622
 msgid "Find the next occurrence of the phrase"
 msgstr "ਸ਼ਬਦ ਦ� ��ਲ� ਮ���ਦ�� ਲੱਭ�"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Mat_ch case"
 msgstr "ਮਿਲਦ� ਸਭ(_c)"
 
-#: ../widgets/misc/e-search-bar.c:657
+#: ../widgets/misc/e-search-bar.c:660
 msgid "Reached bottom of page, continued from top"
 msgstr "ਪ��਼ ਦ� �ੰਤ �ੱਤ� ਪ�ੱ��, �ੱਤ� ਤ�� �ਾਰ� ਰੱ�ਿ�"
 
-#: ../widgets/misc/e-search-bar.c:679
+#: ../widgets/misc/e-search-bar.c:682
 msgid "Reached top of page, continued from bottom"
 msgstr "ਪ��਼ ਦ� �ੱਤ� ਪ�ੱ��, ਹ�ਠਾ� ਤ�� ਫ�ਰ �ਾਰ�"
 
-#: ../widgets/misc/e-send-options.c:515
+#: ../widgets/misc/e-send-options.c:516
 msgid "When de_leted:"
 msgstr "ਹ�ਾ�ਣ ਤ�(_l):"
 
@@ -21405,7 +21142,6 @@ msgstr "ਵਿੱ�(_t)"
 
 #. 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)"
 
@@ -21431,7 +21167,6 @@ msgstr "ਮਿ�ਦ ਮਿਤ� ਸ�ੱ�(_S)"
 
 #. 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)"
 
@@ -21443,38 +21178,38 @@ msgstr "�ਦ�� ਠ�� ਲੱ��(_W)"
 msgid "_When opened:"
 msgstr "�ਦ�� ��ਲ�ਹਿ� �ਾਵ�(_W):"
 
-#: ../widgets/misc/e-signature-editor.c:133
-#: ../widgets/misc/e-signature-editor.c:549
-#: ../widgets/misc/e-signature-manager.c:349
-#: ../widgets/misc/e-signature-script-dialog.c:218
+#: ../widgets/misc/e-signature-editor.c:136
+#: ../widgets/misc/e-signature-editor.c:524
+#: ../widgets/misc/e-signature-manager.c:353
+#: ../widgets/misc/e-signature-script-dialog.c:220
 msgid "Unnamed"
 msgstr "ਬ�-ਨਾ�"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:213
 msgid "_Save and Close"
 msgstr "ਸੰਭਾਲ� ਤ� ਬੰਦ �ਰ�(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:389
+#: ../widgets/misc/e-signature-editor.c:391
 msgid "Edit Signature"
 msgstr "ਦਸਤ�ਤ ਸ�ਧ"
 
-#: ../widgets/misc/e-signature-editor.c:404
+#: ../widgets/misc/e-signature-editor.c:406
 msgid "_Signature Name:"
 msgstr "ਦਸਤ�ਤ ਨਾ�(_S):"
 
-#: ../widgets/misc/e-signature-manager.c:294
+#: ../widgets/misc/e-signature-manager.c:298
 msgid "Add Signature Script"
 msgstr "ਦਸਤ�ਤ� ਸ��ਰਿਪ� ਸ਼ਾਮਿਲ"
 
-#: ../widgets/misc/e-signature-manager.c:359
+#: ../widgets/misc/e-signature-manager.c:363
 msgid "Edit Signature Script"
 msgstr "ਦਸਤ�ਤ ਸ��ਰਿਪ� ਸ�ਧ"
 
-#: ../widgets/misc/e-signature-manager.c:576
+#: ../widgets/misc/e-signature-manager.c:579
 msgid "Add _Script"
 msgstr "ਸ��ਰਿਪ� ����(_S)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:266
+#: ../widgets/misc/e-signature-script-dialog.c:268
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -21484,54 +21219,54 @@ msgstr ""
 "�ਾਵ���। ਨਾ�, �� ਵ� ਤ�ਸ�� ਦਿ���, ਸਿਰਫ ਵ��ਾ�ਣ ਦ� �ੰਮ\n"
 " �ਵ��ਾ।"
 
-#: ../widgets/misc/e-signature-script-dialog.c:311
+#: ../widgets/misc/e-signature-script-dialog.c:313
 msgid "S_cript:"
 msgstr "ਸ��ਰਿਪ�(_c):"
 
 #  mail:signature-notscript secondary
-#: ../widgets/misc/e-signature-script-dialog.c:342
+#: ../widgets/misc/e-signature-script-dialog.c:344
 msgid "Script file must be executable."
 msgstr "ਸ��ਰਿਪ� ਫਾ�ਲ �ੱਲਣਯ�� ਹ�ਣ� �ਾਹ�ਦ� ਹ�।"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:78
 msgid "Click here to go to URL"
 msgstr "URL �ੱਤ� �ਾਣ ਲ� �ੱਥ� ਦਬਾ�"
 
-#: ../widgets/misc/e-web-view.c:369
+#: ../widgets/misc/e-web-view.c:374
 msgid "_Copy Link Location"
 msgstr "ਲਿੰ� �ਿ�ਾਣ� ਦ� ਨ�ਲ(_C)"
 
-#: ../widgets/misc/e-web-view.c:371
+#: ../widgets/misc/e-web-view.c:376
 msgid "Copy the link to the clipboard"
 msgstr "ਲਿੰ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../widgets/misc/e-web-view.c:379
+#: ../widgets/misc/e-web-view.c:384
 msgid "_Open Link in Browser"
 msgstr "ਲਿੰ� ਬਰਾ��਼ਰ ਵਿੱ� ��ਲ�ਹ�(_O)"
 
-#: ../widgets/misc/e-web-view.c:381
+#: ../widgets/misc/e-web-view.c:386
 msgid "Open the link in a web browser"
 msgstr "ਲਿੰ� ਵ�ੱਬ ਬਰਾ��਼ਰ ਵਿੱ� ��ਲ�ਹ�"
 
-#: ../widgets/misc/e-web-view.c:389
+#: ../widgets/misc/e-web-view.c:394
 msgid "_Copy Email Address"
 msgstr "�ਮ�ਲ �ਡਰ�ੱਸ �ਾਪ� �ਰ�(_C)"
 
-#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
+#: ../widgets/misc/e-web-view.c:423 ../widgets/misc/e-web-view.c:1078
 msgid "Select all text and images"
 msgstr "ਸਭ ���ਸ� �ਤ� �ਿੱਤਰ ��ਣ�"
 
-#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
-#: ../widgets/misc/e-web-view.c:854
+#: ../widgets/misc/e-web-view.c:855 ../widgets/misc/e-web-view.c:857
+#: ../widgets/misc/e-web-view.c:859
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ਨ�ੰ �ਾਲ �ਰਨ ਲ� �ਲਿੱ� �ਰ�"
 
-#: ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:861
 msgid "Click to hide/unhide addresses"
 msgstr "�ਡਰ�ੱਸ �ਹਲ�/ਵ��ਾ�ਣ ਲ� ਦਬਾ�"
 
-#: ../widgets/misc/e-web-view.c:858
+#: ../widgets/misc/e-web-view.c:863
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ��ਲ�ਹਣ ਲ� �ਲਿੱ� �ਰ�"
@@ -21707,8 +21442,6 @@ msgstr ""
 #.
 #: ../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 ���ਮ)"



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