[evolution/gnome-2-28] Updating Translation for Punjabi



commit cf0dd57fda4ef41d473f05448713d7e2a178a60a
Author: A S Alam <aalam users sf net>
Date:   Sun Sep 13 11:37:34 2009 +0530

    Updating Translation for Punjabi

 po/pa.po |12324 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 6549 insertions(+), 5775 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index 81ac3a6..133d1ad 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:603
+#: ../shell/main.c:631
 # Punjab Linux Technology <punjablinux netscape net>, 2004.
 # A S Alam <aalam users sf net>, 2004, 2005, 2006, 2007, 2009.
 # Amanpreet Singh Alam <aalam users sf net>, 2008, 2009.
@@ -10,38 +10,38 @@ 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: 2009-03-16 02:56+0000\n"
-"PO-Revision-Date: 2009-03-22 18:27+0000\n"
+"POT-Creation-Date: 2009-08-28 13:23+0000\n"
+"PO-Revision-Date: 2009-09-13 11:35+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
-"Language-Team: Punjabi/Panjabi <punjab-l10n list sf net>\n"
+"Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.3\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution address book"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ�"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "ਨਵਾ� ਸੰਪਰ�"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "ਨਵ�� ਸੰਪਰ� ਲਿਸ�"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "ਮ���ਦਾ �ਡਰ�ੱਸ-ਬ�ੱ� ਫ�ਲਡਰ %s ਵਿੱ� %d �ਾਰਡ"
-msgstr[1] "ਮ���ਦਾ �ਡਰ�ੱਸ-ਬ�ੱ� ਫ�ਲਡਰ %s ਵਿੱ� %d �ਾਰਡ"
+msgstr[1] "1ਮ���ਦਾ �ਡਰ�ੱਸ-ਬ�ੱ� ਫ�ਲਡਰ %s ਵਿੱ� %d �ਾਰਡ"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 msgid "Open"
@@ -59,32 +59,32 @@ msgstr "ਸੰਪਰ�:  "
 msgid "evolution minicard"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਮਿੰਨ�-�ਾਰਡ"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "�ਸ ਲ� �ਲਾਰਮ ਹ�।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
 msgstr "�ਹ ਮ���ਦ�� ਹ�ਾ�।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr "�ੱ� ਮ��ਿੰ� ਹ�।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "��ਲੰਡਰ ��ਨਾਵਾ�: %s ਸੰ��ਪ ਹ�।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
 msgstr "��ਲੰਡਰ ��ਨਾਵਾ�: ��� �ਾਣ�ਾਰ� ਨਹ�� ਹ�।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "��ਲੰਡਰ ਵ��ਣ ��ਨਾ"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
 msgstr "ਫ��ਸ ਲਵ�"
 
@@ -108,8 +108,8 @@ msgstr "�ੱ� 'ਤ� �ਾ�"
 msgid "Go to Date"
 msgstr "ਮਿਤ� 'ਤ� �ਾ�"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr "ਮ���ਦਾ ਸਮ�� ਸ�ਮਾ ਵ��ਣ �ਤ� ��ਣਨ ਲ� �ੱ� ��ਬਲ"
 
@@ -153,7 +153,7 @@ msgid "calendar view for one or more days"
 msgstr "�ੱ� �ਾ� ਵਧ�ਰ� ਦਿਨਾ� ਲ� ��ਲੰਡਰ ਦਿੱ�"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -164,18 +164,18 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:824
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:826
-#: ../calendar/gui/calendar-component.c:831
-#: ../calendar/gui/calendar-component.c:833
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -183,10 +183,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:845
-#: ../calendar/gui/calendar-component.c:852
-#: ../calendar/gui/calendar-component.c:858
-#: ../calendar/gui/calendar-component.c:860
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -196,15 +196,15 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:850
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615
-#: ../calendar/gui/e-week-view-main-item.c:349
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "�ਨ�ਮ ��ਲੰਡਰ"
 
@@ -216,11 +216,11 @@ msgstr "��� ਪੱ��"
 msgid "evolution calendar search bar"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ��� ਪੱ��"
 
-#: ../a11y/calendar/ea-jump-button.c:147
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
 msgstr "�ੰਪ ਬ�ਨ"
 
-#: ../a11y/calendar/ea-jump-button.c:156
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "ਹ�ਰ ��ਨਾਵਾ� ਵ��ਣ ਲ� �ਸ ਨ�ੰ ਦਬਾ�।"
 
@@ -251,20 +251,20 @@ msgstr "ਪ�ਪ�ੱਪ"
 msgid "popup a child"
 msgstr "ਪ�ਪ�ੱਪ �ੱ� �ਾ�ਲਡ"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "ਸ�ਧ"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
 msgstr "�ਸ ਸ�ੱਲ਼ ਸ�ਧਣਾ ਸ਼�ਰ�"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "ਤਬਦ�ਲ"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr "ਸ�ੱਲ ਤਬਦ�ਲ"
 
@@ -284,17 +284,17 @@ msgstr "ਸਮ���"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "�ਸ ਸ�ੱਲ ਵਿੱ� ETree ਰੱ�ਣ ਵਾਲ� �ਤਾਰ ਸਮ���"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 msgid "Table Cell"
 msgstr "��ਬਲ ਸ�ੱਲ"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "ਸ਼ਾਮਲ ਲ� �ਲਿੱ� �ਰ�"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "ਦਬਾ�"
 
@@ -328,14 +328,6 @@ msgstr "ਡਿਫਾਲ� ����ਵ��"
 msgid "Popup Menu"
 msgstr "ਪ�ਪ�ੱਪ ਮ�ਨ�"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "����ਮਿੰ� ਬਾਰ ਬਦਲ�"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "����ਵ��"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -387,10 +379,14 @@ msgid "Could not remove address book."
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ਹ�ਾ�ਣ ਵਿੱ� �ਸਫਲ।"
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and GroupWise Personal Contacts folders."
+#| msgid ""
+#| "Currently you can access only GroupWise System Address Book from "
+#| "Evolution. Please use some other GroupWise mail client once, to get your "
+#| "GroupWise Frequent Contacts and GroupWise Personal Contacts folders."
+msgid ""
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
 "�ਸ ਸਮ�� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਤ�� ਸਿਰਫ਼ �ਰ�ੱਪਵਾ��਼ ਸਿਸ�ਮ �ਡਰ�ੱਸ-ਬ�ੱ� ਦ� ਹ� ਵਰਤ�� �ਰ ਸ�ਦ� ਹ�। �ਿਰਪਾ �ਰ�� "
 "��� ਹ�ਰ �ਰ�ੱਪਵਾ��਼ ਪੱਤਰ �ਲਾ�� ਦ� �ੱ� ਵਰਤ�� �ਰ� ਤਾ� �ਿ ਤ�ਸ�� �ਰ�ੱਪਵਾ��਼ ਫਰ��ਿ��� ਸੰਪਰ� �ਤ� "
@@ -414,7 +410,7 @@ msgstr "LDAP ਸਰਵਰ ਨਾਲ ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
 msgid "Failed to delete contact"
 msgstr "ਸੰਪਰ� ਹ�ਾ�ਣ ਦ�ਰਾਨ �ਲਤ�"
 
@@ -568,104 +564,94 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "ਡਿਫਾਲ� ਸਮ�ਾਲ� �ਡਰ�ੱਸ:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
 msgid "Could not load address book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਲ�ਡ ਨਹ�� ��ਤ� �ਾ ਸ��"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "ਪਾ�ਲ� ਦਾ �ਡਰ�ੱਸ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#: ../addressbook/gui/component/autocompletion-config.c:173
-msgid "Autocompletion"
-msgstr "ਸਵ�-ਪ�ਰਤ�"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "ਸੰਪਰ�(_o)"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "ਸਰ��ਫਿ���"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "ਸਵ�-ਪ�ਰਤ� ਦ� ਸੰਰ�ਨਾ �ਥ� ਦਿ�"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#| msgid "Configure autocomplete here"
+msgid "Configure contacts and autocompletion here"
+msgstr "ਸੰਪਰ� �ਤ� ਸਵ�-ਪ�ਰਨ ਸੰਰ�ਨਾ �ੱਥ� ਦਿ��"
 
-#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:316
-#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "ਸੰਪਰ�"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Address Book"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ�"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book address popup"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ� �ਡਰ�ੱਸ ਪ�ਪ�ੱਪ"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address viewer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ� �ਡਰ�ੱਸ ਦਰਸ਼�"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book card viewer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ� �ਾਰਡ ਦਰਸ਼�"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book component"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਡਰ�ੱਸ-ਬ�ੱ� ਭਾ�"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution S/MIME Certificate Management Control"
 msgstr "�ਵ�ਲ�ਸ਼ਨ S/Mime ਸਰ��ਫਿ��� ਪ�ਰਬੰਧ� �ੰ�ਰ�ਲ"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution folder settings configuration control"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਫ�ਲਡਰ ਸ��ਿੰ� ਸੰਰ�ਨਾ �ੰ�ਰ�ਲ"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Manage your S/MIME certificates here"
 msgstr "�ਪਣ� S/MIME ਸਰ��ਫਿ��� �ਥ� ਰੱ��"
 
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:142
-#: ../addressbook/gui/component/addressbook-component.c:146
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:243
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
-#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
-#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1517
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "�ਸ �ੰਪਿ��ਰ �ੱਤ�"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "LDAP ਸਰਵਰਾ� �ੱਤ�"
+
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. ensure the source name is in current locale, not read from configuration
@@ -677,144 +663,189 @@ msgstr "�ਸ �ੰਪਿ��ਰ �ੱਤ�"
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:154
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
-#: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/calendar-component.c:261
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
-#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "ਨਿੱ��"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:168
-#: ../addressbook/gui/component/addressbook-component.c:171
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "LDAP ਸਰਵਰਾ� �ੱਤ�"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:209
 msgctxt "New"
 msgid "_Contact"
 msgstr "ਸੰਪਰ�(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "ਨਵਾ� ਸੰਪਰ� ਬਣਾ�"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:217
 msgctxt "New"
 msgid "Contact _List"
 msgstr "ਸੰਪਰ� ਲਿਸ�(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "ਨਵ�� ਸੰਪਰ� ਸ��� ਬਣਾ�"
 
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
 msgstr "ਨਵ�� �ਡਰ�ੱਸ-ਬ�ੱ�"
 
-#: ../addressbook/gui/component/addressbook-component.c:254
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgctxt "New"
 msgid "Address _Book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ�(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:255
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
 msgstr "�ੱ� ਸ�ਨ�ਹਾ �ਿਤਾਬ ਬਣਾ�"
 
-#: ../addressbook/gui/component/addressbook-component.c:418
+#: ../addressbook/gui/component/addressbook-component.c:389
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਸ��ਿੰ� �ਾ� ਫ�ਲਡਰ ਰੱ�ਣ ਵਿੱ� �ਸਫਲ।"
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:217
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"�ਹ ��ਣ �ਰਨ ਦਾ �ਰਥ ਹ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� LDAP ਸਰਵਰ ਨਾਲ ਤਾ� �����ਾ, ���ਰ ਤ�ਹਾਡਾ LDAP ਸਰਵਰ "
+"SSL ਲ� ਸਹਾ�� ਹ���।"
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"�ਹ ��ਣ �ਰਨ ਦਾ �ਰਥ ਹ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� LDAP ਸਰਵਰ ਨਾਲ ਤਾ� �����ਾ, ���ਰ ਤ�ਹਾਡਾ LDAP ਸਰਵਰ "
+"TLS ਲ� ਸਹਾ�� ਹ���।"
+
+#: ../addressbook/gui/component/addressbook-config.c:221
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"�ਹ ��ਣ �ਰਨ ਦਾ �ਰਥ ਹ� �ਿ ਤ�ਹਾਡਾ ਸਰਵਰ SSL �ਾ� TLS ਲ� ਸਹਾ�� ਨਹ�� ਹ�। �ਸਦਾ �ਰਥ ਹ� ਤ�ਹਾਡਾ "
+"��ਨ��ਸ਼ਨ �ਣ-ਸ�ਰੱ�ਿ�ਤ ਵ� ਹ� ਸ�ਦਾ ਹ� �ਤ� ਤ�ਸ�� ਸ�ਰੱ�ਿ� ਲ� �ਤਰਾ ਬਣ ਸ�ਦ� ਹ�।"
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
 msgstr "ਬ�ਸ"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "�ਿਸਮ(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr "�ਫਲਾ�ਨ �ਪਰ�ਸ਼ਨ ਲ� ਬ�ੱ� ਸਮੱ�ਰ� �ਾਪ� �ਰ�(_b)"
 
-#: ../addressbook/gui/component/addressbook-config.c:998
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2532
+#: ../addressbook/gui/component/addressbook-config.c:759
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"�ਹ LDAP ਸਰਵਰ ਦ� �ਹ ਪ�ਰ� ਹ�, �ਿਸ ਤ� �ਵ�ਲ�ਸ਼ਨ ���ਨ ਦ� ��ਸ਼ਿਸ �ਰ ਰਿਹਾ ਹ�। �ੱ� ਸ���ਡਰਡ ਪ�ਰ�ਾ� "
+"ਦ� ਸ��� �ਪਲੱਬਧ ਹ�। �ਪਣ� ਸਿਸ�ਮ ਪ�ਰਬੰਧ� ਨ�ੰ ਪ�ੱ�� �ਿ �ਿਹ�� ਪ�ਰ� ਨਿਰਧਾਰਿਤ �ਰਨ� ਹ�।"
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"�ਹ ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� �� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� ਲ� �ਸਤ�ਮਾਲ �ਰ���। �ਸ ਨ�ੰ \"�ਮ�ਲ �ਡਰ�ੱਸ\" ਨਿਰਧਾਰਿਤ "
+"�ਰਨ ਨਾਲ ਤ�ਹਾਡ� ldap ਸਰਵਰ ਲ� ਬ�ਪ�ਾਣ ਪਹ�ੰ� ਲ���ਦ� ਹ�ਵ���।"
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"��� ਸ�ਮਾ �ਹ ਨਿਰਧਾਰਿਤ �ਰਦ� ਹ� �ਿ ਡਾ�ਰ���ਰ� ਲ�� ਵਿੱ� �ਿੰਨ� ਡ�ੰ�ਾ� ਤੱ� ��� ��ਤ� �ਾਵ�। "
+"\"sub\" ਸ�ਮਾ ਨਾਲ ��� �ਧਾਰ ਦ� ਹ�ਠਾ� ਸਭ ���ਮਾ� ਦ� �ਾ�� �ਰ���। ��� ਸ�ਮਾ� \"one\" ਨਾਲ "
+"ਤ�ਹਾਡ� �ਧਾਰ ਤ�� �ੱ� ਪੱਧਰ ਤੱ� �ਾ�� ��ਤ� �ਾਵ���।"
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "ਸਧਾਰਨ"
 
-#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/component/addressbook-config.c:1021
 #: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ�"
 
-#: ../addressbook/gui/component/addressbook-config.c:1003
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "ਸਰਵਰ �ਾਣ�ਾਰ�"
 
-#: ../addressbook/gui/component/addressbook-config.c:1005
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "ਪ�ਰਮਾਣਿ�ਤਾ"
 
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "ਵ�ਰਵਾ"
 
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1021
 msgid "Searching"
 msgstr "��� �ਾਰ� ਹ�"
 
-#: ../addressbook/gui/component/addressbook-config.c:1011
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 msgstr "ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿਸ਼�ਸ਼ਤਾ"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "ਤਬਦ�ਲ ਹ� ਰਿਹਾ ਹ�..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
 msgstr "'%s' ਨ�ੰ ਤਬਦ�ਲ ��ਤਾ �ਾ ਰਿਹਾ ਹ�:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:646
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP ਸਰਵਰ"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:761
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "���-ਪ�ਰਤ� ਸ��ਿੰ�"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -825,7 +856,7 @@ msgstr ""
 "\n"
 "ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -835,7 +866,7 @@ msgstr ""
 "\n"
 "ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -845,7 +876,7 @@ msgstr ""
 "\n"
 "ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -856,18 +887,18 @@ msgstr ""
 "ਥਰੰਮ� ਨਾਲ �ਡ�� �ਰ� ��, �ਦ�� ਤੱ� �ਿ ਫ�ਲਡਰ ਤਬਦ�ਲ ��ਤ� �ਾ ਰਹ� ਹਨ।"
 
 #: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "ਫ�ਲਡਰ \"%s\" ਦਾ ਨਾ� ਬਦਲ�:"
 
 #: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "ਫ�ਲਡਰ ਨਾ� ਬਦਲ�"
 
 #: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
 msgstr "ਫ�ਲਡਰ ਨਾ� �ੱ�ਰ \"/\" ਨਹ�� ਰੱ� ਸ�ਦਾ"
 
@@ -880,19 +911,19 @@ msgid "Save As vCard..."
 msgstr "vCard ਵਾ�� ਸੰਭਾਲ�..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:678
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "ਨਾ� ਤਬਦ�ਲ(_R)..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:681
-#: ../calendar/gui/e-calendar-table.c:1620
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:954
-#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-view.c:1828 ../calendar/gui/e-memo-table.c:949
+#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -900,11 +931,10 @@ msgid "_Delete"
 msgstr "ਹ�ਾ�(_D)"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:686
-#: ../calendar/gui/dialogs/comp-editor.c:2092
-#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
-#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "ਵਿਸ਼�ਸਤਾ(_P)"
 
@@ -917,20 +947,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP ਸਰਵਰ ਨ�ੰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "ਪ�ਰਮਾਣਿਤ ਹ�ਣ ਵਿੱ� �ਸਫਲ ।\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (ਯ��਼ਰ %s) ਲ� ਪਾਸਵਰਡ ਭਰ�"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:422
-#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../plugins/google-account-setup/google-source.c:500
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "ਪਾਸਵਰਡ ਭਰ�"
@@ -978,7 +1008,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "��ਣ� ਨਾ� ਡਾ�ਲਾ� ਵਿੱ� ��ਣ� ���ਰ� ਫ�ਲਡਰ ਦਾ URI ਹ�।"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Vertical pane position"
 msgstr "ਲੰਬ�ਾਰ� ਬਾਹ� ਸਥਿਤ�"
 
@@ -993,10 +1023,25 @@ msgid "Whether to show the preview pane."
 msgstr "�� �ਲ� ਪ�ਨ ਵ��ਾ�ਣ� ਹ�"
 
 #: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Autocompletion"
+msgstr "ਸਵ�-ਪ�ਰਤ�"
+
+#: ../addressbook/gui/component/autocompletion-config.c:177
 msgid "Always _show address of the autocompleted contact"
 msgstr "���-ਪ�ਰਾ ��ਤ� ਸੰਪਰ� ਦਾ �ਡਰ�ੱਸ ਹਮ�ਸਾ� ਵ���"
 
-#: ../addressbook/gui/component/autocompletion-config.c:180
+#: ../addressbook/gui/component/autocompletion-config.c:182
+#| msgid "Date/Time"
+msgid "Date/Time Format"
+msgstr "ਮਿਤ�/ਸਮਾ� ਫਾਰਮ��"
+
+#: ../addressbook/gui/component/autocompletion-config.c:185
+#: ../mail/em-mailer-prefs.c:1456
+#| msgid "Table model"
+msgid "Table column:"
+msgstr "��ਬਲ �ਾਲਮ:"
+
+#: ../addressbook/gui/component/autocompletion-config.c:187
 msgid "Look up in address books"
 msgstr "�ਡਰ�ਸ ਬ�ੱ� ਵਿੱ� ���"
 
@@ -1005,21 +1050,19 @@ msgid "1"
 msgstr "੧"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "੩੨੬੮"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "੩੮੯"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "à©«"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "੬੩੬"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
 msgstr "<b>ਪ�ਰਮਾਣ�ਿਤਾ</b>"
@@ -1032,143 +1075,78 @@ msgstr "<b>ਡਾ�ਨਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�:</b>"
 msgid "<b>Searching</b>"
 msgstr "<b>��� ਹ� ਰਹ� ਹ�</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "<b>Type:</b>"
-msgstr "<b>�ਿਸਮ</b>"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Add Address Book"
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਸ਼ਾਮਿਲ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
-msgid "Always"
-msgstr "ਹਮ�ਸ਼ਾ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-msgid "Anonymously"
-msgstr "�ਣ�ਾਣ"
+#| msgid "Using distinguished name (DN)"
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"��ਿ�ਤ\n"
+"�ਮ�ਲ �ਡਰ�ੱਸ ਵਰਤ��\n"
+"ਵੱ�ਰਾ ਨਾ� ਵਰਤ�� (DN)"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "B_rowse this book until limit reached"
 msgstr "�ਹ �ਿਤਾਬ ਸ�ਮਾ �ੱਪ� ਤੱ� ਵ���(_r)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "ਬ�ਸਿ�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "ਵੱ�ਰਾ ਨਾ�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਹ �-ਮ�ਲ �ਡਰ�ੱਸ ਸਰਵਰ ਤ� ਤ�ਹਾਡ� ਪ�ਰਮਾਣ�ਿਤਾ ਲ� ਵਰਤ��ਾ।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "ਸਭ ਸੰਭਵ ��� �ਧਾਰ ਵਰਤ��"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Lo_gin:"
 msgstr "ਲਾ��ਨ(_g):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
-msgid "Never"
-msgstr "�ਦ� ਨਹ��"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:287
-msgid "No encryption"
-msgstr "��� �ੰ��ਰਿਪਸ਼ਨ ਨਹ��"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "�ੱ�"
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+#| msgid "One"
+msgid ""
+"One\n"
+"Sub"
+msgstr ""
+"�ੱ�\n"
+"ਸਬ"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:295
-msgid "SSL encryption"
-msgstr "SSL �ੰ��ਰਿਪਸ਼ਨ"
+#: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"SSL �ੰ��ਰਿਪਸ਼ਨ\n"
+"TLS �ੰ��ਰਿਪਸ਼ਨ\n"
+"�ੰ��ਰਿਪਸ਼ਨ ਨਹ��"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Search Filter"
 msgstr "��� ਫਿਲ�ਰ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 msgid "Search _base:"
 msgstr "��� ਬ�ਸ(_b):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search _filter:"
 msgstr "ਫਿਲ�ਰ ���(_F):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "��� ਫਿਲ�ਰ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
-msgstr ""
-"��� ਫਿਲ�ਰ �ੱ� �ਿਸਮ ਦ��� ���ਮਾ� ਦ� ��� ਲ� ਹਨ, �ਦ�� �ਿ ��� ��ਤ� �ਾਵ�। ���ਰ �ਸ ਵਿੱ� ਸ�ਧ ਨਾ "
-"��ਤ� �� ਤਾ�,  ਮ�ਲ ��� ਨ�ੰ \"ਵਿ��ਤ�\" �ਿਸਮ ਨ�ੰ ਮੰਨ �� ��� ��ਤ� �ਾਵ���।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"�ਹ ��ਣ �ਰਨ ਦਾ �ਰਥ ਹ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� LDAP ਸਰਵਰ ਨਾਲ ਤਾ� �����ਾ, ���ਰ ਤ�ਹਾਡਾ LDAP ਸਰਵਰ "
-"SSL ਲ� ਸਹਾ�� ਹ���।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#| msgid ""
+#| "Search filter is the type of the objects searched for, while performing "
+#| "the search. If this is not modified, by  default search will be performed "
+#| "on objectclass of the type \"person\"."
 msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
 msgstr ""
-"�ਹ ��ਣ �ਰਨ ਦਾ �ਰਥ ਹ� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� LDAP ਸਰਵਰ ਨਾਲ ਤਾ� �����ਾ, ���ਰ ਤ�ਹਾਡਾ LDAP ਸਰਵਰ "
-"TLS ਲ� ਸਹਾ�� ਹ���।"
+"��� ਫਿਲ�ਰ �ੱ� �ਿਸਮ ਦ��� ���ਮਾ� ਦ� ��� ਲ� ਹਨ, �ਦ�� �ਿ ��� ��ਤ� �ਾਵ�। ���ਰ "
+"�ਸ ਵਿੱ� ਸ�ਧ ਨਾ ��ਤ� �� ਤਾ�,  ਮ�ਲ ��� ਨ�ੰ \"ਵਿ��ਤ�\" �ਿਸਮ ਨ�ੰ ਮੰਨ �� ��� ��ਤ� �ਾਵ���।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"�ਹ ��ਣ �ਰਨ ਦਾ �ਰਥ ਹ� �ਿ ਤ�ਹਾਡਾ ਸਰਵਰ SSL �ਾ� TLS ਲ� ਸਹਾ�� ਨਹ�� ਹ�। �ਸਦਾ �ਰਥ ਹ� ਤ�ਹਾਡਾ "
-"��ਨ��ਸ਼ਨ �ਣ-ਸ�ਰੱ�ਿ�ਤ ਵ� ਹ� ਸ�ਦਾ ਹ� �ਤ� ਤ�ਸ�� ਸ�ਰੱ�ਿ� ਲ� �ਤਰਾ ਬਣ ਸ�ਦ� ਹ�।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "�ਧ�ਨ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Supported Search Bases"
 msgstr "ਸਹਾ�� ��� �ਧਾਰ"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:291
-msgid "TLS encryption"
-msgstr "TLS �ੰ��ਰਿਪਸ਼ਨ"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1177,24 +1155,13 @@ msgstr ""
 "��� �ਧਾਰ �ੰਦਰਾ� ਦਾ ਵੱ�ਰਾ ਨਾ� (DN) ਹ�ੰਦਾ ਹ�, �ਿਥ�� �ਿ ਤ�ਸ�� ��� ਸ਼�ਰ� �ਰਦ� ਹ�। ���ਰ ਤ�ਸ�� �ਸ ਨ�ੰ "
 "�ਾਲ� �ੱਡ ਦਿੱਤਾ ਤਾ�, ��� ਰ�� (root) ਡਾ�ਰ���ਰ� ਤ�� ਸ਼�ਰ� ਹ� �ਾਵ���।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"��� ਸ�ਮਾ �ਹ ਨਿਰਧਾਰਿਤ �ਰਦ� ਹ� �ਿ ਡਾ�ਰ���ਰ� ਲ�� ਵਿੱ� �ਿੰਨ� ਡ�ੰ�ਾ� ਤੱ� ��� ��ਤ� �ਾਵ�। "
-"\"sub\" ਸ�ਮਾ ਨਾਲ ��� �ਧਾਰ ਦ� ਹ�ਠਾ� ਸਭ ���ਮਾ� ਦ� �ਾ�� �ਰ���। ��� ਸ�ਮਾ� \"one\" ਨਾਲ "
-"ਤ�ਹਾਡ� �ਧਾਰ ਤ�� �ੱ� ਪੱਧਰ ਤੱ� �ਾ�� ��ਤ� �ਾਵ���।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "�ਹ ਤ�ਹਾਡ� LDAP ਸਰਵਰ ਦਾ ਪ�ਰਾ ਨਾ� ਹ�। �ਦਾਹਰਨ ਲ� \"ldap.mycompany.com\""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1202,16 +1169,7 @@ msgstr ""
 "�ਹ �ਧਿ�ਤਮ �ੰਦਰਾ� ਹਨ, �� �ਿ ਡਾ�ਨਲ�ਡ ��ਤ� �ਾ ਸ�ਦ� ਹਨ। �ਹ ਨ�ੰ ਵਧ�ਰ� ਨਿਰਧਾਰਿਤ �ਰਨ ਨਾਲ "
 "ਤ�ਹਾਡ� �ਡਰ�ੱਸ-ਬ�ੱ� ਹ�ਲ� ਹ� �ਾਵ���।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"�ਹ ਪ�ਰਮਾਣ�ਿਤਾ ਢੰ� �� �ਿ �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� ਲ� �ਸਤ�ਮਾਲ �ਰ���। �ਸ ਨ�ੰ \"�ਮ�ਲ �ਡਰ�ੱਸ\" ਨਿਰਧਾਰਿਤ "
-"�ਰਨ ਨਾਲ ਤ�ਹਾਡ� ldap ਸਰਵਰ ਲ� ਬ�ਪ�ਾਣ ਪਹ�ੰ� ਲ���ਦ� ਹ�ਵ���।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1219,86 +1177,61 @@ msgstr ""
 "�ਹ �ਸ ਸਰਵਰ ਦਾ ਨਾ� ਹ�, �� �ਿ ਤ�ਹਾਡ� �ਵ�ਲ�ਸ਼ਨ ਫ�ਲਡਰ ਸ��� ਵਿੱ� ਵਿ�ਾ� ਦ� ਰਿਹਾ ਹ�। �ਹ ਸਿਰਫ ਵ��ਣ "
 "ਲ� ਹ�।"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"�ਹ LDAP ਸਰਵਰ ਦ� �ਹ ਪ�ਰ� ਹ�, �ਿਸ ਤ� �ਵ�ਲ�ਸ਼ਨ ���ਨ ਦ� ��ਸ਼ਿਸ �ਰ ਰਿਹਾ ਹ�। �ੱ� ਸ���ਡਰਡ ਪ�ਰ�ਾ� "
-"ਦ� ਸ��� �ਪਲੱਬਧ ਹ�। �ਪਣ� ਸਿਸ�ਮ ਪ�ਰਬੰਧ� ਨ�ੰ ਪ�ੱ�� �ਿ �ਿਹ�� ਪ�ਰ� ਨਿਰਧਾਰਿਤ �ਰਨ� ਹ�।"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "ਵੱ�ਰਾ ਨਾ� ਵਰਤ�� (DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ ਵਰਤ��"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "�ਦ�� ਵ� ਸੰਭਵ ਹ�ਵ�"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਸ਼ਾਮਲ(_A)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "_Download limit:"
 msgstr "ਡਾ�ਨਲ�ਡ ਸ�ਮਾ(_D):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
 msgstr "ਸੰਭਵ ��� �ਧਾਰ ਲੱਭ�(_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "_Login method:"
 msgstr "ਲਾ��ਨ ਢੰ�(_L):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:178
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "ਨਾ�(_N):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "ਪ�ਰ�(_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid "_Search scope:"
 msgstr "��� ਸ�ਮਾ(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:187
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "ਸਰਵਰ(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
 msgstr "ਸਮਾ�-ਸ�ਮਾ(_T):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "ਸ�ਰੱ�ਿ�ਤ ��ਨ��ਸ਼ਨ ਵਰਤ��(_U):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 msgstr "�ਾਰਡ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/caldav/caldav-source.c:430
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:652
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:720
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "ਮਿੰ�"
 
@@ -1323,44 +1256,43 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>ਫ���ਲ</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#| msgid "<b>Home</b>"
+msgid "<b>Notes</b>"
+msgstr "<b>ਨ��ਿਸ</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>ਹ�ਰ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>��ਲ�ਫ�ਨ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>ਵ�ੱਬ �ਡਰ�ੱਸ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>�ੰਮ</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
-msgid "AIM"
-msgstr "AIM"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "���ਾ�ਰ�(_t)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "ਸੰਪਰ�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "ਸਬੰਧ ਸੰਪਾਦ�"
 
@@ -1369,1276 +1301,259 @@ msgid "Full _Name..."
 msgstr "ਪ�ਰਾ ਨਾ�(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2494
 msgid "Image"
 msgstr "�ਿੱਤਰ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
-msgid "MSN Messenger"
-msgstr "MSN ਮ�ਸ�਼ਰ"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "ਪੱਤਰ �ਡਰ�ੱਸ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Nic_kname:"
 msgstr "�ਮ ਨਾ�(_k):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
-msgid "Novell GroupWise"
-msgstr "ਨ�ਵਲ �ਰ�ੱਪਵਾ��਼"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "ਨ��"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "ਨਿੱ�� �ਾਣ�ਾਰ�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "��ਲ�ਫ�ਨ"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:1057
-msgid "Work"
-msgstr "�ੰਮ"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "�ਡਰ�ੱਸ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "ਵਰ�ਹ� �ੰਢ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "ਸਹਾ��(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "�ਨਮ-ਦਿਨ(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:792
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "��ਲੰਡਰ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "ਸ਼ਹਿਰ(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "�ੰਪਨ�(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "ਦ�ਸ਼(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "ਵਿਭਾ�(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "ਫਾ�ਲ ਹ�ਠਾ�(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "ਮ�ੱ� ਸਫਾ(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
 msgstr "ਪ�ਰਬੰਧ�(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Notes:"
-msgstr "ਸ��ਨਾ(_N):"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "ਦ�ਤਰ(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "_PO ਬਾ�ਸ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "�ਿੱਤਾ(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "ਪਤ�/ਪਤਨ�(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "ਸ�ਬਾ/��ਤਰ(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "�ਾ��ਲ(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "ਵ�ਡਿ� �ੱਲਬਾਤ(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "HTML ਪੱਤਰ ਮਨ�਼�ਰ ਹਨ(_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "ਵ�ਬ ਲਾ�(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "�ਿੱਥ�(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Zip/Postal Code:"
 msgstr "�ਿਪ/ਡਾ� ��ਡ(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-msgid "Address"
-msgstr "�ਡਰ�ੱਸ"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:473
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "ਨਾ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3685
-#: ../widgets/text/e-text.c:3686
+#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "ਸ�ਧਯ��"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
-msgid "United States"
-msgstr "�ਮਰ��ਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
-msgid "Afghanistan"
-msgstr "�ਫ�ਾਨਿਸਤਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
-msgid "Albania"
-msgstr "�ਲਬ�ਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
-msgid "Algeria"
-msgstr "�ਲ��ਰ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
-msgid "American Samoa"
-msgstr "�ਮਰ��� ਸਾਮ�ਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "Andorra"
-msgstr "�ਡ�ਰਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Angola"
-msgstr "�ੰ��ਲਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Anguilla"
-msgstr "�ੰ��ਲ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Antarctica"
-msgstr "�ੰ�ਾਰਿ��ਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Antigua And Barbuda"
-msgstr "������ ਤ� ਬਾਰਬ�ਡਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Argentina"
-msgstr "�ਰ�ਨ��ਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Armenia"
-msgstr "�ਰਮ�ਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Aruba"
-msgstr "�ਰ�ਬਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Australia"
-msgstr "�ਸ�ਰ�ਲ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Austria"
-msgstr "�ਸ�ਰ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Azerbaijan"
-msgstr "��਼ਰਬਾ��ਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Bahamas"
-msgstr "ਬਾਹਾਮਾਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Bahrain"
-msgstr "ਬਹਿਰਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Bangladesh"
-msgstr "ਬੰ�ਲਾਦ�ਸ਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Barbados"
-msgstr "ਬਾਰਬਾਡਾਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Belarus"
-msgstr "ਬ�ਲਾਰ�ਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Belgium"
-msgstr "ਬ�ਲ���ਮ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Belize"
-msgstr "ਬ�ਲ��਼�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Benin"
-msgstr "ਬ�ਨਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bermuda"
-msgstr "ਬਾਰਾਮ�ਡਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Bhutan"
-msgstr "ਭ��ਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Bolivia"
-msgstr "ਬ�ਲ�ਵ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Bosnia And Herzegowina"
-msgstr "ਬ�ਸ�ਨ�� ਤ� ਹਰ�਼�ਨ��ਵ�ਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Botswana"
-msgstr "ਬ��ਸਵਾਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bouvet Island"
-msgstr "ਬ��ਵ� �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Brazil"
-msgstr "ਬਰਾ�਼�ਲ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "British Indian Ocean Territory"
-msgstr "ਬਰਤਾਨ�� ਭਾਰਤ� ਸਮ�ੰਦਰ� ��ਤਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Brunei Darussalam"
-msgstr "ਬਰ�ਨ� ਡਾਰ�ਸ਼ਲਾਮ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bulgaria"
-msgstr "ਬ�ਲ�ਾਰ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Burkina Faso"
-msgstr "ਬ�ਪ��ਨਾ ਫਾਸ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Burundi"
-msgstr "ਬ�ਰ�ਮਾਡ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Cambodia"
-msgstr "��ਲੰਬ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Cameroon"
-msgstr "��ਮਰ�ਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Canada"
-msgstr "��ਨ�ਡਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Cape Verde"
-msgstr "��ਪ ਵਾਰਡ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Cayman Islands"
-msgstr "�ਾਯਮਨ �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Central African Republic"
-msgstr "��ਦਰ� �ਫਰ��ਾ �ਣਰਾ�਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Chad"
-msgstr "�ੰਦ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Chile"
-msgstr "�ਿੱਲ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "China"
-msgstr "��ਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Christmas Island"
-msgstr "��ਰਿਸਮਿਸ �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cocos (Keeling) Islands"
-msgstr "����ਸ(�ਿਲਿੰ�) �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Colombia"
-msgstr "��ਲੰਬ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Comoros"
-msgstr "��ਮ�ਰਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Congo"
-msgstr "�ਾ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Congo, The Democratic Republic Of The"
-msgstr "�ਾ���, ਲ��ਤੰਤਰ� �ਣਰਾ�਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cook Islands"
-msgstr "��ੱ� �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Costa Rica"
-msgstr "�ਾਸ� ਰ��ਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Cote d'Ivoire"
-msgstr "���� ਡ�ਵ�ਰ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Croatia"
-msgstr "�ਰ����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Cuba"
-msgstr "�ਿ�ਬਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cyprus"
-msgstr "�ਿ�ਰ�ਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Czech Republic"
-msgstr "��� �ਣਰਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Denmark"
-msgstr "ਡ�ਨਮਾਰ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Djibouti"
-msgstr "ਡ��ਬ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Dominica"
-msgstr "ਡ�ਮ�ਨ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Dominican Republic"
-msgstr "ਡ�ਮ�ਨ��ਨ �ਣਰਾ�਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Ecuador"
-msgstr "��ਵ�ਡਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Egypt"
-msgstr "ਮਿਸਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "El Salvador"
-msgstr "�ਲ ਸਾਲ�ਵਡ�ਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Equatorial Guinea"
-msgstr "ਭ�-�ੰਡ� ���ਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Eritrea"
-msgstr "�ਰ��ਰ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Estonia"
-msgstr "�ਸ��ਨ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ethiopia"
-msgstr "�ਥ�ਪ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Falkland Islands"
-msgstr "ਫਾ�ਲ�ਡ �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Faroe Islands"
-msgstr "ਫਾਰ�� �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Fiji"
-msgstr "ਫਿ�਼�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Finland"
-msgstr "ਫਿਨਲ�ਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "France"
-msgstr "ਫਰਾ�ਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "French Guiana"
-msgstr "ਫਰ�� ���ਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "French Polynesia"
-msgstr "ਫਰ��� ਪ�ਲ�ਸ�ਲ�ਵ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "French Southern Territories"
-msgstr "ਫਰ��� ਦੱ�ਣ� ��ਤਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Gabon"
-msgstr "�ਾਬ�ਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Gambia"
-msgstr "�ਾਬ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "Georgia"
-msgstr "�ਾਰ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "Germany"
-msgstr "�ਰਮਨ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "Ghana"
-msgstr "�ਾਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gibraltar"
-msgstr "��ਬਰਾਲ�ਾਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Greece"
-msgstr "�ਰ�ਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Greenland"
-msgstr "�ਰ�ਨਲ�ਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Grenada"
-msgstr "�ਰ�ਨਾਡਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Guadeloupe"
-msgstr "���ਡ�ਲ�ਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Guam"
-msgstr "���ਮ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Guatemala"
-msgstr "�����ਮਾਲਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Guernsey"
-msgstr "���ਮਸ�ਯਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Guinea"
-msgstr "���ਨ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guinea-Bissau"
-msgstr "���ਨ��-ਬ�ਸ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guyana"
-msgstr "���ਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Haiti"
-msgstr "ਹਾ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Heard And McDonald Islands"
-msgstr "ਹਾਰਡ ਤ� ਮ��ਡਾਨਲਡ �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Holy See"
-msgstr "ਹ�ਲ� ਸ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Honduras"
-msgstr "ਹਾਨਡ�ਰਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Hong Kong"
-msgstr "ਹਾ�� �ਾ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Hungary"
-msgstr "ਹੰ�ਰ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Iceland"
-msgstr "��ਸਲ��ਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "India"
-msgstr "ਭਾਰਤ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Indonesia"
-msgstr "�ੰਡ�ਨ�ਸ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Iran"
-msgstr "�ਰਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Iraq"
-msgstr "�ਰਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Ireland"
-msgstr "��ਰਲ�ਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Isle of Man"
-msgstr "�ਸਲ� �ਫ ਮ�ਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Israel"
-msgstr "��਼ਾਰਾ�ਲ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Italy"
-msgstr "��ਲ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Jamaica"
-msgstr "��ਮਾ��ਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Japan"
-msgstr "�ਾਪਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Jersey"
-msgstr "�਼�ਰਸ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Jordan"
-msgstr "�ਾਰਡਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Kazakhstan"
-msgstr "��਼ਾ�ਸਤਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Kenya"
-msgstr "��ਨ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Kiribati"
-msgstr "��ਰ�ਬਾ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Korea, Democratic People's Republic Of"
-msgstr "��ਰ��, ਲ��ਤੰਤਰ� �ਣਰਾ�਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Korea, Republic Of"
-msgstr "��ਰ�� �ਣਰਾ�਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kuwait"
-msgstr "��ਵ�ਤ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kyrgyzstan"
-msgstr "�ਿਰ�ਸਤਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Laos"
-msgstr "ਲਿ�ਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Latvia"
-msgstr "ਲਾ��ਵਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Lebanon"
-msgstr "ਲ�ਬਨਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Lesotho"
-msgstr "ਲ�ਸ�ਥ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Liberia"
-msgstr "ਲ�ਬਾਰ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Libya"
-msgstr "ਲ�ਬ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Liechtenstein"
-msgstr "ਲ����ਨ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lithuania"
-msgstr "ਲ�ਥ��ਨ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Luxembourg"
-msgstr "ਲ਼�ਸ਼ਬਰ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Macao"
-msgstr "ਮ��ਸ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Macedonia"
-msgstr "ਮ��ਡ�ਨ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Madagascar"
-msgstr "ਮ�ਡਾ�ਾਸ�ਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Malawi"
-msgstr "ਮਾਲਾਵ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Malaysia"
-msgstr "ਮਲ�ਸ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Maldives"
-msgstr "ਮਾਲਦ�ਪ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Mali"
-msgstr "ਮਾਲ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Malta"
-msgstr "ਮਾਲ�ਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Marshall Islands"
-msgstr "ਮਾਰਸ਼ਲ �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Martinique"
-msgstr "ਮਾਰ��ਨ��ਿ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Mauritania"
-msgstr "ਮਾ�ਰ���ਨਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mauritius"
-msgstr "ਮਾ���ਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mayotte"
-msgstr "ਮਾ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Mexico"
-msgstr "ਮ��ਸ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Micronesia"
-msgstr "ਮਾ�ਰ�ਨ�ਸ਼��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Moldova, Republic Of"
-msgstr "ਮ�ਲਡ�ਵਾ �ਣਰਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Monaco"
-msgstr "ਮ�ਨਸ਼��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mongolia"
-msgstr "ਮੰ��ਲ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Montserrat"
-msgstr "ਮ�ਨ�ਸ਼���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Morocco"
-msgstr "ਮ�ਰ�ਸ਼ਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Mozambique"
-msgstr "ਮ��ਾਮਬ��ਿ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Myanmar"
-msgstr "ਮਿ�ਮਾਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Namibia"
-msgstr "ਨ�ਮ�ਬ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Nauru"
-msgstr "ਨ��ਰ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Nepal"
-msgstr "ਨ�ਪਾਲ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Netherlands"
-msgstr "ਨ�ਦਰਲ��ਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Netherlands Antilles"
-msgstr "ਨ�ਦਰਲ��ਡ ���ਲਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "New Caledonia"
-msgstr "ਨਵਾ� �ਾਲ�ਡ�ਨ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "New Zealand"
-msgstr "ਨਿ���ਲ��ਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nicaragua"
-msgstr "ਨਿ�ਾਰ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Niger"
-msgstr "ਨ��਼ਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Nigeria"
-msgstr "ਨ��਼�ਰ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Niue"
-msgstr "ਨ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "Norfolk Island"
-msgstr "ਨ�ਰਫ�� �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Northern Mariana Islands"
-msgstr "�ੱਤਰ� ਮਰ�ਵ��ਨਾ �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Norway"
-msgstr "ਨਾਰਵ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Oman"
-msgstr "�ਮਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Pakistan"
-msgstr "ਪਾ�ਿਸਤਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Palau"
-msgstr "ਪਾਲਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Palestinian Territory"
-msgstr "ਫਿਲ�ਸਤ�ਨ ਭਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Panama"
-msgstr "ਪ�ਨਾਮਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Papua New Guinea"
-msgstr "ਪਾਪ�� ਨਵਾ� ���ਨਿ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Paraguay"
-msgstr "ਪ�ਰ��ਵ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Peru"
-msgstr "ਪ�ਰ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Philippines"
-msgstr "ਫਿਲਿਪ�ਨ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Pitcairn"
-msgstr "ਪਿ�ਸਾਰਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Poland"
-msgstr "ਪ�ਲ��ਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Portugal"
-msgstr "ਪ�ਰਤ�ਾਲ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Puerto Rico"
-msgstr "ਪ��ਰ�� ਰ�ਸ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Qatar"
-msgstr "�ਤਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Reunion"
-msgstr "ਰ�ਯ�ਨ��ਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Romania"
-msgstr "ਰ�ਮਾਨ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Russian Federation"
-msgstr "ਰ�ਸ� �ਣਰਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Rwanda"
-msgstr "ਰਵਾ�ਡਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Saint Kitts And Nevis"
-msgstr "ਸ��� �ਿੱ�ਸ ��ਡ ਨ�ਵਿਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Saint Lucia"
-msgstr "ਸ��� ਲ�ਸ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Saint Vincent And The Grenadines"
-msgstr "ਸ��� ਵ�ਨਸ��� ��ਡ ਦ� �ਰ�ਨਾ-ਡ�ਨਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Samoa"
-msgstr "ਸਾਮ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "San Marino"
-msgstr "ਸਾਨ ਮਾਰ�ਨ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Sao Tome And Principe"
-msgstr "ਸਾ� ��ਮ� ��ਡ ਪ�ਰਿੰਸਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saudi Arabia"
-msgstr "ਸਾ�ਦ� �ਰਬ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Senegal"
-msgstr "ਸ�ਨ��ਾਲ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Serbia And Montenegro"
-msgstr "ਸਰਬ�� ��ਡ ਮ�ਨ����ਰ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Seychelles"
-msgstr "ਸ���ਿਲਸ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "Sierra Leone"
-msgstr "ਸ��ਰ� ਲਿ�ਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Singapore"
-msgstr "ਸਿੰ�ਾਪ�ਰ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Slovakia"
-msgstr "ਸਲ�ਵਾ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Slovenia"
-msgstr "ਸਲ�ਵ�ਨ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Solomon Islands"
-msgstr "ਸ�ਲ�ਮ�ਨ �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Somalia"
-msgstr "ਸ�ਮਾਲ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "South Africa"
-msgstr "ਦੱ�ਣ� �ਫਰ��ਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "ਦੱ�ਣ� �ਾਰ���� ਤ� ਦੱ�ਣ� ਸ�ਡਵਿੱ� �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Spain"
-msgstr "ਸਪ�ਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Sri Lanka"
-msgstr "ਸ�ਰ�ਲੰ�ਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "St. Helena"
-msgstr "ਸ��� ਹ�ਲ�ਨ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "St. Pierre And Miquelon"
-msgstr "ਸ��� ਪ�ਰ��ਰ ਤ� ਮ��ਿ�ਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "Sudan"
-msgstr "ਸ�ਡਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Suriname"
-msgstr "ਸ�ਰ�ਨਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "ਸਵਾਲਬਰਡ �� �ਾਨ ਮਾ�ਯਾਮ �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Swaziland"
-msgstr "ਸਵਾ��ਲ��ਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "Sweden"
-msgstr "ਸਵ�ਡਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Switzerland"
-msgstr "ਸਵਿ�ਰ�ਰਲ��ਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Syria"
-msgstr "ਸ�ਰ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Taiwan"
-msgstr "ਤਾ�ਵਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Tajikistan"
-msgstr "ਤ�ਾ�ਸਤਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Tanzania, United Republic Of"
-msgstr "ਤਨ�ਾਨ���, �ਣਰਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Thailand"
-msgstr "ਥਾ�ਲ��ਡ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Timor-Leste"
-msgstr "��ਮ�ਰ-ਲ�ਸ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Togo"
-msgstr "����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tokelau"
-msgstr "����ਲਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tonga"
-msgstr "��ਨ�ਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Trinidad And Tobago"
-msgstr "�ਰ�ਨ�ਡ ਤ� ��ਬਾ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Tunisia"
-msgstr "��ਨ�ਸ਼��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Turkey"
-msgstr "ਤ�ਰ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Turkmenistan"
-msgstr "ਤ�ਰ�ਸਤਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Turks And Caicos Islands"
-msgstr "ਤ�ਰ� ਤ� �ਾਸ��ਸ �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tuvalu"
-msgstr "��ਵਾਲ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Uganda"
-msgstr "ਯ��ਾ�ਡਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Ukraine"
-msgstr "ਯ��ਰ�ਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "United Arab Emirates"
-msgstr "ਸੰਯ��ਤ ਰਾ� �ਮ�ਰਾਤ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "United Kingdom"
-msgstr "ਬਰਤਾਨ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "United States Minor Outlying Islands"
-msgstr "�ਮਰ��ਾ ਦ� ���� �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uruguay"
-msgstr "�ਰ��ਵ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uzbekistan"
-msgstr "���ਬ�ਸਤਾਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Vanuatu"
-msgstr "ਵਾਨ���"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "Venezuela"
-msgstr "ਵ�ਨ����ਲਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "Viet Nam"
-msgstr "ਵ��ਤਨਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Virgin Islands, British"
-msgstr "ਵਿਰ�ਿਨ �ਾਪ� ਬਰਤਾਨ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Virgin Islands, U.S."
-msgstr "ਵਿਰ�ਿਨ �ਾਪ�, �ਮਰ��ਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Wallis And Futuna Islands"
-msgstr "ਵਾਲਿਸ਼ ਤ� ਫ���ਨਾ �ਾਪ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Western Sahara"
-msgstr "ਦੱ�ਣ� ਸਹਾਰਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Yemen"
-msgstr "ਯਮਨ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Zambia"
-msgstr "���ਬ��"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Zimbabwe"
-msgstr "�ਿੰਬਾਬਾਵ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:467
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:706
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
-msgid "Name"
-msgstr "ਨਾ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
-msgid "AOL Instant Messenger"
-msgstr "AOL ਮ��ਾ ਸ�ਨ�ਹਾ�ਾਰ"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "�ਾਬਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "ਯਾਹ� ਸ�ਨ�ਹ�ਦਾਰ"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "ਯਾਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "�ਡ�-�ਡ� ਸ�ਨ�ਹ�ਦਾਰ"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "�ਡ�-�ਡ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "�ਰ�ੱਪਵਾ��਼"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Skype"
 msgstr "ਸ�ਾ�ਪ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
-msgid "Service"
-msgstr "ਸ�ਵਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:694
-#: ../plugins/save-calendar/csv-format.c:376
-msgid "Location"
-msgstr "�ਿ�ਾਣਾ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
-msgid "Username"
-msgstr "ਯ��਼ਰ ਨਾ�"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "�ੰਮ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "�ਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2297
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2289
 msgid "Other"
 msgstr "ਹ�ਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
-msgid "Yahoo"
-msgstr "ਯਾਹ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Gadu-Gadu"
-msgstr "�ਡ�-�ਡ�"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
-msgid "GroupWise"
-msgstr "�ਰ�ੱਪਵਾ��਼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "ਸਰ�ਤ �ਿਤਾਬ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "ਨਿਯਤ �ਿਤਾਬ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "ਨਵਾ� ਸੰਪਰ� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "ਲਿ�ਣਯ�� ��ਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "ਲ���ਦ� ��ਤਰ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "ਤਬਦ�ਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ਸਬੰਧ ਸੰਪਾਦ� - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
 msgstr "�ਸ ਸੰਪਰ� ਲ� �ਿੱਤਰ ��ਣ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid "_No image"
 msgstr "��� �ਿੱਤਰ ਨਹ��(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2646,43 +1561,43 @@ msgstr ""
 "ਸੰਪਰ� ਡਾ�ਾ �ਲਤ ਹ�:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' �ੱ� �ਲਤ ਫਾਰਮ�� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ਦਾ �ਲਤ ਫਾਰਮ�� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' �ਾਲ� ਹ�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
 msgstr "�ਲਤ ਸੰਬੰਧ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "ਸੰਪਰ� ਤ��-ਸ਼ਾਮਿਲ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "ਪ�ਰਾ ਸ�ਧ�(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "ਪ�ਰਾ ਨਾ�(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "�-ਮ�ਲ(_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�(_S)"
 
@@ -2720,111 +1635,61 @@ msgstr ""
 "�� ਤ�ਸ�� ਸਭ ਸੰਪਰ� ਹ�ਾ�ਣ� �ਾਹ�ੰਦ�\n"
 "ਹ�?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "�ਡਰ�ੱਸ _੨:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "ਸ਼ਹਿਰ(_t):"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "ਦ�ਸ਼(_y):"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "ਪ�ਰਾ �ਡਰ�ੱਸ"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "ਪਿੰਨ ��ਡ(_Z):"
-
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "ਡਾ."
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
+"\n"
+"ਸ�ਰ�ਮਾਨ\n"
+"ਸ�ਰ�ਮਤ�\n"
+"ਸ�ਰ�ਮਤ�\n"
+"��ਮਾਰ�\n"
+"ਡਾ."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "Esq."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
+"\n"
+"ਸ�ਨ�\n"
+"��ਨ�\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "ਪ�ਰਾ ਨਾ�"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "��ਨ��ਰ"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "��ਮਾਰ�"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "ਸ�ਰ�ਮਾਨ"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "ਸ�ਰ�ਮਤ�"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "ਸ�ਰ�ਮਤ�"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "ਸ�ਨ��ਰ"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "ਪਹਿਲਾ�(_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "��ਰ�(_L):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "ਮੱਧ(_M):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "ਪਿ��ਤਰ(_S):"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "IM ��ਾ��� ਸ਼ਾਮਿਲ �ਰ�"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "��ਾ��� ਨਾ�(_A):"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "_IM ਸ�ਵਾ:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
-msgid "_Location:"
-msgstr "�ਿ�ਾਣਾ(_L):"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "<b>Members</b>"
 msgstr "<b>ਮ��ਬਰ</b>"
@@ -2835,9 +1700,9 @@ msgid "Contact List Editor"
 msgstr "ਸੰਪਰ� ਸ��� ਸੰਪਾਦ�"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
+#: ../calendar/gui/e-day-view-time-item.c:812
+#: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
 msgstr "��ਣ�..."
 
@@ -2863,11 +1728,11 @@ msgid "_Members"
 msgstr "ਮ��ਬਰ(_M)"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
 #: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "�ਿਤਾਬ"
 
@@ -2913,27 +1778,27 @@ msgstr ""
 "ਸ਼ਾਮਿਲ ਹ�। �� ਤ�ਸ�� �ਸ ਨ�ੰ �ਿਸ� ਵ� ਤਰਾ� ਸ਼ਾਮਿਲ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "ਮਿਲਾਨ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "ਸੰਪਰ� ਮਿਲਾਨ"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/eab-contact-display.c:871
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "�-ਮ�ਲ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
 #: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "��� ��ਤਰ ਸ਼ਾਮਿਲ"
@@ -2947,35 +1812,35 @@ msgstr "�-ਮ�ਲ �ਸ ਨਾਲ �ਰੰਭ �ਰ�"
 msgid "Name contains"
 msgstr "ਨਾ� ਰੱ�ਦਾ ਹ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "��� ਸੰਪਰ� ਨਹ��"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d ਸੰਪਰ�"
 msgstr[1] "%d ਸੰਪਰ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
 #: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "�ਿ�ਰ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 msgstr "ਬ�ੱ� �ਲ� ਲ�ਣ ਵਿੱ� �ਲਤ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3352
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3549
-#: ../widgets/text/e-text.c:3550
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "ਮਾਡਲ"
 
@@ -2992,105 +1857,103 @@ msgid "Source"
 msgstr "ਸਰ�ਤ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "�ਿਸਮ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
 msgid "Save as vCard..."
 msgstr "vCard �ੰ� ਸੰਭਾਲ�..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1806 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "��ਲ�ਹ�(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "_New Contact..."
 msgstr "ਨਵਾ� ਸੰਪਰ�(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "New Contact _List..."
 msgstr "ਨਵ�� ਸੰਪਰ� ਲਿਸ�(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Save as vCard..."
 msgstr "vCard ਵਾ�� ਸੰਭਾਲ�(_S)...."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contact"
 msgstr "ਸੰਪਰ� �ੱ�� ਭ���(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contacts"
 msgstr "ਸੰਪਰ� �ੱ�� ਭ���(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to Contact"
 msgstr "ਸੰਪਰ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to List"
 msgstr "ਸ��� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contacts"
 msgstr "ਸੰਪਰ� ਨ�ੰ ਸ�ਨ�ਹਾ ਭ���(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "_Print"
 msgstr "ਪਰਿੰ� �ਰ�(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Cop_y to Address Book..."
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� �ਾਪ� �ਰ�(_y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Mo_ve to Address Book..."
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਭ���(_v)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Cu_t"
 msgstr "�ੱ��(_t)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1606
-#: ../calendar/gui/e-calendar-view.c:1820 ../calendar/gui/e-memo-table.c:945
-#: ../composer/e-msg-composer.c:2072 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:940
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "�ਾਪ� �ਰ�(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "P_aste"
 msgstr "��ਪ�(_a)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "��� ���ਾ�ਰ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Unmatched"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "ਸਹਾ��"
 
@@ -3119,8 +1982,8 @@ msgid "Car Phone"
 msgstr "�ਾਰ ਫ�ਨ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3128,7 +1991,7 @@ msgid "Categories"
 msgstr "���ਾ�ਰ���"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Company"
 msgstr "�ੰਪਨ�"
 
@@ -3177,22 +2040,22 @@ msgid "Journal"
 msgstr "�ਰਨਲ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
 msgstr "ਮ�ਨ��ਰ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "ਮ�ਬਾ�ਲ ਫ�ਨ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "�ਮ ਨਾ�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "ਨ��"
 
@@ -3221,14 +2084,14 @@ msgid "Radio"
 msgstr "ਰ�ਡ��"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:710
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "ਰ�ਲ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "ਸਾਥ�"
 
@@ -3258,55 +2121,53 @@ msgstr "ਯ�ਨਿ�"
 msgid "Web Site"
 msgstr "ਵ�ਬ ਸਾ��"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
-#: ../widgets/table/e-table-click-to-add.c:523
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:997
-#: ../widgets/table/e-table-group-container.c:998
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3727 ../widgets/text/e-text.c:3728
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "���ਾ�"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:162
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:990
-#: ../widgets/table/e-table-group-container.c:991
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3735 ../widgets/text/e-text.c:3736
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "��ਾ�"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:170
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "���ਦਰਿਤ ਹ�"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "��ਤਰ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "��ਤਰ ਨਾ�"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "���ਸ� ਮਾਡਲ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "ਨਾ� ਦ� �ਧਿ�ਤਮ ਲੰਬਾ�"
 
@@ -3314,7 +2175,7 @@ msgstr "ਨਾ� ਦ� �ਧਿ�ਤਮ ਲੰਬਾ�"
 msgid "Column Width"
 msgstr "�ਾਲਮ ���ਾ�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3324,7 +2185,7 @@ msgstr ""
 "\n"
 "ਸੰਪਰ� ਦ� ��� �ਾਰ�..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3338,7 +2199,7 @@ msgstr ""
 "\n"
 "�ਾ� �ਥ� ਸੰਪਰ� ਬਣਾ�ਣ ਲ� ਦ� ਵਾਰ ਦਬਾ�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3352,7 +2213,7 @@ msgstr ""
 "\n"
 "�ਥ� ਸੰਪਰ� ਬਣਾ�ਣ ਲ� ਦ� ਵਾਰ ਦਬਾ�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3362,7 +2223,7 @@ msgstr ""
 "\n"
 "ਸੰਪਰ� ਦ� ���।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3372,41 +2233,41 @@ msgstr ""
 "\n"
 "�ਸ �ਲ� ਵਿੱ� ਵ��ਾ� ਲ� ��� ਸ��� ਨਹ�� ਹ�।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "�ਡਪ�ਰ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "�ੰਮ�ਾ�� �-ਮ�ਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "�ਰ �-ਮ�ਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:831
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:825
 msgid "Other Email"
 msgstr "ਹ�ਰ �-ਮ�ਲ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:178
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "��ਣਿ�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:185
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "�ਰਸਰ ਹ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "ਹਮ�ਸ਼ਾ �ਲਾ�ਾਰ� ਵਿੱ� ��ਲ�ਹ�(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
+#: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
 msgstr "ਲਿੰ� �ਿ�ਾਣ� ਦ� ਨ�ਲ(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "�ਸ ਨ�ੰ ਨਵਾ� ਸ�ਨ�ਹਾ ਭ���(_S)..."
 
@@ -3415,96 +2276,101 @@ msgstr "�ਸ ਨ�ੰ ਨਵਾ� ਸ�ਨ�ਹਾ ਭ���(_S)..."
 msgid "Copy _Email Address"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ ਨ�ਲ(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
 msgstr "(ਨ�ਸ਼ਾ)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
 msgstr "ਨ�ਸ਼ਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "ਸ��� ਮ��ਬਰ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "ਵਿਭਾ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "�ਿੱਤਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "ਸਥਿਤ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
 msgstr "ਵ�ਡਿ� �ੱਲਬਾਤ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2523
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2548
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "��ਲੰਡਰ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "ਫ�ਨ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "ਫ��ਸ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "�ਡਰ�ੱਸ"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "ਮ�ੱ� ਸਫਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "ਵ�ਬ ਲਾ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2576
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2580
 msgid "Birthday"
 msgstr "�ਨਮ-ਦਿਨ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2577
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2581
 msgid "Anniversary"
 msgstr "ਵਰ�ਹ� �ੰਢ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
 msgstr "�ੰਮ �ਾ��ਲ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "ਮ�ੱ� ਸਫਾ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Blog"
 
@@ -3559,12 +2425,11 @@ msgstr "ਪ�ਰ����ਾਲ ਸਹਾ�� ਨਹ�� ਹ�"
 
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "ਰੱਦ ��ਤਾ"
 
@@ -3575,13 +2440,13 @@ msgstr "ਰੱਦ ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ �ਸਫਲ"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ ਲਾ�਼ਮ� ਹ�"
 
@@ -3696,7 +2561,7 @@ msgid "Error adding list"
 msgstr "ਸ਼ਾਮਿਲ ਸ��� �ਲਤ�"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "ਸ਼ਾਮਿਲ ਸੰਪਰ� �ਲਤ�"
 
@@ -3713,7 +2578,7 @@ msgid "Error removing list"
 msgstr "ਹ�ਾ�ਣ ਸ��� �ਲਤ�"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "ਹ�ਾ�ਣ ਸੰਪਰ� �ਲਤ�"
 
@@ -3741,7 +2606,7 @@ msgid "Display _All Contacts"
 msgstr "ਸਭ ਸੰਪਰ� ਵ��ਾ�(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3750,46 +2615,46 @@ msgstr ""
 "%s ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�\n"
 "�� �ਸ �ੱਪਰ ਹ� ਲਿ�ਿ� �ਾਵ�?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
 msgstr "�ੱਪਰ ਲਿ��"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "ਸੰਪਰ�"
 msgstr[1] "ਸੰਪਰ�"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "ਸ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "ਸੰਪਰ� ਭ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "ਸੰਪਰ� ਦ� ਨ�ਲ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "ਸੰਪਰ� ਭ���"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "ਸੰਪਰ� ਦ� ਨ�ਲ"
 
@@ -3813,326 +2678,127 @@ msgstr "ਸੰਪਰ� �ਾਣ�ਾਰ�"
 msgid "Contact information for %s"
 msgstr "%s ਲ� ਸੰਪਰ� �ਾਣ�ਾਰ�"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 msgid "Querying Address Book..."
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਦ� �ਾ��..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "�ੱ� ਹ�ਰ ਸੰਪਰ� ਹ�।"
-msgstr[1] "%d ਹ�ਰ ਸੰਪਰ� ਹਨ।"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "ਪ�ਰਾ vCard ਵ���"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "ਥ��ਾ vCard ਵ���"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "ਸ�ਨ�ਹਾ �ਿਤਾਬ ਵਿੱ� ਸੰਭਾਲ�"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "�ਾਰਡ ਵ��ਾ�"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
 #: ../addressbook/importers/evolution-vcard-importer.c:252
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "�ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�...."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "���ਲ�ੱ� CSV �ਾ� ��ਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "���ਲ�ੱ� CSV ਤ� ��ਬ �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "ਮ���ਲਾ CSV �ਾ� ��ਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "ਮ���ਲਾ CSV �ਤ� ��ਬ �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "�ਵ�ਲ�ਸ਼ਨ CSV �ਾ� ��ਬ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ CSV �ਤ� ��ਬ �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ਡਾ�ਾ �ੰਤਰ ਤਬਦ�ਲ� ਫਾਰਮ�� (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ LDIF �ਯਾਤ�ਾਰ"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "Evolution vCard Importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ vCard �ੰਪ�ਰ�ਰ"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 ਬਿੰਦ� ਤਾਹ�ਮਾ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "੮ ਬਿੰਦ� ਤਾਹ�ਮਾ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "�ੰਤ ਤ� �ਾਲ� ਫਾਰਮ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "ਭਾ�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "ਹ�ਠਾ�:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "��ਾਰ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "ਫ���(_o)..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "ਫ���"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "ਪਦਲ��:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "ਫਾਰਮ��"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "ਹ�ੱਡਰ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "ਹ�ੱਡਰ/ਪਦਲ��"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "ਹ�ਡਿੰ�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "ਹਰ ਪੱਤਰ ਲ� ਹ�ਡਿੰ�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "��ਾ�:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "ਹ�ਣ� ਹਰ ਬਾ�ਦ �ਰ�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "ਸ਼ਾਮਿਲ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "ਲ�ਡਸ��ਪ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "�ੱਬਾ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "ਪਾਸ� ਤ� ਪੱਤਰ ��ਬਾ�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "ਹਾਸ਼��"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "�ਾਲਮਾ� ਦ� �ਿਣਤ�:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "��ਣ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "ਸਥਿਤ�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "ਸਫਾ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "ਸ�ਾ ਨਿਰਧਾਰਨ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "ਸਫਾ"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "ਸ�ਾ ਸਰ�ਤ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "ਪ�ਰ�ਰ��"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "�ਲ�:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "ਸਲ��� �ਾ� ਨਾਲ ਪਰਿੰ� �ਰ�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "�ਿਸਤ ਸਫਿ�� ਤ� �ਲ�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "ਸੱ�ਾ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "�ੰਡ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "�ਾ�"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "��ਾਰ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "�ੱ� ਨਵ�� ਸ�� ਸ਼�ਰ� �ਰ�"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "ਸ਼�ਲ� ਨਾ�:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "�ਪਰ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
-msgid "Type:"
-msgstr "�ਿਸਮ:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "���ਾ�:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "ਫ���(_F)..."
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "ਫਾ�ਲ ਨਹ�� ��ਲ� �ਾ ਸ�� ਹ�"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਦ� ਸ��� ਨ�ੰ ਪ�ਰਾਪਤ ਨਹ�� ��ਤ� �ਾ ਸ��"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "�ਿਤਾਬ ਨ�ੰ ��ਲਣ ਵਿੱ� �ਸਫਲ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "ਸ���ਡਰਡ ���ਪ�ੱ� ਫਾ�ਲ ਦ� ਬ�ਾ� ���ਪ�ੱ� ਫਾ�ਲ ਨਿਰਧਾਰਿਤ �ਰ�"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
 msgstr "ਸਥਾਨ� �ਡਰ�ੱਸ ਫ�ਲਡਰਾ� ਦ� ਸ���"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "�ਾਰਡ vcard �ਾ� csv ਫਾ�ਲ ਵਾ�� ਵ��ਾ�"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard।csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "�ਸਿ�ਰ�ਨਾ��਼ ਮ�ਡ ਵਿੱ� ਨਿਰਯਾਤ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "�ੱ� ���ਪ�ੱ� ਫਾ�ਲ ਵਿੱ� �ਸ�ਰ�ਨਸ ਮ�ਡ ਵਿੱ� �ਾਰਡਾ� ਦ� �ਿਣਤ�, ਡਿਫਾਲ� ��ਾਰ 100 ਹ�।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "ਨੰਬਰ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:99
 msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "�ਮਾ�ਡ ਲਾ�ਨ �ਰ��ਮਿੰ� �ਲਤ�, �ਿਰਪਾ �ਰ�� ਵ��ਣ ਲ�--help ਵਰਤ��"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "ਸਿਰਫ csv �ਾ� vcard ਫਾਰਮ�� ਵਰਤ��।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In async mode, output must be file."
 msgstr "�ਸਿ�ਰ�ਨਾ��਼ ਮ�ਡ ਵਿੱ� ���ਪ�ੱ� �ੱ� ਫਾ�ਲ ਹ�ਣ� ਲਾ�ਮ� ਹ�।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 msgid "In normal mode, there is no need for the size option."
 msgstr "ਸਧਾਰਨ ਮ�ਡ ਵਿੱ�, ��ਾਰ ��ਣ ਦ� ਲ�� ਨਹ�� ਹ�।"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "Unhandled error"
 msgstr "�ਣਪ�ਾਤ� �ਲਤ�"
 
@@ -4524,7 +3190,7 @@ msgstr "ਤ�ਹਾਡ� �ੰਮ �ਵ�ਲ�ਸ਼ਨ ਦ� ਮ�� �
 msgid "_Discard Changes"
 msgstr "ਤਬਦ�ਲ��� ਰੱਦ(_D)"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "ਸੰਭਾਲ�(_S)"
 
@@ -4546,56 +3212,56 @@ msgstr "ਸ��ਨਾ ਭ���(_S)"
 msgid "{0}."
 msgstr "{0}"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "ਬਹ�-ਦਿਨ �ਾਰਵਾ��� ਨ�ੰ ਵੱ� �ਰ�:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1019
-#: ../calendar/conduits/todo/todo-conduit.c:1020
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server ਨ�ੰ ਸ਼�ਰ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "ਪਾ�ਲ� ��ਲੰਡਰ �ਾਰ� ਭਾ� ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr "ਪਾ�ਲ� ਦਾ ਮ�ਮ� �ਾਰ� ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr "ਪਾ�ਲ� ਦਾ ਮ�ਮ� �ਾਰ� ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "ਮ�ਲ ਪਹਿਲ:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
-#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "ਪਾ�ਲ� ਦਾ �ੰਮ �ਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
-#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 msgid "Could not write pilot's ToDo application block"
 msgstr "ਪਾ�ਲ� ਦਾ �ਰਨ ਵਾਲਾ ਹਿੱਸਾ ਪ�ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
 msgstr "��ਲੰਡਰ ਤ� �ੰਮ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:869
-#: ../calendar/gui/calendar-component.c:1291
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "��ਲੰਡਰ"
 
@@ -4636,24 +3302,24 @@ msgid "Memo_s"
 msgstr "ਮ�ਮ�(_s)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
-#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:350
-#: ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "ਮ�ਮ�"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "�ੰਮ"
@@ -4664,7 +3330,7 @@ msgstr "��ਲੰਡਰ(_C)"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "�ੰਮ(_T)"
 
@@ -4672,27 +3338,27 @@ msgstr "�ੰਮ(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਲੰਡਰ ��ਤਾਵਨ� �ਿੱਪਣ� ਸ�ਵਾ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ਮਿੰ�"
 msgstr[1] "ਮਿੰ�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/caldav/caldav-source.c:431
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:653
-#: ../plugins/google-account-setup/google-contacts-source.c:376
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:294
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:721
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "�ੰ��"
 msgstr[1] "�ੰ��"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "ਸ਼�ਰ� ਸਮਾ�"
 
@@ -4707,10 +3373,10 @@ msgstr "ਸਭ ਮਨਸ��(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "�ਿ�ਾਣਾ:"
 
@@ -4723,11 +3389,11 @@ msgid "_Dismiss"
 msgstr "ਮਨਸ��(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1382
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
+#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
@@ -4743,32 +3409,32 @@ msgstr "ਬ��ਾਰ(_S)"
 msgid "location of appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਦਾ �ਿ�ਾਣਾ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
 msgid "No summary available."
 msgstr "��� ਸੰ��ਪ �ਾਣ�ਾਰ� �ਪਲੱਬਧ ਨਹ� ਹ�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
 msgid "No description available."
 msgstr "��� ਵ�ਰਵਾ �ਪਲੱਬਧ ਨਹ� ਹ�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1487
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No location information available."
 msgstr "��� �ਿ�ਾਣਾ �ਾਣ�ਾਰ� �ਪਲੱਬਧ ਨਹ� ਹ�।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
 #, c-format
 msgid "You have %d alarms"
 msgstr "ਤ�ਹਾਡ� ਲ� %d �ਲਾਰਮ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "��ਤਾਵਨ�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4780,7 +3446,7 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ �ੱ� ਸਧਾਰਨ ਯਾਦ-ਪੱਤਰ ਪ�ੱ��ਿੱ� ਬ�ਸਾ ਹ�\n"
 "ਵ��ਾ ਸ����।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4796,7 +3462,7 @@ msgstr ""
 "\n"
 "�� ਤ�ਸ�� �ਸ �ਾਰ� ਨ�ੰ �ਲਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "�ਸ �ਾਰ� ਬਾਰ� ਮ�ਨ�ੰ ਮ�� ਨਾ ਪ�ੱ��।"
 
@@ -4869,157 +3535,170 @@ msgid "Calendars to run alarms for"
 msgstr "�ਲਾਰਮ �ਲਾ�ਣ ਲ� ��ਲੰਡਰ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Check this to use system timezone in Evolution."
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸਿਸ�ਮ ਸਮਾ� ਵਰਤਣ ਲ� �ਹ ��ੱ� �ਰ�।"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "ਸਮਾ� ਰ��ਾ ਵਿੱ� ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ �ਿੱ�ਣ ਲ� ਰੰ� (ਮ�ਲ �ਾਲ� ਹ�)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਲ� ਰੰ� ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਹਫਤ� ਸਮ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "ਤੱਥ �ੱਢਣ ਸਮ�� ਪ�ਸ਼��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr "ਨਵ�� �ਵ��� ਲ� ਡਿਫਾਲ� ਮ��-ਵਾਪਰਨ ਦ� �ਿਣਤ�। -1 ਦਾ �ਰਥ ਹ� ਹਮ�ਸ਼ਾ� ਲ�।"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "ਦਿਨ, �ਿੰਨਾ ਤ�� �ਾਰ��ਾਰ� �ੰ�� ਸ਼�ਰ� �ਤ� �ੰਤ ਹ�ੰਦ� ਹਨ, ਵ��ਾ�ਣ ਲ਼�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "ਮ�ਲ ਮ�ਲਾ�ਾਤ ਯਾਦ-ਪੱਤਰ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#| msgid "Default reminder units"
+msgid "Default recurrence count"
+msgstr "ਡਿਫਾਲ� ਦ�ਹਰਾ�ਣ �ਿਣਤ�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
-msgstr "ਮ�ਲ ਯਾਦ-ਪੱਤਰ ���ਮਾ�"
+msgstr "ਡਿਫਾਲ� ਰ�ਮਾ�ਡਰ ਯ�ਨਿ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
 msgstr "ਮ�ਲ ਯਾਦਪੱਤਰ ਮ�ੱਲ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
 msgstr "�ਲਾਰਮ �ਡ�� ਫਾ�ਲਾ� ਨ�ੰ ਸੰਭਾਲਣ ਲ� ਡਾ�ਰ���ਰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Gradient"
 msgstr "��ਨਾ ਰ�ਪ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Event Transparency"
 msgstr "��ਨਾ ਪਾਰਦਰਸ਼ਤਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� ਸਰਵਰ URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�� ��ਪਲ�� URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Gradient of the events in calendar views."
 msgstr "��ਲੰਡਰ �ਲ� ਵਿੱ� ��ਨਾਵਾ� ਵਿੱ� ਢਾ�ਲ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide completed tasks"
 msgstr "ਮ��ੰਮਲ �ੰਮ �ਹਲ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task units"
 msgstr "�ੰਮ ���ਮਾ� �ਹਲ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
 msgstr "�ੰਮ ਮ�ੱਲ �ਹਲ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Horizontal pane position"
 msgstr "�ਿਤਿ�� ਪੱ�� ਸਥਿਤ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "�ਾਰ��ਾਰ� ਦਿਨ �ੰਤ ਹ�ਣ ਤ�� �ੰ��, ��ਵ�� �ੰ�ਾ ਫਾਰਮ�� ਵਿੱ� ੦ ਤ�� ੨੩"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "�ਾਰ��ਾਰ� ਦਿਨ ਸ਼�ਰ� ਹ�ਣ ਤ�� �ੰ��, ��ਵ�� �ੰ�ਾ ਫਾਰਮ�� ਵਿੱ� ੦ ਤ�� ੨੩"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "ਦਿਨ �ਤ� �ੰਮ ਦ� ਹਫਤਾ �ਲ� ਵਿੱ� �ੰਤਰਾਲ, ਮਿੰ� ਵਿੱ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Last alarm time"
 msgstr "��ਰ� �ਲਾਰਮ ਸਮਾ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Level beyond which the message should be logged."
 msgstr "ਲ�ਵਲ, �ਿਸ ਤ�� ਬਾ�ਦ ਸ�ਨ�ਹਾ ਲਾ� '� ਰੱ�ਿ� �ਾਵ��ਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "List of recently used second time zones in a Day View."
 msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਤਾ�਼ਾ ਵਰਤ� ਦ��� ਸਮਾ�-��ਤਰ ਦ� ਲਿਸ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of server URLs for free/busy publishing."
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� ਪਬਲ���ਸ਼ਨ ਲ� ਸਰਵਰ URL ਦ� ਸ��� ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line"
 msgstr "ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਰੰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line Color - Day View"
 msgstr "ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਰੰ� - ਦਿਨ �ਲ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ ਰੰ� - ਸਮਾ� ਰ��ਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr "'day_second_zones' ਵਿੱ� ਯਾਦ ਰੱ�ਣ ਲ� ਤਾ�਼ਾ ਵਰਤ� ਸਮਾ�-��ਤਰਾ� ਦ� ਵੱਧ�-ਵੱਧ �ਿਣਤ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Maximum number of recently used timezones to remember."
 msgstr "ਯਾਦ ਰੱ�ਣ ਲ� ਤਾ�਼ਾ ਵਰਤ� ਸਮਾ�-��ਤਰਾ� ਦ� ਵੱਧ�-ਵੱਧ �ਿਣਤ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "�ੰਮ ਦਿਨ ਦ� ਮਿੰ� �ਤਮ ਹ�ਣ, ੦ ਤ�� ੫੯"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "�ੰਮ ਦਿਨ ਦ� ਮਿੰ� ਸ਼�ਰ� ਹ�ਣ, ੦ ਤ�� ੫੯"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Month view horizontal pane position"
 msgstr "�ਿਤਿ�� ਪਾਸ� ਦ� ਸਥਿਤ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view vertical pane position"
 msgstr "ਮਹ�ਨਾ ਦਿੱ� ਲੰਬ�ਾਰ� ਪੱ�� ਸਥਿਤ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Number of units for determining a default reminder."
 msgstr "ਮ�ਲ ਯਾਦ-ਪੱਤਰ �ਾਣਨ ਲ� ���ਮਾ� ਦ� �ਿਣਤ� ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining when to hide tasks."
 msgstr "�ੰਮ �ਹਲ� �ਰਨ ਦਾ ਪਤਾ �ਰਨ ਲ� ���ਮਾ� ਦ� �ਿਣਤ� ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Overdue tasks color"
 msgstr "ਮਿ�ਦ ਪ�ੱ�� �ੰਮ ਦਾ ਰੰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -5027,7 +3706,7 @@ msgstr ""
 "�ਿਤਿ�� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, �� "
 "�ਿ ਮਹ�ਨਾ ਨਾ ਦਿੱ� ਹ�ਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5035,19 +3714,19 @@ msgstr ""
 "�ਿਤਿ�� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, �� "
 "�ਿ ਮਹ�ਨਾ ਦਿੱ� ਹ�ਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ�, �� �ਿ ��ਲੰਡਰ ਸ��� �ਤ� ਮਿਤ� ਨ�ਵ����ਰ ��ਲੰਡਰ ਬਾਹ� ਵਿੱ� ਵਿੱ� ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr "�ੰਮ ਸ��� �ਤ� �ੰਮ �ਾਤ� ਵਿੱ�, ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲ ਵਿੱ� ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5055,7 +3734,7 @@ msgstr ""
 "ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲਾ� ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ� ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, "
 "�ਦ�� �ਿ ਮਹ�ਨਾ ਦਿੱ� ਹ�ਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5063,83 +3742,102 @@ msgstr ""
 "ਲੰਬ�ਾਰ� ਬਾਹ� ਦ� ਸਥਿਤ� ਪਿ�ਸਲਾ� ਵਿੱ�, �� �ਿ ਦਿੱ� �ਤ� ਮਿਤ� ��ਲੰਡਰ �ਤ� �ੰਮ ਸ��� ਵਿੱ� ਹ�ੰਦ� ਹ�, "
 "�ਦ�� �ਿ ਮਹ�ਨਾ ਦਿੱ� ਨਾ ਹ�ਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#| msgid "Print this calendar"
+msgid "Primary calendar"
+msgstr "ਪ�ਰਾ�ਮਰ� ��ਲੰਡਰ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#| msgid "New memo list"
+msgid "Primary memo list"
+msgstr "ਪ�ਰਾ�ਮਰ� ਮ�ਮ� ਲਿਸ�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#| msgid "New task list"
+msgid "Primary task list"
+msgstr "ਪ�ਰਾ�ਮਰ� �ਾਸ� ਲਿਸ�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Programs that are allowed to be run by alarms."
 msgstr "�ਲਾਰਮ ਵਲ�� �ੱਲਣ ਵਾਲ� �ਾਰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Recently used second time zones in a Day View"
 msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਵਰਤ� ਤਾ�਼ਾ ਦ��� ਸਮਾ� �਼�ਨ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Save directory for alarm audio"
 msgstr "�ਲਾਰਮ �ਡ�� ਲ� ਡਾ�ਰ���ਰ� ਸੰਭਾਲ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Scroll Month View by a week"
+msgstr "ਮਹ�ਨਾ �ਲ� ਨ�ੰ ਹਫ਼ਤ� ਰਾਹ�� �ੱ�� ਪਿੱ�� �ਰ�"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� RSVP ��ਤਰ ਵ��ਾ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show Role field in the event/task/meeting editor"
-msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਰ�ਲ ��ਤਰ ਵ��ਾ�"
+msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਰ�ਲ ��ਤਰ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show appointment end times in week and month views"
-msgstr "ਹਫਤਾ ਤ� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਮ�ਲਾ�ਾਤ �ੰਤ ਸਮਾ� ਵ��ਾ�"
+msgstr "ਹਫਤਾ ਤ� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਮ�ਲਾ�ਾਤ �ੰਤ ਸਮਾ� ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show categories field in the event/meeting/task editor"
-msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ���ਾ�ਰ� ��ਤਰ ਵ��ਾ�"
+msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ���ਾ�ਰ� ��ਤਰ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show display alarms in notification tray"
-msgstr "ਸ��� �ਰ� ਵਿੱ� �ਲਾਰਮ ਵ��ਾ�"
+msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ� ਵਿੱ� �ਲਾਰਮ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Show status field in the event/task/meeting editor"
-msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਹਾਲਤ ��ਤਰ ਵ��ਾ�"
+msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਹਾਲਤ ��ਤਰ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show the \"Preview\" pane"
-msgstr "\"�ਲ�\" ਪ�ਨ ਵ��ਾ�"
+msgstr "\"�ਲ�\" ਪ�ਨ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show the \"Preview\" pane."
-msgstr "\"Preview (�ਲ�)\" ਪੱ�� ਵ��ਾ�।"
+msgstr "\"Preview (�ਲ�)\" ਪੱ�� ਵ���।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show timezone field in the event/meeting editor"
-msgstr "��ਨਾ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਸਮਾ� ��ਤਰ ਵ��ਾ�"
+msgstr "��ਨਾ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਸਮਾ� ��ਤਰ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show type field in the event/task/meeting editor"
-msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਲਿ�ਣ ��ਤਰ ਵ��ਾ�"
+msgstr "��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਲਿ�ਣ ��ਤਰ ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show week number in Day and Work Week View"
 msgstr "ਦਿਨ �ਤ� �ੰਮ ਹਫ਼ਤ� �ਲ� ਵਿੱ� ਹਫ਼ਤਾ �ਿਣਤ� ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show week numbers in date navigator"
-msgstr "ਮਿਤ� ਨ�ਵ����ਰ ਵਿੱ� ਹਫਤਾ �ੰ� ਵ��ਾ�"
+msgstr "ਮਿਤ� ਨ�ਵ����ਰ ਵਿੱ� ਹਫਤਾ �ੰ� ਵ���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਦ��ਾ ਸਮਾ�-��ਤਰ ਵ��ਣਾ �� ਸ�ੱ� ��ਤਾ ਤਾ�। ਮ�ੱਲ 'timezone' ��ੰ�� ਵਿੱ� ਵਰਤ� ਵਾ�� ਹ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Tasks due today color"
 msgstr "�ੱ� ਦ� �ੰਮ ਦਾ ਰੰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Tasks vertical pane position"
 msgstr "�ੰਮ ਲੰਬ�ਾਰ� ਬਾਹ� ਸਥਿਤ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5148,7 +3846,7 @@ msgstr ""
 "ਵ�ਹਲਾ/ਰ��ਿ� ਵਾ�� ਵਰਤਣ ਲ਼� URL ��ਪਲ�� ਡਾ�ਾ, %u ਨ�ੰ ਪੱਤਰ �ਡਰ�ੱਸ ਦ� ਯ��਼ਰ ��ਤਰ �ਤ� %d ਨ�ੰ ਡ�ਮ�ਨ ਨਾਲ "
 "ਤਬਦ�ਲ �ਰ ਦਿੱਤਾ �ਾਵ��ਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5156,68 +3854,88 @@ msgstr ""
 "��ਲੰਡਰ ਵਿੱ� ਵਰਤਣ ਲ� ਮਿਤ� ਤ� ਸਮਾ� ਲ� ਮ�ਲ ਸਮਾ�-��ਤਰ, �ੱ� ਨਾ-�ਨ�ਵਾਦ �ਲਸ�ਨ ਸਮਾ�-��ਤਰ ਡਾ�ਾਬ�ਸ "
 "��ਤਰ, �ਿਵ�� �ਿ \"America/New York\" �ਦਿ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "The second timezone for a Day View"
 msgstr "ਦਿਨ �ਲ� ਵਿੱ� ਦ��ਾ ਸਮਾ�-��ਤਰ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr "ਤਿੰਨ ਸੰਭਵ ਮ�ੱਲ ਹਨ। �ਲਤ��� ਲ� 0। ��ਤਾਵਨ� ਲ� 1। ਡ�ਬੱ� ਸ�ਨ�ਹਾ ਲ� 2।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Time divisions"
 msgstr "ਸਮਾ� ਵੰਡ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Time the last alarm ran, in time_t."
 msgstr "ਸਮਾ� �ਦ�� �ਲਾਰਮ �ੱਲਿ�, ਸਮ�� ਵਿੱ�(_t)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-#: ../plugins/startup-wizard/startup-wizard.c:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Timezone"
 msgstr "ਸਮਾ�-��ਤਰ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr "��ਲੰਡਰ �ਲ� ਵਿੱ� ��ਨਾਵਾ� ਵਿੱ� ਪਾਰਦਰਸ਼ਤਾ, ਮ�ੱਲ 0 (ਪਾਰਦਰਸ਼�) �ਤ� 1 (ਧ�ੰਧਲਾ)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Twenty four hour time format"
 msgstr "��ਵ�� �ੰ�ਾ ਸਮਾ� ਫਾਰਮ��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr "ਹਾ�ਲਾ�� (\"ਪ�ਰਾ�ਮਰ�\") ��ਲੰਡਰ ਲ� URI"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr "ਹਾ�ਲਾ�� (\"ਪ�ਰਾ�ਮਰ�\") ਮ�ਮ� ਲਿਸ� ਲ� URI"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr "ਹਾ�ਲਾ�� (\"ਪ�ਰਾ�ਮਰ�\") �ਾਸ� ਲ� URI"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "ਮ�ਲ ਯਾਦਪੱਤਰਾ� ਲ� ���ਮਾ� ਹਨ, \"ਮਿੰ�\", \"�ੰ��\" or \"ਦਿਨ\""
+msgstr "ਮ�ਲ ਰ�ਮਾ�ਡਰ ਲ� ���ਮਾ� ਹਨ, \"ਮਿੰ�\", \"�ੰ��\" or \"ਦਿਨ\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "�ੰਮ �ਹਲ� �ਰਨ ਲ� �ਾਣਨ ਲ� ���ਮਾ�, \"ਮਿੰ�\", \"�ੰ��\" �ਾ� \"ਦਿਨ\""
+msgstr "�ਾਸ� �ਹਲ� �ਰਨ ਲ� �ਾਣਨ ਲ� ���ਮਾ�, \"ਮਿੰ�\", \"�ੰ��\" �ਾ� \"ਦਿਨ\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#| msgid "_Use system defaults"
+msgid "Use system timezone"
+msgstr "ਸਿਸ�ਮ �ਾ�ਮ-�਼�ਨ ਵਰਤ��"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ��ਣ� ਸਮਾ�-��ਤਰ ਦ� ਬ�ਾ� ਸਿਸ�ਮ ਸਮਾ�-��ਤਰ ਵਰਤ��"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Week start"
 msgstr "ਹਫਤਾ ਸ਼�ਰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "ਹਫਤਾ ਸ਼�ਰ� ਹ�ਣ ਦਾ ਦਿਨ, �ਤਵਾਰ (੦) ਤ�� ਸ਼ਨਿ�ੱਰਵਾਰ (੬)।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "�ਲਾਰਮ ਵ��ਾ�ਣ ਲ� ਸ��ਨਾ ਪੱ�� ਵਿੱ� ਵਰਤਿ� �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "�� ਮ�ਲਾ�ਾਤ �ਾ� �ੰਮ ਹ�ਾ�ਣ ਤ� ਪ�ਸ਼�� �ਰਵਾ� �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "�� ਮ�ਲ�ਾਤ �ਾ� �ੰਮ ਹ�ਾ�ਣ ਤ� ਪ�ਸ਼�� �ਰਵਾ� �ਾਵ� �ਾ� ਨਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5225,141 +3943,142 @@ msgstr ""
 "�� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਹਫਤਿ�� ਨ�ੰ �ੱ�ਠਾ �ਰਨਾ ਹ� ਤਾ� �ਿ ਸ਼ਨਿ�ੱਰਵਾਰ �ਤ� �ਤਵਾਰ ਨ�ੰ �ੱ� ਦਿਨ ਦ� ਤ�ਰ ਤ� "
 "ਵ��ਾ�� �ਾਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "�� ਹਫਤਾ ਤ� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ��ਨਾ ਦਾ ਸਮਾ� �ੰਤ ਵ��ਾ�ਣਾ ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "�� ��ਲੰਡਰ ਵਿੱ� ਮਾਰ��ਸ ਬ��ਸ ਰ��ਾ (ਮ���ਦਾ ਸਮ�� ਦ� ਰ��ਾ) �ਿੱ�ਣ� ਹ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "�� ਮ��ੰਮਲ �ੰਮਾ� ਨ�ੰ �ੰਮ ਦਿੱ� ਵਿੱ� �ਹਲ� ��ਤ� �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "�� ਮਹ�ਨਾ �ਲ� ਨ�ੰ ਹਫ਼ਤ� ਰਾਹ�� ਹਿਲਾ�ਣਾ ਹ� ਨਾ �ਿ ਮਹ�ਨ� ਨਾਲ।"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Whether to set a default reminder for appointments."
-msgstr "�� ਮ�ਲਾ�ਾਤ ਲ� ਮ�ਲ ਯਾਦਪੱਤਰ ਲ�ਾ�� �ਾਵ� �ਾ� ਨਾ।"
+msgstr "�� ਮ�ਲਾ�ਾਤ ਲ� ਮ�ਲ ਰ�ਮਾ�ਡਰ ਲ�ਾ�� �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� RSVP ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "�� ��ਨਾ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ���ਾ�ਰ� ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਰ�ਲ ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਹਾਲਤ ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "�� ਸਮਾ� ਸਵ�ਰ�/ਸ਼ਾਮ ਦ� ਬ�ਾ� ੪ �ੰ�ਿ�� ਵਿੱ� ਵ��ਾ�� �ਾਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� ਸਮਾ� ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "�� ��ਨਾ/�ੰਮ/ਮ��ਿੰ� ਸੰਪਾਦ� ਵਿੱ� �ਿਸਮ ��ਤਰ ਵ��ਾ�ਣਾ ਹ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "�� ਦਿਨ �ਤ� �ੰਮ ਹਫ਼ਤਾ �ਲ� ਵਿੱ� ਹਫ਼ਤਾ ਨੰਬਰ ਵ��ਾ�� �ਾਵ�।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to show week numbers in the date navigator."
 msgstr "�� ਮਿਤ� �ਲ� ਦ�ਰਾਨ ਹਫਤ� ਦਾ �ੰ� ਵ��ਾ�� �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "�� ��ਨਾ ਵ��ਾ�ਣ ਦ�ਰਾਨ ਦਿਨ-ਰਾਤ ਸੰਭਾਲਣ ਸਮਾ� ਦ� ਵਰਤ�� �ਰਨ� ਹ�।"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Work days"
 msgstr "�ਾਰ�� ਦਿਨ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Workday end hour"
 msgstr "�ਾਰ��ਾਰ� �ੰਤ �ੰ�ਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Workday end minute"
 msgstr "�ਾਰ��ਾਰ� �ੰਤ ਮਿੰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Workday start hour"
 msgstr "�ਾਰ�ਾ�ਰ� ਸ਼�ਰ� �ੰ�ਾ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Workday start minute"
 msgstr "�ਾਰ��ਾਰ� ਸ਼�ਰ� ਮਿੰ�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "daylight savings time"
-msgstr "ਦਿਨ-ਰਾਤ ਸੰਭਾਲਣ ਸਮਾ�"
+#: ../calendar/gui/cal-editor-utils.c:100
+#| msgid "Invalid contact."
+msgid "Invalid object"
+msgstr "�ਲਤ �ਬ����"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "ਸੰ��ਪ ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "ਵ�ਰਵ� ਵਿੱ� ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "���ਾ�ਰ� ਹ�"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "�ਿੱਪਣ� ਵਿੱ� ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
 msgstr "�ਿ�ਾਣਾ ਵਿੱ� ਸ਼ਾਮਿਲ"
 
-#: ../calendar/gui/cal-search-bar.c:640
+#: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
 msgstr "�ੱ�� ੭ ਦਿਨ ਦ��� �ਾਸ�ਾ�"
 
-#: ../calendar/gui/cal-search-bar.c:644
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
 msgstr "���ਿਵ �ਾਸ�"
 
-#: ../calendar/gui/cal-search-bar.c:648
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Overdue Tasks"
 msgstr "ਮਿ�ਦ ਪ�ੱ���� �ਾਸ�ਾ�"
 
-#: ../calendar/gui/cal-search-bar.c:652
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Completed Tasks"
 msgstr "ਸਮਾਪਤ �ਾਸ�"
 
-#: ../calendar/gui/cal-search-bar.c:656
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Tasks with Attachments"
 msgstr "�����ਮਿੰ� ਨਾਲ �ਾਸ�"
 
-#: ../calendar/gui/cal-search-bar.c:702
+#: ../calendar/gui/cal-search-bar.c:698
 msgid "Active Appointments"
 msgstr "���ਿਵ ਮ�ਲਾ�ਾਤ"
 
-#: ../calendar/gui/cal-search-bar.c:706
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
 msgstr "��ਲ� ੭ ਦਿਨ ਦ��� ਮ�ਲਾ�ਾਤਾ�"
 
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "ਪਰਿੰ� �ਰ�"
 
-#: ../calendar/gui/calendar-commands.c:315
+#: ../calendar/gui/calendar-commands.c:331
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5368,137 +4087,126 @@ msgstr ""
 "�ਹ ��ਣ� ਸਮ�� ਤ�� ਪ�ਰਾਣ��� ��ਨਾਵਾ� ਨ�ੰ ਹਮ�ਸ਼ਾ ਲ� ਹ�ਾ ਦ�ਵ��ਾ। ���ਰ ਤ�ਸ�� �ਾਰ� ਰਹ� ਤਾ�, �ਹ ��ਨਾਵਾ� "
 "ਮ�� ਪ�ਰਾਪਤ ਨਹ�� ਹ� ਸ�ਣ����।"
 
-#: ../calendar/gui/calendar-commands.c:321
+#: ../calendar/gui/calendar-commands.c:337
 msgid "Purge events older than"
 msgstr "�ਸ ਤ�� ਪ�ਰਾਣ��� ��ਨਾਵਾ� ਸ�ਧ�"
 
-#: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/caldav/caldav-source.c:432
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:654
-#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../calendar/gui/calendar-commands.c:342
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:722
+#: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "ਦਿਨ"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web source group
-#. ensure the group name is in current locale, not read from configuration
-#. Create the source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#. ensure the group name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:287
-#: ../calendar/gui/calendar-component.c:290
-#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
-#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
-#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
-#: ../calendar/gui/tasks-component.c:243
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "ਵ�ੱਬ ਤ�"
 
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:331
-#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "�ਨਮ-ਦਿਨ ਤ� ਵਰ�-�ੰਢ"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:346
-#: ../calendar/gui/calendar-component.c:349
+#: ../calendar/gui/calendar-component.c:195
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "ਮ�ਸਮ"
 
-#: ../calendar/gui/calendar-component.c:676
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "�ਨਮ-ਦਿਨ ਤ� ਵਰ�-�ੰਢ"
+
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "ਨਵਾ� ��ਲੰਡਰ(_N)"
 
-#: ../calendar/gui/calendar-component.c:677
-#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
-#: ../mail/em-folder-tree.c:2124
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "ਨ�ਲ(_C)..."
 
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
 msgid "_Make available for offline use"
 msgstr "�ਫਲਾ�ਨ ਵਰਤ�� ਲ� �ਪਲੱਬਧ �ਰਵਾ�(_M)"
 
-#: ../calendar/gui/calendar-component.c:683
-#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
 msgid "_Do not make available for offline use"
 msgstr "�ਫਲਾ�ਨ ਵਰਤ�� ਲ� �ਪਲੱਬਧ ਨਾ �ਰਵਾ�(_D)"
 
-#: ../calendar/gui/calendar-component.c:1013
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
 msgstr "��ਲੰਡਰ ਦਾ �ੱਪ�ਰ�ਡ �ਸਫਲ"
 
-#: ../calendar/gui/calendar-component.c:1142
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ� ਬਣਾ�ਣ ਲ� ��ਲੰਡਰ '%s' ��ਲਣ ਵਿੱ� �ਸਫਲ"
 
-#: ../calendar/gui/calendar-component.c:1158
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr "ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ� ਬਣਾ�ਣ ਲ� ��ਲੰਡਰ ਨਹ�� ਹ�"
 
-#: ../calendar/gui/calendar-component.c:1271
+#: ../calendar/gui/calendar-component.c:1218
 msgid "Calendar Source Selector"
 msgstr "��ਲੰਡਰ ਸਰ�ਤ ��ਣ�ਾਰ"
 
-#: ../calendar/gui/calendar-component.c:1487
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
 msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ"
 
-#: ../calendar/gui/calendar-component.c:1488
+#: ../calendar/gui/calendar-component.c:1434
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ(_A)"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
 msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ ਬਣਾ�"
 
-#: ../calendar/gui/calendar-component.c:1495
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "ਨਵ�� ਮ��ਿੰ�"
 
-#: ../calendar/gui/calendar-component.c:1496
+#: ../calendar/gui/calendar-component.c:1442
 msgctxt "New"
 msgid "M_eeting"
 msgstr "ਮ��ਿੰ�(_e)"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "ਨਵ�� ਮ��ਿੰ� ਲ� ਬ�ਨਤ�"
 
-#: ../calendar/gui/calendar-component.c:1503
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "ਨਵ�� ਸਾਰ� ਦਿਨ ਦ� ਮ�ਲਾ�ਾਤ"
 
-#: ../calendar/gui/calendar-component.c:1504
+#: ../calendar/gui/calendar-component.c:1450
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "ਸਾਰ� ਦਿਨ ਦ� ਮ�ਲਾ�ਾਤ(_p)"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
 msgstr "ਨਵ�� ਸਾਰਾ-ਦਿਨ ਮ�ਲਾ�ਾਤ ਬਣਾ�"
 
-#: ../calendar/gui/calendar-component.c:1511
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "ਨਵਾ� ��ਲੰਡਰ"
 
-#: ../calendar/gui/calendar-component.c:1512
+#: ../calendar/gui/calendar-component.c:1458
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "��ਲੰਡਰ(_n)"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "ਨਵਾ� ��ਲੰਡਰ ਬਣਾ�"
 
@@ -5540,20 +4248,20 @@ msgid "Category"
 msgstr "���ਾ�ਰ�"
 
 #: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "ਵਰ���ਰਨ"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Confidential"
 msgstr "��ਪਤ"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "ਵ�ਰਵਾ"
@@ -5573,21 +4281,27 @@ msgstr "ਬਾਹਰ ਨਾ �ਾ�"
 msgid "Exist"
 msgstr "ਬਾਹਰ"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:722
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "Location"
+msgstr "�ਿ�ਾਣਾ"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "ਪ�ਰਬੰਧ�"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ਨਿੱ��"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
+#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ਸਰਵ�ਨ�"
 
@@ -5597,11 +4311,11 @@ msgid "Recurrence"
 msgstr "ਦ�ਹਰਾ�"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Summary"
 msgstr "ਸੰ��ਪ"
 
@@ -5621,35 +4335,55 @@ msgid "does not contain"
 msgstr "ਸ਼ਾਮਿਲ ਨਹ� ਹ�"
 
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "ਹ�"
 
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "�ਹ ਨਹ��"
 
-#: ../calendar/gui/comp-editor-factory.c:409
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "��ਲੰਡਰ ��ਲਣ ਵਿੱ� �ਲਤ�"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "��ਲੰਡਰ ��ਲਣ ਲ� ਤਰ��ਾ ਸਹਾ�� ਨਹ�� ਹ�"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Permission denied to open the calendar"
 msgstr "��ਲੰਡਰ ��ਲਣ ਲ� �ਧਿ�ਾਰ ਨਹ�� ਹਨ"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:438 ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "�ਣ�ਾਣ� �ਲਤ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:601
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "�ਲਾਰਮ ਸ�ਧ"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "��ਤਾਵਨ� �ਭਾਰ�"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "ਧ�ਨ� �ਲਾ�"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "�ਾਰ� �ਲਾ�"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "�ੱ� �-ਮ�ਲ ਭ���"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>�ਲਾਰਮ</b>"
@@ -5679,83 +4413,78 @@ msgid "Mes_sage:"
 msgstr "ਸ�ਨ�ਹਾ(_s):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "ਧ�ਨ� �ਲਾ�"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "��ਤਾਵਨ� �ਭਾਰ�"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "�ਾਰ� �ਲਾ�"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "�ੱ� ਫਾ�ਲ ��ਣ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 msgid "Send To:"
 msgstr "ਨ�ੰ ਭ���:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "�ੱ� �-ਮ�ਲ ਭ���"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "�ਰ��ਮਿੰ�(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "�ਾਰ�(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "�ਲਾਰਮ ਦ�ਹਰਾ�(_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "�ਵਾ�(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "ਬਾ�ਦ"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-msgid "before"
-msgstr "ਪਹਿਲਾ�"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "day(s)"
-msgstr "ਦਿਨ"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "ਮ�ਲਾ�ਾਤ ਦਾ �ੰਤ"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#| msgid "before"
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"ਪਹਿਲਾ�\n"
+"ਬਾ�ਦ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
 msgstr "ਹਰ ਵਾਧ� ਸਮਾ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "�ੰ��"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#| msgid ""
+#| "Minutes\n"
+#| "Hours\n"
+#| "Days"
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"ਮਿੰ�\n"
+"�ੰ��\n"
+"ਦਿਨ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "ਮਿੰ�"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#| msgid ""
+#| "Minutes\n"
+#| "Hours\n"
+#| "Days"
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"ਮਿੰ�\n"
+"�ੰ��\n"
+"ਦਿਨ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
-msgid "start of appointment"
-msgstr "ਮ�ਲਾ�ਾਤ ਨਾਲ ਸ਼�ਰ� �ਰ�"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#| msgid "start of appointment"
+msgid ""
+"start of appointment\n"
+"end of appointment"
+msgstr ""
+"ਮ�ਲਾ�ਾਤ ਨਾਲ ਸ਼�ਰ�\n"
+"ਮ�ਲਾ�ਾਤ �ਤਮ"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
@@ -5766,47 +4495,56 @@ msgid "A_dd"
 msgstr "ਸ਼ਾਮਲ(_d)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "�ਲਾਰਮ"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "ਨੱਥ� ਦਾ ���ਮ��ਿ� �ਲ� ਲ� ਸ��ਾ�(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "ਫਾ�ਲ ����"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2955
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:785
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
 #: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2179
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1727
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "��� ਨਹ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
 msgid "Selected Calendars for Alarms"
 msgstr "�ਲਾਰਮ ਲ� ��ਣ� ��ਲੰਡਰ"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+#| msgid "Time zone:"
+msgid "Time and date:"
+msgstr "ਸਮਾ� �ਤ� ਮਿਤ�:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+#| msgid "Date:"
+msgid "Date only:"
+msgstr "��ਵਲ ਮਿਤ�:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "(Shown in a Day View)"
 msgstr "(ਦਿਨ �ਲ� ਵਿੱ� ਵ���)"
@@ -5831,51 +4569,63 @@ msgid "<i>%u and %d will be replaced by user and domain from the email address.<
 msgstr "<i>%u �ਤ� %d ਨ�ੰ �-ਮ�ਲ �ਡਰ�ੱਸ ਵਿੱ��� ਯ��਼ਰ �ਤ� ਡ�ਮ�ਨ ਨਾਲ ਤਬਦ�ਲ ��ਤਾ �ਾਵ��ਾ।<i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ../mail/mail-config.glade.h:10
+#| msgid "<span weight=\"bold\">Alerts</span>"
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">�ਲਾਰਮ</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">��ਤਾਵਨ�</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../mail/mail-config.glade.h:13
+#| msgid "<span weight=\"bold\">Time</span>"
+msgid "<span weight=\"bold\">Date/Time Format</span>"
+msgstr "<span weight=\"bold\">ਸਮਾ�/ਮਿਤ� ਫਾਰਮ��</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">ਮ�ਲ ਵ�ਹਲਾ/ਰ��ਿ� ਸਰਵਰ</span>"
+msgstr "<span weight=\"bold\">ਡਿਫਾਲ� ਵ�ਹਲਾ/ਰ��ਿ� ਸਰਵਰ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">ਸਧਾਰਨ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">�ੰਮ ਲਿਸ�</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">ਸਮਾ�</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">�ੰਮ ਹਫ਼ਤਾ</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "ਦਿਨ-ਰਾਤ ਰ�ਸ਼ਨ� ਸਮਾ� ਲ� �ਨ���ਲ(_v)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "ਦਿਨ ਸਮਾਪਤ(_e):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Display"
 msgstr "ਡਿਸਪਲ��"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+#| msgid "Show display alarms in notification tray"
+msgid "Display alarms in _notification area only"
+msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ� ਵਿੱ� �ਲਾਰਮ ਵ���(_n)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "ਸ਼�ੱ�ਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5885,13 +4635,13 @@ msgstr ""
 "�ੰ��\n"
 "ਦਿਨ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "ਸ�ਮਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5909,215 +4659,232 @@ msgstr ""
 "ਸਨਿੱ�ਰਵਾਰ\n"
 "�ਤਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "ਰੰ� ��ਣ�"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "S_un"
 msgstr "�ਤ(_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "ਸ਼ਨਿੱ�ਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Sc_roll Month View by a week"
+msgstr "ਮਹ�ਨ� ਨ�ੰ ਹਫ਼ਤ� ਨਾਲ ਹਿਲਾ�(_r)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Se_cond zone:"
 msgstr "ਦ��ਾ ��ਤਰ(_c):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Select the calendars for alarm notification"
 msgstr "�ਲਾਰਮ ਸ��ਨਾ ਲ� �ਲੰਡਰ ��ਣ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Sh_ow a reminder"
 msgstr "ਯਾਦਪੱਤਰ ਵ��ਾ�(_o)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show a _reminder"
 msgstr "ਯਾਦਪੱਤਰ ਵ��ਾ�(_r)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week _numbers in date navigator"
 msgstr "ਮਿਤ� ਨ�ਵ����ਰ ਵਿੱ� ਹਫਤ� ਦ� ਦਿਨ ਵ��ਾ�(_n)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "ਦਿਨ �ਤ� �ੰਮ ਹਫ਼ਤਾ �ਲ� ਵਿੱ� ਹਫ਼ਤਾ �ਿਣਤ� ਵ��ਾ�(_u)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "�ਤਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "T_asks due today:"
 msgstr "�ੱ� ਦ� �ੰਮ(_a):"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "T_hu"
 msgstr "ਵ�ਰ(_h)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Template:"
 msgstr "��ਪਲ��:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "ਵ�ਰਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "ਸਮਾ�-��ਤਰ(_z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Time format:"
 msgstr "ਸਮਾ�-ਫਾਰਮ��:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "ਮੰ�ਲਵਾਰ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#| msgid "Show the second time zone"
+msgid "Use s_ystem time zone"
+msgstr "ਸਿਸ�ਮ ਸਮਾ� ��ਤਰ ਵਰਤ��(_y)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "ਬ�ੱਧਵਾਰ"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Wee_k starts on:"
 msgstr "ਹਫਤਾ ਸ਼�ਰ�(_k):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "Work days:"
 msgstr "�ਾਰ�� ਦਿਨ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
 msgstr "_੧੨ �ੰ�� (ਸਵ�ਰ/ ਸ਼ਾਮ)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "_੨੪ �ੰ��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
 msgstr "���ਮਾ� ਹ�ਾ�ਣ ਸਮ�� ਪ�ਸ਼�� �ਰਵਾ�(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Compress weekends in month view"
 msgstr "ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਹਫਤਾ-�ੰਤ ਸਮ���(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Day begins:"
 msgstr "ਦਿਨ ਸ਼�ਰ�(_D):"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Fri"
 msgstr "ਸ਼�ੱ�ਰ(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Hide completed tasks after"
 msgstr "ਸੰਪ�ਰਨ �ੰਮ �ਸ ਬਾ�ਦ �ਹਲ� �ਰ�(_H)"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Mon"
 msgstr "ਸ�ਮ(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Overdue tasks:"
 msgstr "ਮਿ�ਦ ਪ�ੱ�� �ੰਮ(_O):"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Sat"
 msgstr "ਸ਼ਨਿੱ(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Show appointment end times in week and month view"
 msgstr "ਹਫਤ� �ਤ� ਮਹ�ਨਾ �ਲ� ਵਿੱ� ਮ�ਲ�ਾਤ ਵ��ਾ�(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "_Time divisions:"
 msgstr "ਸਮਾ� ਵੰਡ(_T):"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "_Tue"
 msgstr "ਮੰ�ਲ(_T)"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "_Wed"
 msgstr "ਬ�ੱਧ(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
 msgid "before every anniversary/birthday"
 msgstr "ਹਰ�� ਵਰ�ਹ�-�ੰਢ/�ਨਮਦਿਨ ਤ�� ਪਹਿਲਾ�"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "before every appointment"
 msgstr "ਹਰ ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "�ਿਸਮ:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ਬੰਦ �ਾਰਵਾ� ਦ�ਰਾਨ ��ਲੰਡਰ ਭਾ� �ਾਪ� �ਰ�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "�ਫਲਾ�ਨ �ਾਰਵਾ� ਲ� �ੰਮ-ਸ��� ਭਾ�ਾ� ਨ�ੰ ਸਥਾਨ� �ਾਪ� �ਰ�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:275
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "�ਫਲਾ�ਨ �ਾਰਵਾ� ਲ� ਮ�ਮ� ਸ��� ਭਾ�ਾ� ਨ�ੰ ਸਥਾਨ� �ਾਪ� �ਰ�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:345
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "ਰੰ�(_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "�ੰਮ ਲਿਸ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "ਮ�ਮ� ਲਿਸ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "��ਲੰਡਰ ਵਿਸ਼�ਸਤਾ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "ਨਵਾ� ��ਲੰਡਰ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "�ੰਮ ਲਿਸ� ��ਣ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "ਨਵ�� �ੰਮ ਲਿਸ�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "ਮ�ਮ� ਸ��� ਵਿਸ਼�ਸ਼ਤਾ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "ਨਵ�� ਮ�ਮ� ਲਿਸ�"
 
@@ -6170,297 +4937,238 @@ msgstr "%s  ਤ�ਸ�� ��� ਤਬਦ�ਲ� ਨਹ�� ��ਤ
 msgid "Validation error: %s"
 msgstr "�ਾ�� �ਲਤ�: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " ਵੱਲ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (ਸਮਾਪਤ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "ਸਮਾਪਤ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr " (ਬਾ�� "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "ਬਾ�� "
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "���� ��ਤਾ ਸ�ਨ�ਹਾ - %s"
-
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1786
-#: ../composer/e-msg-composer.c:2005
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "���� ��ਤਾ ਸ�ਨ�ਹਾ"
-msgstr[1] "%d ਨੱਥ� ਸ�ਨ�ਹ�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2073
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "ਭ���(_M)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2075
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "��ੱ�ਣਾ ਰੱਦ(_D)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3316 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:453
-msgid "attachment"
-msgstr "����ਮ���"
+#: ../calendar/gui/dialogs/comp-editor.c:224
+#| msgid "Save attachments"
+msgid "Could not save attachments"
+msgstr "����ਮ��� ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:487
 msgid "Could not update object"
 msgstr "��ਾ� �ੱਪਡ�� ਨਹ�� ਹ� ਸ�ਦ� ਹ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:582
 msgid "Edit Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ ਸ�ਧ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Meeting - %s"
 msgstr "ਮ��ਿੰ� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:591
 #, c-format
 msgid "Appointment - %s"
 msgstr "ਮ�ਲਾ�ਾਤ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:597
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ਮਿਲ� �ੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:599
 #, c-format
 msgid "Task - %s"
 msgstr "�ੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:604
 #, c-format
 msgid "Memo - %s"
 msgstr "ਮ�ਮ� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "No Summary"
 msgstr "ਸੰ��ਪ ਨਹ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:762
 msgid "Keep original item?"
 msgstr "�� �ਸਲ� ���ਮ ਰੱ�ਣ� ਹ�?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "Click here to close the current window"
 msgstr "ਮ���ਦਾ ਵਿੰਡ� ਬੰਦ �ਰਨ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "Copy selected text to the clipboard"
 msgstr "��ਣਿ� ���ਸ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:982
 msgid "Cut selected text to the clipboard"
 msgstr "�ਲਿੱਪਬ�ਰਡ ਤ�� �ੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:989
 msgid "Click here to view help available"
 msgstr "�ਪਲੱਬਧ ਮੱਦਦ ਵ��ਣ ਲ� �ੱਥ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:996
 msgid "Paste text from the clipboard"
 msgstr "�ਲਿੱਪਬ�ਰਡ ਤ�� �ਾਪ� �ਰ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1017
 msgid "Click here to save the current window"
 msgstr "ਮ���ਦਾ ਵਿੰਡ� ਸੰਭਾਲਣ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1024
 msgid "Select all text"
 msgstr "ਸਾਰਾ ���ਸ� ��ਣ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1031
 msgid "_Classification"
 msgstr "ਵਰ���ਰਨ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
-#: ../mail/mail-signature-editor.c:208
+#: ../calendar/gui/dialogs/comp-editor.c:1045
+#: ../mail/mail-signature-editor.c:209
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "ਫਾ�ਲ(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1052
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1059
 msgid "_Insert"
 msgstr "ਸ਼ਾਮਿਲ(_i)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1066
 msgid "_Options"
 msgstr "��ਣ(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/em-folder-tree.c:2106
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "ਵ���(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "ਨੱਥ�(_a)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "Click here to attach a file"
 msgstr "�ੱ� ਫਾ�ਲ ਨੱਥ� �ਰਨ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "_Categories"
 msgstr "���ਾ�ਰ�(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 msgid "Toggles whether to display categories"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ �ਲ� ���ਾ�ਰ� ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 msgid "Time _Zone"
 msgstr "ਸਮਾ� ��ਤਰ(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "Toggles whether the time zone is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਸਮਾ� ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Pu_blic"
 msgstr "ਪਬਲਿ�(_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1114
 msgid "Classify as public"
 msgstr "ਪਬਲਿ� ਵਾ�� ਰੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "_Private"
 msgstr "ਨਿੱ��(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Classify as private"
 msgstr "ਨਿੱ�� ਵਾ�� ਰੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "_Confidential"
 msgstr "��ਪਤ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Classify as confidential"
 msgstr "��ਪਤ ਦ� ਤ�ਰ 'ਤ� ਰੱ��"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "R_ole Field"
 msgstr "ਰ�ਲ ��ਤਰ(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "Toggles whether the Role field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਰ�ਲ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ RSVP ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "_Status Field"
 msgstr "ਹਾਲਤ ��ਤਰ(_S):"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1154
 msgid "Toggles whether the Status field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਹਾਲਤ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "_Type Field"
 msgstr "�ਿਸਮ ��ਤਰ(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਦਰਸ਼� �ਿਸਮ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1828
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../composer/e-composer-private.c:67
 msgid "Recent _Documents"
 msgstr "ਤਾ�਼ਾ ਦਸਤਾਵ��਼(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1615
+#: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "ਨੱਥ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> ਨੱਥ�"
-msgstr[1] "<b>%d</b> ਨੱਥ�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1974
-msgid "Hide Attachment _Bar"
-msgstr "ਨੱਥ� ਪੱ�� �ਹਲ�(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1977
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-msgid "Show Attachment _Bar"
-msgstr "ਨੱਥ� ਪੱ�� ਵ��ਾ�(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "ਹ�ਾ�(_R)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../composer/e-msg-composer.c:1042
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Add attachment..."
-msgstr "ਨੱਥ� ਸ਼ਾਮਿਲ(_A)..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:2302
-#: ../mail/em-format-html-display.c:2384
-msgid "Show Attachments"
-msgstr "ਨੱਥ� ਵ��ਾ�"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2303
-msgid "Press space key to toggle attachment bar"
-msgstr "ਨੱਥ� ਪੱ�� ਨ�ੰ ਬਦਲਣ ਲ� ਸਪ�ਸ ਸਵਿੱ� ਦਬਾ�"
+#: ../calendar/gui/dialogs/comp-editor.c:1670
+msgid "Save"
+msgstr "ਸੰਭਾਲ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2448
-#: ../calendar/gui/dialogs/comp-editor.c:2496
-#: ../calendar/gui/dialogs/comp-editor.c:3349
+#: ../calendar/gui/dialogs/comp-editor.c:1924
+#: ../calendar/gui/dialogs/comp-editor.c:1973
+#: ../calendar/gui/dialogs/comp-editor.c:2833
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "���ਰ �ੱਪਡ�� ��ਤਾ �ਸ ��ਾ� ਵਿੱ� ��ਤ��� ਤਬਦ�ਲ��� ਰੱਦ �ਰ ਦਿੱਤ��� �ਾਣ����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3378
+#: ../calendar/gui/dialogs/comp-editor.c:2801 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "����ਮ���"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2862
 msgid "Unable to use current version!"
 msgstr "ਮ���ਦਾ ਵਰ�ਨ ਵਰਤਣ ਵਿੱ� �ਸਫਲ!"
 
@@ -6533,7 +5241,7 @@ msgid "Contacts..."
 msgstr "ਸੰਪਰ�..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "�ਸ ਲ� ਪ�ਰਤ�ਨਿਧ:"
 
@@ -6560,7 +5268,7 @@ msgstr "�ਹ ਮ���ਦ�� ਨ�ੰ �ੱਲ ਬਣਾ�"
 #: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "ਭ��ਣ ��ਣ"
 
@@ -6597,199 +5305,230 @@ msgstr "�ਸ ��ਲੰਡਰ ਲ� ਵ�ਹਲਾ / ਰ��ਿ� �
 msgid "Appoint_ment"
 msgstr "ਮ�ਲਾ�ਾਤ(_m)"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:748
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "�ਵ��� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਿ�, �ਿ���ਿ ��ਣਿ� ��ਲੰਡਰ ��ਵਲ ਪ��ਹਨ ਲ� ਹ� ਹ�।"
+
+#: ../calendar/gui/dialogs/event-page.c:752
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "�ਵ��� ਪ�ਰ� ਤਰ�ਹਾ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ, �ਿ���ਿ ਤ�ਸ�� ਪਰਬੰਧ� ਨਹ�� ਹ�"
+
+#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:2769
 msgid "This event has alarms"
 msgstr "�ਹ ��ਨਾ ਲ� �ਲਾਰਮ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:799
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "ਪ�ਰਬੰਧ�(_O):"
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:874
 msgid "_Delegatees"
 msgstr "ਪ�ਰਤ�ਨਿਧ(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:876
 msgid "Atte_ndees"
 msgstr "ਦਰਸ਼�(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1062
 msgid "Event with no start date"
 msgstr "ਬਿਨਾ� ਸ਼�ਰ��ਤ ਮਿਤ� ਨਾਲ ��ਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1065
 msgid "Event with no end date"
 msgstr "ਬਿਨਾ� �ੰਤ ਮਿਤ� ਨਾਲ ��ਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1203
-#: ../calendar/gui/dialogs/memo-page.c:641
-#: ../calendar/gui/dialogs/task-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:830
 msgid "Start date is wrong"
 msgstr "ਸ਼�ਰ��ਤ� ਮਿਤ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1246
 msgid "End date is wrong"
 msgstr "ਸਮਾਪਤ� ਮਿਤ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1269
 msgid "Start time is wrong"
 msgstr "ਸ਼�ਰ��ਤ� ਸਮਾ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "End time is wrong"
 msgstr "ਸਮਾਪਤ� ਸਮਾ� �ਲਤ ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:1406
-#: ../calendar/gui/dialogs/memo-page.c:682
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:890
 msgid "The organizer selected no longer has an account."
 msgstr "��ਣ� ਪ�ਰਬੰਧ� ਦਾ ��ਾ��� ਨਹ�� ਰਿਹਾ ਹ�।"
 
-#: ../calendar/gui/dialogs/event-page.c:1412
-#: ../calendar/gui/dialogs/memo-page.c:688
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1444
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "An organizer is required."
 msgstr "�ੱ� ਪ�ਰਬੰਧ� ਲ���ਦਾ ਹ�।"
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/task-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:1469
+#: ../calendar/gui/dialogs/task-page.c:920
 msgid "At least one attendee is required."
 msgstr "�ੱ� ਦਰਸ਼� ਤਾ� ਲ���ਦਾ ਹ�।"
 
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1912
+#: ../calendar/gui/dialogs/task-page.c:1219
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "ਹ�ਾ�(_R)"
+
+#: ../calendar/gui/dialogs/event-page.c:1913
+#: ../calendar/gui/dialogs/task-page.c:1220
 msgid "_Add "
 msgstr "ਸ਼ਾਮਲ(_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' ��ਲੰਡਰ ��ਲਣ ਵਿੱ� �ਸਫਲ"
 
-#: ../calendar/gui/dialogs/event-page.c:2645
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1806
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2683
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1825
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ਤ�ਸ�� %s ਦ� ਤ�ਰ �ੱਤ� �ੰਮ �ਰ ਰਹ� ਹ�"
 
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2967
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� %d ਦਿਨ"
 msgstr[1] "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� %d ਦਿਨ"
 
-#: ../calendar/gui/dialogs/event-page.c:2931
+#: ../calendar/gui/dialogs/event-page.c:2973
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� %d �ੰ�ਾ"
 msgstr[1] "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� %d �ੰ��"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2979
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� %d ਮਿੰ�"
 msgstr[1] "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� %d ਮਿੰ�"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2992
 msgid "Customize"
 msgstr "ਪਸੰਦ"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ੧ ਦਿਨ ਪਹਿਲਾ�"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� ੧ �ੰ�ਾ"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "15 minutes before appointment"
-msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� ੧੫ ਮਿੰ�"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
+"ਮ�ਲਾ�ਾਤ ਤ�� 15 ਮਿੰ� ਪਹਿਲਾ�\n"
+"ਮ�ਲਾ�ਾਤ ਤ�� 1 �ੰ�ਾ ਪਹਿਲਾ�\n"
+"ਮ�ਲਾ�ਾਤ ਤ�� 1 ਦਿਨ ਪਹਿਲਾ�"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "ਦਰਸ਼�(_s)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:151
+msgid "Attendees"
+msgstr "ਦਰਸ਼�"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "�ਲਾਰਮ ਸ�ਧ:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
-msgstr "��ਨਾ ਵ�ਰਵਾ"
+msgstr "�ਵ��� ਵ�ਰਵਾ"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "ਸੰ��ਪ(_m):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "�ਲਾਰਮ(_A)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "ਵ�ਰਵਾ(_D):"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "�ਿ�ਾਣਾ(_L):"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 msgid "_Time:"
 msgstr "ਸਮਾ�(_T):"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
-msgid "for"
-msgstr "ਲ�"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
+"a\n"
+"b"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
-msgid "until"
-msgstr "�ਦ ਤੱ�"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>ਦਰਸ਼�(_e)</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "ਪ�ਰਬੰਧ� ਤਬਦ�ਲ(_O):"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "ਸੰਪਰ�(_N)..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "ਪ�ਰਬੰਧ�:"
+#| msgid "until"
+msgid ""
+"for\n"
+"until"
+msgstr ""
+"ਲ�\n"
+"�ਦ�� ਤੱ�"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "ਮ�ਮ�"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:347
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "ਮ�ਮ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ, �ਿ���ਿ ��ਣਿ� ਮ�ਮ� ��ਵਲ ਪ��ਹਨ ਲ� ਹ� ਹ�"
+
+#: ../calendar/gui/dialogs/memo-page.c:351
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "ਮ�ਮ� ਪ�ਰ� ਤਰ�ਹਾ� ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ, �ਿ���ਿ ਤ�ਸ�� ਪਰਬੰਧ� ਨਹ�� ਹ�"
+
+#: ../calendar/gui/dialogs/memo-page.c:871
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' ਵਿੱ� ਮ�ਮ� ��ਲਣ ਤ�� �ਸਮਰੱਥ"
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1624 ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
+#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "ਵੱਲ"
 
@@ -6803,7 +5542,7 @@ msgid "T_o:"
 msgstr "ਵੱਲ(_o):"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:365
+#: ../calendar/gui/dialogs/task-page.c:380
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "�ਰ�ੱਪ(_G):"
@@ -6828,23 +5567,23 @@ msgstr "ਤ�ਸ�� �ੱ� �ਵਰਤ� �ੰਮ ਨ�ੰ ਸ�ਧ
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "ਤ�ਸ�� �ੱ� �ਵਰਤ� ਮ�ਮ� ਨ�ੰ ਸ�ਧ ਰਹ� ਹ�। ਤ�ਸ�� �� ਸ�ਧਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "�ਸ ਮ��� ਤ� ਹ�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "�ਹ �ਤ� ਪਹਿਲ ਮ���"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "�ਹ �ਤ� ਭਵਿੱ�ਤ ਮ��� ਲ�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "ਸਭ ਮ���"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "�ਸ ਮ�ਲਾ�ਾਤ ਵਿੱ� ਲ�� ਹ�, �� �ਿ �ਵ�ਲ�ਸ਼ਨ ਸ�ਧ ਨਹ�� ਸ�ਦਾ ਹ�।"
 
@@ -6866,7 +5605,7 @@ msgstr "�ਾਲ�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "ਪਹਿਲਾ�"
 
@@ -6875,7 +5614,7 @@ msgstr "ਪਹਿਲਾ�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "ਦ��ਾ"
 
@@ -6883,7 +5622,7 @@ msgstr "ਦ��ਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "ਤ��ਾ"
 
@@ -6891,21 +5630,30 @@ msgstr "ਤ��ਾ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "��ਥਾ"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#| msgid "Width"
+msgid "fifth"
+msgstr "ਪੰ�ਵਾ�"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "��ਰ�"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "ਹ�ਰ ਮਿਤ�"
 
@@ -6913,7 +5661,7 @@ msgstr "ਹ�ਰ ਮਿਤ�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "੧ਲ� ਤ�� ੧੦ਵਾ�"
 
@@ -6921,7 +5669,7 @@ msgstr "੧ਲ� ਤ�� ੧੦ਵਾ�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "੧੧ਵ�� ਤ�� ੨੦ਵਾ�"
 
@@ -6929,45 +5677,45 @@ msgstr "੧੧ਵ�� ਤ�� ੨੦ਵਾ�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "੨੧ਵ�� ਤ�� ੩੧ਵਾ�"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "ਦਿਨ"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "�ਸ ਤ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "ਮ���ਦ��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2105
 msgid "Add exception"
 msgstr "�ਪਵਾਦ ਸ਼ਾਮਲ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2146
 msgid "Could not get a selection to modify."
 msgstr "ਸ�ਧ ਲ� �ੱ� ��ਣ ਨਹ�� ਮਿਲ�।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Modify exception"
 msgstr "�ਪਵਾਦ ਸ�ਧ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2196
 msgid "Could not get a selection to delete."
 msgstr "ਹ�ਾ�ਣ ਲ� �ੱ� ��ਣ ਨਹ�� ਮਿਲ�।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "ਮਿਤ�/ਸਮਾ�"
 
@@ -6976,7 +5724,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>�ਪਵਾਦ</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
 msgid "<b>Preview</b>"
 msgstr "<b>�ਲ�</b>"
 
@@ -6984,50 +5732,57 @@ msgstr "<b>�ਲ�</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>ਦ�ਹਰਾ�</b>"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Every"
 msgstr "ਹਰ��"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "This appointment rec_urs"
 msgstr "�ਹ ਮ�ਲਾ�ਾਤ ਮ�� ਹ�(_u)"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
-msgid "forever"
-msgstr "ਹਮ�ਸ਼ਾ"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
-msgid "month(s)"
-msgstr "ਮਹ�ਨਾ"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
+"ਦਿਨ\n"
+"ਹਫ਼ਤ�\n"
+"ਮਹ�ਨ�\n"
+"ਸਾਲ"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
-msgid "week(s)"
-msgstr "ਹਫਤਾ"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
-msgid "year(s)"
-msgstr "ਸਾਲ"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
+"ਲ�\n"
+"�ਦ�� ਤੱ�\n"
+"ਹਮ�ਸ਼ਾ"
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
 msgstr "�ਸ �ਵ��� ਲ� ਮ�ਰ� �ਲਾਰਮ ਭ���"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/send-comp.c:162
+#| msgid "Notify new messages for _Inbox only"
+msgid "Notify new attendees _only"
+msgstr "��ਵਲ ਦਰਸ਼�ਾ� ਲ� ਸ��ਨਾ ਦਿ�(_o)"
+
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "ਸੰਪ�ਰਨ ਮਿਤ� �ਲਤ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
 msgstr "ਵ�ਬ ਪ��਼"
 
@@ -7039,74 +5794,38 @@ msgstr "<span weight=\"bold\">ਫ���ਲ</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">ਸਥਿਤ�</span>"
 
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:663 ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
-msgid "Completed"
-msgstr "ਸਮਾਪਤ"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
-msgid "High"
-msgstr "��ਤਮ"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2558
-msgid "In Progress"
-msgstr "ਤਰੱ�� ਵਿੱ� ਹ�"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
+"�ੱ�\n"
+"ਸਧਾਰਨ\n"
+"�ੱ�\n"
+"ਨਾ-ਪ�ਰਭਾਸਿਤ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
-msgid "Low"
-msgstr "ਨਿ�ਨਤਮ"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1007 ../calendar/gui/e-calendar-table.c:589
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
-msgid "Normal"
-msgstr "ਸਧਾਰਨ"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2555
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "ਸ਼�ਰ� ਨਹ�� ਹ�"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
+"ਸ਼�ਰ� ਨਹ��\n"
+"�ਾਰ� ਹ�\n"
+"ਪ�ਰਾ ��ਤਾ\n"
+"ਰੱਦ ��ਤਾ"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "ਫ�-ਸਦ� ਪ�ਰਾ(_e):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "ਹਾਲਤ(_U):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "ਨਾ-ਪ�ਰਭਾਸ਼ਿਤ"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "ਸੰਪ�ਰਨ ਮਿਤ�(_D):"
@@ -7129,7 +5848,7 @@ msgid "Click to change or view the status details of the task"
 msgstr "�ੰਮ ਦ� ਹਾਲਤ ਵ�ਰਵ� ਲ� ਤਬਦ�ਲ ਲ� ਦਬਾ�"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:525
+#: ../composer/e-composer-actions.c:371
 msgid "_Send Options"
 msgstr "ਭ��ਣ ��ਣ(_S)"
 
@@ -7141,19 +5860,29 @@ msgstr "�ੰਮ(_T)"
 msgid "Task Details"
 msgstr "�ੰਮ ਵ�ਰਵਾ"
 
-#: ../calendar/gui/dialogs/task-page.c:373
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "�ਾਸ� ਸ�ਧ� ਨਹ�� �ਾ ਸ�ਦ�, �ਿ���ਿ ��ਣ� �ਾਸ� ��ਵਲ ਪ��ਹਨ ਲ� ਹ� ਹ�"
+
+#: ../calendar/gui/dialogs/task-page.c:340
+#| msgid ""
+#| "This message cannot be sent because you have not specified any recipients"
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "�ਾਸ� ਪ�ਰ� ਤਰ�ਹਾ� ਸ�ਧ� ਨਹ�� �ਾ ਸ�ਦ�, �ਿ���ਿ ਤ�ਸ�� ਪਰਬੰਧ� ਨਹ�� ਹ�"
+
+#: ../calendar/gui/dialogs/task-page.c:388
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "ਪਰਬੰਧ�(_z):"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:803
 msgid "Due date is wrong"
 msgstr "ਮਿ�ਦ ਮਿਤ� �ਲਤ"
 
-#: ../calendar/gui/dialogs/task-page.c:1763
+#: ../calendar/gui/dialogs/task-page.c:1782
 #, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "'%s' ਵਿੱ� �ਾਰ� ��ਲਣ ਤ�� �ਸਮਰੱਥ"
+msgstr "'%s' ਵਿੱ� �ਾਸ� ��ਲਣ ਤ�� �ਸਮਰੱਥ"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
@@ -7245,82 +5974,169 @@ msgstr "%s, %s ਤ�"
 #: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
-msgstr "�ਣਪ�ਾਤ� ਤਬਦ�ਲ� �ਿਸਮ ਲ�  %s"
+msgstr "�ਣ�ਾਣ ਤਬਦ�ਲ� �ਿਸਮ ਲ�  %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+#| msgid "Import"
+msgid "I_mport"
+msgstr "�ੰਪ�ਰ�(_m)"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+#| msgid "Select Calendar"
+msgid "Select a Calendar"
+msgstr "��ਲੰਡਰ ��ਣ�"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+#| msgid "Select Task List"
+msgid "Select a Task List"
+msgstr "�ੰਮ ਲਿਸ� ��ਣ�"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+#| msgid "Import to Calendar"
+msgid "I_mport to Calendar"
+msgstr "��ਲੰਡਰ ਵਿੱ� �ੰਪ�ਰ� �ਰ�(_m)"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+#| msgid "_Import to Tasks"
+msgid "I_mport to Tasks"
+msgstr "�ੰਮ �ੰਪ�ਰ�(_m)"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ��ਲਣ ਲ� �ਲਿੱ� �ਰ�"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
 msgid "Untitled"
 msgstr "ਬਿਨਾ� ਨਾ�"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "ਸ਼�ਰ��ਤ� ਮਿਤ�:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1213
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "ਵ�ਰਵਾ:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
 #: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "ਵ�ਬ ਸਫਾ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "ਸੰ��ਪ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "ਮਿ�ਦ:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1181
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "ਸਥਿਤ�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "ਤਰੱ�� ਵਿੱ� ਹ�"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "ਸਮਾਪਤ"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "ਸ਼�ਰ� ਨਹ�� ਹ�"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "ਪਹਿਲ:"
 
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:585 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "��ਤਮ"
+
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1076 ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "ਸਧਾਰਨ"
+
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "ਨਿ�ਨਤਮ"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Created"
+msgstr "ਬਣਾ��"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "ਸਮਾਪਤ� ਮਿਤ�"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#| msgid "Modified"
+msgid "Last modified"
+msgstr "��ਰ� ਸ�ਧ"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "ਸ਼�ਰ� ਮਿਤ�"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/e-calendar-table.c:637
 msgid "Free"
 msgstr "ਵ�ਹਲਾ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "ਰ��ਿ�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7330,225 +6146,200 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ਹਾ�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "ਨਹ�"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
-#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "�ਣ�ਾਣ"
 
-#: ../calendar/gui/e-cal-model.c:1009
+#: ../calendar/gui/e-cal-model.c:1078
 msgid "Recurring"
 msgstr "�ਵਿਰਤ�"
 
-#: ../calendar/gui/e-cal-model.c:1011
+#: ../calendar/gui/e-cal-model.c:1080
 msgid "Assigned"
 msgstr "�ਾਰ� ��ਤ�"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
-msgid "Save As..."
-msgstr "�ੰ� ਸੰਭਾਲ�..."
-
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2217
-msgid "Select folder to save selected attachments..."
-msgstr "ਨੱਥ� ਸੰਭਾਲਣ ਲ� ਫ�ਲਡਰ ��ਣ�..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
-#, c-format
-msgid "untitled_image.%s"
-msgstr "ਬਿਨ_ਨਾ�_�ਿੱਤਰ.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "�ੰ� ਸੰਭਾਲ�(_S)..."
-
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "ਬ���ਰਾ��ਡ ਬਣਾ�(_B)"
-
-#: ../calendar/gui/e-cal-popup.c:288
-msgid "_Save Selected"
-msgstr "��ਣ� ਸੰਭਾਲ�(_S)"
-
-#: ../calendar/gui/e-cal-popup.c:431 ../mail/em-popup.c:827
-#, c-format
-msgid "Open in %s..."
-msgstr "%s ਨਾਲ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�..."
-
-#: ../calendar/gui/e-calendar-table.c:336
+#: ../calendar/gui/e-calendar-table.c:335
 msgid "* No Summary *"
 msgstr "* ਸੰ��ਪ ਨਹ�� *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:372
-#: ../calendar/gui/e-calendar-view.c:2437
+#: ../calendar/gui/e-calendar-table.c:371
+#: ../calendar/gui/e-calendar-view.c:2429
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ਪ�ਰਬੰਧ�: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:375
-#: ../calendar/gui/e-calendar-view.c:2441
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2433
 #, c-format
 msgid "Organizer: %s"
 msgstr "ਪ�ਰਬੰਧ�: %s"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "Start: "
 msgstr "ਸ਼�ਰ�:"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "Due: "
 msgstr "ਬਾ��:"
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "ਨਾ-ਪ�ਰਭਾਸ਼ਿਤ"
+
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "0%"
 msgstr "੦%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "10%"
 msgstr "੧੦%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "20%"
 msgstr "੨੦%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "30%"
 msgstr "੩੦%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "40%"
 msgstr "੪੦%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "50%"
 msgstr "੫੦%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "60%"
 msgstr "੬੦%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "70%"
 msgstr "੭੦%"
 
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "80%"
 msgstr "੮੦%"
 
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "90%"
 msgstr "੯੦%"
 
-#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "100%"
 msgstr "੧੦੦%"
 
-#: ../calendar/gui/e-calendar-table.c:900
-#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:452
+#: ../calendar/gui/e-calendar-table.c:897
+#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
 msgid "Deleting selected objects"
 msgstr "��ਣ��� ���ਮਾ� ਹ�ਾ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:657
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:654
 msgid "Updating objects"
 msgstr "��ਾ� �ੱਪਡ�� ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1336 ../calendar/gui/e-memo-table.c:833
-#: ../composer/e-composer-actions.c:275
+#: ../calendar/gui/e-calendar-table.c:1364
+#: ../calendar/gui/e-calendar-view.c:1333 ../calendar/gui/e-memo-table.c:828
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "�ੰ� ਸੰਭਾਲ�..."
 
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1796
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "New _Task"
 msgstr "ਨਵਾ� �ੰਮ(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1599 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
 msgid "Open _Web Page"
 msgstr "ਵ�ੱਬ ਸਫਾ ��ਲ�(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1799 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
+msgid "_Save As..."
+msgstr "�ੰ� ਸੰਭਾਲ�(_S)..."
+
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1792 ../calendar/gui/e-memo-table.c:935
 msgid "P_rint..."
 msgstr "ਪਰਿੰ� �ਰ�(_r)..."
 
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "�ੱ��(_u)"
 
-#: ../calendar/gui/e-calendar-table.c:1607
-#: ../calendar/gui/e-calendar-view.c:1802
-#: ../calendar/gui/e-calendar-view.c:1821 ../calendar/gui/e-memo-table.c:946
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:941
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "��ਪ�(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1611 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1604 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "�ੰਮ �ਾਰ� �ਰ�(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1612 ../calendar/gui/e-memo-table.c:950
+#: ../calendar/gui/e-calendar-table.c:1605 ../calendar/gui/e-memo-table.c:945
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendar ਵਾ�� �ੱ�� ਭ���(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark as Complete"
 msgstr "ਨਿਸ਼ਾਨਾ ਪ�ਰਾ(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1614
+#: ../calendar/gui/e-calendar-table.c:1607
 msgid "_Mark Selected Tasks as Complete"
 msgstr "��ਣ� �ੰਮ ਪ�ਰ� ਹ�� ਨਿਰਧਾਰਿਤ �ਰ�(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1615
+#: ../calendar/gui/e-calendar-table.c:1608
 msgid "_Mark as Incomplete"
 msgstr "ਨਾ-ਪ�ਰਾ ਬਣਾ�(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1616
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "��ਣ� �ੰਮ ਨਾ-ਪ�ਰ� ਹ��� ਬਣਾ�(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1621
+#: ../calendar/gui/e-calendar-table.c:1614
 msgid "_Delete Selected Tasks"
 msgstr "��ਣ� �ੰਮ ਹ�ਾ�(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1858
+#: ../calendar/gui/e-calendar-table.c:1849
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "�ੰਮ ਸ਼ਾਮਿਲ �ਰਨ ਲ� �ਲਿੱ� �ਰ�"
@@ -7566,167 +6357,167 @@ msgstr "ਮ��ੰਮਲ"
 msgid "Completion date"
 msgstr "ਸਮਾਪਤ� ਮਿਤ�"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "ਮਿ�ਦ"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "ਪਹਿਲ"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "ਸ਼�ਰ��ਤ� ਮਿਤ�"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2345
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2337
+#: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "ਸਥਿਤ�"
 
-#: ../calendar/gui/e-calendar-view.c:1482
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Moving items"
 msgstr "���ਮਾ� ਭ���"
 
-#: ../calendar/gui/e-calendar-view.c:1484
+#: ../calendar/gui/e-calendar-view.c:1480
 msgid "Copying items"
 msgstr "���ਮਾ� ਦ� �ਾਪ� �ਾਰ�"
 
-#: ../calendar/gui/e-calendar-view.c:1793
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Appointment..."
 msgstr "ਨਵ�� ਮ�ਲਾ�ਾਤ(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1794
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New All Day _Event"
 msgstr "ਨਵ�� ਸਾਰ� ਦਿਨ ਦ� ਮ�ਲਾ�ਾਤ(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "New _Meeting"
 msgstr "ਨਵ�� ਮ��ਿੰ�(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1806
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "_Current View"
 msgstr "ਮ���ਦਾ �ਲ�(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1808
+#: ../calendar/gui/e-calendar-view.c:1801
 msgid "Select T_oday"
 msgstr "�ੱ� ��ਣ�(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1809
+#: ../calendar/gui/e-calendar-view.c:1802
 msgid "_Select Date..."
 msgstr "ਮਿਤ� ��ਣ�(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1815
+#: ../calendar/gui/e-calendar-view.c:1808
 msgid "Pri_nt..."
 msgstr "ਪਰਿੰ� �ਰ�(_n)..."
 
-#: ../calendar/gui/e-calendar-view.c:1825
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "Cop_y to Calendar..."
 msgstr "��ਲੰਡਰ ਵਿੱ� ਨ�ਲ(_y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1826
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "Mo_ve to Calendar..."
 msgstr "��ਲੰਡਰ ਵਿੱ� ਭ���(_v)..."
 
-#: ../calendar/gui/e-calendar-view.c:1827
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Delegate Meeting..."
 msgstr "ਪ�ਰਤ�ਨਿਧ ਮ��ਿੰ�(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1828
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Schedule Meeting..."
 msgstr "ਮ��ਿੰ� ਨਿਯਤ ਸਮਾ�(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1829
+#: ../calendar/gui/e-calendar-view.c:1822
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar ਵਾ�� �ੱ�� ਭ���(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1830
+#: ../calendar/gui/e-calendar-view.c:1823
 msgid "_Reply"
 msgstr "�ਵਾਬ(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1831 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1824
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "ਸਭ ਨ�ੰ �ਵਾਬ(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1836
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Make this Occurrence _Movable"
 msgstr "�ਹ ਮ���ਦ�� ਨ�ੰ �ੱਲ ਬਣਾ�(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1837 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1830 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "�ਹ ਮ���ਦ�� ਹ�ਾ�(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1838
+#: ../calendar/gui/e-calendar-view.c:1831
 msgid "Delete _All Occurrences"
 msgstr "ਸਾਰ��� ਮ���ਦ���� ਹ�ਾ�(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:2292
-#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-calendar-view.c:2284
+#: ../calendar/gui/e-itip-control.c:1183
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "ਮਨ�਼�ਰ"
 
-#: ../calendar/gui/e-calendar-view.c:2293
-#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-calendar-view.c:2285
+#: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "�ਨ�ਾਰ"
 
-#: ../calendar/gui/e-calendar-view.c:2294
+#: ../calendar/gui/e-calendar-view.c:2286
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "�ਰ��"
 
-#: ../calendar/gui/e-calendar-view.c:2295
+#: ../calendar/gui/e-calendar-view.c:2287
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "ਪ�ਰਤ�ਨਿਧ�"
 
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Needs action"
 msgstr "�ਾਰਵਾ� ਲ���ਦ� ਹ�"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2457 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
 #, c-format
 msgid "Location: %s"
 msgstr "�ਿ�ਾਣਾ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2491
+#: ../calendar/gui/e-calendar-view.c:2480
 #, c-format
 msgid "Time: %s %s"
 msgstr "ਸਮਾ�: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:109
+#: ../calendar/gui/e-cell-date-edit-text.c:102
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%I:%M:%S %p %a %d/%m/%Y"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:113
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7740,12 +6531,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:750
+#: ../calendar/gui/e-day-view-time-item.c:747
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i ਮਿੰ� ਵੰਡ"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:768
 msgid "Show the second time zone"
 msgstr "ਦ��ਾ ਸਮਾ� ��ਤਰ ਵ���"
 
@@ -7755,48 +6546,48 @@ msgstr "ਦ��ਾ ਸਮਾ� ��ਤਰ ਵ���"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1582
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "ਸਵ�ਰ"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "ਸ਼ਾਮ"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2321
+#: ../calendar/gui/e-day-view.c:2309
 #, c-format
 msgid "Week %d"
 msgstr "ਹਫ਼ਤਾ %d"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "ਹਾ� (��ੰ�ਲਦਾਰ �ਵਰਤ�)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "ਹਰ ਦਿਨ"
 msgstr[1] "ਹਰ %d ਦਿਨ"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "ਹਰ ਹਫਤ�"
 msgstr[1] "ਹਰ %d ਹਫਤ�"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7804,35 +6595,35 @@ msgstr[0] "ਹਰ ਹਫਤ�"
 msgstr[1] "ਹਰ %d ਹਫਤ�"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " �ਤ� "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "ਦਿਨ %s "
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s ਵਿੱ���"
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ਹਰ ਮਹ�ਨ�"
 msgstr[1] "ਮਹ�ਨ� ਵਿੱ� %d ਵਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:854
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "ਹਰ ਸਾਲ"
 msgstr[1] "ਹਰ %d ਸਾਲ"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7840,37 +6631,37 @@ msgstr[0] "��ੱਲ %d ਵਾਰ"
 msgstr[1] "��ੱਲ %d ਵਾਰ "
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:880
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr ", ਤ� ਸਮਾਪਤ�"
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "ਸ਼�ਰ�"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "ਸਮਾਪਤ"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "ਬ�ਾ��"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "iCalendar �ਾਣ�ਾਰ�"
 
 #  Title
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "iCalendar �ਲਤ�"
 
-#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -7882,283 +6673,283 @@ msgstr "�ਣ�ਾਣਾ ਵਿ��ਤ�"
 
 #  Describe what the user can do
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
+#: ../calendar/gui/e-itip-control.c:1135
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> �ਿਰਪਾ �ਰ�� ਹ�ਠ ਦਿੱਤ� �ਾਣ�ਾਰ� ਤ� ਮ�� ਵਿ�ਾਰ �ਰ� �ਤ� ਮ�ਨ� ਤ�� ਤੱਦ ��� �ਾਰਵਾ� ��ਣ�।"
 
-#: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "�ਰ�� ਮਨ�਼�ਰ"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1274
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� �� ਹ�, ਪਰ ਤ�ਹਾਡ� ��ਲੰਡਰ ਵਿੱ� ਨਹ�� ਲੱਭ ਸ�ਦ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1280
+#: ../calendar/gui/e-itip-control.c:1276
 msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "�ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ �ਿ� ਹ�, ਪਰ ਤ�ਹਾਡ� �ੰਮ ਸ��� ਵਿੱ� ਨਹ�� ਲੱਭ ਸ�ਦਾ ਹ�"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ਨ� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "ਮ��ਿੰ� ਬਾਰ� �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1360
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ਨ� ਮ��ਿੰ� ਵਿੱ� %s ਦ� ਮ���ਦ�� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> ਨ� ਮ��ਿੰ� ਵਿੱ� ਤ�ਹਾਡ� ਹਾ�ਰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Proposal"
 msgstr "ਮ��ਿੰ� ਸ��ਾ�"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> �ੱ� ਮ���ਦਾ ਮ��ਿੰ� ਵਿ� ਸ਼ਾਮਿਲ ਹ�ਣਾ �ਾਹ�ੰਦਾ ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Update"
 msgstr "ਮ��ਿੰ� �ੱਪਡ��"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ਨਵ�� ਮ��ਿੰ� �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update Request"
 msgstr "ਮ��ਿੰ� �ੱਪਡ�� ਮੰ�"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1382
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ਨ� �ੱ� ਮ��ਿੰ� ਲ� ਬ�ਨਤ� ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "ਮ��ਿੰ� �ਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> ਨ� �ੱ� ਮ��ਿੰ� ਰੱਦ �ਰ ਦਿੱਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Cancelation"
 msgstr "ਮ��ਿੰ� ਰੱਦ"
 
-#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ਨ� �ੱ� ਨਾ ਬ�ਸਮ� ਸ�ਨ�ਹਾ ਭ��ਿ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1402
 msgid "Bad Meeting Message"
 msgstr "�ਲਤ ਮ��ਿੰ� ਸ�ਨ�ਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ਨ� �ੰਮ �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
 msgstr "�ੰਮ �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1437
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ਨ� %s ਨ�ੰ �ਾਰ� ਪ�ਰਾ �ਰਨ ਲ� ਬ�ਨਤ� ਭ��� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ਤ�ਹਾਨ�ੰ �ੱ� �ੰਮ ਲ� �ਹਿ ਰਿਹਾ ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Proposal"
 msgstr "�ੰਮ ਸ��ਾ�"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> ਨ� �ੱ� �ਾਰ� �ੰਮ ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�ਣ ਦ� �ੱ�ਾ �ਤਾ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Update"
 msgstr "�ੰਮ �ੱਪਡ��"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ਤਾ�� �ੰਮ �ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ� �ਾਹ�ੰਦਾ ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update Request"
 msgstr "�ੰਮ �ੱਪਡ�� ਬ�ਨਤ�"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ਨ� �ਾਰ� �ੰਮ ਲ� �ਵਾਬ ਭ��ਿ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Task Reply"
 msgstr "�ੰਮ �ਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> ਨ� �ੰਮ ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Cancelation"
 msgstr "�ੰਮ ਰੱਦ��ਰਨ"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "�ਲਤ �ੰਮ ਸ�ਨ�ਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1503
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ਨ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਪ�ਰ�ਾਸ਼ਿਤ ��ਤ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> ਨ� ਤ�ਹਾਡ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਲ� ਬ�ਨਤ� ਭ��� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� ਬ�ਨਤ�"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ਨ� ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� �ਵਾਬ ਭ��ਿ� ਹ�।"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ�� �ਵਾਬ"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "�ਲਤ ਵ�ਹਲਾ/ਰ��ਿ� ਸ�ਨ�ਹਾ"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
 msgstr "ਸ�ਨ�ਹਾ �ਪਣ� ਸਹ�� ਸਰ�ਪ ਵਿੱ� ਨਹ�� ਹ�"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ਨਾ-ਸਹਾ�� ਬ�ਨਤ��� ਹਨ।"
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "ਨੱਥ� ਵਿੱ� �ੱ� �ਾ�� ��ਲੰਡਰ ਸ�ਨ�ਹਾ ਨਹ�� ਹ�"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
 msgstr "ਨੱਥ� ਵਿੱ� ��� ਵ� ਵ��ਣਯ�� ��ਲੰਡਰ ��ਾ� ਨਹ�� ਹ�"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
 msgstr "ਨਵ�ਨ��ਰਮ ਪ�ਰਨ\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "��ਾ� �ਲਤ ਹ� �ਤ� �ੱਪਡ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "�ਹ �ਵਾਬ �ੱ� ਦਰਸ਼� ਵਲ�� ਨਹ�� ਹ�। �� �ੱ� ਦਰਸ਼� ਵਾ�� ਸ਼ਾਮਿਲ �ਰਨਾ ਹ�?"
 
-#: ../calendar/gui/e-itip-control.c:2044
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "�ਲਤ ਹਾਲਤ �ਰ�� ਦਰਸ਼� �ਾਣ�ਾਰ� �ੱਪਡ�� ਨਹ�� ��ਤ� �ਾ ਸ�� ਹ�!\n"
 
-#: ../calendar/gui/e-itip-control.c:2068
+#: ../calendar/gui/e-itip-control.c:2060
 msgid "Attendee status updated\n"
 msgstr "ਦਰਸ਼� ਸਥਿਤ� ਨਵ�ਨ ਹ�\n"
 
-#: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../calendar/gui/e-itip-control.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ਦਰਸ਼� ਹਾਲਤ ਨ�ੰ �ੱਪਡ�� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�, �ਿ��ਿ ��ਾ� ਹ�ਣ �ਪਲੱਬਧ ਨਹ�� ਰਹ� ਹ�"
 
-#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
 msgstr "��ਾ� ਭ���!\n"
 
-#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
+#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr " ��ਾ� ਨ�ੰ ਭ��ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�!\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "�ਾਰਵਾ� ��ਣ�"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2280
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "�ੱਪਡ��"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "ਮਨ�਼�ਰ"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "�ਰ�� ਮਨ�਼�ਰ"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "�ਨ�ਾਰ"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� ਭ���"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "�ਵਾਬ ਦ�ਣ ਵਾਲਿ�� ਦ� ਹਾਲਤ �ੱਪਡ��"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2449
 msgid "Send Latest Information"
 msgstr "ਤਾ�� �ਾਣ�ਾਰ� ਭ���"
 
-#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ਰੱਦ �ਰ�"
 
@@ -8182,6 +6973,10 @@ msgstr "��ਲੰਡਰ ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 msgid "Loading calendar..."
 msgstr "��ਲੰਡਰ ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "ਪ�ਰਬੰਧ�:"
+
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "ਸਰਵਰ ਸ�ਨ�ਹਾ:"
@@ -8202,77 +6997,73 @@ msgstr "��ਣਵ�� ਭਾ� ਲ�ਣ ਵਾਲ�"
 msgid "Resources"
 msgstr "ਸਰ�ਤ"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
-msgid "Attendees"
-msgstr "ਦਰਸ਼�"
-
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
+#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "�ੱ�ਲਾ"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "ਸਮ�ਹ"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "ਸਰ�ਤ"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "�ਮਰਾ"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
 msgstr "��ਰਸ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "ਲ���ਦ� ਭਾ� ਲ�ਣ ਵਾਲ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "��ਣਵ�� ਭਾ� ਲ��ਣ ਵਾਲ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "��� ਭਾ� ਲ�ਣ ਵਾਲਾ ਨਹ�� ਹ�"
 
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "�ਾਰਵਾ� ਲ���ਦ� ਹ�"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:544
 msgid "Attendee                          "
 msgstr "ਦਰਸ਼�                          "
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 msgid "In Process"
 msgstr "�ਾਰਵਾ� �ਧ�ਨ"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2127
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -8280,78 +7071,78 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2158
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "ਦਫਤਰ ਤ�� ਬਾਹਰ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "��� �ਾਣ�ਾਰ� ਨਹ��"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "ਦਰਸ਼�(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "��ਣ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "ਸਿਰਫ �ੰਮ-�ੰ�� ਹ� ਵ��ਾ�(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "��ਾਰ ਵੱਡਾ ਵ��ਾ�(_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ੱਪਡ��(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "ਸਵ�-��ਣ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "ਸਭ ਵਿ��ਤ� ਤ� ਸਰ�ਤ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "ਸਭ ਵਿ��ਤ� ਤ� �ੱ� ਸਰ�ਤ(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "ਲ���ਦ� ਵਿ��ਤ�(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "ਲ���ਦ� ਲ�� ਤ� �ੱ� ਸਰ�ਤ(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "ਸ਼�ਰ��ਤ� ਸਮਾ�(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "ਸਮਾਪਤ� ਸਮਾ�(_E):"
 
@@ -8379,15 +7170,15 @@ msgstr "ਭਾਸ਼ਾ"
 msgid "Member"
 msgstr "ਮ��ਬਰ"
 
-#: ../calendar/gui/e-memo-table.c:955
+#: ../calendar/gui/e-memo-table.c:950
 msgid "_Delete Selected Memos"
 msgstr "��ਣ� ਮ�ਮ� ਹ�ਾ�(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "�ੱ� ਮ�ਮ� ਸ਼ਾਮਿਲ �ਰਨ ਲ� ਦਬਾ�"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8396,37 +7187,37 @@ msgstr ""
 "%s ਤ� �ਲਤ�:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:812
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
 msgstr "ਮ�ਮ� ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
 
-#: ../calendar/gui/e-memos.c:903
+#: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s �ੱਤ� ਮ�ਮ� ��ਲ ਰਿਹਾ ਹ�"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
 msgstr "��ਣ��� ���ਮਾ� ਹ�ਾ��� �ਾ ਰਹ��� ਹਨ..."
 
-#: ../calendar/gui/e-tasks.c:963
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
 msgstr "�ੰਮ ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
 
-#: ../calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s ਤ� �ੰਮ ��ਲ ਰਿਹਾ ਹ�"
 
-#: ../calendar/gui/e-tasks.c:1306
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
 msgstr "�ੰਮ ਪ�ਰ� �ਰ ਰਿਹਾ ਹ�..."
 
-#: ../calendar/gui/e-tasks.c:1356
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "ਨਿ�ਾਲਾ"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-timezone-entry.c:124
 msgid "Select Timezone"
 msgstr "ਸਮਾ� ��ਤਰ ��ਣ�"
 
@@ -8436,128 +7227,108 @@ msgstr "ਸਮਾ� ��ਤਰ ��ਣ�"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2648
+#: ../calendar/gui/gnome-cal.c:2673
 msgid "_Custom View"
 msgstr "�ਲ� ਸ�ਧ(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2649
+#: ../calendar/gui/gnome-cal.c:2674
 msgid "_Save Custom View"
 msgstr "ਸ�ਧ �ਲ� ਸੰਭਾਲ�(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2654
+#: ../calendar/gui/gnome-cal.c:2679
 msgid "_Define Views..."
 msgstr "�ਲ� ਪ�ਰਭਾਸ਼ਿਤ �ਰ�(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2891
+#: ../calendar/gui/gnome-cal.c:2916
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s �ੱਤ� ਮ�ਲਾ�ਾਤ ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../calendar/gui/gnome-cal.c:2906
+#: ../calendar/gui/gnome-cal.c:2931
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s ਤ� �ੰਮ ਲ�ਡ �ਰ�"
 
-#: ../calendar/gui/gnome-cal.c:2915
+#: ../calendar/gui/gnome-cal.c:2940
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s �ੱਤ� ਮ�ਮ� ਲ�ਡ �ਰ ਰਿਹਾ ਹ�"
 
-#: ../calendar/gui/gnome-cal.c:3027
+#: ../calendar/gui/gnome-cal.c:3052
 #, c-format
 msgid "Opening %s"
 msgstr "%s ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../calendar/gui/gnome-cal.c:3995
+#: ../calendar/gui/gnome-cal.c:4012
 msgid "Purging"
 msgstr "ਸ�ਧਿ� �ਾ ਰਿਹਾ ਹ�"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "�ਪਰ�ਲ"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "��ਸਤ"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "ਦਸੰਬਰ"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "ਫਰਵਰ�"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "�ਨਵਰ�"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "��ਲਾ�"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "��ਨ"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "ਮਾਰ�"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "ਮ�"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "ਨਵੰਬਰ"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "��ਤ�ਬਰ"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
+"�ਨਵਰ�\n"
+"ਫਰਵਰ�\n"
+"ਮਾਰ�\n"
+"�ਪਰ�ਲ\n"
+"ਮ�\n"
+"��ਨ\n"
+"��ਲਾ�\n"
+"��ਸਤ\n"
+"ਸਤੰਬਰ\n"
+"��ਤ�ਬਰ\n"
+"ਨਵੰਬਰ\n"
+"ਦਸੰਬਰ"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "ਮਿਤ� ��ਣ�"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "ਸਤੰਬਰ"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "�ੱ� ��ਣ�(_S)"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:553
 msgid "An organizer must be set."
 msgstr "�ੱ� ਪ�ਰਬੰਧ� ਹ�ਣਾ ਲਾ�ਮ� ਹ�"
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:453
 msgid "At least one attendee is necessary"
 msgstr "�ੱ� ਦਰਸ਼� ਤਾ� ਲ���ਦਾ ਹ�"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
 msgid "Event information"
 msgstr "��ਨਾ �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
 msgid "Task information"
 msgstr "�ੰਮ �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
 msgid "Memo information"
 msgstr "ਮ�ਮ� �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
 msgid "Free/Busy information"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ�"
 
@@ -8565,7 +7336,7 @@ msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ�"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ਮਨ�਼�ਰ"
@@ -8574,7 +7345,7 @@ msgstr "ਮਨ�਼�ਰ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:681
+#: ../calendar/gui/itip-utils.c:684
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "�ਰ�� ਮਨ�਼�ਰ"
@@ -8586,7 +7357,7 @@ msgstr "�ਰ�� ਮਨ�਼�ਰ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "�ਨ�ਾਰ"
@@ -8595,7 +7366,7 @@ msgstr "�ਨ�ਾਰ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ਪ�ਰਤ�ਨਿਧ�"
@@ -8603,7 +7374,7 @@ msgstr "ਪ�ਰਤ�ਨਿਧ�"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ਨਵ�ਨ"
@@ -8611,7 +7382,7 @@ msgstr "ਨਵ�ਨ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ਰੱਦ �ਰ�"
@@ -8619,7 +7390,7 @@ msgstr "ਰੱਦ �ਰ�"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ਮ��-ਤਾ�ਾ"
@@ -8627,99 +7398,99 @@ msgstr "ਮ��-ਤਾ�ਾ"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:729
+#: ../calendar/gui/itip-utils.c:732
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "�ਲ� ਸ��ਾ�"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:802
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ਵ�ਹਲਾ/ਰ��ਿ� �ਾਣ�ਾਰ� (%s ਤ�� %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:810
 msgid "iCalendar information"
 msgstr "iCalendar �ਾਣ�ਾਰ�"
 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:981
 msgid "You must be an attendee of the event."
 msgstr "ਸਮਾ�ਮ ਲ� ਤ�ਸ�� ਦਰਸ਼� ਹ�ਣ� �ਾਹ�ਦ� ਹ�"
 
-#: ../calendar/gui/memos-component.c:507
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "ਨਵ�� ਮ�ਮ� ਲਿਸ�(_N)"
 
-#: ../calendar/gui/memos-component.c:590
+#: ../calendar/gui/memos-component.c:560
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d ਮ�ਮ�"
 msgstr[1] "%d ਮ�ਮ�"
 
-#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d ��ਣਿ�"
 msgstr[1] ", %d ��ਣ�"
 
-#: ../calendar/gui/memos-component.c:639
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
 msgstr "ਮ�ਮ� �ੱਪ�ਰ�ਡ �ਸਫ਼ਲ ਰਿਹਾ ਹ�।"
 
-#: ../calendar/gui/memos-component.c:769
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "ਮ��ਿੰ� �ਤ� ��ਨਾ ਤਿ�ਰ �ਰਨ ਲ� ਮ�ਮ� ਸ��� '%s' ��ਲਣ ਤ�� �ਸਫਲ"
 
-#: ../calendar/gui/memos-component.c:782
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "ਮ�ਮ� ਬਣਾ�ਣ ਲ� ��� ��ਲੰਡਰ �ਪਲੱਬਧ ਨਹ�� ਹ�"
 
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:862
 msgid "Memo Source Selector"
 msgstr "ਮ�ਮ� ਸਰ�ਤ ��ਣ�ਾਰ"
 
-#: ../calendar/gui/memos-component.c:1071
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "ਨਵਾ� ਮ�ਮ�"
 
-#: ../calendar/gui/memos-component.c:1072
+#: ../calendar/gui/memos-component.c:1042
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ਮ�ਮ�(_o)"
 
-#: ../calendar/gui/memos-component.c:1073
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "�ੱ� ਨਵਾ� ਮ�ਮ� ��ਾ� ਬਣਾ�"
 
-#: ../calendar/gui/memos-component.c:1079
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "ਨਵਾ� ਸਾ��ਾ ਮ�ਮ�"
 
-#: ../calendar/gui/memos-component.c:1080
+#: ../calendar/gui/memos-component.c:1050
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "ਸਾ��ਾ ਮ�ਮ�(_S)"
 
-#: ../calendar/gui/memos-component.c:1081
+#: ../calendar/gui/memos-component.c:1051
 msgid "Create a shared new memo"
 msgstr "�ੱ� ਨਵਾ� ਸਾ��ਾ ਮ�ਮ� ਬਣਾ�"
 
-#: ../calendar/gui/memos-component.c:1087
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "ਨਵਾ� ਮ�ਮ� ਲਿਸ�"
 
-#: ../calendar/gui/memos-component.c:1088
+#: ../calendar/gui/memos-component.c:1058
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "ਮ�ਮ� ਲਿਸ�(_s)"
 
-#: ../calendar/gui/memos-component.c:1089
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "ਨਵ�� ਮ�ਮ� ਸ��� ਬਣਾ�"
 
-#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "ਮ�ਮ� ਪਰਿੰ� �ਰ�"
 
@@ -8747,299 +7518,291 @@ msgstr ""
 
 #  FIXME: set proper domain/code
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "evolution/config.xmldb ਤ�� ਪ�ਰਾਣ� ਸ��ਿੰ� ਪ�ਰਾਪਤ �ਰਨ ਤ�� �ਸਫਲ"
 
 #  FIXME: domain/code
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "��ਲੰਡਰ `%s' ਮਾ��ਰ�� �ਰਨ ਲ� �ਸਮਰੱਥ"
 
 #  FIXME: domain/code
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
+#: ../calendar/gui/migration.c:971
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "�ੰਮ `%s' ਮਾ��ਰ�� �ਰਨ ਲ� �ਸਮਰੱਥ"
 
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "ਨ��"
-
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "੧ਲਾ�"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "੨�ਾ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "੩�ਾ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "੪ਵਾ�"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "੫ਵਾ�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "੬ਵਾ�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "੭ਵਾ�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "੮ਵਾ�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "੯ਵਾ�"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "੧੦ਵਾ�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "੧੧ਵਾ�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "੧੨ਵਾ�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "੧੩ਵਾ�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "੧੪ਵਾ�"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "੧੫ਵਾ�"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "੧੬ਵਾ�"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "੧੭ਵਾ�"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "੧੮ਵਾ�"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "੧੯ਵਾ�"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "੨੦ਵਾ�"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "੨੧ਵਾ�"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "੨੨ਵਾ�"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "੨੩ਵਾ�"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "੨੪ਵਾ�"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "੨੫ਵਾ�"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "੨੬ਵਾ�"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "੨੭ਵਾ�"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "੨੮ਵਾ�"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "੨੯ਵਾ�"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "੩੦ਵਾ�"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "੩੧ਵਾ�"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "�ਤ"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "ਸ�ਮ"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "ਮੰ�ਲ"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "ਬ�ੱਧ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "ਵ�ਰ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "ਸ਼�ੱ�ਰ"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "ਸ਼ਨਿ�ੱਰ"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
 msgstr "ਮ�ਲਾ�ਾਤ"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2467
 msgid "Task"
 msgstr "�ਾਸ�"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
 msgstr "ਸੰ��ਪ: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2515
 msgid "Attendees: "
 msgstr "ਦਰਸ਼�:"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "ਹਾਲਤ: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "ਪਹਿਲ: %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ਪ�ਰਤ�ਸ਼ਤ ਪ�ਰਾ: %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "���ਾ�ਰ�: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "ਸੰਪਰ�: "
 
-#: ../calendar/gui/tasks-component.c:499
+#: ../calendar/gui/tasks-component.c:470
 msgid "_New Task List"
 msgstr "ਨਵ�� �ੰਮ ਲਿਸ�(_N)"
 
-#: ../calendar/gui/tasks-component.c:582
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d �ੰਮ"
 msgstr[1] "%d �ੰਮ"
 
-#: ../calendar/gui/tasks-component.c:631
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
 msgstr "�ੰਮ �ੱਪ�ਰ�ਡ �ਸਫਲ ਹ�।"
 
-#: ../calendar/gui/tasks-component.c:764
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "ਮ��ਿੰ� ਤ� ��ਨਾ ਤਿ�ਰ �ਰਨ ਲ� �ਾਰ� ਸ��� '%s' ��ਲਣ ਤ�� �ਸਫਲ"
 
-#: ../calendar/gui/tasks-component.c:777
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr "�ੰਮ ਬਣਾ�ਣ ਲ� ��� ��ਲੰਡਰ �ਪਲੱਬਧ ਨਹ�� ਹ�"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
 msgstr "�ੰਮ ਸਰ�ਤ ��ਣ�ਾਰ"
 
-#: ../calendar/gui/tasks-component.c:1142
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
 msgstr "ਨਵਾ� �ੰਮ"
 
-#: ../calendar/gui/tasks-component.c:1143
+#: ../calendar/gui/tasks-component.c:1114
 msgctxt "New"
 msgid "_Task"
 msgstr "�ੰਮ(_T)"
 
-#: ../calendar/gui/tasks-component.c:1144
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
 msgstr "ਨਵਾ� �ੰਮ ਬਣਾ�"
 
-#: ../calendar/gui/tasks-component.c:1150
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
 msgstr "ਨਵਾ� �ੰਮ ਦਿ�"
 
-#: ../calendar/gui/tasks-component.c:1151
+#: ../calendar/gui/tasks-component.c:1122
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "ਦਿੱਤਾ �ੰਮ(_d)"
 
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
 msgstr "ਨਵਾ� �ੰਮ ਬਣਾ�"
 
-#: ../calendar/gui/tasks-component.c:1158
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
 msgstr "ਨਵ�� �ੰਮ ਸ��� "
 
-#: ../calendar/gui/tasks-component.c:1159
+#: ../calendar/gui/tasks-component.c:1130
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "�ੰਮ ਲਿਸ�(_k)"
 
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
 msgstr "ਨਵ�� �ੰਮ ਸ��� ਬਣਾ�"
 
-#: ../calendar/gui/tasks-control.c:442
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -9051,11 +7814,11 @@ msgstr ""
 "\n"
 "�� ਤ�ਸ�� �ਹਨਾ� �ੰਮਾ� ਨ�ੰ ਹ�ਾ�ਣ ਲ� ਸਹਿਮਤ ਹ�?"
 
-#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "ਮ�ਨ�ੰ ਮ�� ਨਾ ਪ�ੱ��।"
 
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "�ੰਮ ਪਰਿੰ� �ਰ�"
 
@@ -9072,11 +7835,11 @@ msgstr "ਰੱਦ ��ਤਾ"
 msgid "In progress"
 msgstr "ਤਰੱ�� ਵਿੱ� ਹ�"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "ਤ� �ਿ�ਦਾ ਹ�"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "ਤ� �ੱ� ਹ�"
 
@@ -9084,37 +7847,37 @@ msgstr "ਤ� �ੱ� ਹ�"
 msgid "Appointments and Meetings"
 msgstr "ਮ�ਲਾ�ਾਤ �ਤ� ਮ��ਿੰ�"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 msgid "Opening calendar"
 msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar ਫਾ�ਲਾ� (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�-��ਲੰਡਰ �ਯਾਤ�ਾਰ"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "ਯਾਦ-ਪੱਤਰ!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar ਫਾ�ਲਾ� (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�-��ਲੰਡਰ �ਯਾਤ�ਾਰ"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "��ਲੰਡਰ ��ਨਾਵਾ�"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਸ਼ਲ ��ਲੰਡਰ �ਯਾਤ�ਾਰ"
 
@@ -10670,217 +9433,192 @@ msgstr "ਪ�ਰਸ਼ਾਤ/ਵਾਲਿਸ਼"
 msgid "Pacific/Yap"
 msgstr "ਪ�ਰਸ਼ਾਤ/ਯਾਪ�"
 
-#: ../composer/e-composer-autosave.c:273
-msgid "Could not open autosave file"
-msgstr "���-ਸੰਭਾਲ� ਫਾ�ਲ ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
-
-#: ../composer/e-composer-autosave.c:280
+#: ../composer/e-composer-autosave.c:445
 msgid "Unable to retrieve message from editor"
 msgstr "ਸੰਪਾਦ� ਤ�� ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਤ�� �ਸਫਲ"
 
-#: ../composer/e-composer-actions.c:45
-msgid "Insert Attachment"
-msgstr "ਨੱਥ� ਸ਼ਾਮਲ"
-
-#: ../composer/e-composer-actions.c:49
-msgid "A_ttach"
-msgstr "ਨੱਥ�(_t)"
-
-#: ../composer/e-composer-actions.c:140
+#: ../composer/e-composer-actions.c:84
 msgid "Untitled Message"
 msgstr "�਼�ਰ-�ਾ��ਲ ਸ�ਨ�ਹਾ"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "�ੱ� ਫਾ�ਲ ਸ਼ਾਮਿਲ �ਰ�"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "ਬੰਦ �ਰ�(_C)"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:324
 msgid "Close the current file"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਬੰਦ �ਰ�"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "ਪਰਿੰ� �ਰ�(_P)..."
 
-#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "�ਪਾ� �ਲ�(_v)"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:345
 msgid "Save the current file"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:350
 msgid "Save _As..."
 msgstr "�ੰ� ਸੰਭਾਲ�(_A)..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:352
 msgid "Save the current file with a different name"
 msgstr "ਮ���ਦਾ ਫਾ�ਲ ਨ�ੰ ਵੱ�ਰ� ਨਾ� ਨਾਲ ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:357
 msgid "Save as _Draft"
 msgstr "ਡਰਾਫ� ਵਾ�� ਸੰਭਾਲ�(_D)"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:359
 msgid "Save as draft"
 msgstr "ਡਰਾਫ� ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
 msgid "S_end"
 msgstr "ਭ���(_e)"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:366
 msgid "Send this message"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਭ���"
 
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:373
 msgid "Insert Send options"
 msgstr "ਭ��ਣ ��ਣਾ� ਸ਼ਾਮਲ"
 
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:378
 msgid "New _Message"
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ(_M)"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:380
 msgid "Open New Message window"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਾ ਵਿੰਡ� ��ਲ�ਹ�"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:387
 msgid "Character _Encoding"
 msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�(_E)"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:394
 msgid "_Security"
 msgstr "ਸ�ਰੱ�ਿ�(_S)"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "PGP �ੰ��ਰਿਪ�(_E)"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
 msgstr "�ਸ ਸ�ਨ�ਹ� ਨ�ੰ PGP ਨਾਲ �ੰ��ਰਿਪ� �ਰ�"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "PGP ਦਸਤ�ਤ(_S)"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
 msgstr "�ਪਣ� PGP �� ਨਾਲ �ਸ ਸ�ਨ�ਹ� ਤ� ਦਸਤ�ਤ �ਰ�"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:420
 msgid "_Prioritize Message"
 msgstr "ਦਰ�ਾ ਸ�ਨ�ਹਾ(_P)"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:422
 msgid "Set the message priority to high"
 msgstr "ਸ�ਨ�ਹ� ਦਾ ਦਰ�ਾ ਵਧਾ�"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:428
 msgid "Re_quest Read Receipt"
 msgstr "ਪ��ਹਨ ਰਸ�ਦ ਦ� ਮੰ�(_q)"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:430
 msgid "Get delivery notification when your message is read"
 msgstr "�ਦ�� ਤ�ਹਾਡਾ ਸ�ਨ�ਹਾ ਪ�ਿ� �ਾਵ� ਤਾ� ਪ�ਰਾਪਤ� ਸ��ਨਾ ਲਵ�"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:436
 msgid "S/MIME En_crypt"
 msgstr "S/MIME �ੰ��ਰਿਪ�(_C)"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "�ਸ ਸ�ਨ�ਹ� ਨ�ੰ �ਪਣ� S/MIME ��ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਨਾਲ ��ਰਿਪ� �ਰ�"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ਸਾ�ਨ(_n)"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:446
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "�ਪਣ� S/MIME ਦਸਤ�ਤ ਸਰ��ਫਿ��� ਨਾਲ �ਸ ਸ�ਨ�ਹ� ਤ� ਦਸਤ�ਤ �ਰ�"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:452
 msgid "_Bcc Field"
 msgstr "_Bcc ��ਤਰ"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the BCC field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ BCC ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:460
 msgid "_Cc Field"
 msgstr "_Cc ��ਤਰ"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ CC ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:468
 msgid "_From Field"
 msgstr "ਵੱਲ�� ��ਤਰ(_F)"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:470
 msgid "Toggles whether the From chooser is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਵੱਲ�� ��ਣ�ਾਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:630
-msgid "_Post-To Field"
-msgstr "ਭ��ਣਾ ��ਤਰ(_P)"
-
-#: ../composer/e-composer-actions.c:632
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਭ��� ��ਤਰ ਵ��ਿ� �ਾਵ�"
-
-#: ../composer/e-composer-actions.c:638
+#: ../composer/e-composer-actions.c:476
 msgid "_Reply-To Field"
 msgstr "�ਵਾਬ ��ਤਰ(_R)"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:478
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ਤਬਦ�ਲ �ਰ� �ਿ �ਵਾਬ ��ਤਰ ਵ��ਿ� �ਾਵ�"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "ਵਿਸ਼ਾ ��ਤਰ(_S)"
-
-#: ../composer/e-composer-actions.c:648
-msgid "Toggles whether the Subject field is displayed"
-msgstr "ਬਦਲ� �ਿ �� ਵਿਸ਼ਾ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
-
-#: ../composer/e-composer-actions.c:654
-msgid "_To Field"
-msgstr "ਵੱਲ ��ਤਰ(_T)"
-
-#: ../composer/e-composer-actions.c:656
-msgid "Toggles whether the To field is displayed"
-msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਵੱਲ ��ਤਰ ਵ��ਿ� �ਾਵ�"
-
-#: ../composer/e-composer-actions.c:699
+#: ../composer/e-composer-actions.c:521
 msgid "Save Draft"
 msgstr "ਡਰਾਫ� ਸੰਭਾਲ�"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header.c:120
+#| msgid "Sho_w: "
+msgid "Show"
+msgstr "ਵ���"
+
+#: ../composer/e-composer-header.c:123
+#| msgid "_Hide"
+msgid "Hide"
+msgstr "�ਹਲ�"
+
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "ਸ�ਨ�ਹ� ਦ� ਪ�ਰਾਪਤ �ਰਤਾ ਭਰ�"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�ਹ ਸਿਰਨਾਵ�� ਦਿ�, �� �ਿ ਸ�ਨ�ਹ� ਦ� �ਾਪ� ਪ�ਰਾਪਤ �ਰ�"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10889,40 +9627,54 @@ msgstr ""
 "�ਡਰ�ੱਸ।"
 
 #  * From
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:945
 msgid "Fr_om:"
 msgstr "ਵਲ��(_o):"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:923 ../mail/em-mailer-prefs.c:76
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
+msgid "From"
+msgstr "ਵਲ��"
+
+#: ../composer/e-composer-header-table.c:954
 msgid "_Reply-To:"
 msgstr "�ਵਾਬ(_R):"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:959
 msgid "_To:"
 msgstr "ਵੱਲ(_T):"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:965
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../composer/e-composer-header-table.c:971
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
+#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
 #  * Post-To
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:976
 msgid "_Post To:"
 msgstr "ਭ���(_P):"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:980
 msgid "S_ubject:"
 msgstr "ਵਿਸ਼ਾ(_u):"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:989
 msgid "Si_gnature:"
 msgstr "ਦਸਤ�ਤ(_g):"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:116
 msgid "Click here for the address book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਲ� �ੱਥ� �ਲਿੱ� �ਰ�"
 
@@ -10938,37 +9690,26 @@ msgstr "ਸ�ਨ�ਹ� ਭ��ਣ ਲ� ਫ�ਲਡਰ ��ਣ�"
 msgid "Click here to select folders to post to"
 msgstr "ਭ��ਣ ਲ� ਫ�ਲਡਰ ��ਣਨ ਲ� �ੱਥ� �ਲਿੱ� �ਰ�"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1573
-msgid "Show _Attachment Bar"
-msgstr "ਨੱਥ� ਪੱ�� ਵ��ਾ�(_A)"
+#: ../composer/e-composer-private.c:208
+#| msgid "Save Draft"
+msgid "Save draft"
+msgstr "ਡਰਾਫ� ਸੰਭਾਲ�"
 
-#: ../composer/e-msg-composer.c:866
+#: ../composer/e-msg-composer.c:807
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ਬਾਹਰ� ਸ�ਨ�ਹ� ਲ� ਦਸਤ�ਤ ਨਹ� ��ਤ� �ਾ ਸ�ਦ�: �ਸ ��ਾ��� ਲ� ��� ਸਰ��ਫਿ��� ਨਹ�� ਹ�"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:814
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ਬਾਹਰ �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਨ�ੰ ਸ�ਧਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�: �ਸ ��ਾ��� ਲ� ��� ���ਰਿਪਸ਼ਨ ਸਰ��ਫਿ��� ਨਹ�� ਹ�"
 
-#: ../composer/e-msg-composer.c:1515 ../mail/em-format-html-display.c:1952
-#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "ਨੱਥ�"
-msgstr[1] "ਨੱਥ�"
-
-#: ../composer/e-msg-composer.c:1571
-msgid "Hide _Attachment Bar"
-msgstr "ਨੱਥ� ਪੱ�� �ਹਲ�(_A)"
-
-#: ../composer/e-msg-composer.c:1588 ../composer/e-msg-composer.c:2813
+#: ../composer/e-msg-composer.c:1350 ../composer/e-msg-composer.c:2189
 msgid "Compose Message"
 msgstr "ਸ�ਨ�ਹਾ ਲਿ��"
 
-#: ../composer/e-msg-composer.c:4114
+#: ../composer/e-msg-composer.c:3347
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11136,7 +9877,7 @@ msgstr "ਡਰਾਫ� ਸੰਭਾਲ�(_S)"
 msgid "Evolution Mail and Calendar"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਮ�ਲ �ਤ� ��ਲੰਡਰ"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
 msgstr "ਸਮ�ਹਿ� ਸਰ�ਪ"
 
@@ -11152,6 +9893,44 @@ msgstr "�ਡਰਸ �ਾਰਡ"
 msgid "calendar information"
 msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ�"
 
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:188 ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
+msgid "Today"
+msgstr "�ੱ�"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:200 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "�ੱਲ�ਹ"
+
+#: ../e-util/e-datetime-format.c:202
+#| msgid "Yesterday %l:%M %p"
+msgid "Yesterday"
+msgstr "�ੱਲ�ਹ"
+
+#: ../e-util/e-datetime-format.c:205
+#, c-format
+msgid "%d days from now"
+msgstr "ਹ�ਣ ਤ�� %d ਦਿਨ"
+
+#: ../e-util/e-datetime-format.c:207, c-format
+#| msgid "1 day ago"
+#| msgid_plural "%d days ago"
+msgid "%d days ago"
+msgstr "%d ਦਿਨ ਪਹਿਲਾ�"
+
+#: ../e-util/e-datetime-format.c:281 ../e-util/e-datetime-format.c:291
+#: ../e-util/e-datetime-format.c:300
+#| msgid "_Use system defaults"
+msgid "Use locale default"
+msgstr "ਲ���ਲ ਡਿਫਾਲ� ਵਰਤ��"
+
+#: ../e-util/e-datetime-format.c:494
+#| msgid "Format"
+msgid "Format:"
+msgstr "ਫਾਰਮ��:"
+
 #: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਲਤ�"
@@ -11170,7 +9949,7 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ ਸਵਾਲ"
 
 #  setup a dummy error
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "�ੰਦਰ�ਨ� �ਲਤ�, �ਣ�ਾਣ �ਲਤ� '%s' ਬ�ਨਤ�"
@@ -11183,67 +9962,67 @@ msgstr "ਭਾ�"
 msgid "Name of the component being logged"
 msgstr "ਲਾ� ਰੱ�ਣ ਵਾਲ� ਭਾ� ਦਾ ਨਾ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../e-util/e-non-intrusive-error-dialog.c:191
 msgid "Debug Logs"
 msgstr "ਡ�ਬੱ� ਲਾ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:205
 msgid "Show _errors in the status bar for"
 msgstr "ਹਾਲਤ ਪੱ�� ਵਿੱ� �ਲਤ��� ਵ���(_e)"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:222
+#: ../e-util/e-non-intrusive-error-dialog.c:223
 msgid "second(s)."
 msgstr "ਸ�ਿੰ�।"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:229
 msgid "Log Messages:"
 msgstr "ਲਾ� ਸ�ਨ�ਹ�:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:274
 msgid "Log Level"
 msgstr "ਲਾ� ਲ�ਵਲ"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:380
 msgid "Time"
 msgstr "ਸਮਾ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ਸ�ਨ�ਹ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../e-util/e-non-intrusive-error-dialog.c:301
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "�ਹ ਵਿੰਡ� ਬੰਦ �ਰ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Error"
 msgstr "�ਲਤ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Errors"
 msgstr "�ਲਤ���"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warnings and Errors"
 msgstr "��ਤਾਵਨ��� �ਤ� �ਲਤ���"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Debug"
 msgstr "ਡ�ਬੱ�"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Error, Warnings and Debug messages"
 msgstr "�ਲਤ���, ��ਤਾਵਨ��� �ਤ� ਡ�ਬੱ� ਸ�ਨ�ਹ�"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../plugins/publish-calendar/publish-calendar.c:718
 msgid "Enabled"
 msgstr "ਯ�� ��ਤਾ"
 
@@ -11263,6 +10042,10 @@ msgstr "ਪਰਿ�ਿੰ� ਸਿਸ�ਮ ਨ� �ਲਤ� ਬਾਰ� 
 msgid "The printing system did not report any additional details about the error."
 msgstr "ਪਰਿੰ�ਿੰ� ਸਿਸ�ਮ ਨ� �ਲਤ� ਬਾਰ� ਹ�ਰ �ਾਣ�ਾਰ� ਨਹ�� ਦਿੱਤ� ਹ�।"
 
+#: ../e-util/e-signature.c:690
+msgid "Autogenerated"
+msgstr "ਸਵ�-ਨਿਰਮਤ"
+
 #  mail-composer:attach-nomessages secondary
 #  mail-composer:no-sig-file secondary
 #  mail:no-create-tmp-path secondary
@@ -11297,245 +10080,245 @@ msgstr "�ੱਪਰ ਲ਼ਿ��?"
 msgid "_Overwrite"
 msgstr "�ੱਤ� ਲਿ��(_O)"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:133
 msgid "Could not open the link."
 msgstr "ਸਬੰਧ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�।"
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਲ� ਮੱਦਦ ਵ��ਾ� ਨਹ�� �ਾ ਸ��।"
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "�ਾਸ(_m)"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "�ੰਮ(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "ਨਿੱ��(_P)"
 
 #  forest green
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 msgid "_To Do"
 msgstr "�ਰਨ ਲ�(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "ਬਾ�ਦ '�(_L)"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:320
 msgid "Label _Name:"
 msgstr "ਲ�ਬਲ ਨਾ�(_N):"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Edit Label"
 msgstr "ਲ�ਬਲ ਸ�ਧ"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Add Label"
 msgstr "ਲ�ਬਲ ਸ਼ਾਮਲ"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:362
 msgid "Label name cannot be empty."
 msgstr "ਲ�ਬਲ ਨਾ� �ਾਲ� ਨਹ�� ਹ� ਸ�ਦਾ ਹ�।"
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:367
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr "ਸਰਵਰ �ੱਤ� ਪਹਿਲਾ� ਹ� �ੱ� ਲ�ਬਲ �ਸ ��� ਨਾਲ ਮ���ਦ ਹ�। �ਪਣਾ ਲ�ਬਲ ਨਾ� ਬਦਲ� ��।"
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf �ਲਤ�: %s"
 
-#: ../e-util/gconf-bridge.c:1231
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "ਹ�ਰ ਬਾ�� ਸਭ �ਲਤ��� ��ਵਲ �ਰਮ�ਨਲ �ੱਤ� ਹ� ਵ���।"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "੧ ਸ�ਿੰ� ਪਹਿਲਾ�"
 msgstr[1] "%d ਸ�ਿੰ� ਪਹਿਲਾ�"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "��ਣ ਵਾਲਾ ੧ ਸ�ਿੰ�"
 msgstr[1] "��ਣ ਵਾਲ� %d ਸ�ਿੰ�"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "੧ ਮਿੰ� ਪਹਿਲਾ�"
 msgstr[1] "%d ਮਿੰ� ਪਹਿਲਾ�"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "��ਣ ਵਾਲਾ ੧ ਮਿੰ�"
 msgstr[1] "��ਣ ਵਾਲ� %d ਮਿੰ�"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "੧ �ੰ�ਾ ਪਹਿਲਾ�"
 msgstr[1] "%d �ੰ�ਾ ਪਹਿਲਾ�"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "��ਣ ਵਾਲ� ਦਿਨ ਵਿੱ� ੧ �ੰ�ਾ"
 msgstr[1] "��ਣ ਵਾਲ� ਦਿਨ ਵਿੱ� %d �ੰ��"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "੧ ਦਿਨ ਪਹਿਲਾ�"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾ�"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "��ਣ ਵਾਲ� ੧ ਦਿਨ"
 msgstr[1] "��ਣ ਵਾਲ� %d ਦਿਨ"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "੧ ਹਫਤਾ ਪਹਿਲਾ�"
 msgstr[1] "%d ਹਫਤਾ ਪਹਿਲਾ�"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "��ਣ ਵਾਲ� ਦਿਨਾ� ਵਿੱ� ੧ ਹਫ਼ਤਾ"
 msgstr[1] "��ਣ ਵਾਲ� ਦਿਨਾ� ਵਿੱ� %d ਹਫ਼ਤ�"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "੧ ਮਹ�ਨਾ ਪਹਿਲਾ�"
 msgstr[1] "%d ਮਹ�ਨ� ਪਹਿਲਾ�"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "��ਣ ਵਾਲਾ ੧ ਮਹ�ਨਾ"
 msgstr[1] "��ਣ ਵਾਲ� %d ਮਹ�ਨ�"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "੧ ਸਾਲ ਪਹਿਲਾ�"
 msgstr[1] "%d ਸਾਲ ਪਹਿਲਾ�"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "��ਣ ਵਾਲਾ ੧ ਸਾਲ"
 msgstr[1] "��ਣ ਵਾਲ� %d ਸਾਲ"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<ਮਿਤ� ��ਣਨ ਲ� �ਥ� �ਲਿੱ� �ਰ�>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "ਹ�ਣ"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "ਮ�ਲ �ਰਨ ਲ� ਸਮਾ� ��ਣ�"
 
-#: ../filter/filter-file.c:284
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "�ੱ� ਫਾ�ਲ ��ਣ�"
 
-#: ../filter/filter-part.c:532
+#: ../filter/filter-part.c:528
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "�ਾ��"
 
-#: ../filter/filter-rule.c:853
+#: ../filter/filter-rule.c:854
 msgid "R_ule name:"
 msgstr "ਨਿਯਮ ਨਾ�(_u):"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:882
 msgid "Find items that meet the following conditions"
 msgstr "���ਮਾ� ਲੱਭ�, �� �ਿ ਹ�ਠ ਦਿੱਤ� ਸ�ਮਾਵਾ� ਨ�ੰ ਪ�ਰ� �ਰਦ� ਹ�ਵ�"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:916
 msgid "A_dd Condition"
 msgstr "ਸ਼ਰਤ ਸ਼ਾਮਲ(_d)"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If all conditions are met"
 msgstr "���ਰ ਸਭ ਸ�ਮਾ ਮ�ਲ �ਾਣ ਤਾ�"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If any conditions are met"
 msgstr "���ਰ ��� ਵ� ਸ�ਮਾ ਮ�ਲ �ਾਵ�"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/filter-rule.c:924
 msgid "_Find items:"
 msgstr "��ਾ� ���(_F):"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "All related"
 msgstr "ਸਭ ਸੰਬੰਧਿਤ"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies"
 msgstr "�ਵਾਬ"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies and parents"
 msgstr "�ਵਾਬ ਤ� ਮ�ੱਢਲ�"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "No reply or parent"
 msgstr "��� �ਵਾਬ �ਾ� ਮ�ੱਢਲਾ ਨਹ��"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/filter-rule.c:944
 msgid "I_nclude threads"
 msgstr "ਸ਼ਾਮਲ ਥਰਿੱਡ(_n)"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "� ਰਹ�"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "ਬਾਹਰ�"
 
@@ -11624,54 +10407,52 @@ msgstr ""
 " ਨਾਲ ਮਿਲਾ�� �ਾਵ��ਾ।"
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "ਮ���ਦਾ ਸਮ�� ਦ� �ਨ�ਸਾਰ� ਸਮਾ�"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "ਪਹਿਲਾ�"
-
-#: ../filter/filter.glade.h:16
-msgid "in the future"
-msgstr "ਭਵਿੱ� ਵਿੱ�"
-
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "ਮਹ�ਨ�"
-
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
-msgid "seconds"
-msgstr "ਸ�ਿੰ�"
-
-#: ../filter/filter.glade.h:20
-msgid "the current time"
-msgstr "ਮ���ਦਾ ਸਮਾ�"
+#| msgid "in the future"
+msgid ""
+"ago\n"
+"in the future"
+msgstr ""
+"ਪਹਿਲਾ�\n"
+"ਭਵਿੱ� ਵਿੱ�"
+
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
+"ਸ�ਿੰ�\n"
+"ਮਿੰ� "
+"�ੰ��\n"
+"ਦਿਨ\n"
+"ਹਫ਼ਤ�\n"
+"ਮਹ�ਨ�\n"
+"ਸਾਲ"
 
 #: ../filter/filter.glade.h:21
-msgid "the time you specify"
-msgstr "ਸਮਾ� �� ਤ�ਸ�� ਨਿਰਧਾਰਿਤ ��ਤਾ ਹ�"
-
-#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:527
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/google-account-setup/google-contacts-source.c:378
-msgid "weeks"
-msgstr "ਹਫਤ�"
-
-#: ../filter/filter.glade.h:23
-msgid "years"
-msgstr "ਸਾਲ"
+#| msgid "a time relative to the current time"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr ""
+"ਮ���ਦਾ ਸਮਾ�\n"
+"ਤ�ਹਾਡ� ਵਲ�� ਦਿੱਤਾ ਸਮਾ�\n"
+"ਮ���ਦਾ ਸਮ�� ਦ� �ਨ�ਸਾਰ ਸਮਾ�"
 
-#: ../filter/rule-editor.c:382
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "ਨਿਯਮ ����ਹ�"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "ਨਿਯਮ ਸ�ਧ"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "ਨਿਯਮ ਨਾ�"
 
@@ -11701,7 +10482,7 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ��ਾ��� ਸੰਰ�ਨਾ ਸੰਦ"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ��ਾ��� ਸੰਰ�ਨਾ �ੰ�ਰ�ਲ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
@@ -11713,7 +10494,7 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਲ��ਣ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਲ��ਣ ਸੰਰ�ਨਾ ਸੰਦ"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਲ��ਣ ਸੰਰ�ਨਾ �ੰ�ਰ�ਲ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
@@ -11723,21 +10504,21 @@ msgstr "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਪਸੰਦ �ੰ�ਰ�ਲ"
 msgid "Evolution Network configuration control"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੱ�ਵਰ� ਸੰਰ�ਨਾ �ੰ�ਰ�ਲ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:793
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "ਪੱਤਰ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "ਪੱਤਰ ��ਾ���"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "ਪੱਤਰ ਪਸੰਦ"
 
@@ -11746,16 +10527,121 @@ msgid "Network Preferences"
 msgstr "ਨ�ੱ�ਵਰ� ਪਸੰਦ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr "ਪੱਤਰ(_M)"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "�ੱ�� ਭ���(_F)"
+
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Reply to Sender"
+msgstr "ਭ��ਣ ਵਾਲ� ਨ�ੰ �ਵਾਬ(_R)"
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334, c-format
+#| msgid "Attached message"
+#| msgid_plural "%d attached messages"
+msgid "%d attached messages"
+msgstr "%d ਸ�ਨ�ਹ� ���� ��ਤ�"
+
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1642
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "����ਮ���"
+msgstr[1] "����ਮ���"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:607
+#| msgid "Month View"
+msgid "Icon View"
+msgstr "���ਾਨ �ਲ�"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:608
+#| msgid "_List View"
+msgid "List View"
+msgstr "ਲਿਸ� �ਲ�"
+
+#  message-search popup match count string
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "ਮਿਲਦਾ: %d"
+
+#: ../mail/e-mail-search-bar.c:520
+#| msgid "Close this window"
+msgid "Close the find bar"
+msgstr "�ਹ ਪੱ�� ਬੰਦ �ਰ�"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "���(_d):"
+
+#: ../mail/e-mail-search-bar.c:540
+#| msgid "Always search"
+msgid "Clear the search"
+msgstr "��� ਸਾਫ਼ �ਰ�"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "ਪਿੱ��(_P)"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr "ਸ਼ਬਦ ਦ� ਪਿ�ਲ� ਮ���ਦ�� ਲੱਭ�"
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "�ੱ��(_N)"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr "ਸ਼ਬਦ ਦ� ��ਲ� ਮ���ਦ�� ਲੱਭ�"
+
+#: ../mail/e-mail-search-bar.c:587
+#| msgid "M_atch case"
+msgid "Mat_ch case"
+msgstr "ਮਿਲਦ� ਸਭ(_c)"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr "ਪ��਼ ਦ� �ੰਤ �ੱਤ� ਪ�ੱ��, �ੱਤ� ਤ�� �ਾਰ� ਰੱ�ਿ�"
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+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:309
+msgid "No encryption"
+msgstr "��� �ੰ��ਰਿਪਸ਼ਨ ਨਹ��"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+msgid "TLS encryption"
+msgstr "TLS �ੰ��ਰਿਪਸ਼ਨ"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+msgid "SSL encryption"
+msgstr "SSL �ੰ��ਰਿਪਸ਼ਨ"
+
+#: ../mail/em-account-editor.c:408
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ�"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -11768,106 +10654,110 @@ msgstr ""
 "�� �ਿ %s ਲ� ਹ�ਠ ਦਿੱਤ��� ਹਨ\n"
 "�ਤ� ਮਨ�਼�ਰ �ਰਨ ਲ� �ਾ�� ਬ�ਸ� ਤ� �ਲਿੱ� �ਰ�\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "ਫ�ਲਡਰ ��ਣ�"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
-msgid "Autogenerated"
-msgstr "ਸਵ�-ਨਿਰਮਤ"
+#: ../mail/em-account-editor.c:797
+msgid "Never"
+msgstr "�ਦ� ਨਹ��"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:798
+msgid "Always"
+msgstr "ਹਮ�ਸ਼ਾ"
+
+#: ../mail/em-account-editor.c:799
 msgid "Ask for each message"
 msgstr "ਹਰ ਸ�ਨ�ਹ� ਲ� ਪ�ੱ��"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "ਪ�ਾਣ"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "�-ਮ�ਲ ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2216
 msgid "Check for _new messages every"
 msgstr "�ੰਨ� �ੰਤਰਾਲ ਬਾ�ਦ ਪੱਤਰ ��ੱ� �ਰ�(_n)"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2224
 msgid "minu_tes"
 msgstr "ਮਿੰ�(_t)"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
+#: ../mail/em-account-editor.c:2420 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "�-ਮ�ਲ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2479 ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "ਮ�ਲ"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2545 ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 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:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2582 ../mail/em-account-editor.c:2677
 msgid "Receiving Options"
 msgstr "ਪ�ਰਾਪਤ� ��ਣ"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2583 ../mail/em-account-editor.c:2678
 msgid "Checking for New Messages"
 msgstr "ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� ��ੱ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3145 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "��ਾ��� ਸੰਪਾਦ�"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3145 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਾ��� ਸਹਾ��"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[ਮ�ਲ]"
 
-#: ../mail/em-account-prefs.c:488
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr "��ਾ��� ਨਾ�"
 
-#: ../mail/em-account-prefs.c:490
+#: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr "ਪ�ਰ����ਾਲ"
 
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
+#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
 msgid "Unnamed"
 msgstr "ਬ�-ਨਾ�"
 
-#: ../mail/em-composer-prefs.c:970
+#: ../mail/em-composer-prefs.c:961
 msgid "Language(s)"
 msgstr "ਭਾਸ਼ਾ"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:994
 msgid "Add signature script"
 msgstr "�ੱ� ਦਸਤ�ਤ� ਸ�ਰਿਪ� ਸ਼ਾਮਿਲ"
 
-#: ../mail/em-composer-prefs.c:1061
+#: ../mail/em-composer-prefs.c:1036
 msgid "Signature(s)"
 msgstr "ਦਸਤ�ਤ"
 
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- �ੱ�� ਭ��� ਸ�ਨ�ਹ� --------"
 
-#: ../mail/em-composer-utils.c:1602
+#: ../mail/em-composer-utils.c:1585
 msgid "No destination address provided, forward of the message has been cancelled."
 msgstr "��� �ਿ�ਾਣਾ �ਡਰ�ੱਸ ਨਹ�� ਦਿੱਤਾ �ਿ�,  ਸ�ਨ�ਹ� ਲ� �ੱ�� ਭ��ਣਾ ਰੱਦ ��ਤਾ।"
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1591
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "ਵਰਤਣ ਲ� ��� ��ਾ��� ਨਹ�� ਲੱਭਿ�, ਸ�ਨ�ਹਾ �ੱ�� ਭ��ਣ ਨ�ੰ ਰੱਦ ��ਤਾ �ਿ�।"
 
@@ -11890,7 +10780,7 @@ msgstr ""
 msgid "-----Original Message-----"
 msgstr "--------�ਸਲ� ਸ�ਨ�ਹਾ--------"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "ਫਿਲ�ਰ ਨਿਯਮ(_F)"
 
@@ -11908,18 +10798,10 @@ msgstr "ਰੰ� ਦਿ�"
 msgid "Assign Score"
 msgstr "ਸ��ਰ ਦਿ�"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "�ਵਾ�"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "ਸਮਾਪਤ "
@@ -11937,7 +10819,7 @@ msgid "Date sent"
 msgstr "ਭ��ਣ ਮਿਤ�"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
+#: ../plugins/groupwise-features/share-folder.c:765
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11988,226 +10870,236 @@ msgstr "ਸਮ��ਰਨ"
 msgid "Follow Up"
 msgstr "ਪਿੱ�� �ਾ�"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+#| msgid "Forward"
+msgid "Forward to"
+msgstr "�ੱ��"
+
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
 msgid "Important"
-msgstr "ਲਾ�਼ਮ�"
+msgstr "�ਾਸ"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "ਬਾ�ਦ ਹ�"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "ਪਹਿਲਾ� ਹ�"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "ਨਿਸ਼ਾਨ ਹ�ਵ�"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "ਨਾ-ਨਿਸ਼ਾਨ ਹ�ਵ�"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "ਸ�ੱ� ਨਹ�� ਹ�"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "ਸ�ੱ� ਹ�"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "�ੰ�"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "�ੰ� �ਾ��"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "ਲ�ਬਲ"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "ਮ�ਲਿੰ� ਲਿਸ�"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "ਮਿਲਦ� ਸਭ"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "ਸ�ਨ�ਹਾ ਮ�ੱ� ਭਾ�"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "ਸ�ਨ�ਹਾ ਹ�ੱਡਰ"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "ਸ�ਨ�ਹਾ ਰੱਦ� ਹ�"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "ਸ�ਨ�ਹਾ ਰੱਦ� ਨਹ� ਹ�"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
+#| msgid "Message contains"
+msgid "Message Location"
+msgstr "ਸ�ਨ�ਹਾ �ਿ�ਾਣਾ"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
-msgstr "�ਾਰ� ਨਾਲ ਸ਼ਾਮਿਲ"
+msgstr "ਪਰ��ਰਾਮ ਨਾਲ ਸ਼ਾਮਿਲ"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "�ਵਾ� �ਲਾ�"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "ਪ��ਹ�"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "ਪ�ਰਾਪਤ �ਰਤਾ"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "Regex ਮ�ਲ"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "�ਵਾਬ ਭ��ਿ� ਹ�ਵ�"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "ਵਾਪਸ"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "�ਿ�ਦਾ ਵਾਪਿਸ �ਰ�"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "�ੱ� ਵਾਪਿਸ �ਰ�"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "�ਾਰ� �ਲਾ�"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "ਸ��ਰ"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "ਭ��ਣ ਵਾਲਾ"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
 msgstr "ਭ��ਣ ਵਾਲਾ �ਾ� ਪ�ਰਾਪਤ �ਰਤਾ"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
 msgstr "ਲ�ਬਲ ਸ�ੱ�"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "ਹਾਲਤ ਸ�ੱ� �ਰ�"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "��ਾਰ (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "�ਵਾ� ਹ�ਵ�"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "ਸਰ�ਤ ��ਾ���"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "�ਾਸ ਹ�ੱਡਰ"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "�ਸ ਨਾਲ ਸ਼�ਰ�"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "�ਾਰਵਾ� ਰ���"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
+#: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "ਵਿਸ਼ਾ"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "ਸਥਿਤ� ਨਾ-ਨਿਰਧਾਰਨ"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "ਤਦ"
 
-#: ../mail/em-filter-rule.c:550
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "��ਸ਼ਨ ਸ਼ਾਮਲ(_t)"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
 msgstr "��� ਤ�� ��� ਫ�ਲਡਰ ਬਣਾ�(_r)..."
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "ਸਭ ਸ�ਨ�ਹ�"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "ਨਾ-ਪ��ਹ� ਸ�ਨ�ਹ�"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "ਬਿਨ-ਲ�ਬਲ"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "ਪ��ਹ� ਸ�ਨ�ਹ�"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "ਤਾ�਼� ਸ�ਨ�ਹ�"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "��ਰ� ੫ ਦਿਨਾ� ਦ� ਸ�ਨ�ਹ�"
 
-#: ../mail/em-folder-browser.c:231
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "ਨੱਥ� ਸਮ�ਤ ਸ�ਨ�ਹ�"
 
-#: ../mail/em-folder-browser.c:232
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "�ਾਸ ਸ�ਨ�ਹ�"
 
-#: ../mail/em-folder-browser.c:233
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "ਨਾ-�ੰ� ਸ�ਨ�ਹ�"
 
-#: ../mail/em-folder-browser.c:1188
+#: ../mail/em-folder-browser.c:1194
 msgid "Account Search"
 msgstr "��ਾ��� ���"
 
-#: ../mail/em-folder-browser.c:1241
+#: ../mail/em-folder-browser.c:1256
 msgid "All Account Search"
 msgstr "ਸਭ ��ਾ��� ���"
 
@@ -12237,11 +11129,11 @@ msgid "Quota usage"
 msgstr "���ਾ ਵਰਤ��"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
-#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "��ਣ-ਬ�ਸਾ"
 
@@ -12254,291 +11146,292 @@ msgstr "ਫ�ਲਡਰ ਵਿਸ਼�ਸਤਾ"
 msgid "<click here to select a folder>"
 msgstr "<ਫ�ਲਡਰ ��ਣਨ ਲ� �ਥ� �ਲਿੱ� �ਰ�>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "ਬਣਾ�(_r)"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr "ਫ�ਲਡਰ ਨਾ�(_n):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
+#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "��� ਫ�ਲਡਰ"
 
 #  UNMATCHED is always last
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "ਨਾ-ਮਿਲਦਾ"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "ਡਰਾਫ�"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "��ਪਲ��"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "ਬਾਹਰ�-ਬ�ਸਾ"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "ਭ���"
 
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 msgstr "ਲ�ਡ ��ਤਾ �ਾ ਰਿਹਾ ਹ�...."
 
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
-#, c-format
+#: ../mail/em-folder-tree.c:318, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u)"
 msgctxt "folder-display"
-msgid "%s (%u)"
-msgstr "%s (%u)"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "ਪੱਤਰ ਫ�ਲਡਰ ਲ��"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr "ਫ�ਲਡਰ %s ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr "ਫ�ਲਡਰ %s ਦ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ਸ�ਨ�ਹਿ�� ਨ�ੰ %s ਫ�ਲਡਰ ਵਿੱ� ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ਸ�ਨ�ਹ� ਫ�ਲਡਰ %s ਵਿੱ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "�ੱਪਰ� ਸੰਭਾਲ ਤ�� ਸ�ਨ�ਹਾ ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨ�ਲ(_C)"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
+msgid "_Move"
+msgstr "ਭ���(_M)"
+
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
+msgid "Cancel _Drag"
+msgstr "��ੱ�ਣਾ ਰੱਦ(_D)"
+
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ਵਿੱ� ਫ�ਲਡਰ ਦ� �ਾ�� ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr "ਨਵ�� �ਰ��� ਵਿੱ� ��ਲ�ਹ�(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "ਨਵਾ� ਫ�ਲਡਰ(_N)..."
 
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "ਭ���(_M)..."
 
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "ਮ��-ਤਾ�ਾ(_f)"
 
-#: ../mail/em-folder-tree.c:2134
+#: ../mail/em-folder-tree.c:2124
 msgid "Fl_ush Outbox"
 msgstr "���ਬਾ�ਸ ਫਲੱਸ਼(_u)"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "ਰੱਦ� �ਾਲ�(_E)"
 
-#: ../mail/em-folder-tree.c:2243
+#: ../mail/em-folder-tree.c:2232
 msgid "_Unread Search Folder"
 msgstr "��� ਫ�ਲਡਰ �ਣ-ਪ��ਹਿ�(_U)"
 
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "`%s' ਨ�ੰ `%s' ਵਿੱ� �ਾਪ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "ਫ�ਲਡਰ ��ਣ�"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "ਨ�ਲ(_o)"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "ਫ�ਲਡਰ `%s' ਬਣਾ�"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "ਨਿਰਧਾਰਿਤ �ਰ� ਫ�ਲਡਰ �ਿੱਥ� ਬਣਾ�� �ਾਵ�:"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "ਮ�ਲ ਹ�ਾ�ਣਾ ਫ�ਲ�ਹ"
 
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "�ਹ ਪੱਤਰ ਹ�ਾ�ਣ ਲ� ਤ�ਹਾਨ�ੰ ਲ���ਦ� �ਧਿ�ਾਰ ਨਹ�� ਹਨ।"
 
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "ਭ��ਣ ਵਾਲ� ਨ�ੰ �ਵਾਬ(_R)"
-
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward"
-msgstr "�ੱ�� ਭ���(_F)"
-
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1337 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "ਨਵਾ� ਸ�ਨ�ਹ� ਵਿੱ� ਸ�ਧ(_E)..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "ਨਾ-ਹ�ਾ�(_n)"
 
-#: ../mail/em-folder-view.c:1344
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਭ���(_M)..."
 
-#: ../mail/em-folder-view.c:1345
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "ਫ�ਲਡਰ ਵਿੱ� ਨ�ਲ(_C)..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "ਪ��ਹ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_k)"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "ਨਾ-ਪ��ਹ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_U)"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "�ਾਸ ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_I)"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "ਨਾ-�ਾਸ ਨਿਸ਼ਾਨਬੱਧ ਬਣਾ�(_i)"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "ਰੱਦ� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_J)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "ਰੱਦ� ਨਹ�� ਦਾ ਨਿਸ਼ਾਨ ਲ�ਾ�(_N)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "ਪਿੱ�ਾ ��� ਲ� ਨਿਸ਼ਾਨਬੱਧ(_w)..."
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "ਲ�ਬਲ(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "��� ਨਹ��(_N)"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "ਨਵਾ� ਲ�ਬਲ(_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_g)"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "ਨਿਸ਼ਾਨ ਸਾਫ"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "ਸ�ਨ�ਹ� ਤ�� ਨਿਯਮ ਬਣਾ�"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "ਵਿਸ਼� ਤ�� �ਧਾਰਿਤ ��� ਫ�ਲਡਰ(_S)"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "ਭ��ਣ ਵਾਲਿ�� ਤ�� ��� ਫ�ਲਡਰ(_n)"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "ਸਿਰਨਾਵ�� �ੱਤ� �ਧਾਰਿਤ ��� ਫ�ਲਡਰ(_R)"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "ਮ�ਲਿੰ� ਸ��� �ੱਤ� �ਧਾਰਿਤ ��� ਫ�ਲਡਰ(_L)"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "ਵਿਸ਼� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ(_j)"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "ਭ��ਣ ਵਾਲਿ�� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ(_d)"
 
-#: ../mail/em-folder-view.c:1380
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "ਸ�ਨ�ਹ��� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ(_c)"
 
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "ਮ�ਲਿੰ� ਸ��� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ(_M)"
 
@@ -12546,140 +11439,108 @@ msgstr "ਮ�ਲਿੰ� ਸ��� �ੱਤ� �ਧਾਰਿਤ ਫਿ
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:510
-#: ../plugins/google-account-setup/google-source.c:708
+#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:593
+#: ../plugins/google-account-setup/google-source.c:764
 msgid "Default"
 msgstr "ਮ�ਲ"
 
-#: ../mail/em-folder-view.c:2518
+#: ../mail/em-folder-view.c:2493
 msgid "Unable to retrieve message"
 msgstr "ਸ�ਨ�ਹਾ ਪ�ਰਾਪਤ �ਰਨ ਲ� �ਸਫਲ"
 
-#: ../mail/em-folder-view.c:2537
-msgid "Retrieving Message..."
-msgstr "ਸ�ਨ�ਹਾ ਲਿ� �ਾ ਰਿਹਾ ਹ�..."
-
-#: ../mail/em-folder-view.c:2756
-msgid "C_all To..."
-msgstr "�ਾਲ �ਰ�(_a)..."
-
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2696
 msgid "Create _Search Folder"
 msgstr "��� ਫ�ਲਡਰ ਬਣਾ�(_S)"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr "�ਸ �ਡਰ�ੱਸ ਤ��(_F)"
 
-#: ../mail/em-folder-view.c:2761
+#: ../mail/em-folder-view.c:2698
 msgid "_To this Address"
 msgstr "�ਸ �ਡਰ�ੱਸ ਲ�(_T)"
 
-#: ../mail/em-folder-view.c:3254
+#: ../mail/em-folder-view.c:3191
 #, c-format
 msgid "Click to mail %s"
 msgstr "ਪੱਤਰ %s ਲ� ਦਬਾ�"
 
-#: ../mail/em-folder-view.c:3266
+#: ../mail/em-folder-view.c:3203
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ਨ�ੰ �ਾਲ �ਰਨ ਲ� �ਲਿੱ� �ਰ�"
 
-#: ../mail/em-folder-view.c:3271
+#: ../mail/em-folder-view.c:3208
 msgid "Click to hide/unhide addresses"
 msgstr "�ਡਰ�ੱਸ �ਹਲ�/ਵ��ਾ�ਣ ਲ� ਦਬਾ�"
 
-#  message-search popup match count string
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:474
-#, c-format
-msgid "Matches: %d"
-msgstr "ਮਿਲਦਾ: %d"
-
-#: ../mail/em-format-html-display.c:618
-msgid "Fin_d:"
-msgstr "���(_d):"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:642
-msgid "_Previous"
-msgstr "ਪਿੱ��(_P)"
-
-#: ../mail/em-format-html-display.c:647
-msgid "_Next"
-msgstr "�ੱ��(_N)"
-
-#: ../mail/em-format-html-display.c:652
-msgid "M_atch case"
-msgstr "ਮਿਲਦ� ਸਭ(_a)"
-
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
 msgid "Unsigned"
 msgstr "ਨਾ-ਦਸਤ�ਤ"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:560
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਦਸਤ�ਤ ਨਾਲ ਨਹ�� ਹ�। �ਸ ਦ� ��� �ਾਰੰ�� ਨਹ�� �ਿ �ਹ ਸ�ਨ�ਹਾ ਸਹ�� ਹ�।"
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
 msgid "Valid signature"
 msgstr "�ਾ�� ਦਸਤ�ਤ"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:561
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਦਸਤ�ਤ ਨਾਲ ਹ� �ਤ� �ਾ�� ਮਤਲਬ ਵ� ਹ�, ਪਰ �ਹ ਪ�ਰਮਾਣਿਤ ਨਹ�� ਲੱ�ਦਾ ਹ�।"
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:562 ../mail/em-format-html.c:656
 msgid "Invalid signature"
 msgstr "�ਲਤ ਦਸਤ�ਤ"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:562
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "�ਸ ਸ�ਨ�ਹ� ਦ� ਦਸਤ�ਤ �ਾ��� ਨਹ�� ਹਨ, ਪਰ ਸੰ�ਾਰ ਦ�ਰਾਨ �ਹ ਤਬਦ�ਲ ਹ� �� �ਾਪਦ� ਹਨ।"
 
-#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
 msgid "Valid signature, but cannot verify sender"
 msgstr "ਦਸਤ�ਤ ਠ�� ਹਨ, ਪਰ ਭ��ਣ ਵਾਲਾ ��ੱ� ਨਹ�� ��ਤਾ"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:563
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "�ਸ ਸ�ਨ�ਹ� ਦ� ਦਸਤ�ਤ ਤਾ� �ਾ�� ਹਨ, ਪਰ �ਸ ਦ� ਭ��ਣ ਵਾਲ� ਨ�ੰ �ਾ��ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
 
-#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
 msgid "Signature exists, but need public key"
 msgstr "ਦਸਤ�ਤ ਮ���ਦ ਹਨ, ਪਰ ਪਬਲਿ� ��ੰ�� ਲ���ਦ� ਹ�"
 
-#: ../mail/em-format-html-display.c:955
+#: ../mail/em-format-html-display.c:564
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "�ਸ ਸ�ਨ�ਹ� ਦ� ਦਸਤ�ਤ ਤਾ� ਹਨ, ਪਰ ਸਬੰਧਿਤ ਪਬਲਿ� �� ਨਾਲ ਸਬੰਧਿਤ ਨਹ��।"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
 msgid "Unencrypted"
 msgstr "�ਣ-�ੰ��ਰਿਪ�ਡ"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:571
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "�ਹ ਸ�ਨ�ਹਾ �ੰ��ਰਿਪ�ਡ ਨਹ�� ਹ� �ਸ ਦ� ��� ਭਾ� �ੰ�ਰਨ�ੱ� ਤ� ਸੰ�ਾਰ ਦ�ਰਾਨ ਵ��� �ਾ ਸ�ਦ� ਹਨ।"
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
 msgid "Encrypted, weak"
 msgstr "�ੰ��ਰਿਪ�ਡ, ਹਲ�ਾ"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:572
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12688,21 +11549,21 @@ msgstr ""
 "�ਹ ਸ�ਨ�ਹ� �ੰ��ਰਿਪ�ਡ ਹ� �ਤ� �ਸ ਲ� ਹਲ�ਾ �ਲ���ਰਿਥਮ ਵਰਤਿ� �ਿ� ਹ�। �ਸ ਸ�ਨ�ਹ� ਨ�ੰ �ੱ� ਸੰਭਵ ਸਮ�� ਵਿੱ� "
 "�ਿਸ� ਵ� ਬਾਹਰ� ਵਿ��ਤ� ਵਲ�� ��ਲਣ ��ਾ ਤਾ� ਹ�, ਪਰ �ਸੰਭਵ ਨਹ�� ਹ�।"
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
 msgid "Encrypted"
 msgstr "�ੰ��ਰਿਪ�ਡ"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:573
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "�ਹ ਸ�ਨ�ਹਾ �ੰ��ਰਿਪ�ਡ ਹ�, �ਸ ਸ�ਨ�ਹ� ਦ� �ਿਸ� ਭਾ� ਨ�ੰ ਬਾਹਰ�� ਵ��ਣਾ ਸੰਭਵ ਨਹ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:668
+#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:667
 msgid "Encrypted, strong"
 msgstr "�ੰ��ਰਿਪ�, ਸ�ਤ"
 
-#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:574
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12711,341 +11572,306 @@ msgstr ""
 "�ਹ ਸ�ਨ�ਹ� �ੰ��ਰਿਪ�ਡ ਹ� �ਤ� �ਸ ਲ� ਸ�ਤ �ਲ���ਰਿਥਮ ਵਰਤਿ� �ਿ� ਹ�। �ਸ ਸ�ਨ�ਹ� ਦ� ਭਾ�ਾ� ਨ�ੰ �ੱ� ਸੰਭਵ ਸਮ�� "
 "ਵਿੱ� �ਿਸ� ਵ� ਬਾਹਰ� ਵਿ��ਤ� ਵਲ�� ਵ��ਣਾ ��ਾ ਹ�।"
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "ਸਰ��ਫਿ��� ਵ���(_V)"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:690
 msgid "This certificate is not viewable"
 msgstr "�ਹ ਸਰ��ਫਿ��� ਵ��ਣਯ�� ਨਹ�� ਹ�"
 
-#: ../mail/em-format-html-display.c:1410
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%B %d, %Y, %l:%M %p ਵ�� ਸਮਾਪਤ"
+#: ../mail/em-format-html-display.c:980
+#| msgid "Completed On"
+msgid "Completed on"
+msgstr "ਸਮਾਪਤ "
 
-#: ../mail/em-format-html-display.c:1418
+#: ../mail/em-format-html-display.c:988
 msgid "Overdue:"
 msgstr "ਮਿ�ਦ ਪ�ੱ��:"
 
-#: ../mail/em-format-html-display.c:1421
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "ਵੱਲ�� %B %d, %Y, %l:%M %p"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:992
+msgid "by"
+msgstr "ਨ�ੰ"
 
-#: ../mail/em-format-html-display.c:1499
+#: ../mail/em-format-html-display.c:1071
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "ਲਾ�ਨ '� ਵ���(_V)"
 
-#: ../mail/em-format-html-display.c:1500
+#: ../mail/em-format-html-display.c:1072
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "�ਹਲ�(_H)"
 
-#: ../mail/em-format-html-display.c:1501
+#: ../mail/em-format-html-display.c:1073
 msgid "_Fit to Width"
 msgstr "���ਾ� ਦ� ਫਿੱ�(_F)"
 
-#: ../mail/em-format-html-display.c:1502
+#: ../mail/em-format-html-display.c:1074
 msgid "Show _Original Size"
-msgstr "�ਸਲ� ��ਾਰ ਵ��ਾ�(_O)"
-
-#: ../mail/em-format-html-display.c:2171
-msgid "Save attachment as"
-msgstr "�����ਮਿੰ� ਸੰਭਾਲ�"
-
-#: ../mail/em-format-html-display.c:2175
-msgid "Select folder to save all attachments"
-msgstr "ਸਭ �����ਮਿੰ� ਸੰਭਾਲਣ ਲ� ਫ�ਲਡਰ ��ਣ�"
-
-#: ../mail/em-format-html-display.c:2226
-msgid "_Save Selected..."
-msgstr "��ਣ� ਸੰਭਾਲ�(_S)..."
+msgstr "�ਸਲ� ��ਾਰ ਵ���(_O)"
 
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2293
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d ਨੱਥ�(_t)"
-msgstr[1] "%d ਨੱਥ�(_t)"
-
-#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390
-msgid "S_ave"
-msgstr "ਸੰਭਾਲ�(_a)"
-
-#: ../mail/em-format-html-display.c:2311
-msgid "S_ave All"
-msgstr "ਸਭ ਸੰਭਾਲ�(_a)"
-
-#: ../mail/em-format-html-display.c:2386
-msgid "No Attachment"
-msgstr "��� ਨੱਥ� ਨਹ��"
-
-#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572
+#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
 msgid "View _Unformatted"
 msgstr "ਬਿਨ-ਫਾਰਮ�� ਵ���(_U)"
 
-#: ../mail/em-format-html-display.c:2535
+#: ../mail/em-format-html-display.c:1577
 msgid "Hide _Unformatted"
 msgstr "ਬਿਨ-ਫਾਰਮ�� �ਹਲ�(_U)"
 
-#: ../mail/em-format-html-display.c:2592
+#: ../mail/em-format-html-display.c:1634
 msgid "O_pen With"
 msgstr "�ਸ ਨਾਲ ��ਲ�ਹ�(_p)"
 
-#: ../mail/em-format-html-display.c:2668
+#: ../mail/em-format-html-display.c:1711
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ �ਹ �-ਮ�ਲ ਨ�ੰ ਰ�ਡਰ ਨਹ�� �ਰ ਸ�ਦ�, �ਿ���ਿ �ਹ ਬਹ�ਤ ਵੱਡ� ਹ�। ਤ�ਸ�� �ਸ ਨ�ੰ ਬਿਨਾ� ਫਾਰਮ�� ਵ�� "
-"ਸ�ਦ� ਹ� �ਾ� ਬਾਹਰ� ਪਾਠ ਸੰਪਾਦ� ਨਾਲ ਵ�� ਸ�ਦ� ਹ�।"
+"ਸ�ਦ� ਹ� �ਾ� ਬਾਹਰ� ���ਸ� �ਡ��ਰ ਨਾਲ ਵ�� ਸ�ਦ� ਹ�।"
 
 #: ../mail/em-format-html-print.c:157
 #, c-format
 msgid "Page %d of %d"
-msgstr "%2d ਦਾ %1d ਸਫਾ"
+msgstr "%2$d ਵਿੱ��� %1$d ਸਫ਼ਾ"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "%s ਪ�ਰਾਪਤ ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:929
 msgid "Unknown external-body part."
 msgstr "�ਣ�ਾਣ ਬਾਹਰ�-ਮ�ੱ� ਭਾ�।"
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:937
 msgid "Malformed external-body part."
 msgstr "ਨਿ�ਾਰਾ ਬਾਹਰ�-ਭਾ�"
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ਸਾ�� (%s) ਲ� ਸੰ��ਤ�"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:978
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "ਸਥਾਨ� ਫਾ�ਲ (%s) ਲ� ਸਾ�� %s ਦ� ਲ� ਸੰ��ਤ�"
+msgstr "ਲ��ਲ ਫਾ�ਲ (%s) ਲ� ਸਾ�� %s ਦ� ਲ� ਸੰ��ਤ�"
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:980
 #, c-format
 msgid "Pointer to local file (%s)"
-msgstr "ਸਥਾਨ� ਫਾ�ਲ (%s) ਲ� ਸੰ��ਤ�"
+msgstr "ਲ��ਲ ਫਾ�ਲ (%s) ਲ� ਸੰ��ਤ�"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1001
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ਰਿਮ�� ਡਾ�ਾ(%s) ਲ� ਸੰ��ਤ�"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1012
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "�ਣ�ਾਣ� ਬਾਹਰ� ਡਾ�ਾ (\"%s\" �ਿਸਮ) ਲ� ਸੰ��ਤ�"
 
-#: ../mail/em-format-html.c:1241
+#: ../mail/em-format-html.c:1240
 msgid "Formatting message"
 msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਫਾਰਮ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/em-format-html.c:1415
+#: ../mail/em-format-html.c:1414
 msgid "Formatting Message..."
 msgstr "ਸ�ਨ�ਹਾ ਫਾਰਮ�� ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1631
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1637
+#: ../mail/em-format-html.c:1655 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "Bcc"
 
 #  pseudo-header
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
+#: ../mail/em-format-html.c:1747 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1435
 msgid "Mailer"
 msgstr "ਮ�ਲਰ"
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
-msgid " (%a, %R %Z)"
-msgstr " (%a, %R %Z)"
-
-#  translators: strftime format for local time equivalent in Date header display, without day
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1781
-msgid " (%R %Z)"
-msgstr " (%R %Z)"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1917
+#: ../mail/em-format-html.c:1910
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "�ਹ ਸ�ਨ�ਹਾ <b>%s</b> ਵਲ�� <b>%s</b> ਦ� ਤ�ਰ �ੱਤ� ਭ��ਿ� �ਿ� ਹ�"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
-msgid "From"
-msgstr "ਵਲ��"
-
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:76
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
+#: ../mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "�ਸ ਨ�ੰ �ਵਾਬ"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "ਮਿਤ�"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "�ਬਰਸਾਰ ਸਮ�ਹ"
 
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "ਫ�ਸ"
 
-#: ../mail/em-format.c:1160
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "%s ਨੱਥ�"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ਸ�ਨ�ਹਾ S/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ਸ�ਨ�ਹਾ MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�, ਸਰ�ਤ ਦ� ਤ�ਰ ਤ� ਹ� ਵ��ਾ�� �ਾ ਰਿਹਾ ਹ�।"
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ਬਹ�ਭਾ�/���ਰਿਪਸ਼ਨ ਲ� ਨਾ-ਸਹਾ�� �ੰ��ਰਿਪਸ਼ਨ �ਿਸਮ"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "ਸ�ਨ�ਹਾ PGP/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ਸ�ਨ�ਹਾ PGP/MIME ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "ਨਾ-ਸਹਾ�� ਦਸਤ�ਤ ਫਾਰਮ��"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "ਦਸਤ�ਤ �ਾ�� ਦ�ਰਾਨ �ਲਤ�"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "ਦਸਤ�ਤ �ਾ�� ਦ�ਰਾਨ �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "PGP ਸ�ਨ�ਹਾ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP ਸ�ਨ�ਹ� ਨ�ੰ ਪਾਰਸ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: �ਣ�ਾਣ� �ਲਤ�"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "ਹਰ ਸਮ��"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "ਦਿਨ ਵਿੱ� ��ਵਾਰ"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "ਹ�ਤ� ਵਿੱ� ��ਵਾਰ"
 
-#: ../mail/em-mailer-prefs.c:97
+#: ../mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "ਮਹ�ਨ� ਵਿੱ� ��ਵਾਰ"
 
-#: ../mail/em-mailer-prefs.c:327
+#: ../mail/em-mailer-prefs.c:332
 msgid "Add Custom Junk Header"
 msgstr "�ਸ�ਮ �ੰ� ਹ�ੱਡਰ ਸ਼ਾਮਲ"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:336
 msgid "Header Name:"
 msgstr "ਹ�ੱਡਰ ਨਾ�:"
 
-#: ../mail/em-mailer-prefs.c:332
+#: ../mail/em-mailer-prefs.c:337
 msgid "Header Value Contains:"
 msgstr "ਹ�ੱਡਰ ਮ�ੱਲ ਰੱ�ਦਾ ਹ�:"
 
-#: ../mail/em-mailer-prefs.c:437
+#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "ਹ�ੱਡਰ"
+
+#: ../mail/em-mailer-prefs.c:442
 msgid "Contains Value"
 msgstr "ਮ�ੱਲ ਰੱ�ਦਾ ਹ�"
 
-#: ../mail/em-mailer-prefs.c:459
+#: ../mail/em-mailer-prefs.c:465
 msgid "Color"
 msgstr "ਰੰ�"
 
-#: ../mail/em-mailer-prefs.c:462
+#: ../mail/em-mailer-prefs.c:468
 msgid "Tag"
 msgstr "���"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s ਪਲੱ��ਨ �ਪਲੱਬਧ ਹ� �ਤ� ਬਾ�ਨਰ� �ੰਸ�ਾਲ ਹ�।"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
+#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s ਪਲੱ��ਨ �ਪਲੱਬਧ ਨਹ�� ਹ�। ��ੱ� �ਰ� �� �ਿ ਪ���� �ੰਸ�ਾਲ ਹ�।"
 
-#: ../mail/em-mailer-prefs.c:1108
+#: ../mail/em-mailer-prefs.c:1092
 msgid "No Junk plugin available"
 msgstr "��� �ੰ� ਪਲੱ��ਨ ਨਹ�� ਹ�"
 
+#: ../mail/em-mailer-prefs.c:1455
+#| msgid "Table header"
+msgid "Date header:"
+msgstr "ਮਿਤ� ਹ�ੱਡਰ:"
+
 #  forest green
 #. green
-#: ../mail/em-migrate.c:1059
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr "�ਰਨ-ਲ�"
 
 #. blue
-#: ../mail/em-migrate.c:1060
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr "ਬਾ�ਦ ਵਿੱ�"
 
-#: ../mail/em-migrate.c:1228
+#: ../mail/em-migrate.c:1128
 msgid "Migration"
 msgstr "ਤਬਦ�ਲ"
 
-#: ../mail/em-migrate.c:1673
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "ਨਵਾ� ਫ�ਲਡਰ `%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:1699
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ਫ�ਲਡਰ `%s' ਨ�ੰ `%s' ਵਿੱ� �ਾਪ� �ਰਨ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:1884
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "`%s' ਤ� �ਪਲੱਬਧ ਪੱਤਰ-ਬ�ਸਿ�� ਦ� �ਾ�� ਲ� �ਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:1889
+#: ../mail/em-migrate.c:1789
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13054,33 +11880,33 @@ msgid ""
 msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ-ਬ�ਸਾ ਫ�ਲਡਰ ਦ� ਸਥਿਤ� ਤ� ਲ�� �ਵ�ਲ�ਸ਼ਨ ੧.੦ ਬਾ�ਦ ਤਬਦ�ਲ ਹ� �� ਹ�।\n"
 "\n"
-"�ਿਰਪਾ �ਰ�� �ੰਤ�ਾਰ �ਰ� �ਦ�� ਤੱ� �ਿ ਤ�ਸ�� ਫ�ਲਡਰਾ� ਨ�ੰ ਤਬਦ�ਲ �ਰ ਰਹ� ਹ�..."
+"�ਡ��� �� �ਦ�� ਤੱ� �ਿ ਤ�ਹਾਡ� ਫ�ਲਡਰ ਮਾ��ਰ�� ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "POP3 ਸਰਵਰ ਤ� ਰੱ�ਿ� ਪ�ਰਾਣ� ਡਾ�� `%s' ਨ�ੰ ��ਲਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2104
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 ਸਰਵਰ ਤ� ਰੱ�� ਡਾ�ਾ ਡਾ�ਰ���ਰ� `%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2133
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 ਸਰਵਰ ਤ� ਰੱ�ਿ� ਡਾ�ਾ `%s' ਦ� �ਾਪ� ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ਲ��ਲ ਪੱਤਰ ਸੰਭਾਲ`%s' ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid "Migrating Folders"
 msgstr "ਫ�ਲਡਰ ਮਾ��ਰ�� ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -13089,104 +11915,121 @@ msgid ""
 msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ-ਬ�ਸਾ ਫ�ਲਡਰ ਦਾ ਸੰ��ਪ ਫਾਰਮ�� �ਵ�ਲ�ਸ਼ਨ ੨.੨੪ ਬਾ�ਦ SQLite ਲ� ਤਬਦ�ਲ ਹ� �� ਹ�।\n"
 "\n"
-"�ਿਰਪਾ �ਰ�� �ੰਤ�ਾਰ �ਰ� �ਦ�� ਤੱ� �ਿ ਤ�ਸ�� ਫ�ਲਡਰਾ� ਨ�ੰ ਤਬਦ�ਲ �ਰ ਰਹ� ਹ�..."
+"�ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਤ�ਹਾਡ� ਫ�ਲਡਰ ਮਾ��ਰ�� ਹ�ਣ ਤੱ� ਸਬਰ ਰੱ�� ��..."
 
-#: ../mail/em-migrate.c:3056
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr "`%s' ਤ� ਸਥਾਨ� ਫ�ਲਡਰ ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
+msgstr "`%s' �ੱਤ� ਲ��ਲ ਫ�ਲਡਰ ਬਣਾ�ਣ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../mail/em-migrate.c:3075
+#: ../mail/em-migrate.c:2974
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
-"ਪ�ਰਾਣ� �ਵ�ਲ�ਸ਼ਨ ਦ� ਸ��ਿੰ� ਪ�ਨ ਤ�� �ਸਫਲ, `evolution/config.xmldb' ਮ���ਦ ਨਹ�� ਹ� �ਾ� ਨਿ�ਾਰਾ "
+"ਪ�ਰਾਣ� �ਵ�ਲ�ਸ਼ਨ ਦ� ਸ��ਿੰ� ਪ��ਹਨ ਤ�� �ਸਫਲ, `evolution/config.xmldb' ਮ���ਦ ਨਹ�� ਹ� �ਾ� ਨਿ�ਾਰਾ "
 "ਹ� �� ਹ�।"
 
-#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-popup.c:364
+msgid "Save As..."
+msgstr "...ਵਾ�� ਸੰਭਾਲ�"
+
+#: ../mail/em-popup.c:389
+#, c-format
+msgid "untitled_image.%s"
+msgstr "ਬਿਨ_ਨਾ�_�ਿੱਤਰ.%s"
+
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "ਬ���ਰਾ��ਡ ਬਣਾ�(_B)"
+
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "ਭ��ਣ ਵਾਲ� ਨ�ੰ �ਵਾਬ(_R)"
 
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
-msgstr "ਸ��� ਨ�ੰ �ਵਾਬ(_L)"
+msgstr "ਲਿਸ� ਨ�ੰ �ਵਾਬ(_L)"
 
 #. make it first item
-#: ../mail/em-popup.c:623 ../mail/em-popup.c:848
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
 msgid "_Add to Address Book"
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� '� ����(_A)"
 
-#: ../mail/em-subscribe-editor.c:605
+#: ../mail/em-popup.c:725
+#, c-format
+msgid "Open in %s..."
+msgstr "%s ਨਾਲ ��ਲ�ਹ�..."
+
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "�ਹ ਭੰਡਾਰ ਮ��ਬਰ ਲ� ਸਹਾ� ਨਹ�� �ਾ� �ਹ ਯ�� ਨਹ�� ਹ�।"
 
-#: ../mail/em-subscribe-editor.c:638
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "ਮਨ�਼�ਰ"
 
-#: ../mail/em-subscribe-editor.c:642
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "ਫ�ਲਡਰ"
 
 #  FIXME: This is just to get the shadow, is there a better way?
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:844
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
-msgstr "�ਿਰਪਾ �ਰ�� �ੱ� ਸਰਵਰ ��ਣ�।"
+msgstr "ਸਰਵਰ ��ਣ� ��।"
 
-#: ../mail/em-subscribe-editor.c:865
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "��� ਸਰਵਰ ��ਣਿ� ਨਹ�� �ਿ�"
 
 #. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
 msgid "_Do not show this message again."
-msgstr "�ਹ ਸ�ਨ�ਹਾ ਮ�� ਨਾ ਵ��ਾ�(_D)।"
+msgstr "�ਹ ਸ�ਨ�ਹਾ ਮ�� ਨਾ ਵ���(_D)।"
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "ਸ�ਨ�ਹਾ ਫਿਲ�ਰ"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "ਸ�ਨ�ਹਾ"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
-msgstr "ਸ�ਨ�ਹਾ ਸੰਭਾਲ�..."
+msgstr "...ਸ�ਨ�ਹਾ ਸੰਭਾਲ�"
 
-#: ../mail/em-utils.c:705
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "�ਡਰ�ੱਸ ����ਹ�"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ਤ�� ਸ�ਨ�ਹਾ"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "��� ਫ�ਲਡਰ(_F)"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "��� ਫ�ਲਡਰ ਸਰ�ਤ"
 
 #: ../mail/evolution-mail.schemas.in.h:1
 msgid "\"Send and Receive Mail\" window height"
-msgstr "\"ਭ��� �ਤ� ਪ�ਰਾਪਤ ਡਾ�\" �ਰ��ਾ ��ਾ�"
+msgstr "\"ਭ��� �ਤ� ਪ�ਰਾਪਤ ਡਾ�\" ਵਿੰਡ� ��ਾ�"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "\"ਡਾ� ਭ��� �ਤ� ਲਵ�\" �ਰ��ਾ ਵੱਧ�-ਵੱਧ ਹਾਲਤ"
+msgstr "\"ਡਾ� ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ"
 
 #: ../mail/evolution-mail.schemas.in.h:3
 msgid "\"Send and Receive Mail\" window width"
-msgstr "\"ਭ��� �ਤ� ਪ�ਰਾਪਤ ਡਾ�\" �ਰ��ਾ ���ਾ�"
+msgstr "\"ਭ��� �ਤ� ਪ�ਰਾਪਤ ਡਾ�\" ਵਿੰਡ� ���ਾ�"
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows Evolution to display text part of limited size"
@@ -13327,9 +12170,9 @@ msgid ""
 "can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
-"ਪਤਾ �ਰਦ� ਹ� �ਿ �� ਭ��ਣ ਵਾਲ� �ਮ�ਲ ਲ� �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ���ਣਾ ਹ�। �� ਲੱਭਿ� ਤਾ� �ਸ ਸਮਪ ਨਹ�� ਹ�ਵ��ਾ। "
-"�ਹ ਬ�ੱ� ਵਿੱ� ਲੱਭਦਾ ਹ�, �� �ਿ ���-ਪ�ਰਨ ਲ� ਮਾਰ� ਹਨ। �ਸ ਹ�ਲ� ਹ� ਸ�ਦਾ ਹ�, �� ਰਿਮ�� �ਡਰ�ਸ ਬ�ੱ� "
-"(LDAP ਵਾ��) ਨ�ੰ ���-ਪ�ਰਨ ਲ� ਮਾਰ� ��ਤਾ �ਿ� ਹ�ਵ�।"
+"ਪਤਾ �ਰਦ� ਹ� �ਿ �� ਭ��ਣ ਵਾਲ� �ਮ�ਲ ਲ� �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ���ਣਾ ਹ�। �� ਲੱਭਿ� ਤਾ� �ਸ ਸਮਪ ਨਹ�� "
+"ਹ�ਵ��ਾ। �ਹ ਬ�ੱ� ਵਿੱ� ਲੱਭਦਾ ਹ�, �� �ਿ ���-ਪ�ਰਨ ਲ� ਮਾਰ� ਹਨ। �ਸ ਹ�ਲ� ਹ� ਸ�ਦਾ ਹ�, �� ਰਿਮ�� �ਡਰ�ਸ "
+"ਬ�ੱ� (LDAP ਵਾ��) ਨ�ੰ ���-ਪ�ਰਨ ਲ� ਮਾਰ� ��ਤਾ �ਿ� ਹ�ਵ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
@@ -13385,76 +12228,90 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਬੰਦ �ਰਨ ਸਮ�� ਰੱਦ� �ਾਲ� �ਰ�।"
 
 #: ../mail/evolution-mail.schemas.in.h:47
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"HTML ਪੱਤਰ ਵਿੱ� �ਨ�ਮ�� �ਿੱਤਰ ਯ�� �ਰ�। �� ਯ��਼ਰ �ਨ�ਮ�� �ਿੱਤਰਾ� ਨ�ੰ ਪਸੰਦ ਨਹ�� ��ਤ� �ਤ� "
+"ਸਥਿਰ �ਿੱਤਰ ਹ� ਪਸੰਦ �ਰਦ� ਹਨ।"
+
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "�ਾਰ�� ਮ�ਡ ਯ��, ਤਾ� �ਿ ਤ�ਸ�� ਪੱਤਰ ਪ�ਨ ਦ�ਰਾਨ �ਰਸਰ ਵ��ਾ ਸ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable magic space bar"
 msgstr "ਮ��ਿ� ਸਪ�ਸ ਬਾਰ ਯ�� �ਾ� �ਯ�� �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
+#| msgid "It disables/enables the prompt while marking multiple messages."
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "�ਦ�� �� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਨਿਸ਼ਾਨਬੱਧ ��ਤਾ �ਾਵ� ਤਾ� ਪ�ੱ�ਣ ਨ�ੰ ਯ��/�ਯ�� �ਰਦਾ ਹ�।"
+
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable or disable type ahead search feature"
 msgstr "�ੱ�� ��� ਫ��ਰ �ਿਸਮ ਨ�ੰ ਯ�� �ਾ� �ਯ��"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Enable search folders"
 msgstr "��� ਫ�ਲਡਰ ਯ��"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable search folders on startup."
 msgstr "ਸ਼�ਰ� ਸਮ�� ��� ਫ�ਲਡਰ ਯ�� �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"ਬਾਹ� ��� ਫ��ਰ �ਾਲ� �ਰ� ਤਾ� �ਿ ਤ�ਸ�� ���ਸ� ਵਿੱ� ਲਿ� �� ��� ਸ਼�ਰ� �ਰ ਸ��। �ਸ ਦਾ ਫਾ�ਦਾ �ਹ ਹ� "
-"�ਿ ਤ�ਸ�� ਬਾਹ� ਵਿੱ� ਫ�ਲਡਰ ਨਾ� ਲਿ� �� ਹ� ��� �ਰ ਸ�� �ਤ� ��� ���ਮ��ਿ� ਹ� �ਸ ਫ�ਲਡਰ �ੱਤ� �ਲ� �ਾਵ�।"
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr "ਬਾਹਰ� ��� ਫ��ਰ ਨ�ੰ ਯ�� �ਰ�, �� �ਿ ਫ�ਲਡਰ ਨਾ� ਦ� ��� ਲ� ਸਹਾ�� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr "�ਸ ਨ�ੰ ਯ�� �ਰਨ ਨਾਲ ਸਪ�ਸ ਬਾਰ ਸਵਿੱ� ਸ�ਨ�ਹਾ �ਲ�, ਸ�ਨ�ਹਾ ਸ��� �ਤ� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਰ�ਲ �ਰ���। "
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable to render message text part of limited size."
 msgstr "ਰ�ਡਰ ਸ�ਨ�ਹਾ ���ਸ� ਭਾ� ਨ�ੰ ਸ�ਮਿਤ ��ਾਰ ਦਿ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable/disable caret mode"
 msgstr "�ਾਰ�� ਮ�ਡ ਯ��/�ਯ��"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "���ਲ�ੱ�/��ਮ�ਲ ਢੰ� ਨਾਲ ਫਾ�ਲ ਨਾ� �ੰ��ਡ �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:57
-msgid ""
-"Encode file names in the mail headers same as Outlook or GMail does, to let "
-"them understand localized file names sent by Evolution, because they do not "
-"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+#: ../mail/evolution-mail.schemas.in.h:59
+#| msgid ""
+#| "Encode file names in the mail headers same as Outlook or GMail does, to "
+#| "let them understand localized file names sent by Evolution, because they "
+#| "do not follow the RFC 2231, but uses incorrect RFC 2047 standard."
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
 "���ਲ�ੱ� �ਾ� ��ਮ�ਲ ਵਾ�� ਮ�ਲ ਹ�ੱਡਰ ਵਿੱ� �ੰ��ਡ ��ਤ� ਫਾ�ਲ ਨਾ�, ਤਾ� �� �ਹ ਸਮ� ਸ�ਣ �ਿ �ਵ�ਲ�ਸ਼ਨ ਵੱਲ�� "
-"ਸਥਾਨ� ਫਾ�ਲ ਨਾ� ਵਿੱ� ਭ��ਿ� ਹ�, �ਿ���ਿ �ਹ RFC ੨੨੩੧ ਦ� ਮ�ਤਾਬ� ਨਹ��, ਬਲ�ਿ RFC ੨੦੪੭ ਸ���ਡਰਡ "
-"ਨ�ੰ ਮੰਨਦ� ਹਨ।"
+"UTF-8 �ੱ�ਰ ਨਾਲ ਭ��� ਫਾ�ਲ ਨਾ� ਵਿੱ� ਭ��ਿ� ਹ�, �ਿ���ਿ �ਹ RFC ੨੨੩੧ ਦ� ਮ�ਤਾਬ� ਨਹ��, ਬਲ�ਿ RFC "
+"੨੦੪੭ ਸ���ਡਰਡ ਨ�ੰ ਮੰਨਦ� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane"
-msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਪੱ�� ਦ� ��ਾ�"
+msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਪੱ�� ਦ� ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Height of the message-list pane."
-msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਪੱ�� ਦ� ��ਾ�।"
+msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਪੱ�� ਦ� ��ਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ਪਰ-ਫ�ਲਡਰ �ਲ� �ਹਲ� �ਰ� �ਤ� ��ਣ ਹ�ਾ ਦਿ�"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -13462,13 +12319,13 @@ msgstr ""
 "���ਰ ਯ��਼ਰ ਨ� ੧੦ �ਾ� ਵਧ�ਰ� ਸ�ਨ�ਹ� �ੱ�� ਸਮ�� ��ਲਣ ਦ� ��ਸ਼ਿਸ ��ਤ� ਤਾ�, ਯ��਼ਰ ਨ�ੰ ਪ�ੱ�� �ਿ �� �ਹ �ੰ� �ਰਨਾ "
 "�ਾਹ�ੰਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr "���ਰ \"�ਲ�\" ਬਾਹ� �ਾਲ� ਹ�ਵ� ਤਾ� �ਹ ਨਾਲ-ਨਾਲ ਹ� ਵ��ਾ��ਾ, ਨਾ �ਿ ਲੰਬ�ਾਰ� ਰ�ਪ ਵਿੱ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -13477,15 +12334,15 @@ msgstr ""
 "�ੱ� �ਾਸ MIME �ਿਸਮ ਲ� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਦਰਸ਼� ਸ਼ਾਮਿਲ ਨਹ�� ਹ�, �ਿਸ� MIME �ਿਸਮ ਨ�ੰ �ਸ ਸ��� ਵਿੱ� "
 "�ਪਲੱਬਧ ਹ�ਣ ਲ� �ਸ ਨ�ੰ �ਨ�ਮ ਦ� MIME �ਿਸਮ ਡਾ�ਾਬ�ਸ ਦ� ਬ�ਨਬ�-ਭਾ� ਦਰਸ਼� ਵਿੱ� �ਪਲੱਬਧ ਹ�ਣਾ ਸਹਾ�� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"\"ਮ�ਲ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ �ਰ��� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ�ਰ��ਾ ਤਾ� ਮ�ੱਲ "
-"�ੱਪਡ�� ਹ�ਵ��ਾ।"
+"\"ਮ�ਲ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ��ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ �ਰ��� ਨ�ੰ ਵਰ���ਲ ਮ��-��ਾਰ "
+"�ਰ��ਾ ਤਾ� ਮ�ੱਲ �ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13493,12 +12350,12 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
-"\"Send and Receive Mail (ਮ�ਲ ਭ��� �ਤ� ਲਵ�)\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ ਹ�। ਮ�ੱਲ "
-"ਨ�ੰ �ੱਪਡ�� ��ਤਾ �ਾ�ਦਾ ਹ�, �ਦ�� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਵੱਧ�-ਵੱਧ �ਾ� �ਣ-ਵੱਧ�-ਵੱਧ �ਰਦਾ ਹ�। ਯਾਦ ਰੱ�� �ਿ �ਹ �ਾਸ "
-"ਮ�ੱਲ �ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਨਹ�� ਵਰਤਿ� �ਾ�ਦਾ, �ਦ�� \"Send and Receive Mail (ਮ�ਲ ਭ��� �ਤ� ਲਵ�)\" "
-"ਵਿੰਡ� ਵੱਧ�-ਵੱਧ ਨਾ ਹ�ਵ�। �ਹ ��ੰ�� ��ਵਲ ਸਥਾਪਨ ਵ�ਰਵਾ ਵ��� ਹ� ਮ���ਦ ਹ�।"
+"\"Send and Receive Mail (ਮ�ਲ ਭ��� �ਤ� ਲਵ�)\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ਵੱਧ�-ਵੱਧ ਹਾਲਤ ਹ�। ਮ�ੱਲ ਨ�ੰ �ੱਪਡ�� "
+"��ਤਾ �ਾ�ਦਾ ਹ�, �ਦ�� ਯ��਼ਰ ਵਿੰਡ� ਨ�ੰ ਵੱਧ�-ਵੱਧ �ਾ� �ਣ-ਵੱਧ�-ਵੱਧ �ਰਦਾ ਹ�। ਯਾਦ ਰੱ�� �ਿ �ਹ �ਾਸ ਮ�ੱਲ "
+"�ਵ�ਲ�ਸ਼ਨ ਵਲ�� ਨਹ�� ਵਰਤਿ� �ਾ�ਦਾ, �ਦ�� \"Send and Receive Mail (ਮ�ਲ ਭ��� �ਤ� ਲਵ�)\" ਵਿੰਡ� ਵੱਧ�-"
+"ਵੱਧ ਨਾ ਹ�ਵ�। �ਹ ��ੰ�� ��ਵਲ ਸਥਾਪਨ ਵ�ਰਵਾ ਵ��� ਹ� ਮ���ਦ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13506,11 +12363,7 @@ msgstr ""
 "\"ਮ�ਲ ਭ��� �ਤ� ਲਵ�\" ਵਿੰਡ� ਦ� ਸ਼�ਰ��ਤ� ���ਾ�। �ਿਵ�� ਹ� ਯ��਼ਰ �ਰ��� ਨ�ੰ ਹਰ���ਲ ਮ��-��ਾਰ�ਰ��ਾ ਤਾ� ਮ�ੱਲ "
 "�ੱਪਡ�� ਹ�ਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "�ਦ�� �� ਸ�ਨ�ਹਿ�� ਨ�ੰ ਨਿਸ਼ਾਨਬੱਧ ��ਤਾ �ਾਵ� ਤਾ� ਪ�ੱ�ਣ ਨ�ੰ ਯ��/�ਯ�� �ਰਦਾ ਹ�।"
-
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13518,40 +12371,40 @@ msgstr ""
 "ਲ�ਾਤਾਰ ਪਰ��� �ਯ��/ਯ�� �ਰਦਾ ਹ�, �� �ਫਲਾ�ਨ ਸਿ�ਰ� (sync) �ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� �ਾਣ ਲ� ਲਾ�਼ਮ� "
 "ਹ�ਵ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 msgstr ""
-"�ਹ ਲ�ਾਤਾਰ ਪ�ੱ�ਣ ਨ�ੰ �ਯ��/ਯ�� ਰਦ� ਹ�, �� �ਿ ��ਤਾਵਨ� ਦਿੰਦ� �ਿ ��� ਫ�ਲਡਰ ਤ�� ਸ�ਨ�ਹ� ਹ�ਾ�ਣ ਨਾਲ ਸ�ਨ�ਹ� ਨ�ੰ "
-"ਪੱ�� ਤ�ਰ �ੱਤ� ਹ�ਾ�� �ਾਵ��ਾ, ਨਾ �ਿ ��ਵਲ ��� ਨਤ��ਿ�� ਵਿੱ���।"
+"�ਹ ਲ�ਾਤਾਰ ਪ�ੱ�ਣ ਨ�ੰ �ਯ��/ਯ�� ਰਦ� ਹ�, �� �ਿ ��ਤਾਵਨ� ਦਿੰਦ� �ਿ ��� ਫ�ਲਡਰ ਤ�� ਸ�ਨ�ਹ� ਹ�ਾ�ਣ ਨਾਲ "
+"ਸ�ਨ�ਹ� ਨ�ੰ ਪੱ�� ਤ�ਰ �ੱਤ� ਹ�ਾ�� �ਾਵ��ਾ, ਨਾ �ਿ ��ਵਲ ��� ਨਤ��ਿ�� ਵਿੱ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty junk was run"
 msgstr "��ਰ� ਵਾਰ �ੰ� ਨ�ੰ �ਾਲ� ��ਤਾ ਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Last time empty trash was run"
 msgstr "��ਰ� ਵਾਰ ਰੱਦ �ਾਲ� �ਰਨ ਦਾ ਸਮਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of Labels and their associated colors"
 msgstr "ਲ�ਬਲ ਸ��� �ਤ� ਸੰਬੰਧਿਤ ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "ਬ�ਨਬ� ਭਾ� ਦਰਸ਼� ਦ� �ਾ�� ਲ� MIME �ਿਸਮ ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accepted licenses"
 msgstr "ਮਨ�਼�ਰ ਲਾ�ਸ��ਸਾ� ਦ� ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of accounts"
 msgstr "��ਾ��� ਦ� ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13559,15 +12412,15 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਦ� ਪੱਤਰ ਭਾ� ��ਲ �ਪਲੱਬਧ ��ਾ���ਾ� ਦ� ਲਿਸ�। �ਸ ਸ��� ਵਿੱ� ਲਾ�ਨਾ� ਸਬ-ਡਾ�ਰ���ਰ��� /apps/"
 "evolution/mail/accounts ਦ� �ਨ�ਸਾਰ ਸ਼ਾਮਿਲ ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of custom headers and whether they are enabled."
 msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰਾ� ਦ� ਸ��� �ਤ� �� �ਹ ਵਰਤ� �ਾਣ।"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ਸ਼ਬਦ-��� ��ੱ� �ਰਨ ਲ� ਡਿ�ਸ਼ਨਰ� ਭਾਸ਼ਾ ��ਡ ਦ� ਲਿਸ�"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13575,15 +12428,15 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਦ� ਪੱਤਰ ਭਾ� ਲ� ਪ�ਾਣ ਦ� ਲ�ਬਲ ਸ��� ਹ�। �ਹ ਸ��� �ਹ ਸਾਰ� ਰੰ� ਰੱ�ਦ� ਹ�, �� �ਿ HTML "
 "ਹ��ਸਾ �ੰ��ਡਿੰ� ਲ� ਵਰਤ� �ਾਦ� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "List of protocol names whose license has been accepted."
 msgstr "ਪਰ�����ਲਾ� ਨਾ� ਦ� ਲਿਸ�, �ਿਹਨਾ� ਦਾ ਲਾ�ਸ��ਸ ਮਨ�਼�ਰ ��ਤਾ �ਿ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Load images for HTML messages over HTTP"
 msgstr "HTML ਸ�ਨ�ਹ� ਲ� HTTP ਤ�� �ਿੱਤਰ ਪ�ਰਾਪਤ �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -13593,103 +12446,103 @@ msgstr ""
 "�ਿੱਤਰ ਡਾ�ਨਲ�ਡ ਤਾ� ਹ� �ਰ�, ���ਰ ਭ��ਣ ਵਾਲਾ �ਡਰ�ੱਸ ਸ��� ਵਿੱ� ਸ਼ਾਮਿਲ ਹ�ਵ� \"2\" -  ਨ�ੱ� ਤ�� ਹਮ�ਸ਼ਾ "
 "�ਿੱਤਰ ਡਾ�ਨਲ�ਡ �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions"
 msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Log filter actions to the specified log file."
 msgstr "ਨਿਰਧਾਰਿਤ ਲਾੱ� ਫਾ�ਲ ਲ� ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions"
 msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਲ� ਲਾੱ�-ਫਾ�ਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Logfile to log filter actions."
 msgstr "ਲਾੱ� ਫਿਲ�ਰ �ਾਰਵਾ� ਲ� ਲਾੱ�-ਫਾ�ਲ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "ਨਿਰਧਾਰਿਤ ਸਮ�� ਬਾ�ਦ ਵ��ਿ� ਨਿਰਧਾਰਿਤ �ਰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "ਨਿਰਧਾਰਿਤ ਸਮ�� ਬਾ�ਦ ਵ��ਿ� ਨਿਰਧਾਰਿਤ �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\""
 msgstr "ਸ�ਨ�ਹਾ \"�ਲ�\" ਵਿੱ� ਨਿਸ਼ਾਨ ਦਿ�"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Mark citations in the message \"Preview\"."
 msgstr "ਸ�ਨ�ਹਾ \"�ਲ�\" ਵਿੱ� ਨਿਸ਼ਾਨ ਦਿ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default height"
 msgstr "ਸ�ਨ�ਹਾ �ਰ��� ਦ� ਮ�ਲ ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message Window default width"
 msgstr "ਸ�ਨ�ਹਾ �ਰ��� ਦ� ਮ�ਲ ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "ਸ�ਨ�ਹਾ ਵ��ਾ�ਣ ਸ਼�ਲ� (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ਬੰਦ �ਰਨ ਸਮ�� �ੰ� ਨ�ੰ �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� ਦਿਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ਬੰਦ �ਰਨ ਤ� ਰੱਦ� �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� ਦਿਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "ਬੰਦ �ਰਨ �ੱਤ� ਰੱਦ� �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� ਸਮਾ� ਦਿਨਾ� ਵਿੱ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ਬੰਦ �ਰਨ ਤ� ਰੱਦ� �ਾਲ� �ਰਨ ਲ� �ੱ��-�ੱ� �ੰਤਰਾਲ ਦਿਨਾ� ਵਿੱ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "ਵੱਲ/CC/BCC ਵਿੱ� ਵ��ਾ�ਣ ਲ� ਸਿਰਨਾਵ��� ਦ� �ਿਣਤ�"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt on empty subject"
 msgstr "�ਾਲ� ਵਿਸ਼� ਤ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "�ਦ�� ਯ��਼ਰ ਫ�ਲਡਰ ਨ�ੰ ਹ�ਾ�ਣ �ਾ ਰਿਹਾ ਹ�ਵ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "�ਦ�� ਯ��਼ਰ ਬਿਨਾ� ਵਿਸ਼� ਤ�� ਸ�ਨ�ਹਾ ਭ��ਣ �ਾ ਰਿਹਾ ਹ�ਵ� ਤਾ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "��ੱ� �ਰਨ ਲ� ਪ�ੱ��, �� ਯ��਼ਰ ਤ�ਰੰਤ ਹ� �ਫਲਾ�ਨ �ਾਣਾ �ਾਹ�ੰਦਾ ਹ�ਵ�"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when deleting messages in search folder"
 msgstr "ਪ�ੱ��, �ਦ�� ��� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨ�ਹ� ਹ�ਾ�ਣ� ਹ�ਣ"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user expunges"
 msgstr "�ਦ�� ਯ��਼ਰ ਹ�ਾ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user only fills Bcc"
 msgstr "���ਰ ਸਿਰਫ Bcc ��ਤਰ ਹ� ਭਰਿ� ਹ�ਵ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "�ਦ�� ਯ��਼ਰ �ੱ�� ਸਮ�� ੧੦ ਸ�ਨ�ਹ� ��ਲਣ ਦ� ��ਸ਼ਿਸ �ਰ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13697,147 +12550,234 @@ msgstr ""
 "�ਦ�� ਯ��਼ਰ HTML ਸ�ਨ�ਹ�, �ਹਨਾ� ਯ��਼ਰ ਨ�ੰ ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ�, �� �ਿ �ਹ ਪ�ਰਾਪਤ ਹ� ਨਹ�� �ਰਨਾ �ਾਹ�ੰਦ� "
 "ਹਨ, ਤਾ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "�ਦ�� ਯ��਼ਰ ਬਿਨਾ� ਵੱਲ �ਾ� Cc ਪ�ਰਾਪਤ�ਰਤਾ ਦ� ਸ�ਨ�ਹ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ� ਤਾ� ਪ�ੱ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "�ਦ�� ਯ��਼ਰ ਨਾ-�ਾਹਿ�� HTML ਸ�ਨ�ਹ� ਭ��ਣ ਦ� ��ਸ਼ਿਸ �ਰ� ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Prompt while marking multiple messages"
 msgstr "�ਦ�� �� ਸ�ਨ�ਹ� ਨਿਸ਼ਾਨਬੱਧ �ਰਨ� ਹ�ਣ ਤਾ� ਪ�ੱ��"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Put personalized signatures at the top of replies"
+msgstr "�ਵਾਬ ਦ� �ੱਤ� ਨਿੱ�� ਦਸਤ�ਤ ਦਿ�"
+
+#: ../mail/evolution-mail.schemas.in.h:114
+#| msgid "Start _typing at the bottom on replying"
+msgid "Put the cursor at the bottom of replies"
+msgstr "�ਵਾਬਾ� ਦ� ਹ�ਠਾ� �ਰਸਰ ਰੱ��"
+
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "���ਸ� ਵਿੱ��� �ਮ�ਸ਼ਨ ਦ� ਪ�ਾਣ �ਰ�� �ਿੱਤਰਾ� ਨਾਲ ਬਦਲ ਦਿ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Recognize links in text and replace them."
 msgstr "���ਸ� ਵਿੱ� ਲਿੰ�ਾ� ਦ� �ਾ�� �ਰ� �ਤ� ਤਬਦ�ਲ �ਰ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Run junk test on incoming mail."
 msgstr "� ਰਹ��� ਮ�ਲਾ� ਲ� �ੰ� ��ਸ� �ਲਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Save directory"
 msgstr "ਡਾ�ਰ���ਰ� ਸੰਭਾਲ�"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Search for the sender photo in local address books"
 msgstr "ਲ��ਲ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਭ��ਣ ਵਾਲ� ਫ��� ਦ� ���"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Send HTML mail by default"
 msgstr "ਡਿਫਾਲ� HTML ਪੱਤਰ ਭ���"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Send HTML mail by default."
 msgstr "ਡਿਫਾਲ� HTML ਪੱਤਰ ਭ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Sender email-address column in the message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਵਿੱ� ਸ�ਨ�ਹਾ �ਾਲਮ ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� �-ਮ�ਲ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Server synchronization interval"
 msgstr "ਸਰਵਰ ਸ��ਰ�ਨਾ��਼ �ੰਤਰਾਲ"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "�ਦ�� ਮ�ਲ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Bcc\" ��ਤਰ ਵ���"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "�ਦ�� ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Cc\" ��ਤਰ ਵ���"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "ਨਿ��਼�ਰ�ੱਪ ਵਿੱ� ਭ��ਣ ਦ�ਰਾਨ \"ਵਲ��\" ��ਤਰ ਵ���"
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Show \"From\" field when sending a mail message"
+msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣ ਦ�ਰਾਨ \"ਵਲ��\" ��ਤਰ ਵ���"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "ਨਿ��਼�ਰ�ੱਪ ਨ�ੰ ਭ��ਣ ਦ�ਰਾਨ \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+#| msgid "Also encrypt to sel_f when sending encrypted messages"
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���"
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show Animations"
-msgstr "ਸ��ਵਤਾ ਵ��ਾ�"
+msgstr "�ਨ�ਮ�ਸ਼ਨ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show animated images as animations."
-msgstr "ਸ��ਵ ਸ�ਨ�ਹ� ਸ��ਵ ਹ� ਵ��ਾ�।"
+msgstr "�ਨ�ਮ�ਸ਼ਨ ਸ�ਨ�ਹ� �ਨ�ਮ�ਸ਼ਨ ਵ��� ਹ� ਵ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਵਿੱ� ਹ�ਾ� ਸ�ਨ�ਹ� ਵ��ਾ� (ਵਿੰਨ� ਹ��)।"
+msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਵਿੱ� ਹ�ਾ� ਸ�ਨ�ਹ� ਵ��� (ਵਿੰਨ� ਹ��)।"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Show deleted messages in the message-list"
-msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਵਿੱ� ਹ�ਾ� ਸ�ਨ�ਹ� ਵ��ਾ�"
+msgstr "ਸ�ਨ�ਹਾ-ਲਿਸ� ਵਿੱ� ਹ�ਾ� ਸ�ਨ�ਹ� ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:134
+#| msgid "_Show image animations"
+msgid "Show image animations"
+msgstr "�ਿੱਤਰ �ਨ�ਮ�ਸ਼ਨ ਵ���"
+
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Show photo of the sender"
-msgstr "ਭ��ਣ ਵਾਲ� ਦ� ਫ��� ਵ��ਾ�"
+msgstr "ਭ��ਣ ਵਾਲ� ਦ� ਫ��� ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Bcc\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
+"�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"Cc\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
+"�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"�ਦ�� ਨਿ��਼�ਰ�ੱਪ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"ਵਲ��\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
+"�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"ਵਲ��\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
+"�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+"�ਦ�� ਨਿ��਼�ਰ�ੱਪ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
+"�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+"�ਦ�� ਪੱਤਰ ਸ�ਨ�ਹਾ ਭ��ਣਾ ਹ�ਵ� ਤਾ� \"�ਵਾਬ ਦਿ�\" ��ਤਰ ਵ���। �ਸ ਨ�ੰ ਮ�ਲ ��ਾ��� ��ਣਨ ਦ� ਦ�ਰਾਨ ਵ��� ਮ�ਨ� ਤ�� "
+"�ੰ�ਰ�ਲ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
-msgstr "ਸ�ਨ�ਹਾ ਸ��� ਵਿੱ� ਵੱ�ਰ� �ਾਲਮ ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� �-ਮ�ਲ ਵ���"
+msgstr "ਸ�ਨ�ਹਾ ਲਿਸ� ਵਿੱ� ਵੱ�ਰ� �ਾਲਮ ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� �-ਮ�ਲ ਵ���"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show the photo of the sender in the message reading pane."
-msgstr "ਸ�ਨ�ਹਾ ਪ��ਹਨ ਪ��ਨ ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� ਫ��� ਵ��ਾ�।"
+msgstr "ਸ�ਨ�ਹਾ ਪ��ਹਨ ਪ��ਨ ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� ਫ��� ਵ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Spell check inline"
-msgstr "�ਤਾਰ ਵਿੱ� ਸ਼ਬਦ-��� �ਾ��"
+msgstr "ਲਾ�ਨ ਵਿੱ� ਸ਼ਬਦ-��� �ਾ��"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Spell checking color"
 msgstr "ਸ਼ਬਦ-��� �ਾ�� ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Spell checking languages"
 msgstr "ਸ਼ਬਦ-��� �ਾ�� ਭਾਸ਼ਾਵਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Subscribe dialog default height"
-msgstr "ਮ�ਲ ��ਾ� ਤ�ਤ� ਮਨ�਼�ਰ �ਰ�"
+msgstr "ਮ��ਬਰ ਬਣ� ਡਾ�ਲਾ� ਮ�ਲ ��ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Subscribe dialog default width"
-msgstr "ਮ�ਲ ���ਾ� ਤ�ਤ� ਮਨ�਼�ਰ �ਰ�"
+msgstr "ਮ��ਬਰ ਬਣ� ਡਾ�ਲਾ� ਮ�ਲ ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Terminal font"
-msgstr "�ਰਮ�ਨਲ ਫ��"
+msgstr "�ਰਮ�ਨਲ ਫ���"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Text message part limit"
 msgstr "���ਸ� ਸ�ਨ�ਹਾ ਭਾ� ਸ�ਮਾ"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The default plugin for Junk hook"
 msgstr "�ੰ� ਹ�ੱ� ਲ� ਡਿਫਾਲ� ਪਲੱ��ਨ"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "��ਰ� ਵਾਰ �ੰ� �ਾਲ ��ਤਾ �ਿ� ਸ�, �ੰਨ�ਹ� ਦਿਨ ਪਹਿਲਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "�ਾਫ� ਦਿਨ ਪਹਿਲਾ� ਰੱਦ� �ਾਲ� ��ਤ� ਸ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "The terminal font for mail display."
 msgstr "ਮ�ਲ ਵ��ਾ�ਣ ਲ� �ਰਮ�ਨਲ ਫ��� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "The variable width font for mail display."
 msgstr "ਮ�ਲ ਵ��ਾ�ਣ ਲ� ਵ�ਰ�ਬਲ ���� ਫ��� ਹਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr "ਤਿੰਨ ਸੰਭਵ ਮ�ੱਲ ਹਨ। �ਲਤ��� ਲ� \"0\"। ��ਤਾਵਨ� ਲ� \"1\"। ਡ�ਬੱ� ਸ�ਨ�ਹਾ ਲ� \"2\"।"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:159
 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."
 msgstr ""
 "�ਹ ���ਸ� ਭਾ� ਦਾ ਵੱਧ ਤ�� ਵੱਧ ��ਾਰ ਤਹਿ �ਰਦਾ ਹ�, �ਿਸ ਨ�ੰ �ਵ�ਲ�ਸ਼ਨ ਮ�ਤਾਬ� ਫਾਰਮ�� ��ਤਾ �ਾ ਸ�ਦਾ "
-"ਹ�। ਡਿਫਾਲ� ੪MB / ੪੦੯੬ KB ਹ� �ਤ� KB ਦ� ਰ�ਪ ਵਿੱ� ਦਿੱਤਾ �ਾ ਸ�ਦਾ ਹ�।"
+"ਹ�। ਡਿਫਾਲ� 4 (੪) MB / ੪੦੯੬ KB ਹ� �ਤ� KB ਦ� ਰ�ਪ ਵਿੱ� ਦਿੱਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13846,7 +12786,7 @@ msgstr ""
 "�ਹ ਡਿਫਾਲ� �ੰ� ਪਲੱ��ਨ ਹ�, ਭਾਵ�� �ਿ �� ਪਲੱ��ਨ ਯ�� ਹਨ। �� ਡਿਫਾਲ� ਦਿੱਤ� ਪਲੱ��ਨ �ਯ�� ਹ� ਤਾ� �ਹ "
 "ਹ�ਰ �ਪਲੱਬਧ ਪਲੱ��ਨ �ਾਲ� ਨਹ�� �ਰ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -13854,7 +12794,7 @@ msgstr ""
 "�ਹ �� ��ਵਲ ਪ��ਹਨ ਲ� ਹ� �ਤ� ਪ��ਹਨ ਬਾ�ਦ \"�ਲਤ\" ਲ� ਰ�-ਸ�ੱ� ��ਤਾ ਹ�। ਸ��� ਵਿੱ��ਹ ਮ�ਲ �ਣ-"
 "��ਣ� ਹ� �ਤ� �ਸ ਫ�ਲਡਰ ਲ� �ਲ� ਹ�ਾ�ਦ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13865,20 +12805,20 @@ msgstr ""
 "XML ਢਾ��� ਦਾ ਫਾਰਮ�� ਹ� &lt; �ਾ��ਲ ਯ��&gt; - ਸ�ੱ� �ਰ�, ���ਰ ਮ�ਲ �ਲ� ਵਿੱ� ਤ�ਸ�� ਹ�ੱਡਰ ਵ��ਣਾ "
 "�ਾਹ�ੰਦ� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
-"�ਹ ��ਣ lookup_addressbook ��ੰ�� ਨਾਲ ਸਬੰਧਿਤ ਹ� �ਤ� �ਸ ਨ�ੰ ਲ��ਲ �ਡਰ�ੱਸ ਵਿੱ� �ਡਰ�ੱਸ ਦ� "
-"��� ਲ� ਵਰਤਿ� �ਾ�ਦਾ ਹ�, �ਦ�� �ਿ �ੰ� ਫਿਲ�ਰ ਤ�� �ਣ�ਾਣ ਸੰਪਰ� ਨ�ੰ �ੱਡ ��ਤਾ �ਾ ਸ��।"
+"�ਹ ��ਣ lookup_addressbook ��ੰ�� ਨਾਲ ਸਬੰਧਿਤ ਹ� �ਤ� �ਸ ਨ�ੰ ਲ��ਲ �ਡਰ�ੱਸ ਵਿੱ� �ਡਰ�ੱਸ ਦ� ��� ਲ� "
+"ਵਰਤਿ� �ਾ�ਦਾ ਹ�, �ਦ�� �ਿ �ੰ� ਫਿਲ�ਰ ਤ�� �ਣ�ਾਣ ਸੰਪਰ� ਨ�ੰ �ੱਡ ��ਤਾ �ਾ ਸ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "This option would help in improving the speed of fetching."
 msgstr "�ਹ ��ਣ ਲ�ਣ ਦ� ਸਪ�ਡ ਸ�ਧਾਰਨ ਲ� ਮੱਦਦ �ਰ���।"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13886,7 +12826,7 @@ msgstr ""
 "�ਹ ਡਿਫਾਲ� ਸ�ਨ�ਹਾ ਸ��� �ਲ� ਵਿੱ� �ਡਰ�ੱਸਾ� ਦ� �ਿਣਤ� ਸ�ੱ� �ਰਦ� ਹ�, �ਿਸ ਤ�� ਬਾ�ਦ �ੱ� '...' "
 "ਵ��ਾ�� �ਾ�ਦਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13894,7 +12834,7 @@ msgstr ""
 "�ਹ ਸ��ਿੰ� ਤਹਿ �ਰਦ� ਹ� �ਿ ਡਿਫਾਲ� ਰ�ਪ ਵਿੱ� ਥਰਿੱਡ ਫ�ਲਿ� ਹ�ਵ� �ਾ� ਸਮ��ਿ� ਹ���। �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ��-"
 "�ਾਲ� �ਰਨਾ ਪਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13903,115 +12843,93 @@ msgstr ""
 "�ਹ ਸ��ਿੰ� ਤਹਿ �ਰਦ� ਹ� �ਿ ਥਰਿੱਡਾ� ਨ�ੰ ਹਰ�� ਥਰਿੱਡ ਵਿੱ� ਤਾ�਼ਾ ਸ�ਨ�ਹਿ�� ਮ�ਤਾਬ� ਲ��ਬੱਧ ��ਤਾ �ਾਵ�, "
 "ਨਾ �ਿ ਸ�ਨ�ਹ� ਦ� ਮਿਤ� ਮ�ਤਾਬ�। �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਮ��-ਸ�ਾਰ� �ਰਨਾ ਪਵ��ਾ।"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Thread the message list."
 msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਥਰਿੱਡ।"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Thread the message-list"
 msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਥਰਿੱਡ"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Thread the message-list based on Subject"
 msgstr "ਵਿਸ਼� ਤ� �ਧਾਰਿਤ ਸ�ਨ�ਹਾ-ਸ��� ਦਾ ਥਰਿੱਡ ਬਣਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Timeout for marking message as seen"
 msgstr "ਸ�ਨ�ਹ� ਵ��ਿ� ਬਣਾ�ਣ ਲ� �ਾ�ਮ-���"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Timeout for marking message as seen."
 msgstr "ਸ�ਨ�ਹ� ਵ��ਿ� ਬਣਾ�ਣ ਲ� �ਾ�ਮ-��� ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "UID string of the default account."
 msgstr "ਮ�ਲ ��ਾ��� ਲ਼� UID ਲਾ�ਨ।"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "�ਦ�� �ਨ-ਲਾ�ਨ ਸਪ�ਲਿੰ� ਦ� ਵਰਤ�� ਹ�ਵ� ਤਾ� �ਲਤ ਸ਼ਬਦ ਲ� ਹ�ਠਾ� ਲਾ�ਨ ਲ� ਰੰ�"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use SpamAssassin daemon and client"
 msgstr "Spamasssassin ਡ�ਮਨ �ਤ� �ਲਾ�� ਵਰਤ��"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAsssassin ਡ�ਮਨ �ਤ� �ਲਾ�� ਵਰਤ�� (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use custom fonts"
 msgstr "ਪਸੰਦ�ਦਾ ਫ��� ਵਰਤ��"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Use custom fonts for displaying mail."
 msgstr "ਮ�ਲ ਵ��ਾ�ਣ ਲ� �ਸ�ਮ ਫ��� ਵਰਤ�� ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Use only local spam tests."
 msgstr "ਸਿਰਫ ਸਥਾਨ� ਫਰ�� �ਾ�� ਹ� ਵਰਤ��।"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ਸਿਰਫ ਸਥਾਨ� ਫਰ�� �ਾ�� ਹ� ਵਰਤ�� (DNS ਨਹ��)।"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Use side-by-side or wide layout"
 msgstr "ਨਾਲ-ਨਾਲ �ਾ� ਫ�ਲਿ� �ਾ�ਾ ਵਰਤ��"
 
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Variable width font"
-msgstr "�ਸਥਿਰ ���ਾ� ਫ���"
-
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "ਵ���/Bcc ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "ਵ���/Bcc ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�।"
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "ਵ���/Cc ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "ਵ���/Cc ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�।"
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "ਵ���/ਵੱਲ�� ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "ਵ���/ਵੱਲ�� ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�।"
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "ਵ���/ਭ��� ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "ਵ���/ਭ��� ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�"
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
+"ਯ��਼ਰ ਨ�ੰ ਸ�ਨ�ਹਾ ਦਾ �ਵਾਬ ਦ�ਣ ਸਮ�� �ਰਸਰ �ਿੱਥ� ਰੱ� �� ਦ�ਣ� ਹ�। �ਹ ਤਹਿ �ਰਦਾ ਹ� �ਿ �ਰਸਰ ਨ�ੰ ਸ�ਨ�ਹ� "
+"ਦ� �ੱਤ� ਰੱ�ਿ� �ਾਵ��ਾ �ਾ� ਹ�ਠਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "ਵ���/�ਵਾਬ ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�"
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
+"ਯ��਼ਰ ਸ�ਨ�ਹ� ਦਾ �ਵਾਬ ਦ�ਣ ਸਮ�� �ਪਣ� ਦਸਤ�ਤ �ਿੱਥ� ਲ� ਸ���ਾ। �ਹ ਤਹਿ �ਰਦਾ ਹ� �ਿ ਦਸਤ�ਤਾ� ਨ�ੰ "
+"ਸ�ਨ�ਹ� ਦ� �ੱਤ� ਰੱ�ਿ� �ਾਵ��ਾ �ਿ ਹ�ਠਾ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "ਵ���/�ਵਾਬ ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�।"
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Variable width font"
+msgstr "�ਸਥਿਰ ���ਾ� ਫ���"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "�� ਮ�ਲ ਰ�ਪ ਵਿੱ� ਹਰ�� ਸ�ਨ�ਹ� ਨਾਲ �ਵਾਬ� ਰਸ�ਦ ਦ� ਮੰ� ��ਤ� �ਾਵ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "�� ਬਾਹ�  ਵਿੱ� �ੰਡਾ�ਾਰ ਫ�ਲਡਰ ਨਾ� ਫ��ਰ �ਯ�� �ਰਨਾ ਹ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -14019,15 +12937,15 @@ msgstr ""
 "�� ਮਾਮਲਿ�� ਨ�ੰ ਵਿਸ਼� ਮ�ਤਾਬ� ��ਤਾ �ਾਵ� �ਾ� ਨਾ, �ਦ�� �ਿ ਸ�ਨ�ਹਿ�� ਵਿੱ� �ਵਾਬ �ਾ� ਹਵਾਲਾ ��ਤਰ "
 "ਸ਼ਾਮਿਲ ਨਾ ਹ�ਵ�।"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "�� ਮਾਮਲ� ਨ�ੰ �ਸ ਮਾਮਲ� ਵਿੱ� ਤਾ�਼ਾ ਸ�ਨ�ਹਾ ਮ�ਤਾਬ� ਲ��ਬੱਧ �ਰਨਾ ਹ�"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Width of the message-list pane"
 msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਬਾਹ� ਦ� ���ਾ�"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Width of the message-list pane."
 msgstr "ਸ�ਨ�ਹਾ-ਸ��� ਬਾਹ� ਦ� ���ਾ� ਹ�।"
 
@@ -14044,12 +12962,12 @@ msgid "Import mail from Elm."
 msgstr "Elm ਤ�� ਪੱਤਰ �ਯਾਤ ਹ�।"
 
 #: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "Destination folder:"
 msgstr "ਨਿਯਤ ਫ�ਲਡਰ:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder to import into"
 msgstr "�ਯਾਤ �ਰਨ ਲ� ਫ�ਲਡਰ ��ਣ�"
 
@@ -14067,8 +12985,8 @@ msgstr "ਪੱਤਰ-ਬ�ਸਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
+#: ../plugins/pst-import/pst-importer.c:454
+#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
@@ -14095,152 +13013,148 @@ msgstr "Pine ਤ�� ਪੱਤਰ �ਯਾਤ ਹ�।"
 msgid "Mail to %s"
 msgstr "%s ਨ�ੰ ਪੱਤਰ"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "%s ਤ�� ਪੱਤਰ"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "ਵਿਸ਼ਾ ਹ� %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s ਪੱਤਰ ਲਿਸ�"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "ਫਿਲ�ਰ ਨਿਯਮ ਸ਼ਾਮਿਲ �ਰ�"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " %d ��ਣਿ�, "
 msgstr[1] " %d ��ਣ�, "
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d ਹ�ਾ��"
 msgstr[1] "%d ਹ�ਾ�"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d �ੰ�"
 msgstr[1] "%d �ੰ�"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ਡਰਾਫ�"
 msgstr[1] "%d ਡਰਾਫ�"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d ਭ��ਿ�"
 msgstr[1] "%d ਭ���"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d ਨਾ-ਭ��ਿ�"
 msgstr[1] "%d ਨਾ-ਭ���"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d �ਣ-ਰ�ਡ, "
 msgstr[1] "%d �ਣ-ਰ�ਡ, "
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d ��ੱਲ"
 msgstr[1] "%d ��ੱਲ"
 
-#: ../mail/mail-component.c:927
+#: ../mail/mail-component.c:952
 msgid "New Mail Message"
 msgstr "ਨਵਾ� ਪੱਤਰ ਸ�ਨ�ਹਾ"
 
-#: ../mail/mail-component.c:928
+#: ../mail/mail-component.c:953
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ਪੱਤਰ ਸ�ਨ�ਹਾ(_M)"
 
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:954
 msgid "Compose a new mail message"
 msgstr "�ੱ� ਨਵਾ� ਪੱਤਰ ਸ�ਨ�ਹਾ ਲਿ��"
 
-#: ../mail/mail-component.c:935
+#: ../mail/mail-component.c:960
 msgid "New Mail Folder"
 msgstr "ਨਵਾ� ਪੱਤਰ ਫ�ਲਡਰ"
 
-#: ../mail/mail-component.c:936
+#: ../mail/mail-component.c:961
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "ਪੱਤਰ ਫ�ਲਡਰ(_F)"
 
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:962
 msgid "Create a new mail folder"
 msgstr "ਨਵਾ� ਪੱਤਰ ਫ�ਲਡਰ ਬਣਾ�"
 
-#: ../mail/mail-component.c:1084
+#: ../mail/mail-component.c:1109
 msgid "Failed upgrading Mail settings or folders."
 msgstr "ਪੱਤਰ ਸ��ਿੰ� �ਾ� ਫ�ਲਡਰ ਨ�ੰ �ੱਪਡ�� �ਰਨ ਵਿੱ� �ਸਫਲ ਹ�।"
 
 #: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr " ਸਹਾ�� �ਿਸਮ ਲ� �ਾ��(_e)"
-
-#: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
 msgstr "(ਨ��: �ਪਲ���ਸ਼ਨ ਮ��-ਸ�ਾਰ� �ਰਨ ਦ� ਲ�� ਹ�)"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b> SSL ਸਹਿਯ�� �ਵ�ਲ�ਸ਼ਨ ਦ� �ਸ ਵਰ�ਨ ਲ� ਸਹਿਯ�� ਨਹ��</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:4
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>ਭ��ਣ ਵਾਲ� ਦ� ਫ���</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>ਦਸਤ�ਤ(_n)</b>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>�ਾਪ ਪ�ਸ�ਿੰ� ��ਣ</b> (ਸਿਫਾਰਸ਼� ਨਹ�� ਹ�)"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>ਭਾਸ਼ਾਵਾ�(_L)</b>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">��ਾ��� �ਾਣ�ਾਰ�</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">ਪ�ਰਮਾਣ�ਿਤਾ</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">ਸ�ਨ�ਹ� ਲਿ�ਣ�</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">ਸੰਰ�ਨਾ</span>"
 
@@ -14361,59 +13275,83 @@ msgstr "���ਰਿਪ�ਡ ਸ�ਨ�ਹ� ਭ��ਣ ਸਮ�� 
 msgid "Always request rea_d receipt"
 msgstr "ਪ�ਨ ਰਸ�ਦ ਹਮ�ਸ਼ਾ ਮੰ��(_d)"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
+#| msgid "Attachment Reminder"
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+"����ਮ���\n"
+"ਲਾ�ਨ ਵਿੱ�\n"
+"ਹਵਾਲਾ"
+
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+"����ਮ���\n"
+"ਲਾ�ਨ ਵਿੱ� (���ਲ�ੱ� ਸ�ਾ�ਲ)\n"
+"ਹਵਾਲਾ\n"
+"ਹਵਾਲਾ ਨਹ��"
+
+#: ../mail/mail-config.glade.h:52
 msgid "Automatically insert _emoticon images"
 msgstr "�ਮ�ਸ਼ਨ �ਿੱਤਰ ���ਮ��ਿ� ਸ਼ਾਮਿਲ �ਰ�(_e)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr "ਬਾਲ�ਿ� (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr "ਬਾਲ�ਿ� (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "�ੱ�ਰ ਸਮ�ਹ(_h):"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
+#: ../mail/mail-config.glade.h:56
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+msgid "Ch_eck for Supported Types"
 msgstr "ਸਹਾ�� �ਿਸਮ ਲ� �ਾ��(_e)"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:57
 msgid "Check cu_stom headers for junk"
 msgstr "�ੰ� ਲ� �ਸ�ਮ ਹ�ੱਡਰ ��ੱ� �ਰ�(_s)"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:58
 msgid "Check incoming _messages for junk"
 msgstr "�ੰ� ਲ� � ਰਹ� ਸ�ਨ�ਹ� ��ੱ� �ਰ�(_m)"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "I �ਿਸਮ ਲ� ਸ਼ਬਦ-��� ਦ� �ਾ�� �ਰ�(_t)"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "��ਣ ਵਾਲ� ਪੱਤਰਾ� ਵਿੱ� �ੰ� ਦ� �ਾ�� �ਰ�"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "ਸਾ�(_a)"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "ਸਾ�(_r)"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "�ਲਤ ਸ਼ਬਦ-��� �ੱ�ਰਾ� ਦਾ ਰੰ�(_m):"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "ਫ�ਲਡਰ ਦ� ਤੱਥ �ੱਢਣ ਸਮ�� ਪ�ਸ਼�� �ਰ�(_w)"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:65
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14429,181 +13367,183 @@ msgstr ""
 "\n"
 "�ਿਰਪਾ �ਰ�� �ਪਣਾ ਸ��ਿੰ� ਲਾ�� �ਰਨ ਲ� \"ਲਾ�� �ਰ�\" ਦਬਾ�।"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr "ਮ�ਲ(_f)"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "ਮ�ਲ �ੱ�ਰ ���ਡਿੰ�(_n):"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:74
 msgid "Delete junk messages on e_xit"
 msgstr "ਬੰਦ �ਰਨ ਸਮ�� �ੰ� ਮ�ਲ ਹ�ਾ�(_x)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:76
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ਬਾਹਰ �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਡਿ���ਲ ਸਾ�ਨ �ਰ� (ਡਿਫਾਲ�)(_s)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:77
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "ਮ�ਲ ਵਿੱ� ���ਸ� ਸਮੱ�ਰ� ਫਾਰਮ�� ਨਾ �ਰ�, �� ���ਸ� ਸਾ��਼ ਵੱਧ �ਾਵ�(_z)"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "�� ਭ��ਣ ਵਾਲਾ ਮ�ਰ� �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਹ�ਵ� ਤਾ� ਸ�ਨ�ਹਾ �ੰ� ਨਾ ਬਣਾ�(_k)"
 
-#: ../mail/mail-config.glade.h:73
-msgid "Do not quote"
-msgstr "��� ਨਾ �ਰ�"
-
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr "ਸਮਾਪਤ"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
 msgstr "ਡਰਾਫ� ਫ�ਲਡਰ(_F):"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr "�-ਮ�ਲ ��ਾ���"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ(_A):"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "ਬੰਦ �ਰਨ ਤ� ਰੱਦ� ਫ�ਲਡਰ ਬੰਦ �ਰ ਦਿ�(_x)"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:84
 msgid "Enable Magic S_pacebar"
 msgstr "ਮ��ਿ� ਸਪ�ਸਬਾਰ ਯ��(_p)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:85
 msgid "Enable Sea_rch Folders"
 msgstr "��� ਫ�ਲਡਰ ਯ��(_r)"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "���ਰਿਪਸ਼ਨ ਸਰ��ਫਿ���(_p):"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "ਬਾਹਰ� �ਾਣ ਵਾਲ� ਪੱਤਰਾ� ਨ�ੰ ���ਰਿਪਸ਼ਨ(ਮ�ਲ ਹ�)(_g)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
 msgstr "ਸਥਿਰ ���ਾ�(_x):"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
 msgstr "ਸਥਿਰ ���ਾ� ਫ���(_e):"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
 msgstr "ਫ��� ਵਿਸ਼�ਸ਼ਤਾ"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "_HTML ਵਿੱ� ਫਾਰਮ�� ਸ�ਨ�ਹਾ"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "ਪ�ਰਾ ਨਾ�(_E):"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:96
 msgid "HTML Messages"
 msgstr "HTML ਸ�ਨ�ਹ�"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:97
 msgid "H_TTP Proxy:"
 msgstr "H_TTP ਪਰਾ�ਸ�:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "ਹ�ੱਡਰ"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "ਹਵਾਲ� ਨ�ੰ �ਭਾਰ�(_q)"
 
-#: ../mail/mail-config.glade.h:96
-msgid "Inline"
-msgstr "ਲਾ�ਨ '�"
-
-#: ../mail/mail-config.glade.h:97
-msgid "Inline (Outlook style)"
-msgstr "�ਨਲਾ�ਨ (���ਲ�ੱ� ਸ�ਾ�ਲ)"
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
+msgstr "�� ਸਰਵਰ �਼�ਰ-ਸ���ਡਰਡ ਪ�ਰ� ਵਰਤਦਾ ਹ�ਵ� ਤਾ� ਸਰਵਰ �ਡਰ�ੱਸ \"ਸਰਵਰ-ਨਾ�:ਪ�ਰ�-ਨੰਬਰ\" ਮ�ਤਾਬ� ਦਿ�।"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "ਲ�ਬਲ"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "ਭਾਸ਼ਾ ��ਬਲ"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "ਮ�ਲ ਸੰਰ�ਨਾ"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "ਮ�ਲ ਹ�ੱਡਰ ��ਬਲ"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr "ਮ�ਲ-ਬਾ�ਸ �ਿ�ਾਣਾ"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "ਸ�ਨ�ਹਾ ਲ���"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr "�ਸ ਲ� ��� ਪਰਾ�ਸ� ਨਹ��(_P):"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:112
 msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "ਨ��: ਲ�ਬਲ ਨਾ� ਵਿੱ� ਹ�ਠਾ� ਲਾ�ਨ ਨ�ੰ ਮ�ਨ� ਵਿੱ� ਨ�ਮ�ਨਿ� ਪ�ਾਣ�ਰਤਾ ਵਾ��"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "ਸ��ਨਾ: �ਦ�� ਤੱ� �ਿ ਤ�ਸ�� ਪਹਿਲ�� ਵਾਰ ਲਾ��ਨ ਨਹ�� �ਰਦ�, ਤ�ਹਾਡ� ��ਲ�� ਪਾਸਵਰਡ ਪ��ਿ� ਨਹ�� �ਾਵ��ਾ"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:114
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "��ਣ ਨ�ੰ �ਣਡਿੱਠਾ ��ਤਾ �ਾਵ��ਾ, �� ਰਲਦਾ �ਸ�ਮ �ੰ� ਹ�ੱਡਰ ���ਿ� �ਾਵ�।"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "ਸੰ�ਠਨ(_g):"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 msgid "Pass_word:"
 msgstr "ਪਾਸਵਰਡ(_w):"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+#| msgid "Please select among the following options"
+msgid "Please configure the following account settings."
+msgstr "ਹ�ਠ ਦਿੱਤ� ��ਾ��� ਸ��ਿੰ� ਦ� ਸੰਰ�ਨਾ �ਰ� ��।"
+
+#: ../mail/mail-config.glade.h:120
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below.\n"
+#| "This name will be used for display purposes only."
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
 msgstr ""
-"�ੱ�� ਦਿੱਤ� ਥਾ� ਵਿੱ� �ਸ ��ਾ��� ਬਾਰ� ਵਰਣਨ �ਰਦ� �ਾਣ�ਾਰ� ਦਿ� ��।\n"
+"�ੱ�� ਦਿੱਤ� ਥਾ� ਵਿੱ� �ਸ ��ਾ��� ਬਾਰ� ਵਰਣਨ �ਰਦ� �ਾਣ�ਾਰ� ਦਿ� ��। "
 "�ਹ ਨਾ� ਸਿਰ� ਵ��ਾ�ਣ ਲ� ਹ� ਵਰਤ� �ਾਵ���।"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14611,7 +13551,7 @@ msgstr ""
 "�ਸ ਢੰ� ਦ� �ਾਣ�ਾਰ� ਦਿ� ��, �ਿਸ ਰਾਹ�� ਤ�ਸ�� ਪੱਤਰ ਭ��ਣਾ �ਾਹ�ੰਦ� ਹ�। ���ਰ ਤ�ਸ�� ਯ��ਨ� ਨਹ�� ਹ� "
 "ਤਾ� �ਪਣ� ਸਿਸ�ਮ ਪਰਸ਼ਾਸ਼� �ਾ� �ੰ�ਰਨ�ੱ� ਸਰਵਿਸ ਪ�ਰਬੰਧ� ਨਾਲ ਸੰਪਰ� �ਰ�।"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 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 "
@@ -14620,65 +13560,49 @@ msgstr ""
 "ਹ�ਠਾ� �ਪਣਾ ਨਾ� �ਤ� �-ਮ�ਲ �ਡਰ�ੱਸ ਦਿ� ��। ਹ�ਠਾ� \"��ਣਵਾ�\" ��ਤਰ ਭਰਨ ਦ� ਲ�� ਨਹ�� ਹ�, �ਦ�� ਤੱ� �ਿ "
 "ਤ�ਸ�� �-ਮ�ਲ ਰਾਹ� ਭ��� �ਾਣ ਵਾਲ� �ਾਣ�ਾਰ� ਵਿੱ� ਸ਼ਾਮਿਲ ਨਾ �ਰ �ਾਹ�।"
 
-#: ../mail/mail-config.glade.h:119
-msgid "Please select among the following options"
-msgstr "ਹ�ਠ ਲਿ���� ��ਣਾ� ਵਿੱ��� ��ਣ� ��"
-
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Port:"
 msgstr "ਪ�ਰ�:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ਸ��ਿਤ �ਰ�, �ਦ�� ਵ� ਸ�ਨ�ਹ� ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�ਵ�, �� �ਿ Bcc ਪ�ਰਾਪਤ�ਰਨ ਵਾਲਿ�� ਲ� ਹ�ਵ�(_o)"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Quoted"
-msgstr "ਹਵਾਲਾ"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_m)"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "�ਸ ਨ�ੰ �ਵਾਬ(_p):"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_p)"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "S_OCKS ਹ�ਸ�:"
-
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_earch for sender photograph only in local address books"
 msgstr "ਭ��ਣ ਵਾਲ� ਦ� ਤਸਵ�ਰ ਦ� ��� ਸਿਰਫ਼ ਲ��ਲ �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਹ� �ਰ�(_e)"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "��ਣ�(_e)..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
 msgstr "ਸ�ਨ�ਹਾ ਰਸ�ਦ ਭ���(_e):"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
 msgstr "ਸ���ਡਰਡ ਫ���(_t):"
 
-#: ../mail/mail-config.glade.h:133
-msgid "Select Drafts Folder"
-msgstr "ਡਰਾਫ� ਫ�ਲਡਰ ��ਣ�"
-
 #: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "HTML ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 
 #: ../mail/mail-config.glade.h:135
 msgid "Select HTML fixed width font for printing"
-msgstr "ਪਰਿ�ਿੰ� ਲ� HTML ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
+msgstr "ਪਰਿੰ� ਲ� HTML ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 
 #: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font"
@@ -14688,71 +13612,71 @@ msgstr "HTML �ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 msgid "Select HTML variable width font for printing"
 msgstr "ਪਰਿ�ਿੰ� ਲ� HTML �ਸਥਿਰ ���ਾ� ਫ�� ��ਣ�"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Select Sent Folder"
-msgstr "ਭ��� ਫ�ਲਡਰ ��ਣ�"
-
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "ਪੱਤਰ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "ਭ��� ਸ�ਨ�ਹ� ਫ�ਲਡਰ(_M):"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "ਸਰਵਰ ਲ� ਪ�ਰਮਾਣ�ਿਤਾ ਲ���ਦ� ਹ�"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Server _Type: "
-msgstr "ਸਰਵਰ �ਿਸਮ(_T): "
+#: ../mail/mail-config.glade.h:142
+#| msgid "Server _Type: "
+msgid "Server _Type:"
+msgstr "ਸਰਵਰ �ਾ�ਪ(_T): "
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ(_n):"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "ਦਸਤ�ਤ(_u):"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "ਦਸਤ�ਤ"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "ਦਸਤ�ਤ ��ਬਲ"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "ਸ਼ਬਦ-��� �ਾ��"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "�ਦ�� �ਵਾਬ ਦ�ਣਾ ਹ�ਵ� ਤਾ� ਹ�ਠਾ� ਲਿ�ਣਾ �ਾਹ�ੰਦ� ਹ�(_t)"
 
-#: ../mail/mail-config.glade.h:150
-msgid "T_ype: "
-msgstr "�ਿਸਮ(_y): "
+#: ../mail/mail-config.glade.h:149
+#| msgid "T_ype: "
+msgid "T_ype:"
+msgstr "�ਿਸਮ(_y):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "ਭਾਸ਼ਾਵਾ� ਦ� ਲਿਸ�, ਸਿਰਫ �ਹਨਾ� ਨ�ੰ ਵ��ਾ�ਦ� ਹ�, �ਿਨਾ� ਲ� ਸ਼ਬਦ-��ਸ਼ �ੰਸ�ਾਲ ਹ�।"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:151
+#| msgid ""
+#| "The output of this script will be used as your\n"
+#| "signature. The name you specify will be used\n"
+#| "for display purposes only. "
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
-"�ਸ ਸ��ਰਿਪ� ਦ� ���ਪ�ੱ� ਤ�ਹਾਡ� ਦਸਤ�ਤ\n"
-"ਵਿੱ� ਵਰਤ� �ਾਵ���। ਨਾ�, �� ਵ� ਤ�ਸ�� ਦਿ���, ਸਿਰਫ\n"
-"ਵ��ਾ�ਣ ਦ� �ੰਮ �ਵ���।"
+"�ਸ ਸ��ਰਿਪ� ਦ� ���ਪ�ੱ� ਤ�ਹਾਡ� ਦਸਤ�ਤ ਵਿੱ� ਵਰਤ� �ਾਵ���।\n"
+"ਨਾ�, �� ਵ� ਤ�ਸ�� ਦਿ���, ਸਿਰਫ ਵ��ਾ�ਣ ਦ� �ੰਮ �ਵ���।"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14760,156 +13684,160 @@ msgstr ""
 "ਨਾ� ਲਿ��, �ਿਸ ਨਾਲ ਤ�ਸ�� �ਸ ��ਾ��� ਨ�ੰ ਸੰਬ�ਧਨ �ਰਨਾ �ਾਹ�ੰਦ� ਹ�।\n"
 "�ਦਾਹਰਨ ਲ�: \"�ੰਮ�ਾਰ�\" �ਾ� \"ਨਿੱ��\""
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
 msgid "Us_ername:"
 msgstr "ਯ��਼ਰ ਨਾ�(_e):"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
 msgid "Use Authe_ntication"
 msgstr "ਪ�ਰਮਾਣਿ�ਤਾ ਵਰਤ��(_n)"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
-#: ../plugins/google-account-setup/google-source.c:615
-#: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:349
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:681
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "ਯ��਼ਰ ਨਾ�(_n):"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "�ਸਥਿਰ-���ਾ�(_a):"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Forward\" to begin. "
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Forward\" to begin. "
+"Click \"Forward\" to begin."
 msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਸੰਰ�ਨਾ ਸਹਾ�� ਤ� ਸਵਾ�ਤ ਹ�।\n"
+"�ਵ�ਲ�ਸ਼ਨ ਪੱਤਰ ਸੰਰ�ਨਾ ਸਹਾ�� ਵਲ�� �� ���� ਨ�ੰ\n"
 "\n"
 "ਸ਼�ਰ� �ਰਨ ਲ� \"�ੱ��\" ਦਬਾ�।"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "ਦਸਤ�ਤ ਸ਼ਾਮਿਲ(_A)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "�ੰ�ਰਨ�ੱ� ਤ�� �ਿੱਤਰ ਹਮ�ਸ਼ਾ ਪ�ਰਾਪਤ �ਰ�(_A)"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "���ਮ��ਿ� ਪਰਾ�ਸ� ਸੰਰ�ਨਾ URL (_a):"
-
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "ਡਿਫਾਲ� �ੰ� ਪਲੱ��ਨ(_D):"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "�ੰ�ਰਨ�ੱ� ਲ� ਸਿੱਧਾ ��ਨ��ਸ਼ਨ(_D)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ਮ��ਿੰ� ਬ�ਨਤ� �ੱਤ� ਦਸਤ�਼ਤ ਨਾ �ਰ� (���ਲ�ੱ� �ਨ���ਲਤਾ ਲ�) (_D)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "�ੱ�� ਭ��ਣ ਸ�ਾ�ਲ(_F):"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "�ਵਾਬ ਦ�ਣ ਸਮ�� ਦਸਤ�ਤ �ਸਲ�� ਸ�ਨ�ਹ� ਦ� �ੱਤ� ਰੱ��(_K)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "ਸੰਪਰ�ਾ� ਤ�� �� ਸ�ਨ�ਹਿ�� '� �ਿੱਤਰ ਲ�ਡ �ਰ�(_L)"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local address book only"
 msgstr "ਲ��ਲ �ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਹ� ਵ���(_L)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "ਮ�ਰ� �ਸ ��ਾ��� ਨ�ੰ ਮ�ਲ ਬਣਾ�(_M)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "ਦਸਤ� ਪਰਾ�ਸ� ਸੰਰ�ਨਾ(_M):"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "ਬਾ�ਦ ਵਿੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਪ�ਿ� ਬਣਾ�(_M)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "�ੰ�ਰਨ�ੱ� ਤ�� �ਿੱਤਰ �ਦ� ਵ� ਲ�ਡ ਨਾ �ਰ�(_N)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "ਮਾਰ�(_P):"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:178
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML ਸ�ਨ�ਹਾ ਸੰਪਰ�ਾ� ਨ�ੰ ਭ��ਣ ਸਮ�� ਪ�ੱ��, �� �ਿ ਨਹ�� �ਾਹ�ੰਦ� ਹਨ (_P)"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "�ਾਲ� ਵਿਸ਼ਾ ਲਾ�ਨ ਨਾਲ ਸ�ਨ�ਹਾ ਭ��ਣ ਸਮ�� ਪ�ੱ��(_P)"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "�ਵਾਬ ਸ�ਾ�ਲ(_R):"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "ਸ��ਰਿਪ�(_S):"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "ਸ�ਰੱ�ਿ�ਤ HTTP ਪਰਾ�ਸ�(_S):"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "��ਣ�(_S)..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "�ਿੱਤਰ ਸ��ਵਤਾ ਵ��ਾ�(_S)"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "�ਮ�ਲ �ਲ� ਵਿੱ� ਭ��ਣ ਵਾਲ� ਦ� ਫ��� ਵ���(_S)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ਵੱਲ / Cc / Bcc ਹ�ੱਡਰ ਨ�ੰ ਸ�ੰ���(_S) "
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "ਸ�ਰੱ�ਿ�ਤ ��ਨ��ਸ਼ਨ ਵਰਤ��(_U):"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "ਸਿਸ�ਮ ਡਿਫਾਲ� ਵਰਤ��(_U)"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "ਹ�ਰ �ਾਰ� ਵਾ�� �ਹ� ਫ��� ਵਰਤ��(_U)"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "�ਡਰ�ੱਸ"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "ਰੰ�"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "ਵ�ਰਵਾ"
 
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "ਸ�ਿੰ�"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "     "
@@ -14939,50 +13867,34 @@ msgid "All local folders"
 msgstr "ਸਭ ਸਥਾਨ� ਫ�ਲਡਰ"
 
 #: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "�ੱ�ਰ ��ਾਰ ਪ�ਰਤ� ਸੰਵ�ਦਨਸ਼�ਲ(_S)"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "ਮ��ੰਮਲ(_m)"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "���(_i):"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ਲੱਭ�"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "ਨਿਸ਼ਾਨ ਦ� ਪਿੱ��"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "ਫ�ਲਡਰ ਮ��ਬਰ�"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ�"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "��� ��ਣਿ� ਨਹ��"
-
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "ਸਰਵਰ(_e):"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "ਸ�ਰੱ�ਿ� �ਾਣ�ਾਰ�"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "�ਾਸ ਫ�ਲਡਰ"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14990,19 +13902,19 @@ msgstr ""
 "ਸ�ਨ�ਹ�, �� �ਿ ਤ�ਸ�� ਪਿੱ�ਾ �ਰਨ ਲ� ��ਣ� ਸਨ, ਹ�ਠਾ� ਦਿੱਤ� �ਾ ਰਹ� ਹਨ।\n"
 "�ਿਰਪਾ �ਰ�� \"ਨਿਸ਼ਾਨ\" ਮ�ਨ�ੰ ਵਿੱ��� �ਾਰਵਾ� �ਰਨ ਲ� ��ਣ।"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "ਲਾ�ਸ��ਸ ਮਨ�਼�ਰ(_A)"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "ਦ�ਣਯ��(_D):"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "ਨਿਸ਼ਾਨ(_F):"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਮਨ�਼�ਰ �ਰਨ ਲ� �ਸ ਨ�ੰ ��ਣ�(_T)"
 
@@ -15011,21 +13923,21 @@ msgstr "ਲਾ�ਸ��ਸ ਸ਼ਰਤਾ� ਮਨ�਼�ਰ �ਰਨ ਲ
 msgid "Pinging %s"
 msgstr "ਪਿੰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ� %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "ਪੱਤਰ ਲ� �ਾ ਰਹ� ਹਨ"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ਬਾਹਰ� ਫਿਲ�ਰ ਲਾ�� �ਰਨ ਤ�� �ਸਫਲ: %s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15034,123 +13946,123 @@ msgstr ""
 "%s ਵਿੱ� ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� �ਸਫਲ: %s\n"
 "ਲ��ਲ`Sent' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ ��ਤ� �ਾ ਰਹ� ਹ�।"
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ਸਥਾਨ� `Sent' ਫ�ਲਡਰ ਸ਼ਾਮਿਲ �ਰਨ ਵਿੱ� �ਸਫਲ: %s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
 msgid "Sending message"
 msgstr "ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d ਵਿੱ��� %1$d ਸ�ਨ�ਹਾ ਭ��ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ਸ�ਨ�ਹ� %2$d ਵਿੱ��� %1$d ਭ��ਣ ਵਿੱ� �ਸਫ਼ਲ"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:701
 msgid "Canceled."
 msgstr "ਰੱਦ ��ਤਾ।"
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
 msgid "Complete."
 msgstr "ਸਮਾਪਤ"
 
-#: ../mail/mail-ops.c:872
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr "ਸ�ਨ�ਹ� ਨ�ੰ ਫ�ਲਡਰ ਵਿੱ� ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s ਵਿੱ� ਸ�ਨ�ਹ� ਭ��� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s ਵਿੱ� ਸ�ਨ�ਹ� �ਾਪ� ��ਤ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr "�ੱ�� ਭ��� ਸ�ਨ�ਹ�"
 
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "ਫ�ਲਡਰ %s ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1277
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "%s ਫ�ਲਡਰ ���ਾ �ਾਣ�ਾਰ� ਲ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "ਸ��ਰ %s ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "ਫ�ਲਡਰ %s ਹ�ਾ�� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ਫ�ਲਡਰ '%s' ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "��ਾ��� '%s' ਸ�ੰ��ਿ� �ਾ ਰਿਹਾ ਹ� �ਤ� ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
 msgstr "��ਾ��� '%s' ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1649
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr "ਫ�ਲਡਰ ਤਾ�਼ਾ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "ਨਿ�ਾਲਾ ਫ�ਲਡਰ"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ਵਿੱ� ਰੱਦ� �ਾਲ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "ਸਥਾਨ� ਫ�ਲਡਰ"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr "ਸ�ਨ�ਹਾ %s ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ਸ�ਨ�ਹਾ %d ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 msgstr[1] "ਸ�ਨ�ਹ� %d ਪ�ਰਾਪਤ ��ਤਾ �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "ਸ�ਨ�ਹਾ %d ਸੰਭਾਲਿ� �ਾ ਰਿਹਾ ਹ�"
 msgstr[1] "ਸ�ਨ�ਹ� %d ਸੰਭਾਲ� �ਾ ਰਹ� ਹਨ"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15159,11 +14071,11 @@ msgstr ""
 "ਸ�ਨ�ਹਾ ਸੰਭਾਲਣ ਵਿੱ� �ਲਤ�: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
 msgstr "ਨੱਥ� ਸੰਭਾਲ�"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15172,27 +14084,27 @@ msgstr ""
 "���ਪ�ੱ� ਫਾ�ਲ ਨ�ੰ ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ਡਾ�ਾ ਲਿ�ਿ� ਨਹ�� �ਾ ਸ�ਿ� ਹ�: %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ਨਾਲ�� ��ਨ��ਸ਼ਨ �ਤਮ ��ਤਾ �ਾ�ਦਾ ਹ�"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ਨਾਲ ਮ�� ���ਿ� �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2450
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "�ਫਲਾ�ਨ ਲ� ��ਾ��� '%s' ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2536
 msgid "Checking Service"
 msgstr "ਸ�ਵਾ ਦ� �ਾ�� �ਾਰ� ਹ�"
 
@@ -15216,43 +14128,43 @@ msgstr "�ੱਪਡ�� �ਾਰ�..."
 msgid "Waiting..."
 msgstr "�ਡ�� �ਾਰ�..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:814
 #, c-format
 msgid "Checking for new mail"
 msgstr "ਨਵਾ� ਪੱਤਰ ਲ� �ਾ�� �ਾਰ�"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਦਿ�"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "ਪਾਸਵਰਡ ਦਿ�"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s ਲ� ਪਾਸਵਰਡ ਭਰ�"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "ਪਾਸਵਰਡ ਭਰ�"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
 msgstr "ਯ��਼ਰ ਨ� �ਾਰਵਾ� ਰੱਦ ��ਤ�।"
 
-#: ../mail/mail-signature-editor.c:201
+#: ../mail/mail-signature-editor.c:202
 msgid "_Save and Close"
 msgstr "ਸੰਭਾਲ� ਤ� ਬੰਦ �ਰ�(_S)"
 
-#: ../mail/mail-signature-editor.c:355
+#: ../mail/mail-signature-editor.c:356
 msgid "Edit Signature"
 msgstr "ਦਸਤ�ਤ ਸ�ਧ"
 
-#: ../mail/mail-signature-editor.c:370
+#: ../mail/mail-signature-editor.c:371
 msgid "_Signature Name:"
 msgstr "ਦਸਤ�ਤ ਨਾ�(_S):"
 
@@ -15285,21 +14197,21 @@ msgstr "�ਲਤ ਫ�ਲਡਰ: `%s'"
 msgid "Setting up Search Folder: %s"
 msgstr "��� ਫ�ਲਡਰ ਤਿ�ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s:%s' ਲ� ��� ਫ�ਲਡਰ �ੱਪਡ�� �ਰਨਾ �ਾਰ�"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' ਲ� ��� ਫ�ਲਡਰ �ੱਪਡ�� �ਰਨਾ �ਾਰ�"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "��� ਫ�ਲਡਰ ਸ�ਧ"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "ਨਵਾ� ��� ਫ�ਲਡਰ"
 
@@ -15850,8 +14762,8 @@ msgid ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"��ਤਾਵਨ�: ��� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨ�ਹ� ਹ�ਾ�ਣ ਨਾਲ ਸ�ਨ�ਹਿ�� ਨ�ੰ ਤ�ਹਾਡ� ਲ��ਲ �ਾ� ਰਿਮ�� ਫ�ਲਡਰ ਵਿੱ� "
-"ਵ� ਹ�ਾ�� �ਾਵ��ਾ।\n"
+"��ਤਾਵਨ�: ��� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨ�ਹ� ਹ�ਾ�ਣ ਨਾਲ ਸ�ਨ�ਹਿ�� ਨ�ੰ ਤ�ਹਾਡ� ਲ��ਲ �ਾ� ਰਿਮ�� ਫ�ਲਡਰ ਵਿੱ� ਵ� ਹ�ਾ�� "
+"�ਾਵ��ਾ।\n"
 "�� ਤ�ਸ�� �ਾਰ� ਰੱ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #  mail:account-incomplete secondary
@@ -15908,85 +14820,90 @@ msgstr "ਸ�ੰ���(_E)"
 msgid "_Open Messages"
 msgstr "ਸ�ਨ�ਹ� ��ਲ�ਹ�(_O)"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "ਨਾ-ਵ���"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "ਵ���"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "�ਵਾਬ ਦਿੱਤ�"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "�ੱ�� ਭ��ਿ�"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "ਬਹ� ਨਾ-ਵ��� ਸ�ਨ�ਹ�"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "ਬਹ�-ਸ�ਨ�ਹ�"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "ਨਿ�ਨਤਮ"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "�ੱ�"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "ਵੱਧ"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "ਸਭ ਤ�� ਵੱਧ"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:71
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "�ੱ� %l:%M %p"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:81
+#: ../mail/message-list.c:1670
 msgid "Yesterday %l:%M %p"
 msgstr "�ੱਲ�ਹ %l:%M %p"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:93
+#: ../mail/message-list.c:1682
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:101
+#: ../mail/message-list.c:1690
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:103
+#: ../mail/message-list.c:1692
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3985 ../mail/message-list.c:4450
+#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
 msgid "Generating message list"
 msgstr "ਸ�ਨ�ਹਾ ਸ��� ਬਣਾ� �ਾ ਰਹ� ਹ�"
 
-#: ../mail/message-list.c:4289
+#: ../mail/message-list.c:4299
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "��� ਸ�ਨ�ਹਾ ਤ�ਹਾਡ� ��� ਮ�ਤਾਬ� ਨਹ�� ਹ�। �ਾ� ਤਾ� ��� -> ��� ਮ�ਨ� ���ਮ ਰਾਹ�� ਸਾਫ਼ �ਰ� �ਾ� ਬਦਲ� ��।"
 
-#: ../mail/message-list.c:4291
+#: ../mail/message-list.c:4301
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
+msgstr "�ਸ ਫ�ਲਡਰ ਵਿੱ� ��ਵਲ ਲ��ਵ�� ਸ�ਨ�ਹ� ਹ� ਹਨ। �ਹਨਾ� ਨ�ੰ ਵ��ਣ ਲ� ਵ���->ਲ��ਵ�� ਸ�ਨ�ਹ� ਵਰਤ��।"
+
+#: ../mail/message-list.c:4303
 msgid "There are no messages in this folder."
 msgstr "�ਸ ਫ�ਲਡਰ ਵਿੱ� ��� ਸ�ਨ�ਹਾ ਨਹ�� ਹ�।"
 
@@ -16016,6 +14933,7 @@ msgstr "ਭ��� ਸ�ਨ�ਹ�"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "��ਾਰ"
 
@@ -16023,39 +14941,39 @@ msgstr "��ਾਰ"
 msgid "Subject - Trimmed"
 msgstr "ਵਿਸ਼ਾ - ���ਾ ��ਤਾ"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "�ਾਲ"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "�ੱ�� ਨਾ ਭ���"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "ਸਹਾ��"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "ਤ�ਹਾਡ� �ਾਣ�ਾਰ� ਲ�"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "�ੱ��"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "��� �ਵਾਬ ਲ���ਦਾ ਨਹ�� ਹ�"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "�ਵਾਬ"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "ਸਭ ਨ�ੰ �ਵਾਬ"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "ਮ��-�ਾ��"
 
@@ -16080,20 +14998,26 @@ msgid "Subject contains"
 msgstr "ਵਿਸ਼� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Recipients contains"
+#| msgid "Subject or Sender contains"
+msgid "Subject or Addresses contains"
 msgstr "ਵਿਸ਼ਾ �ਾ� ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
 
 #: ../mail/searchtypes.xml.h:7
+msgid "Subject or Recipients contains"
+msgstr "ਵਿਸ਼ਾ �ਾ� ਪ�ਰਾਪਤ �ਰਨ ਵਾਲਿ�� '� ਹ�"
+
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "ਵਿਸ਼ਾ �ਾ� ਭ��ਣ ਵਾਲਿ�� '� ਹ�"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "ਸਥਾਨ� �ਡਰ�ੱਸ-ਬ�ੱ�"
+#| msgid "List local address book folders"
+msgid "Add local address books to Evolution."
+msgstr "ਲ��ਲ �ਡਰ�ੱਸ ਬ�ੱ� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�।"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "ਸਥਾਨ� ��ਲੰਡਰ ਲ� ਮ�ਲ ਸਹ�ਲਤਾ� ਦਿੰਦਾ ਹ�।"
+msgid "Local Address Books"
+msgstr "ਲ��ਲ �ਡਰ�ੱਸ-ਬ�ੱ�"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
@@ -16107,8 +15031,8 @@ msgid ""
 "body."
 msgstr "����ਮ��� ਰ�ਮਾ�ਡਰ ਪਲੱ��ਨ ਵਲ�� ਸ�ਨ�ਹਾ ਮ�ੱ� ਭਾ� ਵਿੱ� ��� ਲ� ਸ�ਹਾ� ਦ� ਲਿਸ�"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "ਸ਼ਬਦ"
 
@@ -16118,10 +15042,8 @@ msgid "Attachment Reminder"
 msgstr "�����ਮ��� ਰ�ਮਾ�ਡਰ"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
-msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ����ਮ��� ਦ� ਸ�ਹ ਲਵ� �ਤ� �� ����ਮ��� ਨਾ ਹ�ਵ� ਤਾ� ��ਤਾਵਨ� ਦਿ�"
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "ਤ�ਹਾਨ�ੰ ਯਾਦ �ਰਵਾ�ਦਾ ਹ� �ਿ ਤ�ਸ�� ਮ�ਲ ਸ�ਨ�ਹ� ਵਿੱ� ��� ����ਮ��� �ਰਨ� ਭ�ੱਲ ਤਾ� ਨਹ�� ��।"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -16133,25 +15055,26 @@ msgstr ""
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "Message has no attachments"
-msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ��� �����ਮਿੰ� ਨਹ�� ਹ�"
+msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ��� �����ਮ��� ਨਹ�� ਹ�"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "����ਮ��� ਸ਼ਾਮਿਲ(_A)..."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "ਸ�ਨ�ਹਾ ਸ�ਧ(_E)"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
-msgstr ""
-"�ੱ� ਫਾਰਮ�� ਪਲੱ�-�ਨ ਹ�, �� �ਿ ਨੱਥ� ਪਲੱ�-�ਨ ਨ�ੰ ਲਾ�ਨ '� ਵ��ਾ� �ਤ� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਸਿੱਧਾ �ਲਾ�ਣ ਲ� "
-"ਸਹਾ�� ਹ�।"
+#| msgid "Audio inline plugin"
+msgid "Audio Inline"
+msgstr "�ਡ�� �ਨ-ਲਾ�ਨ"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "�ਡ�� �ਨ-ਲਾ�ਨ ਪਲੱ�-�ਨ"
+msgid "Play audio attachments directly from Evolution."
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਤ�� �ਡ�� ����ਮ��� ਸਿੱਧ��� �ਲਾ�।"
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
 msgstr "�ਵ�ਲ�ਸਨ ਬ���ੱਪ ਫਾ�ਲ ਦਾ ਨਾ� ��ਣ�"
 
@@ -16172,136 +15095,142 @@ msgid "Restore from backup"
 msgstr "ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ�"
 
 #: ../plugins/backup-restore/backup-restore.c:289
+#| msgid ""
+#| "You can restore Evolution from your backup. It can restore all the Mails, "
+#| "Calendars, Tasks, Memos, Contacts. \n"
+#| "It also restores all your personal settings, mail filters etc."
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
-"ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਪਣ� ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�। �ਹ ਸਭ ਮ�ਲਾ�, ��ਲੰਡਰ, �ਾਸ�, ਮ�ਮ�, ਸੰਪਰ� �ਦਿ "
-"ਨ�ੰ ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�।\n"
-"�ਹ ਤ�ਹਾਡ� ਨਿੱ�� ਸ��ਿੰ�, ਮ�ਲ ਫਿਲ�ਰ �ਦਿ ਵ� ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�।"
+"ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਪਣ� ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�। �ਹ ਸਭ ਮ�ਲਾ�, ��ਲੰਡਰ, �ਾਸ�, ਮ�ਮ�, ਸੰਪਰ� "
+"�ਦਿ ਨ�ੰ ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�। �ਹ ਤ�ਹਾਡ� ਨਿੱ�� ਸ��ਿੰ�, ਮ�ਲ ਫਿਲ�ਰ �ਦਿ ਵ� ਰ�ਸ��ਰ �ਰ ਸ�ਦ� ਹ�।"
 
-#: ../plugins/backup-restore/backup-restore.c:295
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "ਬ���ੱਪ ਫਾ�ਲ ਤ� �ਵ�ਲ�ਸ਼ਨ ਰ�ਸ��ਰ �ਰ�(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "ਰ�ਸ��ਰ �ਰਨ ਲ� �ਵ�ਲ�ਸ਼ਨ ��ਾ�ਵ ��ਣ� ��:"
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "ਰ�ਸ��ਰ �ਰਨ ਲ� �ੱ� ਫਾ�ਲ ��ਣ�"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "ਬ���ੱਪ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਰ���ਰ�"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
-msgstr "ਮ��-ਪ�ਰਾਪਤ� �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਰ���ਰ�"
+msgstr "ਰ�-ਸ��ਰ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਰ���ਰ�"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਬ���ੱਪ ��ੱ� �ਰ�"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਮ��-�ਾਲ�"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "�ਰਾਫਿ�ਲ ਯ��਼ਰ �ੰ�ਰਫ�ਸ ਨਾਲ"
 
-#: ../plugins/backup-restore/backup.c:124
-#: ../plugins/backup-restore/backup.c:257
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਬੰਦ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
-msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਾ��� �ਤ� ਸ��ਿੰ� ਬ���ੱਪ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
+msgstr "�ਵ�ਲ�ਸ਼ਨ ��ਾ��� �ਤ� ਸ��ਿੰ� ਬ���ੱਪ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਬ���ੱਪ ��ਤਾ �ਾ ਰਿਹਾ ਹ� (ਮ�ਲ, ਸੰਪਰ�, ��ਲੰਡਰ, �ਾਸ�, ਮ�ਮ�)"
 
-#: ../plugins/backup-restore/backup.c:146
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "ਬ���ੱਪ ਪ�ਰਾ ਹ���"
 
-#: ../plugins/backup-restore/backup.c:151
-#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਮ��-�ਾਲ� ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../plugins/backup-restore/backup.c:261
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "ਮ���ਦਾ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਬ���ੱਪ"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "ਬ���ੱਪ ਤ�� ਫਾ�ਲਾ� ��ਲ�ਹ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ��ਿੰ� ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../plugins/backup-restore/backup.c:277
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "�ਰ�਼� ਬ���ੱਪ ਫਾ�ਲਾ� ਹ�ਾ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "ਲ��ਲ ਸਰ�ਤ ਯ��ਨ� ਬਣਾ� �ਾ ਰਹ� ਹਨ"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "ਫ�ਲਡਰ %s ਲ� ਬ���ੱਪ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:434
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "ਫ�ਲਡਰ %s ਤ�� ਰ�ਸ��ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਬ���ੱਪ"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਰ�ਸ��ਰ"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "ਮ���ਦਾ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਬ���ੱਪ"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "�ਦ�� �ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� ਡਾ�� ਦਾ ਬ���ੱਪ ਲ� ਰਹ� ਹ� ਤਾ� �ਦ�� ਤੱ� �ਡ��� ��।"
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ ਰ�ਸ��ਰ ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਦ�� ਤੱ� ਤ�ਹਾਡ� ਡਾ�� ਨ�ੰ ਰ�-ਸ��ਰ �ਰਦ� ਹ�, �ਦ�� ਤੱ� �ਡ��� ��।"
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:511
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "�ਹ ਤ�ਹਾਡ� ��ਾ��� ਦ� ਡਾ�� ਦ� ਮਾਤਰਾ ਮ�ਤਾਬ� ��� ਸਮਾ� ਲ� ਸ�ਦਾ ਹ�।"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ਬ���ੱਪ �ਤ� ਮ��-ਪਰਾਪਤ �ਰਨ ਲ� �ੱ� ਪਲੱ�-�ਨ ਹ�।"
-
 #. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#| msgid "Backup and restore plugin"
+msgid "Backup and Restore"
+msgstr "ਬ���ੱਪ �ਤ� ਰ�ਸ��ਰ"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
-msgstr "ਬ���ੱਪ �ਤ� ਮ��-ਪ�ਰਾਪਤ� ਪਲੱ�-�ਨ"
+#| msgid "Backup and restore Evolution data and settings"
+msgid "Backup and restore your Evolution data and settings."
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ਬ���ੱਪ �ਤ� ਰ�ਸ��ਰ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -16347,9 +15276,9 @@ msgid ""
 "restore, please enable the toggle button."
 msgstr ""
 "�ਹ ਤ�ਹਾਡ� ਮ���ਦਾ �ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ਨ�ੰ ਹ�ਾ ਦ�ਵ��ਾ �ਤ� ਤ�ਹਾਡ� ਬ���ੱਪ ਤ�� ਰ�ਸ��ਰ �ਰ��ਾ। �ਵ�ਲ�ਸ਼ਨ "
-"ਰ�ਸ��ਰ ਤਾ� ਹ� ਸ਼�ਰ� ਹ� ਸ�ਦਾ ਹ�, �� �ਵ�ਲ�ਸ਼ਨ �ੱਲ ਨਾ ਰਹ� ਹ�ਵ�। ਯ��ਨ� ਬਣਾ� �ਿ ਤ�ਸ�� �ੱ�� ਵਧਣ ਤ�� ਪਹਿਲਾ� "
-"ਸਭ �ਣ-ਸੰਭਾਲ��� ਵਿੰਡ��਼ ਨ�ੰ ਪਹਿਲਾ� ਬੰਦ �ਰ ਦਿੱਤਾ ਹ�। �� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਰ�ਸ��ਰ ਦ� ਬਾ�ਦ ���ਮ��ਿ� ਹ� "
-"ਮ��-�ਾਲ� �ਰਨਾ �ਾਹ�ੰਦ� ਹ�, ਤਾ� �ਹ ਬ�ਨ �ਾਲ� �ਰ�।"
+"ਰ�ਸ��ਰ ਤਾ� ਹ� ਸ਼�ਰ� ਹ� ਸ�ਦਾ ਹ�, �� �ਵ�ਲ�ਸ਼ਨ �ੱਲ ਨਾ ਰਹ� ਹ�ਵ�। ਯ��ਨ� ਬਣਾ� �ਿ ਤ�ਸ�� �ੱ�� ਵਧਣ ਤ�� "
+"ਪਹਿਲਾ� ਸਭ �ਣ-ਸੰਭਾਲ��� ਵਿੰਡ��਼ ਨ�ੰ ਪਹਿਲਾ� ਬੰਦ �ਰ ਦਿੱਤਾ ਹ�। �� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਰ�ਸ��ਰ ਦ� ਬਾ�ਦ "
+"���ਮ��ਿ� ਹ� ਮ��-�ਾਲ� �ਰਨਾ �ਾਹ�ੰਦ� ਹ�, ਤਾ� �ਹ ਬ�ਨ �ਾਲ� �ਰ�।"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
@@ -16363,74 +15292,83 @@ msgstr "ਸ��ਿੰ� ਰ�ਸ��ਰ(_e)..."
 msgid "_Backup Settings..."
 msgstr "ਬ���ੱਪ ਸ��ਿੰ�(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "���ਮ��ਿ� ਸੰਪਰ�"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
-msgstr "ਸ�ਨ�ਹਿ�� ਦ� �ਵਾਬ ਦ�ਣ ਸਮ�� ��ਦ ਹ� �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ���ਰ� ਬਣਾ ਲਵ�(_A)"
+#: ../plugins/bbdb/bbdb.c:646
+#| msgid "_Auto-create address book entries when replying to messages"
+msgid "Create _address book entries when sending mails"
+msgstr "ਪੱਤਰ ਭ��ਣ ਸਮ�� ��ਦ ਹ� �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ���ਰ� ਬਣਾ ਲਵ�(_A)"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
 msgstr "���ਮ��ਿ� ਸੰਪਰ�ਾ� ਲ� �ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "�ੱ�ਪ� ਸ�ਨ�ਹ� ਸੰਪਰ�"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "ਨਿਯਮਤ ਤ�ਰ �ੱਤ� ਪਿਡ�ਿਨ ਬੱਡ� ਸ��� ਨਾਲ ਸੰਪਰ� �ਾਣ�ਾਰ� �ਤ� �ਿੱਤਰਾ� ਨਾਲ ਸਿ�ਰ�ਨਾ��਼ �ਰਦ� ਰਹ�"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "ਪਿਡ�ਿਨ ਬੱਡ� ਸ��� ਲ� �ਡਰ�ੱਸ-ਬ�ੱ� ��ਣ�"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
-msgstr "ਭਾ� ਸ��ਨਾ ਨਾਲ ਸਿ�ਰ�ਨਾ��਼ �ਰ�(_b)"
+msgstr "ਬੱਡ� ਲਿਸ� ਨਾਲ ਸਿ�ਰ�ਨਾ��਼ �ਰ�(_b)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#| msgid ""
+#| "Automatically fills your address book with names and email addresses as "
+#| "you reply to messages. Also fills in IM contact information from your "
+#| "buddy lists."
 msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
 "Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
+"ਤ�ਹਾਡ� �ਡਰ�ੱਸ ਬ�ੱ� ਦ� ਪਰਬੰਧ �ਰਨ ਦ� ਭਿ�ਨ� ਭਾ� ਦਾ ਧਿ�ਨ ਰੱ�ਦ� ਹ�।\n"
+"\n"
 "�ਿਵ�� ਹ� ਤ�ਸ�� �ਿਸ� �-ਮ�ਲ ਦਾ �ਵਾਬ ਦਿੰਦ� ਹ�, ਤਾ� ਤ�ਹਾਡ� �ਡਰ�ੱਸ-ਬ�ੱ� ਵਿੱ� ਨਾ� �ਤ� �-ਮ�ਲ �ਡਰ�ੱਸ ਵਿੱ� "
 "�ਾਣ�ਾਰ� �ਪਣ� �ਪ ਹ� ਭਰ ਦਿੱਤ� �ਾਵ���। ਤ�ਹਾਡ� ਬੱਡ� ਸ��� ਤ�� IM ਸੰਪਰ� �ਾਣ�ਾਰ� ਭਰ ਦਿੱਤ� "
 "�ਾਵ���।"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
-
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "%s ਸਵ�ਪ �ਰਨ ਦ�ਰਾਨ �ਲਤ�: %s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "ਬ���ਫਿਲ�ਰ �ਲਾ�ਡ ਪਰ�ਸ�ਸ �ਵਾਬ ਨਹ�� ਦ� ਰਿਹਾ, �ਿਲ (kill) ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "ਬ���ਫਿਲ�ਰ �ਲਾ�ਡ ਪਰ�ਸ�ਸ ਦ�ਲ ਦ� �ਡ�� �ਾਰ�, �ਤਮ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "ਬ���ਫਿਲ�ਰ ਲ� ਪਾ�ਪ ਫ�ਲ�ਹ ਹ�, �ਲਤ� ��ਡ: %d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "ਮ�ਲ ���ਸ� ਨ�ੰ ਯ�ਨ���ਡ '� ਬਦਲ�(_U)"
 
@@ -16446,73 +15384,118 @@ msgstr ""
 "ਸ�ਨ�ਹ� ���ਸ� ਨ�ੰ ਯ�ਨ���ਡ UTF-੮ ਤ�� ਯ�ਨ�ਫਾ� ਸਪਮ/ਹਮ ���ਨ ਵਿੱ� ਬਦਲ�, �� �ਿ ਵੱ�ਰ� �ੱ�ਰ ਸ�ੱ� ਤ�� ��ਦ� ਹਨ।"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Bogofilter ��ਣਾ�"
+#| msgid "Bogofilter junk plugin"
+msgid "Bogofilter Junk Filter"
+msgstr "Bogofilter �ੰ� ਫਿਲ�ਰ"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "Bogofilter �ੰ� ਪਲੱ��ਨ"
+msgid "Bogofilter Options"
+msgstr "Bogofilter ��ਣਾ�"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
+#| msgid "Filters junk messages using Bogofilter."
+msgid "Filter junk messages using Bogofilter."
 msgstr "Bogfilter ਨਾਲ �ੰ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ �ਰ�।"
 
-#. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:348
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:608
-#: ../plugins/google-account-setup/google-contacts-source.c:348
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "_SSL ਵਰਤ��"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:415
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:509
-#: ../plugins/google-account-setup/google-source.c:632
-#: ../plugins/google-account-setup/google-contacts-source.c:367
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "ਮ��-ਤਾ�ਾ(_f):"
 
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:296
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:723
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "ਹਫਤ�"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV ��ਲੰਡਰ ਸਰ�ਤ"
+msgid "Add CalDAV support to Evolution."
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� CalDAV ਸਹਿਯ�� ਸ਼ਾਮਲ �ਰ�।"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "CalDAV ਸਰ�ਤ"
+#| msgid "CalDAV sources"
+msgid "CalDAV Support"
+msgstr "CalDAV ਸਹਿਯ��"
+
+#: ../plugins/calendar-file/calendar-file.c:208
+#| msgid "Customize"
+msgid "_Customize options"
+msgstr "��ਣਾ� ਲ� ਪਸੰਦ(_C)"
+
+#: ../plugins/calendar-file/calendar-file.c:227
+#| msgid "File name:"
+msgid "File _name:"
+msgstr "ਫਾ�ਲ ਨਾ�(_n):"
+
+#: ../plugins/calendar-file/calendar-file.c:231
+#| msgid "Choose a file"
+msgid "Choose calendar file"
+msgstr "��ਲੰਡਰ ਫਾ�ਲ ��ਣ�"
+
+#: ../plugins/calendar-file/calendar-file.c:279
+#| msgid "Open"
+msgid "On open"
+msgstr "��ਲ�ਹਣ ਸਮ��"
+
+#: ../plugins/calendar-file/calendar-file.c:280
+msgid "On file change"
+msgstr "ਫਾ�ਲ ਬਦਲਣ ਸਮ��"
+
+#: ../plugins/calendar-file/calendar-file.c:281
+#| msgid "Personal"
+msgid "Periodically"
+msgstr "ਨਿਯਮਤ"
+
+#: ../plugins/calendar-file/calendar-file.c:308
+msgid "Force read _only"
+msgstr "��ਵਲ ਪ��ਹਨ ਲ� ਮ�ਬ�ਰ(_o)"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "ਸਥਾਨ� ��ਲੰਡਰ"
+msgid "Add local calendars to Evolution."
+msgstr "ਲ��ਲ ��ਲੰਡਰ �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "ਸਥਾਨ� ��ਲੰਡਰ ਲ� ਮ�ਲ ਸਹ�ਲਤਾ� ਦਿੰਦ� ਹ�।"
+msgid "Local Calendars"
+msgstr "ਲ��ਲ ��ਲੰਡਰ"
 
-#: ../plugins/calendar-http/calendar-http.c:332
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "ਸ�ਰੱ�ਿ�ਤ ��ਨ��ਸ਼ਨ (_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:397
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "ਯ��਼ਰ ਨਾ�(_m):"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "HTTP ��ਲੰਡਰ"
+msgid "Add web calendars to Evolution."
+msgstr "ਵ�ੱਬ ��ਲੰਡਰ �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "ਵ�ਬ-��ਲ �ਤ� http ��ਲੰਡਰਾ� ਲ� ਮ�ਲ ਸਹ�ਲਤਾ� ਦਿੰਦ� ਹ�।"
+#| msgid "Calendars"
+msgid "Web Calendars"
+msgstr "ਵ�ੱਬ ��ਲੰਡਰ"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
@@ -16548,125 +15531,123 @@ msgstr "ਮ�ਸਮ: ਸਾਫ਼ ਰਾਤ"
 
 #: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Thunderstorms"
-msgstr "ਮ�ਸਮ: ਬ�ਰ�ਲਾ ਤ�ਫਾਨ"
+msgstr "ਮ�ਸਮ: ਬਰ��ਲਾ ਤ�ਫਾਨ"
 
 #: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "�ੱ� �ਿ�ਾਣਾ ��ਣ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "_Units:"
 msgstr "��ਾ�(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr "ਮ��ਰਿ� (ਸ��ਲਸ��ਸ, ਸ��ਮ�, �ਦਿ)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:614
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "�ੰਪ�ਰਿਲ (ਫਾਰਨਹ���, �ੰ� �ਦਿ)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "ਮ�ਸਮ ��ਲੰਡਰ ਲ� ਮ�ਲ ਸਹ�ਲਤਾ� ਦਿੰਦ� ਹ�।"
+msgid "Add weather calendars to Evolution."
+msgstr "ਮ�ਸਮ ��ਲੰਡਰ �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "ਮ�ਸਮ ��ਲੰਡਰ"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
-"�ੱ� ���ਸ� ਪਲੱ�-�ਨ, �� �ਿ ਪਾਪ�ੱਪ ਮ�ਨ� ਦ� �ਲ� ਵਿ�ਾ�ਦ� ਹ�, �� �ਿ ਤ�ਹਾਨ�ੰ �ਲਿੱਪਬ�ਰਡ ਤ�� ���਼ਾ� ਦ� "
-"�ਾਪ� �ਰਨ ਲ� ਸਹਾ�� ਹ�।"
+#| msgid "Copy tool"
+msgid "Copy Tool"
+msgstr "��ਲ �ਾਪ� �ਰ�"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "ਸੰਦ ਨ�ਲ"
+#| msgid "Copy selected messages to the clipboard"
+msgid "Copy things to the clipboard."
+msgstr "���਼ਾ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ� �ਾਪ� �ਰ�।"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
-msgstr "�ਾ�� �ਰ� �ਿ �� �ਵ�ਲ�ਸ਼ਨ ਮ�ਲ ਪੱਤਰ �ਾਰ� ਹ�"
+msgstr "�ਾ�� �ਰ� �ਿ �� �ਵ�ਲ�ਸ਼ਨ ਡਿਫਾਲ� ਮ�ਲਰ ਹ�"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "ਹਰ ਵਾਰ �ਦ�� ਵ� �ਵ�ਲ�ਸ਼ਨ �ੱਲ ਤਾ� �ਾ�� �ਰ� �ਿ �ਹ ਮ�ਲ ਪੱਤਰ �ਾਰ� ਹ� �ਾ� ਨਹ��।"
+msgstr "ਹਰ ਵਾਰ �ਦ�� ਵ� �ਵ�ਲ�ਸ਼ਨ �ੱਲ ਤਾ� �ਾ�� �ਰ� �ਿ �ਹ ਡਿਫਾਲ� ਮ�ਲਰ ਹ� �ਾ� ਨਹ��।"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "�ੱਲਣ ਸਮ�� �ਾ�� �ਰ� �ਿ �� �ਵ�ਲ�ਸ਼ਨ ਮ�ਲ ਪੱਤਰ �ਲਾ��� ਹ�।"
+#| msgid "Checks whether Evolution is the default mail client on startup."
+msgid "Check whether Evolution is the default mail client on startup."
+msgstr "�ੱਲਣ ਸਮ�� �ਾ�� �ਰ� �ਿ �� �ਵ�ਲ�ਸ਼ਨ ਡਿਫਾਲ� ਮ�ਲ �ਲਾ�� ਹ�।"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
-msgstr "ਮ�ਲ ਪੱਤਰ �ਲਾ��� "
+#| msgid "Default Mail Client "
+msgid "Default Mail Client"
+msgstr "ਡਿਫਾਲ� ਮ�ਲ �ਲਾ��"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "�� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ �ਪਣਾ ਮ�ਲ �-ਮ�ਲ �ਲਾ��� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "�ਵ�ਲ�ਸ਼ਨ"
 
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "ਡਿਫਾਲ� �ਡਰ�ੱਸ ਬ�ੱ� ਵਾ�� ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:101
 msgid "Mark as _default calendar"
 msgstr "ਡਿਫਾਲ� ��ਲੰਡਰ ਵਾ�� ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:102
 msgid "Mark as _default task list"
 msgstr "ਡਿਫਾਲ� �ਾਸ� ਵਾ�� ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default memo list"
 msgstr "ਡਿਫਾਲ� ਮ�ਮ� ਲਿਸ� ਵਾ�� ਨਿਸ਼ਾਨਬੱਧ(_d)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
-msgstr "ਮ�ਲ ਸਰ�ਤ"
+msgstr "ਡਿਫਾਲ� ਸਰ�ਤ"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
-msgstr "�ੱ� ��ਲੰਡਰ �ਾ� �ਡਰ�ੱਸ-ਬ�ੱ� ਲ� ਡਿਫਾਲ� ਬਣਾ�ਣ ਲ� ਸਹ�ਲਤ ਦਿੰਦ� ਹ�"
+msgid "Mark your preferred address book and calendar as default."
+msgstr "ਤ�ਹਾਡ� ਪਸੰਦ�ਦਾ ਦਾ �ਡਰ�ੱਸ ਬ�ੱ� �ਤ� ��ਲੰਡਰ ਨ�ੰ ਡਿਫਾਲ� ਬਣਾ�।"
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:333
 msgid "Security:"
 msgstr "ਸ�ਰੱ�ਿ�:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Unclassified"
 msgstr "ਬਿਨਾ�-ਵਰ�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Protected"
 msgstr "ਸ�ਰੱ�ਿ�ਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Secret"
 msgstr "��ਪਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:342
 msgid "Top secret"
 msgstr "ਬਹ�ਤ ��ਪਤ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ(_C)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:907
+#: ../plugins/email-custom-header/email-custom-header.c:906
 msgid "Key"
 msgstr "��"
 
-#: ../plugins/email-custom-header/email-custom-header.c:918
-#: ../plugins/templates/templates.c:396
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:395
 msgid "Values"
 msgstr "ਮ�ੱਲ"
 
@@ -16685,8 +15666,9 @@ msgstr "�ਮ�ਲ ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
-msgid "Adds custom header to outgoing messages."
-msgstr "ਬਾਹਰ �ਾ ਰਹ� ਸ�ਨ�ਹਿ�� ਲ� ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ ਸ਼ਾਮਲ"
+#| msgid "Adds custom header to outgoing messages."
+msgid "Add custom headers to outgoing mail messages."
+msgstr "ਬਾਹਰ �ਾ ਰਹ� ਸ�ਨ�ਹਿ�� ਲ� ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ ਸ਼ਾਮਲ �ਰ�।"
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Custom Header"
@@ -16694,7 +15676,7 @@ msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 msgid "List of Custom Headers"
-msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ ਦ� ਸ���"
+msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ ਦ� ਲਿਸ�"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
@@ -16703,12 +15685,11 @@ msgid ""
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
 "��ੰ�� �ਸ�ਮ ਹ�ੱਡਰਾ� ਦ� ਲਿਸ� ਦਿੰਦ� ਹ�, �� �ਿ ਤ�ਸ�� ਬਾਹਰ ਭ�� ਰਹ� ਸ�ਨ�ਹਿ�� ਵਿੱ� ਸ਼ਾਮਲ �ਰ ਸ�ਦ� ਹ�। "
-"�ੱ� ਹ�ੱਡਰ �ਾ� ਹ�ੱਡਰ ਮ�ੱਲ ਦ�ਣ ਲ� ਫਾਰਮ��: \"=\" ਦ� ਬਾ�ਦ �ਸ�ਮ ਹ�ੱਡਰ ਦਾ ਨਾ� �ਤ� ਮ�ੱਲ \";\" "
-"ਨਾਲ ਵੱ�।"
+"�ੱ� ਹ�ੱਡਰ �ਾ� ਹ�ੱਡਰ ਮ�ੱਲ ਦ�ਣ ਲ� ਫਾਰਮ��: \"=\" ਦ� ਬਾ�ਦ �ਸ�ਮ ਹ�ੱਡਰ ਦਾ ਨਾ� �ਤ� ਮ�ੱਲ \";\" ਨਾਲ ਵੱ�।"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
-msgstr "ਹ�ਰ ਯ��਼ਰ ਦ� ਫ�ਲਡਰ ��ਲ�"
+msgstr "ਹ�ਰ ਯ��਼ਰ ਦ� ਫ�ਲਡਰ ��ਲ�ਹ�"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
 msgid "_Account:"
@@ -16744,11 +15725,11 @@ msgid ""
 "password authentication."
 msgstr "�ਹ ��ਣ ਤ�ਹਾਨ�ੰ ��ਸ਼��� ਸਰਵਰ ਨਾਲ ਸਧਾਰਨ ਪਾਸਵਰਡ ਪ�ਰਮਾਣ�ਿਤਾ ਨਾਲ ������।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "ਦਫਤਰ�� ਬਾਹਰ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16756,90 +15737,93 @@ msgstr ""
 "ਹ�ਠਾ� ਨਿਰਧਾਰਿਤ ��ਤਾ ਸ�ਨ�ਹਾ ���ਮ��ਿ� ਹ� �ਹਨਾ� ਸਾਰ� ਪੱਤਰ ਭ��ਣ ਵਾਲਿ�� ਨ�ੰ ਭ�� ਦਿੱਤਾ\n"
 "�ਾਵ��ਾ, �� �ਿ ਤ�ਹਾਡ� ਦਫਤਰ�� ਬਾਹਰ ਹ�ਣ ਦ� ਸ�ਰਤ ਵਿੱ� ਪੱਤਰ ਭ��ਣ।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "ਮ�� ਦ�ਤਰ ਤ�� ਬਾਹਰ ਹਾ�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "ਮ�� ਦ�ਤਰ ਵਿੱ� ਹਾ�"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "��ਸ਼���਼ ��ਾ��� ਲ� ਪਾਸਵਰਡ ਤਬਦ�ਲ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "ਪਾਸਵਰਡ ਤਬਦ�ਲ"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
 msgstr "��ਸ���਼ ��ਾ��� ਲ� ਡ�ਲ���� ਸ��ਿੰ� ਪਰਬੰਧਨ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "ਡ�ਲ���ਸ਼ਨ ਸਹਾ��"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "ਫ���ਲ"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "ਸਭ ��ਸ਼���਼ ਫ�ਲਡਰਾ� ਦਾ ��ਾਰ ਵ��ਾ�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "ਫ�ਲਡਰ ��ਾਰ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "��ਸ਼��� ਸ��ਿੰ�"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 msgid "A_uthenticate"
 msgstr "ਪ�ਰਮਾਣ�ਿਤਾ(_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr "ਮ�ਲਬਾ�ਸ ਨਾ� ਦਿ�(_p)"
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
+msgid "Mailbox name is _different than user name"
+msgstr "ਮ�ਲਬਾ�ਸ ਨਾ� ਯ��਼ਰ ਨਾ� ਤ�� ਵੱ�ਰਾ ਹ�(_d)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
 msgid "_Mailbox:"
 msgstr "ਮ�ਲਬਾ�ਸ(_M):"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 msgid "_Authentication Type"
 msgstr "ਪਰਮਾਣਿ�ਤਾ �ਾ�ਪ(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
-msgid "Ch_eck for Supported Types"
-msgstr "ਸਹਾ�� �ਿਸਮ ਲ� �ਾ��(_e)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "��ਾਰ:"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:196
 #: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
@@ -16880,38 +15864,35 @@ msgstr "ਨਵਾ� ਪਾਸਵਰਡ:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "ਤ�ਹਾਡ� ਮ���ਦਾ ਪਾਸਵਰਡ ਦ� ਮਿ�ਦ �ਤਮ ਹ� �� ਹ�। �ਿਰਪਾ �ਰ�� �ਪਣਾ ਪਾਸਵਰਡ ਹ�ਣ� ਬਦਲ�।"
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "ਤ�ਹਾਡ� ਪਾਸਵਰਡ ਦ� ਮਿ�ਦ ��ਲ� %d ਦਿਨਾ� '� �ਤਮ ਹ�ਵ���"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:565
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "ਪਸੰਦ�ਦਾ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "ਸੰਪਾਦ� (ਪ�ਨ, ਲਿ�ਣ, ਸ�ਧਣ)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
 msgstr "ਲ��� (ਪ�ਨ, ਲਿ�ਣ)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
 msgstr "ਪ���ਲ�ਰਤਾ (ਪ�ਨ ਲ� ਹ�)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "ਪ�ਰਤ�ਨਿਧ �ਧਿ�ਾਰ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s ਲ� �ਧਿ�ਾਰ"
@@ -16919,7 +15900,7 @@ msgstr "%s ਲ� �ਧਿ�ਾਰ"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:343
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16929,84 +15910,96 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr "ਤ�ਹਾਨ�ੰ ਮ�ਰ� ਫ�ਲਡਰ ਲ� ਹ�ਠ ਦਿੱਤ� �ਧਿ�ਾਰ ਦਿੱਤ� �� ਹਨ:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 msgid "You are also permitted to see my private items."
 msgstr "ਤ�ਹਾਨ�ੰ ਮ�ਰ��� ਪ�ਰਾ�ਵ�� ���ਮਾ� ਵ��ਣ ਦਾ ਵ� �ਧਿ�ਾਰ ਹ�।"
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
 msgstr "ਪਰ ਤ�ਹਾਨ�ੰ ਮ�ਰ��� ਪ�ਰਾ�ਵ�� ���ਮਾ� ਵ��ਣ ਦਾ �ਧਿ�ਾਰ ਨਹ�� ਹ�।"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "ਤ�ਹਾਨ�ੰ %s ਲ� �ੱ� ਡ�ਲ���� ਦਾ �ਹ�ਦਾ ਦਿੱਤਾ �ਿ� ਹ�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "�ਸ ਲ� ਪ�ਰਤ�ਨਿਧ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "�� ਪ�ਰਤ�ਨਿਧ %s ਨ�ੰ ਹ�ਾ�ਣਾ ਹ�?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "ਸਰ�ਰਮ ਡਾ�ਰ���ਦ� ਲ� ਪਹ�ੰ� ਨਹ�� ਹ�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "ਸਰ�ਰਮ ਡਾ�ਰ���ਰ� ਵਿੱ� ��ਦ ਨ�ੰ ���ਿ� ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "ਸਰ�ਰਮ ਡਾ�ਰ���ਰ� ਵਿੱ� %s ਪ�ਰਤ�ਨਿਧ ���ਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "ਪ�ਰਤ�ਨਿਧ %s ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "ਪ�ਰਤ�ਨਿਧਾ� ਸ��� �ੱਪਡ�� ਨਹ�� ਹ� ਸ��"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "ਪ�ਰਤ�ਨਿਧ %s ਹ�ਾ�� ਨਹ�� �ਾ ਸ�ਿ�"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "ਪ�ਰਤ�ਨਿਧ ਸ��� ਪ�ਨ ਦ�ਰਾਨ �ਲਤ� ਹ�।"
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "��ਲੰਡਰ(_a):"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "ਸੰਪਰ�(_n):"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegates"
 msgstr "ਪ�ਰਤ�ਨਿਧ"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+"��� ਨਹ��\n"
+"ਰ�ਵਿ�ਰ (��ਵਲ ਪ��ਹਨ ਲ�)\n"
+"ਲ��� (ਪ��ਹਨ, ਬਣਾ�)\n"
+"�ਡ��ਰ (ਪ��ਹਨ, ਬਣਾ�, ਸ�ਧਣ)"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "�ਧਿ�ਾਰ ਨਹ� ਹ�"
 
@@ -17033,6 +16026,7 @@ msgstr "ਸੰ��ਪ �ਧਿ�ਾਰ(_S)"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
 msgstr "�ੰਮ(_T):"
 
@@ -17050,11 +16044,11 @@ msgid "Folder Size"
 msgstr "ਫ�ਲਡਰ ��ਾਰ"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
 msgid "User"
 msgstr "ਯ��਼ਰ"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "ਹ�ਰ ਯ��਼ਰ ਦ� ਫ�ਲਡਰਾ� ਲ� ਮ��ਬਰ ਬਣਾ�"
@@ -17063,20 +16057,20 @@ msgstr "ਹ�ਰ ਯ��਼ਰ ਦ� ਫ�ਲਡਰਾ� ਲ� ਮ��
 msgid "Exchange Folder Tree"
 msgstr "��ਸ਼���਼ ਫ�ਲਡਰ ਲ��"
 
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr "ਫ�ਲਡਰ ਲ� ਮ��ਬਰ ਹ�ਾ�..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "�� ਫ�ਲਡਰ \"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ�ਣ� ਹ�?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ�"
@@ -17141,18 +16135,18 @@ msgstr "ਤ�ਹਾਡ� ਪਾਸਵਰਡ ਦ� ਮਿ�ਦ ੭ ਦਿਨ
 msgid "_Change Password"
 msgstr "ਪਾਸਵਰਡ ਬਦਲ�(_C)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(�ਧਿ�ਾਰ ਪਾਬੰਦ� ਹ�।)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "ਯ��਼ਰ ����:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "ਯ��਼ਰ ਸ਼ਾਮਲ"
 
@@ -17270,11 +16264,11 @@ msgstr "ਸੰਵ�ਦਨਸ਼�ਲਤਾ(_S): "
 msgid "_User"
 msgstr "ਯ��਼ਰ(_U)"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "ਯ��਼ਰ ��ਣ�"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
 msgstr "�ਡਰ�ੱਸ-ਬ�ੱ�..."
 
@@ -17287,10 +16281,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "ਹ�ਰ ਯ��਼ਰ ਦ� ��ਲੰਡਰ ਦ� ਮ��ਬਰ ਬਣ�"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
-msgstr "�ੱ� ਪਲੱ�-�ਨ, �� �ਿ ��ਸ਼���਼ ��ਾ��� ਨਾਲ ਸਬੰਧਤ �ਾਸ �ਾਰਵਾ��� �ਤ� ਫ��ਰ ਦ� ਸਮ�ਹ ਨ�ੰ ਹ��ਡਲ �ਰਦ� ਹ�।"
+msgid "Activates the Evolution-Exchange extension package."
+msgstr "�ਵ�ਲ�ਸ਼ਨ-��ਸ���਼ ��ਸ��ਨਸ਼ਨ ਪ���� ����ਵ�� �ਰ�"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17438,7 +16430,7 @@ msgid "Folder offline"
 msgstr "ਫ�ਲਡਰ �ਫਲਾ�ਨ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "ਸਧਾਰਨ �ਲਤ�"
 
@@ -17556,7 +16548,9 @@ msgid "Unknown error looking up {0}"
 msgstr "��� {0} ਦ�ਰਾਨ �ਣ�ਾਣ �ਲਤ� �� ਹ�"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:821
 msgid "Unknown error."
 msgstr "�ਣ�ਾਣ� �ਲਤ� ਹ�।"
 
@@ -17635,65 +16629,88 @@ msgid "Check folder permissions"
 msgstr "ਫ�ਲਡਰ �ਧਿ�ਾਰ ��ੱ� �ਰ�"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr "�ਦ�� ਮ�ਲ �ੰਪ��਼ਰ ਵਿੱ� ਸਵਿੱ� ਦੱਬ� �ਾਵ� ਤਾ� ���ਮ��ਿ� ਹ� �ਡ��ਰ �ਲਾ�"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+msgid "Automatically launch when a new mail is edited"
+msgstr "�ਦ��  ਵ� ਨਵ�� ਮ�ਲ ਲਿ�ਣ� ਸ਼�ਰ� ਹ�ਵ� ਤਾ� ���ਮ��ਿ� ਹ� �ਲਾ�"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
 msgstr "ਡਿਫਾਲ� ਬਾਹਰ� �ਡ��ਰ"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
 msgstr "ਮ�ਲ �ਮਾ�ਡ, �� �ਿ �ਡ��ਰ ਵ��� ਵਰਤ� �ਾਣ� ਲਾ�਼ਮ� ਹ�।"
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
-msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
-msgstr "ਬਾਹਰ� ਸੰਪਾਦ� ਨ�ੰ �ੰਪ��਼ਰ ਵ��� ਵਰਤਣ ਲ� ਪਲੱ��ਨ। ਤ�ਸ�� ��ਵਲ ਸਮਤਲ-ਪਾਠ ਸ�ਨ�ਹ� ਹ� ਭ�� ਸ�ਦ� ਹ�।"
-
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
 msgstr "ਬਾਹਰ� �ਡ��ਰ"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#| msgid ""
+#| "A plugin for using an external editor as the composer. You can send only "
+#| "plain-text messages."
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "ਬਾਹਰ� ਸੰਪਾਦ� ਨ�ੰ ਪਲ�ਨ-���ਸ� ਮ�ਲ ਸ�ਨ�ਹ� ਲਿ�ਣ ਲ� ਵਰਤ��।"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "�ਰ�਼� ਫਾ�ਲ ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦ�"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "�ਡ��ਰ �ੱਲਣਯ�� ਨਹ�� ਹ�"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਤ�ਹਾਡ� ਮ�ਲ ਸੰਭਾਲਣ ਲ� �ੱ� �ਰ�਼� ਫਾ�ਲ ਬਣਾ�ਣ ਲ� �ਸਮਰੱਥ ਹ�। ਬਾ�ਦ '� ��ਸ਼ਿਸ਼ �ਰ�।"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#| msgid "External Editor"
+msgid "External editor still running"
+msgstr "ਬਾਹਰ� �ਡ��ਰ ਹਾਲ� ਵ� �ੱਲ ਰਿਹਾ ਹ�"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+"ਬਾਹਰ� ਸੰਪਾਦ� ਹਾਲ� ਵ� �ੱਲ ਰਿਹਾ ਹ�। ਮ�ਲ �ੰਪ��਼ਰ ਵਿੰਡ� ਸੰਪਾਦ� ਦ� �ੱਲਦ� ਰਹਿਣ ਦ� ਹਾਲਤ ਵਿੱ� "
+"ਬੰਦ ਨਹ�� ��ਤ� �ਾ ਸ�ਦ� ਹ�।"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
-"ਤ�ਹਾਡ� ਪਲੱ��ਨ ਪਸੰਦ ਵਿੱ� ਬਾਹਰ� �ਡ��ਰ ਸ�ੱ� ��ਤਾ �ਾਲ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�। �ੱ� ਵੱ�ਰਾ�ਡ��ਰ "
-"ਸ�ੱ� �ਰ�� ��ਸ਼ਿਸ਼ �ਰ�। "
-
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in _External Editor"
-msgstr "ਬਾਹਰ� �ਡ��ਰ ਵਿੱ� �ੰਪ��਼ �ਰ�(_E)"
+"ਤ�ਹਾਡ� ਪਲੱ��ਨ ਪਸੰਦ ਵਿੱ� ਬਾਹਰ� �ਡ��ਰ ਸ�ੱ� ��ਤਾ �ਾਲ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਦਾ ਹ�। �ੱ� ਵੱ�ਰਾ "
+"�ਡ��ਰ ਸ�ੱ� �ਰ�� ��ਸ਼ਿਸ਼ �ਰ�। "
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr "ਸ�ਨ�ਹ� ਬਾਹਰ� �ਡ��ਰ ਨਾਲ ਲਿ��"
-
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:109
 msgid "Command to be executed to launch the editor: "
 msgstr "�ਡ��ਰ �ਾਲ� �ਰਨ ਲ� �ਲਾ�ਣ ਵਾਸਤ� �ਮਾ�ਡ:"
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:110
+#| msgid ""
+#| "For Emacs use \"xemacs\"\n"
+#| "For VI use \"gvim\""
 msgid ""
 "For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"For VI use \"gvim -f\""
 msgstr ""
 "Emacs ਲ� \"xemacs\" ਵਰਤ��\n"
-"VI ਲ� \"gvim\" ਵਰਤ��"
+"VI ਲ� \"gvim -f\" ਵਰਤ��"
+
+#: ../plugins/external-editor/external-editor.c:354
+#: ../plugins/external-editor/external-editor.c:356
+#| msgid "Compose in _External Editor"
+msgid "Compose in External Editor"
+msgstr "ਬਾਹਰ� ਸੰਪਾਦ� ਵਿੱ� ਲਿ��"
 
 #: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
@@ -17708,38 +16725,51 @@ msgid "_Face"
 msgstr "ਫ�ਸ(_F)"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#| msgid ""
+#| "Attach Face header to outgoing messages. First time the user needs to "
+#| "configure a 48*48 png image. It is base64 encoded and stored in ~/."
+#| "evolution/faces This will be used in messages that are sent further."
 msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 msgstr ""
-"ਬਾਹਰ �ਾਣ ਵਾਲ� ਫ�ਸ ਹ�ੱਡਰ ���� ਹ�। ਪਹਿਲ� ਵਾਰ ਯ��਼ਰ ਨ�ੰ ੪੮*੪੮ png �ਿੱਤਰ ਦ� ਸੰਰ�ਨਾ �ਰਨ ਦ� ਲ�� "
-"ਹ�ੰਦ� ਹ�। �ਸ ਬ�ਸ੬੪ �ੰ��ਡ ਮ�ਤਾਬ� ਹ� �ਤ� ~/.evolution/faces ਵਿੱ� ਸੰਭਾਲਿ� �ਾ�ਦਾ ਹ�। �ਸ ਨ�ੰ ਭ��ਣ "
-"ਲ� ਸ�ਨ�ਹਿ�� ਵਿੱ� ਵਰਤਿ� �ਾਵ��ਾ।"
+"�ਪਣ� �ਿਹਰ� ਦ� ���� �ਿਹ� ਤਸਵ�ਰ ਬਾਹਰ �ਾਣ ਵਾਲ� ਸ�ਨ�ਹਿ�� ਨਾਲ ���� �ਰ�\n"
+"\n"
+"ਪਹਿਲ� ਵਾਰ ਯ��਼ਰ ਨ�ੰ ੪੮*੪੮ png �ਿੱਤਰ ਦ� ਸੰਰ�ਨਾ �ਰਨ ਦ� ਲ�� "
+"ਹ�ੰਦ� ਹ�। �ਸ ਬ�ਸ੬੪ (Base-64) �ੰ��ਡ ਮ�ਤਾਬ� ਹ� �ਤ� ~/.evolution/faces ਵਿੱ� "
+"ਸੰਭਾਲਿ� �ਾ�ਦਾ ਹ�। �ਸ ਨ�ੰ ਭ��ਣ ਲ� ਸ�ਨ�ਹਿ�� ਵਿੱ� ਵਰਤਿ� �ਾਵ��ਾ।"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
-msgstr "ਫ�ਲਡਰ \"%s\" �ਮਨ�਼�ਰ"
+msgstr "ਫ�ਲਡਰ \"%s\" ਲ� ਮ��ਬਰ� ਹ�ਾ� �ਾ ਰਹ� ਹ�"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr "ਫ�ਲਡਰ ਲ�� ਪਰਸੰ� ਮ�ਨ� ਵਿੱ� ਪੱਤਰ ਫ�ਲਡਰ ਤ�� ਮ��ਬਰ� ਹ�ਾ�ਣ ਲ� ਸਹਾ�� ਹ�।"
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "ਫ�ਲਡਰ ਮ��ਬਰ� ਹ�ਾ�"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr "IMAP ਫ�ਲਡਰ ਤ�� ਮ��ਬਰ� ਹ�ਾ�ਣ ਲ� ਫ�ਲਡਰ ਲ�� ਵਿੱ� ਸੱ�ਾ �ਲਿੱ� �ਰ�"
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "ਮ��ਬਰ� ਹ�ਾ�(_U)"
 
-#: ../plugins/google-account-setup/google-source.c:421
+#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+msgid "Google"
+msgstr "���ਲ"
+
+#: ../plugins/google-account-setup/google-source.c:499
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "ਯ��਼ਰ %s ਨ�ੰ ਮ��ਬਰ� ਵਾਲ� ��ਲੰਡਰ ਦ� �ਸ�ਸ ਲਿਸ� ਲ� ਪਾਸਵਰਡ ਦਿ�।"
 
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:604
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17748,45 +16778,41 @@ msgstr ""
 "���ਲ ਸਰਵਰ ਤ�� ਡਾ�ਾ ਪ��ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�।\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../plugins/google-account-setup/google-source.c:739
 msgid "Cal_endar:"
 msgstr "��ਲੰਡਰ(_e):"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:774
 msgid "Retrieve _list"
 msgstr "ਲਿਸ� ਲ� �ਾ ਰਹ� ਹ�(_l)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:69
-#: ../plugins/google-account-setup/google-contacts-source.c:71
-msgid "Google"
-msgstr "���ਲ"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:326
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
 msgid "<b>Server</b>"
 msgstr "<b>ਸਰਵਰ</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "���ਲ ��ਲੰਡਰ �ਤ� ਸੰਪਰ� ਸ�ੱ��ੱਪ �ਰਨ ਲ� �ੱ� ਪਲੱ�-�ਨ ਹ�।"
+msgid "Add Google Calendars to Evolution."
+msgstr "���ਲ ��ਲੰਡਰ �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�।"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
+#| msgid "Gnome Calendar"
+msgid "Google Calendars"
 msgstr "���ਲ ��ਲੰਡਰ"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 msgid "Checklist"
 msgstr "�ਾ�� ਲਿਸ�"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "�ਰ�ੱਪਵਾ��਼ ��ਲੰਡਰ �ਤ� ਸੰਪਰ� ਸਰ�ਤ ਸ�ੱ��ੱਪ �ਰਨ ਲ� �ੱ� ਪਲੱ��ਨ ਹ�।"
+msgid "Add Novell GroupWise support to Evolution."
+msgstr "ਨ�ਵਲ �ਰ�ੱਪਵਾ��਼ ਸਹਿਯ�� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�।"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "�ਰ�ੱਪਵਾ�� ��ਾ��� ਸ���ੱਪ"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17811,11 +16837,11 @@ msgstr ""
 "ਸਾ��ਾ ਫ�ਲਡਰ �ੰਸ�ਾਲ �ਰਨ ਲ� '�ੱ��' ਦਬਾ�\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "ਸਾ��ਾ ਫ�ਲਡਰ �ੰਸ�ਾਲ �ਰ�"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "ਸਾ��ਾ ਫ�ਲਡਰ �ੰਸ�ਾਲ�ਸ਼ਨ"
 
@@ -17853,11 +16879,11 @@ msgstr "ਯ��(_E)"
 msgid "_Junk List"
 msgstr "�ੰ� ਲਿਸ�(_J)"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "ਸ�ਨ�ਹਾ ਹਾਲਤ"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:57
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
@@ -17865,11 +16891,11 @@ msgstr ""
 "�ੱ� ਸ�ਨ�ਹ� ਨ�ੰ ਮ��-�ਾ��ਣ ਨਾਲ �ਸ ਨ�ੰ ਪ�ਰਾਪਤ-�ਰਤਾ ਦ� ਮ�ਲ ਬ�ਸ� ਤ�� ਹ�ਾ�� �ਾਵ��ਾ। �� ਤ�ਸ�� �ਹ �ਰਨ "
 "ਲ� ਯ��ਨ� ਹ�?"
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "ਸ�ਨ�ਹਾ ਸਫ਼ਲਤਾ ਨਾਲ ਮ��-���ਿ� �ਿ�"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "ਪੱਤਰ ਮ��-�ਾ��"
 
@@ -17878,92 +16904,130 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "�ਰ�ੱਪਵਾ��਼ ਸ�ਨ�ਹਿ�� ਲ� ਭ��ਣ ��ਣਾ� ਸ਼ਾਮਲ"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "�ਰ�ੱਪਵਾ�� ��ਾ���ਾ� ਵਿੱ� ਫ��ਰਾ� ਲ� �ੱ� ਪਲੱ�-�ਨ ਹ�।"
+#| msgid "A plugin for the features in GroupWise accounts."
+msgid "Fine-tune your GroupWise accounts."
+msgstr "�ਪਣ� �ਰ�ੱਪਵਾ�� ��ਾ��� ਵਿੱ� ਸ�ਧਾਰ �ਰ�।"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 msgstr "�ਰ�ੱਪਵਾ�� ਫ��ਰ"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "ਸ�ਨ�ਹਾ ਪਿੱ�ਾ ��� ਫ�ਲ�ਹ ਹ��"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
 msgstr "ਸਰਵਰ ��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ ਪਿੱ�ਾ-��� ਲ� ਸਹਿਯ��� ਨਹ�� ਹ�"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#  mail:no-rename-folder-exists secondary
+#  mail:vfolder-notunique secondary
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "��ਾ��� &quot;{0}&quot; ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। �ਪਣਾ ਫ�ਲਡਰ �ਰ� ��� �ਰ� ��।"
+
+#  XXX we shouldn't be popping up dialogs in this code.
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "��ਾ��� ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "�ਲਤ ਯ��਼ਰ"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"&quot;{0}&quot; ਵ��� ਪਰਾ�ਸ� ਲਾ��ਨ ਫ�ਲ�ਹ ਰਿਹਾ। �ਪਣਾ �ਮ�ਲ �ਡਰ�ੱਸ ��ੱ� �ਰ� �ਤ� ਮ��-ਲਾ��ਨ ਦ� "
+"�ਰਾ� �ਰ�।"
+
 #. 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/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "ਯ��਼ਰ &quot;{0}&quot; ਲ� ਪਰਾ�ਸ� �ਸ�ੱਸ ਨਹ�� ਦਿੱਤ� �ਾ ਸ��"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
 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/org-gnome-proxy-errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
 msgid "You have already given proxy permissions to this user."
 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/org-gnome-proxy-errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "ਤ�ਹਾਨ�ੰ ਪਰਾ�ਸ� ਹੱ� ਦ�ਣ ਲ� �ੱ� ਠ�� ਯ��਼ਰ ਨਾ� ਦ�ਣਾ ਪਵ��ਾ।"
 
-#  mail:no-rename-folder-exists secondary
-#  mail:vfolder-notunique secondary
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "��ਾ��� &quot;{0}&quot; ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। �ਪਣਾ ਫ�ਲਡਰ �ਰ� ��� �ਰ� ��।"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "ਤ�ਸ�� ਦਿੱਤ� ਯ��਼ਰ &quot;{0}&quot; ਨਾਲ �ਹ ਫ�ਲਡਰ ਸਾ��ਾ ਨਹ�� �ਰ ਸ�ਦ� ਹ�।"
 
-#  XXX we shouldn't be popping up dialogs in this code.
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "��ਾ��� ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr "ਤ�ਹਾਨ�ੰ �� ਯ��਼ਰ ਨਾ� ਦ�ਣਾ ਪਵ��ਾ, �� �ਿ ਲਿਸ� ਵਿੱ� ਦ�ਣਾ �ਾਹ�ੰਦ� ਹ�"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"&quot;{0}&quot; ਵ��� ਪਰਾ�ਸ� ਲਾ��ਨ ਫ�ਲ�ਹ ਰਿਹਾ। �ਪਣਾ �ਮ�ਲ �ਡਰ�ੱਸ ��ੱ� �ਰ� �ਤ� ਮ��-ਲਾ��ਨ ਦ� "
-"�ਰਾ� �ਰ�।"
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the meeting ?"
+msgstr "�� ਤ�ਸ�� ਮ��ਿੰ� ਮ��-ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#| msgid "Are you sure you want to delete this meeting?"
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "�� ਤ�ਸ�� ਮ��-ਹ�ਣ ਵਾਲ� ਮ��ਿੰ� ਫ�ਰ ਭ��ਣ� �ਾਹ�ੰਦ� ਹ�?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+#| msgid "Do you want to recover unfinished messages?"
+msgid "Do you want to retract the original item ?"
+msgstr "�� ਤ�ਸ�� �ਸਲ� ���ਮਾ� ਨ�ੰ ਮ��-�ਾ��ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+#| msgid "_Delete this item from all other recipient's mailboxes?"
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "�ਸਲ� ਨ�ੰ ਪ�ਰਾਪਤ �ਰਤਾ ਦ� ਮ�ਲ-ਬਾ�ਸ ਵਿੱ��� ਵ� ਹ�ਾ�� �ਾਵ��ਾ।"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
 msgid "This is a recurring meeting"
 msgstr "�ਹ ਮ��-ਹ�ਣ ਵਾਲ� ਮ��ਿੰ� ਹ�"
 
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr "�ਹ ਮ���ਦਾ ਮ��ਿੰ� ਵ�ਰਵ� ਦ� ਵਰਤ�� �ਰ�� ਨਵ�� ਮ��ਿੰ� ਬਣਾ��ਾ।"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+"�ਹ ਮ���ਦਾ ਮ��ਿੰ� ਵ�ਰਵ� ਦ� ਵਰਤ�� �ਰ�� ਨਵ�� ਮ��ਿੰ� ਬਣਾ��ਾ। ਮ��-ਹ�ਣ ਵਾਲਾ ਨਿਯਮ "
+"ਮ��-ਲਿ�ਣ ਦ� ਲ�� ਹ�।"
+
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
 msgid "Would you like to accept it?"
 msgstr "�� ਤ�ਸ�� �ਹ ਮਨ�਼�ਰ �ਰਦ� ਹ�?"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
 msgid "Would you like to decline it?"
 msgstr "�� ਤ�ਸ�� �ਸ ਲ� �ਨ�ਾਰ �ਰਦ� ਹ�?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "ਤ�ਸ�� ਦਿੱਤ� ਯ��਼ਰ &quot;{0}&quot; ਨਾਲ �ਹ ਫ�ਲਡਰ ਸਾ��ਾ ਨਹ�� �ਰ ਸ�ਦ� ਹ�।"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "ਤ�ਹਾਨ�ੰ �� ਯ��਼ਰ ਨਾ� ਦ�ਣਾ ਪਵ��ਾ, �� �ਿ ਲਿਸ� ਵਿੱ� ਦ�ਣਾ �ਾਹ�ੰਦ� ਹ�"
-
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "��਼ਮਾ�ਸ� �ਰ��"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+#| msgid "_Delegate Meeting..."
+msgid "Rese_nd Meeting..."
+msgstr "ਮ��ਿੰ� ਮ��-ਭ���(_n)..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>ਯ��਼ਰ :</b>"
@@ -17977,7 +17041,7 @@ msgid "Con_tacts..."
 msgstr "ਸੰਪਰ�(_t)..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "ਸ�ਨ�ਹਾ"
 
@@ -18060,10 +17124,10 @@ msgstr "<b>��ਾ��� ਨਾ�</b>"
 msgid "Proxy Login"
 msgstr "ਪਰਾ�ਸ� ਲਾ��ਨ"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%1$s %2$s (ਯ��਼ਰ %3$s) ਲ� ਪਾਸਵਰਡ ਦਿ�"
@@ -18071,17 +17135,17 @@ msgstr "%1$s %2$s (ਯ��਼ਰ %3$s) ਲ� ਪਾਸਵਰਡ ਦਿ�"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:510
+#: ../plugins/groupwise-features/proxy-login.c:512
 msgid "_Proxy Login..."
 msgstr "ਪਰਾ�ਸ� ਲਾ��ਨ(_P)..."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "���ਰ ��ਾ��� �ਨਲਾ�ਨ ਹ��� ਤਾ� ਹ� ਪਰਾ�ਸ� ��ਬ �ਪਲੱਬਧ ਹ�ਵ���।"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "���ਰ ��ਾ��� ਯ�� ਹ��� ਤਾ� ਹ� ਪਰਾ�ਸ� ��ਬ �ਪਲੱਬਧ ਹ�ਵ���।"
 
@@ -18089,102 +17153,102 @@ msgstr "���ਰ ��ਾ��� ਯ�� ਹ��� ਤਾ� ਹ�
 msgid "Advanced send options"
 msgstr "ਤ�ਨ��� ਭ��ਣ ��ਣਾ�"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "ਯ��਼ਰ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "ਯ��਼ਰ ਦਿ� �ਤ� �ਧਿ�ਾਰ ਨਿਰਧਾਨ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
 msgstr "ਨਵਾ� ਸਾ��ਾ ਫ�ਲਡਰ(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "ਸਾ��"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:531
 msgid "Custom Notification"
 msgstr "�ਸ�ਮ ਨ���ਫਿ��ਸ਼ਨ"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "ਸ਼ਾਮਲ   "
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "ਸ�ਧ"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "ਸ�ਨ�ਹਾ ਹਾਲਤ"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "ਵਿਸ਼ਾ:"
 
 #  * From
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "ਵਲ��:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "ਲਿ�ਣ ਮਿਤ�:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "ਪ�ਰਾਪਤ �ਰਤਾ: "
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "ਡਿਲਵਰ ��ਤ�: "
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "��ਲ�ਹ�: "
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "ਮਨ�਼�ਰ ��ਤ�: "
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "ਹ�ਾ�: "
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "�ਨ�ਾਰ: "
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "ਪ�ਰਾ: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "�ਣ-ਡਿਲਵਰ: "
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Track Message Status..."
 msgstr "ਸ�ਨ�ਹਾ ਹਾਲਤ �ਰ��..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "ਹ�ਲਾ ��ਲੰਡਰ ਸਰ�ਤ ਸ�ੱ��ੱਪ �ਰਨ ਲ� �ੱ� ਪਲੱ�-�ਨ ਹ�।"
+msgid "Add Hula support to Evolution."
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਲ� ਹ�ਲਾ ਸਹਿਯ�� ਸ਼ਾਮਲ।"
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "ਹ�ਲਾ ��ਾ��� ਸ�ੱ��ੱਪ"
+msgid "Hula Support"
+msgstr "ਹ�ਲਾ ਸਹਿਯ��"
 
-#: ../plugins/imap-features/imap-headers.c:320
+#: ../plugins/imap-features/imap-headers.c:332
 msgid "Custom Headers"
 msgstr "ਪਸੰਦ�ਦਾ ਹ�ੱਡਰ"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:345
 msgid "IMAP Headers"
 msgstr "IMAP ਹ�ੱਡਰ"
 
@@ -18201,10 +17265,6 @@ msgid "Basic and _Mailing List Headers (Default)"
 msgstr "ਮ�ੱਢਲ� �ਤ� ਮ�ਲਿੰ� ਸ��� ਹ�ੱਡਰ (ਮ�ਲ) (_M)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "ਸਭ ਹ�ੱਡਰ ਲਵ�(_l)"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -18213,7 +17273,7 @@ msgstr ""
 "ਵਾਧ� ਹ�ੱਡਰ ਦਿੰਦ� ਹ�, �ਿਸ ਦ� ਤ�ਹਾਨ�ੰ ਸ���ਡਰਡ ਹ�ੱਡਰ ਵਿੱ� ���ਨ ਦ� ਲ�� ਹ�ੰਦ� ਹ�।\n"
 "ਤ�ਸ�� �ਸ ਨ�ੰ �ਣਡਿੱਠਾ �ਰਦ� ਹ� �� ਤ�ਸ�� \"ਸਭ ਹ�ੱਡਰ\" ਦ� ��ਣ �ਰਦ� ਹ�।"
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.glade.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18221,7 +17281,7 @@ msgstr ""
 "�ਪਣ� IMAP ਹ�ੱਡਰ ਪਸੰਦ ��ਣ�। \n"
 "�ਿੰਨ� ਹ�ੱਡਰ ਵੱਧ �ਨ�ਹਾ� ਹ� ਤ�ਹਾਨ�ੰ �ਨ�ਹਾ� ਨ�ੰ ਡਾ�ਨਲ�ਡ �ਰਨ �ੱਤ� ਸਮਾ� ਲੱ���ਾ।"
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.glade.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18229,53 +17289,24 @@ msgstr ""
 "ਮ�ਲ ਹ�ੱਡਰ - (ਸਭ ਤ�� ਤ��਼) (_B)\n"
 "�ਹ ��ਣ�, �� ਤ�ਹਾਡ� ��ਲ ਮ�ਲਿੰ� ਸ��� �ੱਤ� �ਧਾਰਿਤ ਫਿਲ�ਰ ਨਹ�� ਹਨ"
 
+#: ../plugins/imap-features/imap-headers.glade.h:10
+#| msgid "Fetch A_ll Headers"
+msgid "_Fetch All Headers"
+msgstr "ਸਭ ਹ�ੱਡਰ ਲਵ�(_F)"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "IMAP ��ਾ���ਾ� ਵਿੱ� ਫ��ਰਾ� ਲ� �ੱ� ਪਲੱ��ਨ ਹ�।"
+msgid "Fine-tune your IMAP accounts."
+msgstr "�ਪਣ� IMAP ��ਾ��� ਵਿੱ� ਸ�ਧਾਰ �ਰ�।"
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "IMAP ਫ��ਰ"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
-msgid "_Import to Calendar"
-msgstr "��ਲੰਡਰ �ਯਾਤ(_I)"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Tasks"
-msgstr "�ੰਮ �ਯਾਤ(_I)"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:201
-msgid "Import ICS"
-msgstr "ICS �ਯਾਤ"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:224
-msgid "Select Task List"
-msgstr "�ੰਮ ਸ��� ��ਣ�"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:228
-msgid "Select Calendar"
-msgstr "��ਲੰਡਰ ��ਣ�"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
-msgid "_Import"
-msgstr "�ਯਾਤ(_I)"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "�ਯਾਤ ਲ� ��ਲੰਡਰ"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "ICS ਨੱਥ� ��ਲੰਡਰ ਲ� �ਯਾਤ �ਰ�।"
-
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "ਹਾਰਡਵ��ਰ �ਬਸ�ਸ਼ਨ ਲ��ਰ ਲ�ਡ ਨਹ�� ਹ�"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18283,7 +17314,7 @@ msgstr ""
 "\"hald\" ਸਰਵਿਸ ਲ���ਦ� ਸ�, ਪਰ �ਸ ਵ�ਲ� �ੱਲ ਨਹ�� ਰਹ� ਹ�। ਸਰਵਿਸ ਯ�� �ਰ� �ਤ� �ਹ ਪਰ��ਰਾਮ ਮ��-"
 "�ਾ� �ਾ� �ਪਣ� ਸਿਸ�ਮ ਪਰਸ਼ਾਸ਼� ਨਾਲ ਸੰਪਰ� �ਰ�।"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
 msgstr "�ੱ� iPod ��� ਫ�ਲ�ਹ ਹ��"
 
@@ -18301,204 +17332,204 @@ msgid "iCalendar format (.ics)"
 msgstr "iCalendar ਫਾਰਮ�� (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/address book with Apple iPod"
-msgstr "�ਪਲ ��ਪ�ਡ ਨਾਲ ��ਣ� �ਾਸ�/ਮ�ਮ�/��ਲੰਡਰ/�ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ਸਿ�ਰ�ਨਾ��਼ �ਰ�"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
 msgstr "iPod ਨਾਲ ਸਿ�ਰ�ਨਾ��਼"
 
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+#| msgid "Synchronize to iPod"
+msgid "Synchronize your data with your Apple iPod."
+msgstr "�ਪਣਾ ਡਾ�ਾ �ਪਣ� �ਪਲ iPod ਨਾਲ ਸਿ�ਰ�ਨਾ��਼ �ਰ�"
+
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "iPod ਸਿ�ਰ�ਨਾ��਼"
 
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
-msgstr "'%s' ��ਲੰਡਰ ਲ�ਡ �ਰਨ '� �ਸਫਲ"
+msgstr "'%s' ��ਲੰਡਰ ਲ�ਡ �ਰਨ ਲ� ਫ�ਲ�ਹ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "��ਲੰਡਰ '%s' ਵਿੱ� �ੱ� ਮ�ਲਾ�ਾਤ �ਸ ਮ��ਿੰ� ਨਾਲ ��ਰਾ ਰਹ� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:662
+#: ../plugins/itip-formatter/itip-formatter.c:663
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' ��ਲੰਡਰ ਵਿੱ� ਮ�ਲਾ�ਾਤ ਮਿਲ� ਹ�"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find any calendars"
 msgstr "��� ਵ� ��ਲੰਡਰ ਲੱਭਣ ਲ� �ਸਫ਼ਲ ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
 msgstr "�ਿਸ� ਵ� ��ਲੰਡਰ ਵਿੱ� �ਹ ਮ��ਿੰ� ਲੱਭਣ ਲ� �ਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Unable to find this task in any task list"
 msgstr "�ਿਸ� �ੰਮ ਸ��� ਵਿੱ� �ਹ �ੰਮ ਲੱਭਣ ਲ� �ਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this memo in any memo list"
 msgstr "�ਿਸ� ਮ�ਮ� ਸ��� ਵਿੱ� �ਹ �ੰਮ ਲੱਭਣ ਲ� �ਸਮਰੱਥ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:839
+#| msgid "Opening calendar"
+msgid "Opening the calendar. Please wait.."
+msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� �ਾ ਰਿਹਾ ਹ�। �ਡ��� ��..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
 msgstr "�ਹ ਮ�ਲਾ�ਾਤ ਲ� �ੱ� ਮ���ਦਾ ਵਰ�ਨ ਦ� ��� �ਾਰ� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 msgid "Unable to parse item"
 msgstr "��ਾ� ਪਾਰਸ �ਰਨ ਤ�� �ਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "'%s' ��ਲੰਡਰ ਤ�� ��ਾ� ਭ��ਣ ਵਿੱ� �ਸਫਲ।  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ਮਨ�਼�ਰ ਦ� ਭ��ਿ� ��ਲੰਡਰ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "�ੰਤਰਮ ਦ� ਤ�ਰ ਤ� ��ਲੰਡਰ '%s' ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "�ਨ�ਾਰ ਵਾ�� ਭ��ਿ� ��ਲੰਡਰ '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "��ਲੰਡਰ '%s' ਭ��ਿ� ਰੱਦ ਵਾ��"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ਸੰ�ਠ� ਨ� ਪ�ਰਤ�ਨਿਧ %s ਨ�ੰ ਹ�ਾ ਦਿੱਤਾ ਹ� "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "�ੱ� ਪ�ਰਤ�ਨਿਧ ਨ�ੰ ਰੱਦ ਹ�ਣ ਦ� ਸ��ਨਾ ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ਪ�ਰਤ�ਨਿਧ ਨ�ੰ ਰੱਦ �ਰਨਾ ਬਾਰ� �ਾਣ�ਾਰ� ਭ��� ਨਹ�� �ਾ ਸ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ਹਾਲਤ �ਲਤ ਹ�ਣ �ਰ�� ਦਰਸ਼� �ਾਣ�ਾਰ� ਦਾ �ੱਪਡ�� ਨਹ�� ��ਤ� �ਾ ਸ��"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "��ਲੰਡਰ %s ਨ�ੰ ਤਬਦ�ਲ �ਰਨ ਵਿੱ� �ਸਫਲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 msgid "Attendee status updated"
 msgstr "ਦਰਸ਼� ਸਥਿਤ� ਨਵ�ਨ ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Meeting information sent"
 msgstr "ਮ��ਿੰ� �ਾਣ�ਾਰ� ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Task information sent"
 msgstr "�ੰਮ �ਾਣ�ਾਰ� ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 msgid "Memo information sent"
 msgstr "ਮ�ਮ� �ਾਣ�ਾਰ� ਭ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ਮ��ਿੰ� �ਾਣ�ਾਰ� ਭ��ਣ ਲ� �ਸਮੱਰਥ ਹ�, ਮ��ਿੰ� ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid "Unable to send task information, the task does not exist"
 msgstr "�ੰਮ �ਾਣ�ਾਰ� ਭ��ਣ ਲ� �ਸਫ਼ਲ, �ੰਮ ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ਮ�ਮ� �ਾਣ�ਾਰ� ਭ��ਣ ਲ� �ਸਮੱਰਥ ਹ�, ਮ�ਮ� ਮ���ਦ ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 msgid "The calendar attached is not valid"
 msgstr "ਨੱਥ� ��ਲੰਡਰ ਠ�� ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ��ਲੰਡਰ ਹ�ਣ ਦਾ ਦਾ�ਵਾ ਤਾ� ਹ�, ਪਰ ��ਲੰਡਰ ਠ�� ����ਲੰਡਰ (iCalendar) ਨਹ�� ਹ�।"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The item in the calendar is not valid"
 msgstr "��ਲੰਡਰ ਵਿੱ� ��ਾ� ਠ�� ਨਹ�� ਹ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 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:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr "ਨੱਥ� ��ਲੰਡਰ ਵਿੱ� �� ���ਮਾ� ਹਨ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1589
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "�ਹਨਾ� ਸਭ ���ਮਾ� ਤ� �ਾਰਵਾ� �ਰਨ ਲ਼�, ਫਾ�ਲ ਨ�ੰ ਸੰਭਾਲਣਾ ਪਵ��ਾ �ਤ� ��ਲੰਡਰ �ਯਾਤ �ਰਨਾ ਪਵ��ਾ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "This meeting recurs"
 msgstr "�ਹ ਮ��ਿੰ� ਫ�ਰ ਹ�ਵ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "This task recurs"
 msgstr "�ਹ �ੰਮ ਫ�ਰ ਹ�ਵ���"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "This memo recurs"
 msgstr "�ਹ ਮ�ਮ� ਫ�ਰ ਹ�"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 msgid "_Delete message after acting"
 msgstr "�ਾਰਵਾ� �ਪਰੰਤ ਸ�ਨ�ਹਾ ਹ�ਾ�(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
 msgstr "�ਪਵਾਦ ���"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ਮ��ਿੰ� ��ਰਾ ਲੱਭਣ ਲ� ��ਲੰਡਰ ��ਣ�"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:297
-msgid "Today"
-msgstr "�ੱ�"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
@@ -18517,11 +17548,6 @@ msgstr "�ੱ� %H:%M:%S"
 msgid "Today %l:%M:%S %p"
 msgstr "�ੱ� %l:%M:%S %p"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:219
-msgid "Tomorrow"
-msgstr "�ੱਲ�ਹ"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
@@ -18857,112 +17883,110 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> ਨ� �ੱ�� ਦਿੱਤਾ ਸਾ��ਾ ਮ�ਮ� ਰੱਦ �ਰ ਦਿੱਤਾ ਹ�:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "��ਲੰਡਰ ��ਲ�ਹ�(_O))"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
-msgid "_Decline"
-msgstr "ਨਾ-ਮਨ�਼�ਰ(_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:829
 #: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:839
 #: ../plugins/itip-formatter/itip-view.c:856
 #: ../plugins/itip-formatter/itip-view.c:861
+msgid "_Decline"
+msgstr "ਨਾ-ਮਨ�਼�ਰ(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "ਮਨ�਼�ਰ(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "ਸਭ ਨਾ-ਮਨ�਼�ਰ(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "ਸਭ �ਰ�਼� ਮਨ�਼�ਰ(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "�ਰ�਼�(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "ਸਭ ਮਨ�਼�ਰ(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "�ਾਣ�ਾਰ� ਭ���(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
 msgstr "ਦਰਸ਼� ਹਾਲਤ �ੱਪਡ��(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "�ੱਪਡ��(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "ਸ਼�ਰ��ਤ� ਸਮਾ�:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "ਸਮਾਪਤ� ਸਮਾ�:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "�ਿੱਪਣ�:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "ਭ��ਣ ਵਾਲ� ਨ�ੰ �ਵਾਬ ਦਿ�(_r)"
 
 #  FIXME: domain/code
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
 msgstr "ਦਰਸ਼�ਾ� ਨ�ੰ �ੱਪਡ�� ਭ���(_u)"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "ਸਭ ਮ��ਿ�� �ੱਤ� ਲਾ��(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1151
 msgid "Show time as _free"
 msgstr "�ਾ�ਮ ਫਰ� ਵਾ�� ਵ���(_f)"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
 msgstr "ਮ�ਨ�ੰ ਯਾਦ ਰੱ��(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1158
+#: ../plugins/itip-formatter/itip-view.c:1160
 msgid "_Inherit reminder"
 msgstr "�ੰਹ�ਰਿ� ਰ�ਮਾ�ਡਰ(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks :"
-msgstr "�ੰਮ(_T):"
-
 #: ../plugins/itip-formatter/itip-view.c:1914
-msgid "Memos :"
-msgstr "ਮ�ਮ� :"
+#| msgid "_Memos"
+msgid "_Memos:"
+msgstr "ਮ�ਮ�(_M):"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ���ਸ�/��ਲੰਡਰ ਭਾ� ਵ��ਾ�"
+#| msgid "Displays text/calendar parts in messages."
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "ਪੱਤਰ ਸ�ਨ�ਹਿ�� ਵਿੱ� \"���ਸ�/��ਲੰਡਰ\" ਮਾ�ਮ ਭਾ� ਵ���"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -18987,13 +18011,13 @@ msgid "Proxy _Logout"
 msgstr "ਪਰਾ�ਸ� ਲਾ����(_L)"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "��ਾ��� �ਯ�� �ਰਨ ਮਨ�਼�ਰ ਹ�।"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
 msgstr "��ਾ��� �ਯ��"
 
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr "�ਹ ��ਾ��� ਨ�ੰ ਫ�ਲਡਰ �ਰ� ਵਿੱ� �ਸ �ੱਤ� ਸੱ�ਾ �ਲਿੱ� �ਰ�� �ਯ�� �ਰ�।"
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "ਬ�ਪ �ਾ� ਸਾ��ਡ ਫਾ�ਲ �ਲਾ�"
@@ -19060,20 +18084,20 @@ msgstr "�� ���ਾਨ �ਪ�ਦਾ ਹ�ਣਾ �ਾਹ�ਦਾ 
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "�� ��ਵਲ �ਨ-ਬਾ�ਸ ਵਿ�ਲ� ਸ�ਨ�ਹਿ�� ਲ� ਹ� ਨ���ਫਾ� �ਰਨਾ ਹ�।"
 
-#: ../plugins/mail-notification/mail-notification.c:260
+#: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
 msgstr "ਡ�-ਬੱਸ ਸ�ਨ�ਹਾ ਬਣਾ�(_D)"
 
-#: ../plugins/mail-notification/mail-notification.c:383
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Evolution's Mail Notification"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਦਾ ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ"
 
-#: ../plugins/mail-notification/mail-notification.c:404
+#: ../plugins/mail-notification/mail-notification.c:389
 msgid "Mail Notification Properties"
 msgstr "ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ ਵਿਸ਼�ਸ਼ਤਾ"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:483
+#: ../plugins/mail-notification/mail-notification.c:498
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19088,113 +18112,252 @@ msgstr[1] ""
 "ਤ�ਹਾਨ�ੰ %2$s ਵਿੱ� %1$d ਨਵ�� ਸ�ਨ�ਹ�\n"
 "�� ਹਨ।"
 
-#: ../plugins/mail-notification/mail-notification.c:488
+#: ../plugins/mail-notification/mail-notification.c:503
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "ਤ�ਹਾਨ�ੰ �ੱ� ਨਵਾ� %d  ਸ�ਨ�ਹਾ ��� ਹ�।"
 msgstr[1] "ਤ�ਹਾਨ�ੰ %d  ਨਵ�� ਸ�ਨ�ਹ� �� ਹਨ।"
 
-#: ../plugins/mail-notification/mail-notification.c:505
-#: ../plugins/mail-notification/mail-notification.c:510
+#: ../plugins/mail-notification/mail-notification.c:520
+#: ../plugins/mail-notification/mail-notification.c:525
 msgid "New email"
 msgstr "ਨਵ�� �ਮ�ਲ"
 
-#: ../plugins/mail-notification/mail-notification.c:570
+#: ../plugins/mail-notification/mail-notification.c:588
 msgid "Show icon in _notification area"
 msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ���ਾਨ ਵ���(_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:573
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "B_link icon in notification area"
 msgstr "ਨ���ਫਿ��ਸ਼ਨ �ਰ�� ਵਿੱ� ���ਾਨ �ਪ�ਾ�(_l)"
 
-#: ../plugins/mail-notification/mail-notification.c:575
+#: ../plugins/mail-notification/mail-notification.c:593
 msgid "Popup _message together with the icon"
 msgstr "���ਾਨ ਨਾਲ ਸ�ਨ�ਹਾ ਵ� ਪ�ਪ�ੱਪ �ਰ�(_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:756
+#: ../plugins/mail-notification/mail-notification.c:774
 msgid "_Play sound when new messages arrive"
 msgstr "ਨਵਾ� ਸ�ਨ�ਹਾ ��ਣ �ੱਤ� ਸਾ��ਡ �ਲਾ�(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:762
+#: ../plugins/mail-notification/mail-notification.c:780
 msgid "_Beep"
 msgstr "ਬ�ਪ(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:763
+#: ../plugins/mail-notification/mail-notification.c:781
 msgid "Play _sound file"
 msgstr "ਸਾ��ਡ ਫਾ�ਲ �ਲਾ�(_s)"
 
-#: ../plugins/mail-notification/mail-notification.c:774
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Specify _filename:"
 msgstr "�ਾਸ ਫਾ�ਲ ਨਾ�(_f):"
 
-#: ../plugins/mail-notification/mail-notification.c:775
+#: ../plugins/mail-notification/mail-notification.c:793
 msgid "Select sound file"
 msgstr "ਧ�ਨ� ਫਾ�ਲ ��ਣ�"
 
-#: ../plugins/mail-notification/mail-notification.c:776
+#: ../plugins/mail-notification/mail-notification.c:794
 msgid "Pl_ay"
 msgstr "�ਲਾ�(_a)"
 
-#: ../plugins/mail-notification/mail-notification.c:833
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Notify new messages for _Inbox only"
 msgstr "��ਵਲ �ਨ-ਬਾ�ਸ ਵਿੱ� ਨਵ�� ਸ�ਨ�ਹਿ�� ਲ� ਨ���ਫਾ� �ਰ�(_I)"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#| msgid "Play sound when new messages arrive."
+msgid "Notifies you when new mail messages arrive."
+msgstr "�ਦ�� ਵ� ਨਵਾ� ਸ�ਨ�ਹ� �ਵ� ਤਾ� ਤ�ਹਾਨ�ੰ ਸ��ਨਾ ਦ�ਵ�।"
+
+#: ../plugins/mail-to-task/mail-to-task.c:376
+#, c-format
 msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
 msgstr ""
-"�ੱ� ਡ�-ਬੱਸ ਸ�ਨ�ਹਾ ਬਣਾ� �ਾ� ਨ���ਫਿ��ਸ਼ਨ ��ਤਰ ਵਿੱ� ਯ��਼ਰ ਨ�ੰ �ੱ� ���ਾਨ ਨਾਲ ਨ���ਫਾ� ��ਤਾ �ਾ�ਦਾ ਹ� "
-"�ਤ� �ਦ�� ਨਵਾ� ਸ�ਨ�ਹਾ ��ਦਾ ਹ� ਤਾ� ਨ���ਫਿ��ਸ਼ਨ ਸ�ਨ�ਹਾ ਵ��ਾ�� �ਾ�ਦਾ ਹ�।"
+"��ਣਿ� ��ਲੰਡਰ ਵਿੱ� �ਵ��� '%s' ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। �� ਤ�ਸ�� ਪ�ਰਾਣ� �ਵ��� ਨ�ੰ ਸ�ਧਣਾ �ਾਹ�ੰਦ� "
+"ਹ�?"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-msgid "Mail Notification"
-msgstr "ਮ�ਲ ਨ���ਫਿ��ਸ਼ਨ"
+#: ../plugins/mail-to-task/mail-to-task.c:379
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr "��ਣ� �ਾਸ� ਲਿਸ� ਵਿੱ� �ਾਸ� '%s' ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। �� ਤ�ਸ�� ਪ�ਰਾਣ� �ਾਸ� ਨ�ੰ ਸ�ਧਣ� �ਾਹ�ੰਦ� ਹ�?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:382
+#, c-format
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
+msgstr ""
+"��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਮ�ਮ� '%s' ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। �� ਤ�ਸ�� ਪ�ਰਾਣ� ਮ�ਮ� ਲਿਸ� ਨ�ੰ ਸ�ਧਣਾ �ਾਹ�ੰਦ� ਹ�?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:399
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+msgstr ""
+"��ਣ� ��ਲੰਡਰ ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� �ਵ��� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� �ਵ��� ਫ�ਰ ਵ� ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:402
+msgid ""
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
+msgstr ""
+"��ਣ� �ਾਸ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� �ਾਸ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� �ਾਸ� ਫ�ਰ ਵ� "
+"ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:405
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+msgstr ""
+"��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� ਮ�ਮ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� ਮ�ਮ� ਫ�ਰ ਵ� ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:423
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
+msgstr[0] ""
+"��ਣ� ��ਲੰਡਰ ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� �ੱ� �ਵ��� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵਾ� �ਵ��� ਫ�ਰ ਵ� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
+msgstr[1] ""
+"��ਣ� ��ਲੰਡਰ ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� �ਵ��� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� �ਵ��� ਫ�ਰ ਵ� ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:429
 msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr "�ੱ� ਪਲੱ�-�ਨ ਹ�, �� �ਿ �ੱ� ਪੱਤਰ ਸ�ਨ�ਹ� ਦ� ਭਾ�ਾ� ਤ�� ਮ��ਿੰ�ਾ� ਬਣਾ�ਣ ਲ� ਸਹਾ�� ਹ�।"
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
+msgstr[0] ""
+"��ਣ� �ਾਸ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� �ੱ� �ਾਸ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� �ਾਸ� ਫ�ਰ ਵ� "
+"ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
+msgstr[1] ""
+"��ਣ� �ਾਸ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� �ਾਸ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� �ਾਸ� ਫ�ਰ ਵ� "
+"ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:435
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+msgstr[0] ""
+"��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ਮ�ਮ� ਪਹਿਲਾ� ਹ� ਹ�। �� ਤ�ਸ�� ਨਵ�� ਮ�ਮ� ਫ�ਰ ਵ� ਬਣਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
+msgstr[1] ""
+"��ਣ� ਮ�ਮ� ਲਿਸ� ਵਿੱ� ਦਿੱਤ� ਪੱਤਰਾ� ਲ� ��� ਮ�ਮ� ਪਹਿਲਾ� ਹ� ਹਨ। �� ਤ�ਸ�� ਨਵ�� ਮ�ਮ� ਫ�ਰ ਵ� ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:494
+#| msgid "No Summary"
+msgid "[No Summary]"
+msgstr "[ਸੰ��ਪ ਨਹ��]"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "ਮ��ਿੰ� ਲ� ਤਬਦ�ਲ(_v)"
+#: ../plugins/mail-to-task/mail-to-task.c:505
+msgid "Invalid object returned from a server"
+msgstr "ਸਰਵਰ ਤ�� �ਲਤ �ਬ���� ਵਾਪਸ ਮਿਲਿ�"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "ਮ��ਿੰ� ਲ� ਪੱਤਰ"
+#: ../plugins/mail-to-task/mail-to-task.c:570, c-format
+#| msgid "An error occurred while printing"
+msgid "An error occurred during processing: %s"
+msgstr "ਪਰ�ਸ�ਸ �ਰਨ ਦ�ਰਾਨ �ਲਤ� ��: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
+#: ../plugins/mail-to-task/mail-to-task.c:599
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "��ਲੰਡਰ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:292
+#: ../plugins/mail-to-task/mail-to-task.c:606
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr "��ਣਿ� ਸਰ�ਤ ਪ��ਹਨ ਲ� ਹ�, �ਸ�ਰ�� �ਵ��� ਬਣਾ�� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�। ਹ�ਰ ਸਰ�ਤ ��ਣ� ��।"
+
+#: ../plugins/mail-to-task/mail-to-task.c:609
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr "��ਣਿ� ਸਰ�ਤ ਪ��ਹਨ ਲ� ਹ�, �ਸ�ਰ�� �ੰਮ ਬਣਾ� ਨਹ�� �ਾ ਸ�ਦਾ ਹ�। ਹ�ਰ ਸਰ�ਤ ��ਣ� ��।"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:612
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
-msgstr "�ੱ� ਪਲੱ�-�ਨ ਹ�, �� �ਿ �ੱ� ਪੱਤਰ ਸ�ਨ�ਹ� ਦ� ਭਾ� ਤ�� �ੰਮ ਬਣਾ�ਣ ਲ� ਸਹਾ�� ਹ�।"
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
+msgstr "��ਣਿ� ਸਰ�ਤ ਪ��ਹਨ ਲ� ਹ�, �ਸ�ਰ�� ਮ�ਮ� �ੱਥ� ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ ਹ�। ਹ�ਰ ਸਰ�ਤ ��ਣ� ��।"
+
+#: ../plugins/mail-to-task/mail-to-task.c:821, c-format
+#| msgid "Cannot open source \"{2}\"."
+msgid "Cannot get source list. %s"
+msgstr "ਸਰ�ਤ ਲਿਸ� ਲ� ਨਹ�� �ਾ ਸ�ਦ�: %s"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#| msgid "Convert the selected message to a new task"
+msgid "Convert a mail message to a task."
+msgstr "ਪੱਤਰ ਸ�ਨ�ਹ� ਨ�ੰ �ਾਸ� ਵਿੱ� ਬਦਲ�"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "�ੰਮ '� ਬਦਲ�(_v)"
+#| msgid "Create a new memo"
+msgid "Create a Mem_o"
+msgstr "ਮ�ਮ� ਬਣਾ�(_o)"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "�ੰਮ ਲ� ਪੱਤਰ"
-
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਨ�ੰ �ੱ� ਨਵ�� �ੰਮ '� ਬਦਲ�"
+#| msgid "New _Meeting"
+msgid "Create a _Meeting"
+msgstr "ਮ��ਿੰ� ਬਣਾ�(_M)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+#| msgid "Create a new task"
+msgid "Create a _Task"
+msgstr "�ਾਸ� ਬਣਾ�(_T)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+#| msgid "_Create new view"
+msgid "Create an _Event"
+msgstr "�ਵ��� ਬਣਾ�(_E)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+#| msgid "Mail to task"
+msgid "Mail-to-Task"
+msgstr "ਪੱਤਰ ਤ�� �ੰਮ"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new event from the selected message"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵਾ� �ਵ��� ਬਣਾ�"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+#| msgid "Create a new meeting request"
+msgid "Create a new meeting from the selected message"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵ�� ਮ��ਿੰ� ਬਣਾ�"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new memo from the selected message"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵਾ� ਮ�ਮ� ਬਣਾ�"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new task from the selected message"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਤ�� ਨਵ�� �ਾਸ� ਬਣਾ�"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
@@ -19202,15 +18365,15 @@ msgstr "ਸੰਪਰ� ਸ��� ਮਾਲ�(_o)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Get list _archive"
-msgstr "ਸ��� ��ਾ�ਵ ਲਵ�(_a)"
+msgstr "ਲਿਸ� ��ਾ�ਵ ਲਵ�(_a)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
 msgid "Get list _usage information"
-msgstr "ਵਰਤ�� ਸ��� �ਾਣ�ਾਰ� ਲਵ��(_u)"
+msgstr "ਲਿਸ� ਵਰਤ�� �ਾਣ�ਾਰ� ਲਵ��(_u)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
 msgid "Mailing List Actions"
-msgstr "ਮ�ਲਿੰ� ਸ��� �ਾਰਵਾ�"
+msgstr "ਮ�ਲਿੰ� ਲਿਸ� �ਾਰਵਾ�"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
@@ -19218,20 +18381,23 @@ msgid "Mailing _List"
 msgstr "ਮ�ਲਿੰ� ਲਿਸ�(_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+#| msgid ""
+#| "Provide actions for common mailing list commands (subscribe, "
+#| "unsubscribe...)."
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr "�ਮ ਮ�ਲਿੰ� ਸ��� �ਮਾ�ਡਾ� (ਮ��ਬਰ ਬਣ�, ਹ��,...) �ਪਲੱਬਧ �ਰਵਾ�ਦਾ ਹ�।"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
-msgstr "ਸ��� ਲ� ਸ�ਨ�ਹ� ਭ���(_P)"
+msgstr "ਲਿਸ� ਲ� ਸ�ਨ�ਹ� ਭ���(_P)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
 msgid "_Subscribe to list"
-msgstr "ਸ��� ਲ� ਮ��ਬਰ(_S)"
+msgstr "ਲਿਸ� ਲ� ਮ��ਬਰ(_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
 msgid "_Un-subscribe to list"
-msgstr "ਸ��� ਤ�� ਮ��ਬਰ� ਹ�ਾ�(_U)"
+msgstr "ਲਿਸ� ਤ�� ਮ��ਬਰ� ਹ�ਾ�(_U)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -19268,11 +18434,11 @@ msgid ""
 "mailing list. Contact the list owner for details."
 msgstr ""
 "�ਸ ਮ�ਲਿੰ� ਸ��� ਤ� ਪੱਤਰ ਭ��ਣ ਤ� ਰ�� ਹ�। ਸੰਭਵ ਤ�ਰ ਤ�, �ਹ ਸਿਰ� ਪ�ਨ ਲ� ਹ� ਪੱਤਰ ਸ��� ਹ�। ਵਧ�ਰ� "
-"�ਾਣ�ਾਰ� ਲ� ਸ��� ਪ�ਰਬੰਧ ਨਾਲ ਸੰਪਰ� �ਰ�।"
+"�ਾਣ�ਾਰ� ਲ� ਲਿਸ� ਪ�ਰਬੰਧ ਨਾਲ ਸੰਪਰ� �ਰ�।"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
-msgstr "�� �-ਮ�ਲ ਮ�ਲਿੰ� ਸ��� ਨ�ੰ ਭ��ਣਾ ਹ�?"
+msgstr "�� �-ਮ�ਲ ਮ�ਲਿੰ� ਲਿਸ� ਨ�ੰ ਭ��ਣਾ ਹ�?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
@@ -19312,7 +18478,7 @@ msgstr "ਸ�ਨ�ਹਾ ਭ���(_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact List _Owner"
-msgstr "ਸੰਪਰ� ਸ��� ਮਾਲ�(_O)"
+msgstr "ਸੰਪਰ� ਲਿਸ� ਮਾਲ�(_O)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
@@ -19320,43 +18486,43 @@ msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਸ��� 
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get List _Archive"
-msgstr "ਸ��� ��ਾ�ਵ ਲਵ�(_A)"
+msgstr "ਲਿਸ� ��ਾ�ਵ ਲਵ�(_A)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get List _Usage Information"
-msgstr "ਵਰਤ�� ਸ��� �ਾਣ�ਾਰ� ਲਵ��(_U)"
+msgstr "ਲਿਸ� ਵਰਤ�� �ਾਣ�ਾਰ� ਲਵ��(_U)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਸ��� ਦ� ��ਾ�ਵ ����"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਲਿਸ� ਦ� ��ਾ�ਵ ����"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get information about the usage of the list this message belongs to"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਸ��� ਦ� ਵਰਤ�� ਬਾਰ� �ਾਣ�ਾਰ� ਲਵ�"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਲਿਸ� ਦ� ਵਰਤ�� ਬਾਰ� �ਾਣ�ਾਰ� ਲਵ�"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਸ��� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� �ੱ� �ਵਾਬ ਲਿ��"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਸ��� ਲ� ਮ��ਬਰ ਬਣ�"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� ਮ��ਬਰ ਬਣ�"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
 msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਸ��� ਲ� ਮ��ਬਰ� ਹ�ਾ�"
+msgstr "��ਣ� ਸ�ਨ�ਹ� ਦ� ਮ�ਲਿੰ� ਲਿਸ� ਲ� ਮ��ਬਰ� ਹ�ਾ�"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post Message to List"
-msgstr "ਸ��� ਲ� ਸ�ਨ�ਹ� ਭ���(_P)"
+msgstr "ਲਿਸ� ਲ� ਸ�ਨ�ਹ� ਭ���(_P)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to List"
-msgstr "ਸ��� ਲ� ਮ��ਬਰ(_S)"
+msgstr "ਲਿਸ� ਲ� ਮ��ਬਰ(_S)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Unsubscribe from List"
-msgstr "ਸ��� ਤ�� ਮ��ਬਰ� ਹ�ਾ�(_U)"
+msgstr "ਲਿਸ� ਤ�� ਮ��ਬਰ� ਹ�ਾ�(_U)"
 
 #: ../plugins/mark-all-read/mark-all-read.c:39
 msgid "Also mark messages in subfolders?"
@@ -19370,13 +18536,15 @@ msgstr ""
 "�ਸ ਨਾਲ ਮ���ਦਾ ਫ�ਲਡਰ ਵਿੱ� ਹ� ਸ�ਨ�ਹ� ਪ��ਹ� ਮਾਰ� �ਰਨਾ �ਾਹ�ੰਦ� ਹ� �ਾ� ਮ���ਦਾ ਫ�ਲਡਰ ਦ� ਨਾਲ ਸਭ �ਧ�ਨ-"
 "ਫ�ਲਡਰ ਵ�?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
-msgid "Current Folder and _Subfolders"
-msgstr "ਮ���ਦਾ ਫ�ਲਡਰ �ਤ� ਸਬ-ਫ�ਲਡਰਾ� �ੱਤ�(_S)"
+#: ../plugins/mark-all-read/mark-all-read.c:166
+#| msgid "Current Folder and _Subfolders"
+msgid "In Current Folder and _Subfolders"
+msgstr "ਮ���ਦਾ ਫ�ਲਡਰ �ਤ� ਸਬ-ਫ�ਲਡਰਾ� ਵਿੱ�(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "Current _Folder Only"
-msgstr "��ਵਲ ਮ���ਦਾ ਫ�ਲਡਰ(_F)"
+#: ../plugins/mark-all-read/mark-all-read.c:180
+#| msgid "Current _Folder Only"
+msgid "In Current _Folder Only"
+msgstr "��ਵਲ ਮ���ਦਾ ਫ�ਲਡਰ ਵਿੱ�(_F)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
@@ -19387,20 +18555,22 @@ msgid "Mark Me_ssages as Read"
 msgstr "ਸ�ਨ�ਹਿ�� ਨ�ੰ ਪ��ਹ� ਹ�� ਬਣਾ�(_S)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr "�ੱ� ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹਿ�� ਨ�ੰ ਪ��ਹਿ�� ਬਣਾ�ਣ ਲ� ਵਰਤਿ� �ਾ�ਦਾ ਹ�"
+#| msgid "Mark all messages in the folder as read"
+msgid "Mark all messages in a folder as read."
+msgstr "ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹ� ਪ��ਹ� ਮਾਰ� �ਰ�"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "ਮ�ਨ� ਪਲੱ�-�ਨ ਦ� ਸ��ਿੰ� ਲ� �ੱ� ਪਲੱ�-�ਨ ਹ�।"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "ਮ�ਨ� ਲ�ਡਰ"
 
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr "ਸਹਿਯ�� ਪਲੱ��ਨ ਮ�ਨ� ਵਿੱ� ਲਿ���� ���� ਹਨ।"
+
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "�ੱ� ਪਲੱ�-�ਨ, �� �ਿ ਪਲੱ�-�ਨਾ� ਨ�ੰ ਯ�� �ਤ� �ਯ�� �ਰਨ ਲ� ਸਹਾ�� ਹ�।"
+#| msgid "Change Evolution's settings"
+msgid "Manage your Evolution plugins."
+msgstr "ਤ�ਹਾਡ� �ਵ�ਲ�ਸ਼ਨ ਪਲੱ��ਨ ਪਰਬੰਧ।"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -19437,30 +18607,23 @@ msgstr "ਸੰ��ਪ"
 msgid "Plugin"
 msgstr "ਪਲੱ�-�ਨ"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"�ੱ� ��ਸ� ਪਲੱ�-�ਨ, �� �ਿ ਤ�ਹਾਨ�ੰ �ੱ� ਫਾਰਮ�� ਪਲੱ�-�ਨ ਦਾ �ੰਮ ਵਿ�ਾ�ਦ� ਹ�, �� �ਿ ਤ�ਹਾਨ�ੰ HTML "
-"ਪੱਤਰਾ� ਨ�ੰ �ਯ�� �ਰਨ ਲ� ਸਹਾ�� ਹ�।\n"
-"\n"
-"�ਹ ਪਲੱ�-�ਨ ਸਿਰਫ਼ ਨਾ-ਸਹਾ�� �ਲ� ��ਡ ਹ� ਹ�।\n"
-
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "ਪਲ�ਨ ���ਸ� ਮ�ਡ"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+#| msgid "Prefer plain-text"
+msgid "Prefer Plain Text"
 msgstr "ਪਲ�ਨ-���ਸ� ਪਸੰਦ"
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "ਪੱਤਰ ਸ�ਨ�ਹ� ਨ�ੰ ਪਲ��-���ਸ� ਵ���, �� �ਹ HTML ਸਮੱ�ਰ� ਵ� ਰੱ�ਦ� ਹ�ਵ�।"
+
 #: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
-msgstr "���ਰ HTML ਹ�ਵ� ਤਾ� ਵ��ਾ�"
+msgstr "���ਰ HTML ਹ�ਵ� ਤਾ� ਵ���"
 
 #: ../plugins/prefer-plain/prefer-plain.c:190
 msgid "Prefer PLAIN"
@@ -19468,7 +18631,7 @@ msgstr "ਸਧਾਰਨ ਹ� ਪਸੰਦ"
 
 #: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Only ever show PLAIN"
-msgstr "ਹਮ�ਸ਼ਾ ਸਧਾਰਨ ਹ� ਵ��ਾ�"
+msgstr "ਹਮ�ਸ਼ਾ ਸਧਾਰਨ ਹ� ਵ���"
 
 #: ../plugins/prefer-plain/prefer-plain.c:234
 msgid "HTML _Mode"
@@ -19479,8 +18642,8 @@ msgid "Evolution Profiler"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਰ�ਫਾ�ਲਰ"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "ਡਾ�ਾ ��ਨਾਵਾ� ਨ�ੰ ਪਰ�ਫਾ�ਲ �ਰਨ ਦਾ ਲਾ� ਰੱ��।"
+msgid "Profile data events in Evolution (for developers only)."
+msgstr "�ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਪਰ�ਫਾ�ਲ ਡਾ�ਾ �ਵ��� (ਡਿਵ�ਲਪਰਾ� ਲ� ਹ�)"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19495,44 +18658,76 @@ msgid "Outlook personal folders (.pst)"
 msgstr "Outlook ਨਿੱ�� ਫ�ਲਡਰ (.pst)"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:315
 msgid "_Address Book"
 msgstr "�ਡਰ�ੱਸ ਬ�ੱ�(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:322
 msgid "A_ppointments"
 msgstr "ਮ�ਲਾ�ਾਤ(_p)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:334
 msgid "_Journal entries"
 msgstr "�ਰਨਲ ���ਰ���(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:349
 msgid "Importing Outlook data"
 msgstr "���ਲ�ੱ� ਡਾ�ਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "��ਲੰਡਰਾ� ਨ�ੰ ਵ�ੱਬ �ੱਤ� ਪਰ�ਾਸ਼ਿਤ ਹ�ਣ ਲ� ਮਨ�਼�ਰ �ਰਦਾ ਹ�"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "��ਲੰਡਰ ਪਰਾ�ਸ਼ਨ"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "�ਿ�ਾਣ�"
 
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#| msgid "Allows calendars to be published to the web"
+msgid "Publish calendars to the web."
+msgstr "��ਲੰਡਰ ਵ�ੱਬ �ੱਤ� ਪਬਲਿਸ਼ �ਰ�।"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "��ਲੰਡਰ �ਾਣ�ਾਰ� ਪਰ�ਾਸ਼ਤ(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337, c-format
+#| msgid "Could not open source"
+msgid "Could not open %s:"
+msgstr "%s ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:97, c-format
+#| msgid "Could not parse PGP message: Unknown error"
+msgid "Could not open %s: Unknown error"
+msgstr "%s ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਿ�: �ਣ�ਾਣ �ਲਤ�"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "%s ਪਬਲਿਸ਼ �ਰਨ ਦ�ਰਾਨ �ਲਤ� ��:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "%s ਲ� ਪਬਲਿਸ ਸਫ਼ਲ ਰਿਹਾ"
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "%s ਦਾ ਮਾ��� ਫ�ਲ�ਹ:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:624
 msgid "Are you sure you want to remove this location?"
 msgstr "�� ਤ�ਸ�� �ਹ �ਿ�ਾਣਾ ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
+#: ../plugins/publish-calendar/publish-calendar.c:788
+#| msgid "Could not create message."
+msgid "Could not create publish thread."
+msgstr "ਥਰਿੱਡ ਪਬਲਿਸ਼ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�।"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">�ਿ�ਾਣਾ</span>"
@@ -19587,29 +18782,44 @@ msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
-msgstr "ਸ�ਵਾ �ਿਸਮ(_T): "
+msgstr "ਸਰਵਿਸ �ਿਸਮ(_T): "
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#| msgid "Time _zone:"
+msgid "Time _duration:"
+msgstr "ਸਮਾ� �ੰਤਰਾਲ(_d):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "ਫਾ�ਲ(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "ਪਾਸਵਰਡ(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "�ੰ� ਪਰ�ਾਸ਼ਤ(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱ��(_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "ਯ��਼ਰ ਨਾ�(_U):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+"ਦਿਨ\n"
+"ਹਫ਼ਤ�\n"
+"ਮਹ�ਨ�"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -19617,11 +18827,17 @@ msgstr ""
 "iCal\n"
 "ਵ�ਹਲਾ/ਰ��ਿ�"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr "��ਲੰਡਰ ਪਬਲਿਸ਼ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: ��ਲੰਡਰ ਬ���ਡ ਹ�ਣ ਮ���ਦ ਨਹ�� ਰਿਹਾ।"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "ਨਵਾ� �ਿ�ਾਣਾ"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "�ਿ�ਾਣਾ ਸ�ਧ"
 
@@ -19649,177 +18865,142 @@ msgstr "�ੱ� ਪਲੱ��ਨ, �� ਹ�ਰ ਪਲੱ��ਨ ਲ�
 msgid "Python Loader"
 msgstr "ਪਾ�ਥਨ ਲ�ਡਰ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (ਬਿਲ�-�ਨ)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin ਨਹ�� ਲੱਭਿ�, ��ਡ: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "ਪਾ�ਪ ਬਣਾ�ਣ ਲ� ਫ�ਲ�ਹ: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "ਫ�ਰ� ਬਾ�ਦ �ਲਤ�: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin �ਾ�ਲਡ ਪਰ�ਸ�ਸ �ਵਾਬ ਨਹ�� ਦਿੰਦਾ, �ਤਮ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "SpamAssassin �ਾ�ਲਡ ਪਰ�ਸ�ੱਸ ਦ�ਲ ਦ� �ਡ��, �ਤਮ ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "SpamAssassin ਲ� ਪਾ�ਪ ਫ�ਲ�ਹ, �ਲਤ� ��ਡ: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin �ਪਲੱਬਧ ਨਹ�� ਹ�।"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "�ਹ Spamassasin ਨ�ੰ ਹ�ਰ ਵ� ਭਰ�ਸ�ਯ�� ਬਣਾ�ਦਾ ਹ�, ਪਰ ਹ�ਲ� �ਰਦਾ ਹ�"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 msgid "I_nclude remote tests"
 msgstr "ਰਿਮ�� �ਾ�� ਸ਼ਾਮਿਲ �ਰ�(_n)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr ""
-"SpamAssassin ਦ� ਵਰਤ�� �ਰ�� �ੰ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ �ਰਦ� ਹ�। �ਹ ਪਲੱ�-�ਨ ਲ� SpamAssassin �ੰਸ�ਾਲ "
-"ਹ�ਣਾ ਲਾ�਼ਮ� ਹ�।"
+#| msgid "Filters junk messages using Bogofilter."
+msgid "Filter junk messages using SpamAssassin."
+msgstr "SpamAssassin ਦ� ਵਰਤ�� �ਰ�� �ੰ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ �ਰ�।"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "Spamassassin ��ਣਾ�"
+#| msgid "SpamAssassin junk plugin"
+msgid "SpamAssassin Junk Filter"
+msgstr "SpamAssassin �ੰ� ਫਿਲ�ਰ"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "SpamAssassin �ੰ� ਪਲੱ�-�ਨ"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
-msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "�ੱ� ਸ�ਨ�ਹ� ਨਾਲ ਨੱਥ� ਸਭ ਦਸਤਾਵ��਼ �ਾ� ਭਾ�ਾ� ਨ�ੰ �ੱ�� ਵਾਰ ਸੰਭਾਲਣ ਲ� �ੱ� ਪਲੱ�-�ਨ ਹ�।"
-
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
-msgid "Save attachments"
-msgstr "ਨੱਥ� ਸੰਭਾਲ�"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "ਨੱਥ� ਸੰਭਾਲ�..."
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "ਸਭ ਨੱਥ� ਸੰਭਾਲ�..."
-
-#: ../plugins/save-attachments/save-attachments.c:321
-msgid "Select save base name"
-msgstr "ਸੰਭਾਲ ਮ�ਲ ਨਾ� ��ਣ�"
-
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "MIME Type"
-msgstr "MIME �ਿਸਮ"
-
-#: ../plugins/save-attachments/save-attachments.c:348
-msgid "Save"
-msgstr "ਸੰਭਾਲ�"
+msgid "SpamAssassin Options"
+msgstr "Spamassassin ��ਣਾ�"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
 msgstr "ਵ�ਰਵਾ ਲਿਸ�"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
 msgstr "���ਾ�ਰ� ਲਿਸ�"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Comment List"
 msgstr "�ਿੱਪਣ� ਲਿਸ�"
 
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Created"
-msgstr "ਬਣਾ��"
-
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Contact List"
 msgstr "ਸੰਪਰ� ਲਿਸ�"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "ਸ਼�ਰ�"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "ਸਮਾਪਤ"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "ਫ�-ਸਦ� ਮ��ੰਮਲ"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "ਦਰਸ਼� ਲਿਸ�"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "ਸ�ਧਿ�"
 
-#: ../plugins/save-calendar/csv-format.c:532
-msgid "Advanced options for the CSV format"
-msgstr "CSV ਫਾਰਮ�� ਲ� ਤ�ਨ��� ��ਣਾ�"
+#: ../plugins/save-calendar/csv-format.c:523
+#| msgid "Advanced options for the CSV format"
+msgid "A_dvanced options for the CSV format"
+msgstr "CSV ਫਾਰਮ�� ਲ� ਤ�ਨ��� ��ਣਾ�(_d)"
 
-#: ../plugins/save-calendar/csv-format.c:539
-msgid "Prepend a header"
-msgstr "ਸ��ਾ�� ਹ�ੱਡਰ"
+#: ../plugins/save-calendar/csv-format.c:530
+#| msgid "Prepend a header"
+msgid "Prepend a _header"
+msgstr "ਹ�ੱਡਰ �ੱ�� ����(_h)"
 
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Value delimiter:"
-msgstr "ਮ�ਲ ਸ�ਮਾ:"
+#: ../plugins/save-calendar/csv-format.c:539
+#| msgid "Value delimiter:"
+msgid "_Value delimiter:"
+msgstr "ਮ�ੱਲ ਸ�ਮਾ(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:554
-msgid "Record delimiter:"
-msgstr "ਰਿ�ਾਰਡ ਸ�ਮਾ:"
+#: ../plugins/save-calendar/csv-format.c:546
+#| msgid "Record delimiter:"
+msgid "_Record delimiter:"
+msgstr "ਰਿ�ਾਰਡ ਸ�ਮਾ(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:560
-msgid "Encapsulate values with:"
-msgstr "ਮ�ੱਲ �ਸ ਨਾਲ ਢੱ��:"
+#: ../plugins/save-calendar/csv-format.c:553
+#| msgid "Encapsulate values with:"
+msgid "_Encapsulate values with:"
+msgstr "ਮ�ੱਲ �ਸ ਨਾਲ ਢੱ��(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:575
 msgid "Comma separated value format (.csv)"
 msgstr "�ਾਮਿ�� ਨਾਲ ਵੱ� ਮ�ੱਲ਼ ਫਾਰਮ�� (.csv)"
 
@@ -19828,8 +19009,9 @@ msgid "Save Selected"
 msgstr "��ਣ� ਸੰਭਾਲ�"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
-msgstr "��ਣ� ��ਲੰਡਰ �ਾ� �ੰਮਾ� ਨ�ੰ ਡਿਸ� 'ਤ� ਸੰਭਾਲ�।"
+#| msgid "Saves selected calendar or tasks list to disk."
+msgid "Save a calendar or task list to disk."
+msgstr "��ਣ� ��ਲੰਡਰ �ਾ� �ਾਸ� ਲਿਸ� ਨ�ੰ ਡਿਸ� 'ਤ� ਸੰਭਾਲ�।"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
@@ -19844,33 +19026,40 @@ msgstr "ਡਿਸ� �ੱਤ� ਸੰਭਾਲ�(_S)"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "RDF ਫਾਰਮ�� (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:104
+#| msgid "Format"
+msgid "_Format:"
+msgstr "ਫਾਰਮ��(_F):"
+
+#: ../plugins/save-calendar/save-calendar.c:165
 msgid "Select destination file"
 msgstr "ਨਿਯਤ ਫਾ�ਲ ��ਣ�"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "�ੱ� ਸਰ�ਤ ��ਣ�"
+#| msgid "Selects a single calendar or task source for viewing."
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "ਤ�ਰੰਤ ਵ��ਣ ਲ� �ੱ� �ੱ�ਲ� ��ਲੰਡਰ �ਾ� �ਾਸ� ਲਿਸ� ��ਣ�।"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "ਵ��ਣ ਲ� �ੱ� �ੱ�ਲ� ��ਲੰਡਰ �ਾ� �ੰਮ ਸਰ�ਤ ਨ�ੰ ��ਣ�।"
+#| msgid "Select one source"
+msgid "Select One Source"
+msgstr "�ੱ� ਸਰ�ਤ ��ਣ�"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
-msgstr "ਸਿਰਫ਼ �ਹ ��ਲੰਡਰ ਹ� ਵ��ਾ�(_O)"
+msgstr "ਸਿਰਫ਼ �ਹ ��ਲੰਡਰ ਹ� ਵ���(_O)"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
 msgid "Show _only this Memo List"
-msgstr "��ਵਲ ਮ�ਮਰ� ਸ��� ਹ� ਵ���(_o)"
+msgstr "��ਵਲ ਮ�ਮ� ਲਿਸ� ਹ� ਵ���(_o)"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
-msgstr "ਸਿਰਫ਼ �ਹ �ੰਮ ਸ��� ਹ� ਵ��ਾ�(_O)"
+msgstr "ਸਿਰਫ਼ �ਹ �ਾਸ� ਲਿਸ� ਹ� ਵ���(_O)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -19880,55 +19069,56 @@ msgstr "�ਪਣ� ਸ਼�ਰ��ਤ� ��ਾ��� ਸ���ੱ
 msgid "Setup Assistant"
 msgstr "ਸ���ੱਪ ਸਹਾ��"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਸ�ੱ��ੱਪ ਸਹਾ�� "
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "�� ��� ਨ�ੰ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"�ਵ�ਲ�ਸ਼ਨ ਤ� ਸਵਾ�ਤ ਹ�, ��ਲ� ��� ਪਰਦ� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਤ�ਹਾਡ� �-ਮ�ਲ ��ਾ���ਾ� ਨਾਲ ���ਨ ਵਿੱ�\n"
-"ਸਹਾ�� ਹ�ਣ�� �ਤ� ਹ�ਰ �ਾਰ�ਾ� ਤ�� ਫਾ�ਲਾ� �ਯਾਤ �ਰਨ ਵਿੱ� ਮੱਦਦ �ਰਨ��।\n"
+"�ਵ�ਲ�ਸ਼ਨ ਵਲ�� �� ���� ਨ�ੰ। �ੱ�� ��� ਸ�ਰ�ਨਾ� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਤ�ਹਾਡ� �-ਮ�ਲ ��ਾ���ਾ� ਨਾਲ ���ਨ ਵਿੱ�\n"
+"ਸਹਾ�� ਹ�ਣ���� �ਤ� ਹ�ਰ �ਪਲ���ਸ਼ਨਾ� ਤ�� ਫਾ�ਲਾ� �ੰਪ�ਰ� �ਰਨ ਵਿੱ� ਮੱਦਦ �ਰਨ��।\n"
 "\n"
-"�ਿਰਪਾ �ਰ�� �ਾਰ� ਰਹਿਣ ਲ� \"�ੱ��\" ਬ�ਨ ਦਬਾ�।"
+"�ਾਰ� ਰੱ�ਣ ਥ� \"�ੱ��\" ਬ�ਨ ਨ�ੰ ਦੱਬ� ��। "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Importing files"
-msgstr "ਫਾ�ਲਾ� �ਯਾਤ ��ਤ��� �ਾ�ਦ��� ਹਨ"
+msgstr "ਫਾ�ਲਾ� �ੰਪ�ਰ� ��ਤ��� �ਾ ਰਹ��� ਹਨ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 msgid "Please select the information that you would like to import:"
-msgstr "�ਿਰਪਾ �ਰ�� �ਾਣ�ਾਰ�, �� ਵ� ਤ�ਸ�� �ਯਾਤ �ਰਨ� �ਾਹ�ੰਦ� ਹ�, ਨ�ੰ ��ਣ�:"
+msgstr "�ਾਣ�ਾਰ�, �� ਵ� ਤ�ਸ�� �ੰਪ�ਰ� �ਰਨ� �ਾਹ�ੰਦ� ਹ�, ਨ�ੰ ��ਣ� ��:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:152
-#: ../shell/e-shell-importer.c:394
+#: ../plugins/startup-wizard/startup-wizard.c:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
-msgstr "ਵੱਲ�� %s:"
+msgstr "%s ਤ��:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:548
 #, c-format
 msgid "Importing data."
-msgstr "ਡਾ�ਾ �ਯਾਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ�।"
+msgstr "ਡਾ�ਾ �ੰਪ�ਰ� ��ਤਾ �ਾ ਰਿਹਾ ਹ�"
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:562
 msgid "Please wait"
-msgstr "�ਿਰਪਾ �ਰ�� �ਡ���"
+msgstr "�ਡ��� ��"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr "ਵ��ਾ�ਦਾ ਹ� �ਿ �� ਸ�ਨ�ਹਿ�� ਦਾ ਥਰਿੱਡ ਵਿਸ਼� ਨਾਲ ਸਬੰਧਤ ਰਹ�।"
+#| msgid "Thread messages by subject"
+msgid "Sort mail message threads by subject."
+msgstr "ਪੱਤਰ ਸ�ਨ�ਹ� ਮਸਲਾ ਦ� ਵਿਸ਼� ਰਾਹ�� ਲ��ਬੱਧ �ਰ�।"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -19949,15 +19139,15 @@ msgid ""
 "message body."
 msgstr "ਸ�ਨ�ਹਾ ਮ�ੱ� ਭਾ� ਵਿੱ� ��ਪਲ�� ਪਲੱ��ਨ ਸਬ-�ਾ��ਲ ਲ� ਸ਼ਬਦ/ਮ�ੱਲ ��� ਦ� ਲਿਸ� ਹ�।"
 
-#: ../plugins/templates/templates.c:603
+#: ../plugins/templates/templates.c:601
 msgid "No title"
-msgstr "��� �ਾ��ਲ ਨਹ��"
+msgstr "�ਾ��ਲ ਨਹ��"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:709
 msgid "Save as _Template"
 msgstr "��ਪਲ�� ਵਾ�� ਸੰਭਾਲ�(_T)"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:711
 msgid "Save as Template"
 msgstr "��ਪਲ�� ਵਾ�� ਸੰਭਾਲ�"
 
@@ -19966,33 +19156,71 @@ msgid "Drafts based template plugin"
 msgstr "��ਪਲ�� ਪਲੱ��ਨ ਮ�ਤਾਬ� ਡਰਾਫ�"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "�ੱ� ਸ��ਪਲ ਪਲੱ��ਨ, �� �ਿ TNEF �����ਮ��� ਨ�ੰ ਡ���ਡ �ਰਨ ਲ� yTNEF ਵਰਤਦਾ ਹ�।"
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "ਮਾ��ਰ�ਸਾਫ� ���ਲ�ੱ� ਤ�� TNEF (winmail.dat) ਡ���ਡ �ਰ�।"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
-msgstr "TNEF �����ਮਿੰ� ਡ���ਡਰ"
+#| msgid "TNEF Attachment decoder"
+msgid "TNEF Decoder"
+msgstr "TNEF ਡ���ਡਰ"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+#| msgid "Multiple vCards"
+msgid "Inline vCards"
+msgstr "�ਨ-ਲਾ�ਨ vCards"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "ਮ�ਲ ਸ�ਨ�ਹਿ�� ਵਿੱ� ਸਿੱਧ� vCard ਵ���।"
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+msgid "Show Full vCard"
+msgstr "ਪ�ਰਾ vCard ਵ���"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+msgid "Show Compact vCard"
+msgstr "ਥ��ਾ vCard ਵ���"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+#| msgid "There is one other contact."
+#| msgid_plural "There are %d other contacts."
+msgid "There is one other contact."
+msgstr "�ੱ� ਹ�ਰ ਸੰਪਰ� ਹ�।"
+
+#: ../plugins/vcard-inline/vcard-inline.c:231, c-format
+#| msgid "There is one other contact."
+#| msgid_plural "There are %d other contacts."
+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:252
+#| msgid "Save in address book"
+msgid "Save in Address Book"
+msgstr "�ਡਰ�ੱਸ ਬ�ੱ� ਵਿੱ� ਸੰਭਾਲ�"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "WebDAV ਸੰਪਰ� ਸ�ੱ��ੱਪ �ਰਨ ਲ� �ੱ� ਪਲੱ�-�ਨ ਹ�।"
+#| msgid "WebDAV contacts"
+msgid "Add WebDAV contacts to Evolution."
+msgstr "WebDAV ਸੰਪਰ� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� ਸ਼ਾਮਲ �ਰ�।"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV ਸੰਪਰ�"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:337
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:364
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "��-ਮ�ਲ �ਣਡਿੱਠਾ (_Apache < 2.2.8 ਦ� ਲ�� ਹ�)"
+msgstr "ifMatch �ਣਡਿੱਠਾ (_Apache < 2.2.8 ਦ� ਲ�� ਹ�)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -20074,42 +19302,62 @@ msgstr ""
 "keyring �ਾ� ~/.gnome2_private/Evolution ਪਾਸਵਰਡ ਫਾ�ਲ ਤ�� ਲਿ� �ਾ�ਦਾ ਹ�।"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
+#| msgid "Insert Attachment"
+msgid "Initial attachment view"
+msgstr "ਸ਼�ਰ��ਤ� ����ਮ��� �ਲ�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+#| msgid "Install the shared folder"
+msgid "Initial file chooser folder"
+msgstr "ਸ਼�ਰ��ਤ� ਫਾ�ਲ ��ਣ�ਾਰ ਫ�ਲਡਰ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "GtkFileChooser ਡਾ�ਲਾ� ਲ� ਸ਼�ਰ��ਤ� ਫ�ਲਡਰ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr "����ਮ��� ਪੱ�� ਵਿਦ��ੱ� ਲ� ਸ਼�ਰ��ਤ� �ਲ�। \"0\" ���ਾਨ �ਲ� ਲ�, \"1\" ਲਿਸ� �ਲ� ਲ�।"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Last upgraded configuration version"
 msgstr "��ਰ� ਨਵ�ਨ ਸੰਰ�ਨਾ ਵਰ�ਨ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "ਫ�ਲਡਰ, �� �ਿ �ਫਲ਼ਾ�ਨ ਲ� ਸਿ�ਰ�ਨਾ��਼ �ਰਨ� ਹਨ, ਦ� ਰਸਤ� ਦ� ਲਿਸ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Non-proxy hosts"
 msgstr "�਼�ਰ-ਪਰਾ�ਸ� ਹ�ਸ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "�ਦ�� HTTP ਪਰਾ�ਸ� ��ਤਾ �ਾਵ� ਤਾ� ਪਰਮਾਣ�ਿਤਾ ਵਾਸਪ� ਪਾਸਵਰਡ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Proxy configuration mode"
 msgstr "ਪਰਾ�ਸ� ਸੰਰ�ਨਾ ਮ�ਡ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "SOCKS proxy host name"
 msgstr "SOCKS ਪਰਾ�ਸ� ਹ�ਸ� ਨਾ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "SOCKS proxy port"
 msgstr "SOCKS ਪਰਾ�ਸ� ਪ�ਰ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Secure HTTP proxy host name"
 msgstr "ਸ�ਰੱ�ਿ�ਤ HTTP ਪਰਾ�ਸ� ਹ�ਸ� ਨਾ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Secure HTTP proxy port"
 msgstr "ਸ�ਰੱ�ਿ�ਤ HTTP ਪਰਾ�ਸ� ਪ�ਰ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -20120,41 +19368,41 @@ msgstr ""
 "ਨਹ��\", \"��ਦ ਪਰਾ�ਸ� ਸੰਰ�ਨਾ ਦਿ�\" �ਤ� \"autoconfig url ਵਿੱ� ਦਿੱਤ� ਪਰਾ�ਸ� ਸੰਰ�ਨਾ ਵਰਤ��"
 "\" ਹਨ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
 msgstr "ਬਾਹ� ਵ��ਾ� ਦਿੰਦ� ਹ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Skip development warning dialog"
 msgstr "ਵਿ�ਾਸ ��ਤਾਵਨ� ਪ�ੱ��ਿੱ� ਡਾ�ਲਾ� �ੱਡ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "�ਫਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Statusbar is visible"
 msgstr "ਹਾਲਤ-ਪੱ�� ਵ��ਾ� ਦਿੰਦ� ਹ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਦਾ ਸੰਰ�ਨਾ ਵਰ�ਨ, ਵੱਧ/�ੱ�/ਸੰਰ�ਨਾ ਪੱਧਰ ਨਾਲ (�ਦਾਹਰਨ ਲ� \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default height for the main window, in pixels."
 msgstr "ਸ�ਨ�ਹਾ ਵਿੰਡ� ਦ� ਡਿਫਾਲ� ��ਾ�, ਪਿ�ਸਲ ਵਿੱ� ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The default width for the main window, in pixels."
 msgstr "ਸ�ਨ�ਹਾ �ਰ��� ਦ� ਮ�ਲ ���ਾ�, ਪਿ�ਸਲ ਵਿੱ� ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default width for the sidebar, in pixels."
 msgstr "ਬਾਹ� ਦ� ਮ�ਲ ���ਾ�, ਪਿ�ਸਲ ਵਿੱ� ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20162,19 +19410,19 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ ਦਾ ��ਰ� �ੱਪ�ਰ�ਡ ��ਤਾ ਸੰਰ�ਨਾ ਵਰ�ਨ, ਵੱਧ/�ੱ�/ਸੰਰ�ਨਾ ਪੱਧਰ ਨਾਲ (�ਦਾਹਰਨ ਲ� \"2.6.0"
 "\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy HTTP through."
 msgstr "ਪਰਾ�ਸ� HTTP ਰਾਹ�� ਮਸ਼�ਨ ਨਾ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The machine name to proxy secure HTTP through."
 msgstr "ਪਰ�ਾਸ� ਸ�ਰੱ�ਿ�ਤ HTTP ਰਾਹ�� ਮਸ਼�ਨ ਨਾ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The machine name to proxy socks through."
 msgstr "ਪਰਾ�ਸ� ਸਾ�� ਰਾਹ�� ਮਸ਼�ਨ ਨਾ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20182,7 +19430,7 @@ msgstr ""
 "ਮਸ਼�ਨ ਦ� ਪ�ਰ� ਨ�ੰ \"/apps/evolution/shell/network_config/http_host\" ਰਾਹ�� ਦਿੱਤਾ "
 "�ਾ ਸ�ਦਾ ਹ�, �� ਤ�ਹਾਨ�ੰ ਪਰਾ�ਸ� �ਰਦਾ ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20190,7 +19438,7 @@ msgstr ""
 "ਮਸ਼�ਨ ਦ� ਪ�ਰ� ਨ�ੰ  \"/apps/evolution/shell/network_config/secure_host\" ਰਾਹ�� "
 "ਦਿੱਤਾ �ਾ ਸ�ਦਾ ਹ�, �� ਤ�ਹਾਨ�ੰ ਪਰਾ�ਸ� �ਰਦਾ ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20198,7 +19446,7 @@ msgstr ""
 "ਮਸ਼�ਨ ਦ� ਪ�ਰ� ਨ�ੰ \"/apps/evolution/shell/network_config/socks_host\"ਰਾਹ�� ਦਿੱਤਾ "
 "�ਾ ਸ�ਦਾ ਹ�, �� ਤ�ਹਾਨ�ੰ ਪਰਾ�ਸ� �ਰਦਾ ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20207,66 +19455,66 @@ msgstr ""
 "ਵਿੰਡ� ਬ�ਨਾ� ਦਾ ਸ�ਾ�ਲ ਹ�। \"���ਸ�\", \"���ਾਨ\", \"ਦ�ਵ��\", \"��ਲਬਾਰ\" ਸੰਭਵ ਹ�। �� \"��ਲਬਾਰ"
 "\" ਨ�ੰ ��ਣਿ� �ਿ� ਤਾ�, �ਨ�ਮ ��ਲਬਾਰ ਸ��ਿੰ� ਰਾਹ�� ਹ� ਬ�ਨਾ� ਦਾ ਸ�ਾ�ਲ ਲਿ� �ਾਵ��ਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
 "(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
-" �ਸ ��ੰ�� ਵਿੱ� ਹ�ਸ�ਾ� ਦ� ਲਿਸ� ਹ�, �� �ਿ ਸਿੱਧ� ��ਨ��� ਹਨ, ਨਾ �ਿ ਪਰਾ�ਸ� ਰਾਹ�� (�� �ਹ ���ਿਵ ਹ�ਵ�)। �ਹ "
-"ਮ�ੱਲ ਵਿੱ� ਹ�ਸ�-ਨਾ�, ਡ�ਮ�ਨ (ਸ਼�ਰ��ਤ� ਵਲਾ�ਡ-�ਾਰਡ *.foo.com �ਦਿ ਨਾਲ), IP ਹ�ਸ� �ਡਰ�ੱਸ "
+" �ਸ ��ੰ�� ਵਿੱ� ਹ�ਸ�ਾ� ਦ� ਲਿਸ� ਹ�, �� �ਿ ਸਿੱਧ� ��ਨ��� ਹਨ, ਨਾ �ਿ ਪਰਾ�ਸ� ਰਾਹ�� (�� �ਹ ���ਿਵ "
+"ਹ�ਵ�)। �ਹ ਮ�ੱਲ ਵਿੱ� ਹ�ਸ�-ਨਾ�, ਡ�ਮ�ਨ (ਸ਼�ਰ��ਤ� ਵਲਾ�ਡ-�ਾਰਡ *.foo.com �ਦਿ ਨਾਲ), IP ਹ�ਸ� �ਡਰ�ੱਸ "
 "(IPv੪ �ਤ� IPv੬ ਦ�ਵਾ�) ਨਾਲ �ਤ� ਨ�ੱ�ਵਰ� �ਡਰ�ੱਸ ਨਾਲ ਨ�ੱ�ਮਾਸ� (�ਿਵ�� �ਿ 192.168.0.0/24) ਹਨ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
 msgstr "��ਲਬਾਰ �ਪਲੱਬਧ ਹ�"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "URL that provides proxy configuration values."
 msgstr "URL �� �ਿ ਪਰਾ�ਸ� ਸੰਰ�ਨਾ ਮ�ੱਲ ਦਿੰਦਾ ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Use HTTP proxy"
 msgstr "HTTP ਪਰਾ�ਸ� ਵਰਤ��"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "ਪਰਮਾਣ�ਿਤਾ ਵ��� ਦ�ਣ ਲ� ਯ��਼ਰ ਨਾ�, �ਦ�� �ਿ HTTP ਪਰਾ�ਸ� �ਾਰ� ਹ�ਵ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "�� �ਵ�ਲ�ਸ਼ਨ �ਫਲਾ�ਨ ਢੰ� ਨਾਲ ਸ਼�ਰ� ��ਤਾ �ਾਵ��ਾ, ਨਾ�ਿ �ਨਲਾ�ਨ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether or not the window should be maximized."
 msgstr "�� �ਰ��� ਨ�ੰ ਵੱਧ ਤ�� ਵੱਧ ��ਾਰ ਦਿੱਤਾ �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the sidebar should be visible."
 msgstr "�� ਬਾਹ� ਵ��ਾ� ਦ�ਣ� �ਾਹ�ਦ� ਹ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
 msgstr "�� ਹਾਲਤ-ਪੱ�� ਵ��ਾ� �ਾਵ� �ਾ� ਨਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr "�� ਸੰਦ ਪੱ�� �ਪਲੱਬਧ ਹ�ਵ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "�� �ਵ�ਲ�ਸ਼ਨ ਦ� ਵਿ�ਾਸ ਵਰ�ਨ ਡਾ�ਲਾ� ਨ�ੰ ਵ��ਾ�� ਨਾ �ਾਵ�।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "�� ਵਿੰਡ� ਬ�ਨ ਵ��ਾ� ਦ�ਣ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "ਵਿੰਡ� ਬ�ਨ ਸ�ਾ�ਲ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "ਵਿੰਡ� ਬ�ਨ ਦਿੱ� ਹਨ।"
 
@@ -20282,21 +19530,21 @@ msgstr "ਸਰ�ਰਮ ��ਨ��ਸ਼ਨ ਦਬਾ�"
 msgid "Click OK to close these connections and go offline"
 msgstr "�ਹ ��ਨ��ਸ਼ਨ ਬੰਦ �ਰਨ ਲ� �ਤ� �ਫਲਾ�ਨ �ਾਣ ਲ� OK ਦਬਾ�"
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-importer.c:128
 msgid "Choose the type of importer to run:"
 msgstr "�ਲਾ�ਣ ਲ� �ਯਾਤ�ਾਰ ਦ� �ਿਸਮ ��ਣ�:"
 
-#: ../shell/e-shell-importer.c:134
+#: ../shell/e-shell-importer.c:131
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "ਫਾ�ਲ, �� ਵ� ਤ�ਸ�� �ਵ�ਲ�ਸ਼ਨ ਵਿੱ� �ਯਾਤ �ਰਨ� ਹ� �ਤ� �ਸ ਦ� �ਿਸਮ ਸ��� ਵਿੱ��� ��ਣ�।"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
 msgstr "�ਸ �ਯਾਤ ਲ� ਨਿਯਤ ਸਥਾਨ ��ਣ�"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20308,81 +19556,85 @@ msgstr ""
 "�ਯਾਤ ��ਤ� �ਾ ਸ�� ਨਹ�� ਲੱਭ� ਹ�। ���ਰ ਤ�ਸ�� ਮ�� ��ਸ਼ਿਸ �ਰਨ� �ਾਹ�ੰਦ�\n"
 "ਹ� ਤਾ� \"ਪਿੱ��\" ਬ�ਨ ਨ�ੰ ਦਬਾ �� ਮ�� ��ਸ਼ਿਸ �ਰ ਸ�ਦ� ਹ�।\n"
 
-#: ../shell/e-shell-importer.c:282
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "ਫਾ�ਲ਼ ਨਾ�(_i):"
 
-#: ../shell/e-shell-importer.c:287
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "�ੱ� ਫਾ�ਲ ��ਣ�"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "ਫਾ�ਲ �ਿਸਮ(_t):"
 
-#: ../shell/e-shell-importer.c:332
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr "ਪ�ਰਾਣ� �ਾਰ� ਤ�� ਡਾ�ਾ �ਤ� ਸ��ਿੰ� �ਯਾਤ �ਰ�"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr "�ੱ� ��ਹ�ਰ� ਫਾ�ਲ �ਯਾਤ �ਰ�(_s)"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-importer.c:743
+msgid "_Import"
+msgstr "�ਯਾਤ(_I)"
+
+#: ../shell/e-shell-settings-dialog.c:312
 msgid "Evolution Preferences"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਪਸੰਦ"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - �ਵ�ਲ�ਸ਼ਨ"
 
-#: ../shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "�ਨ�ਮ ਪਾ�ਲ� ਤ�ਹਾਡ� ਸਿਸ�ਮ ਤ� �ੰਸ�ਾਲ ਨਹ�� �ਾਪਦਾ ਹ�।"
 
-#: ../shell/e-shell-window-commands.c:83
-#, c-format
-msgid "Error executing %s."
-msgstr "%s �ਲਾ�ਣ ਵਿੱ� �ਲਤ�।"
+#: ../shell/e-shell-window-commands.c:78, c-format
+#| msgid "Error executing %s."
+msgid "Error executing %s. (%s)"
+msgstr "%s �ਲਾ�ਣ ਵਿੱ� �ਲਤ�: (%s)"
 
-#: ../shell/e-shell-window-commands.c:139
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr "ਬੱ�-ਬੱਡ� �ੰਸ�ਾਲ ਨਹ�� ਹ�।"
 
-#: ../shell/e-shell-window-commands.c:142
+#: ../shell/e-shell-window-commands.c:138
 msgid "Bug buddy could not be run."
 msgstr "ਬੱ�-ਬੱਡ� ਨ�ੰ �ਲਾ�� ਨਹ�� �ਾ ਸ�ਿ� ਹ�।"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:942
+#: ../shell/e-shell-window-commands.c:938
 msgid "translator-credits"
 msgstr ""
 "�ਮਨਪਰ�ਤ ਸਿੰ� �ਲਮ\n"
 "Punjabi OpenSource Team\n"
 "http://www.satluj.org/";
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-commands.c:949
 msgid "Evolution Website"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ਵ�ੱਬਸਾ��"
 
-#: ../shell/e-shell-window-commands.c:1170
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
 msgstr "�ਨ-ਲਾ�ਨ �ਾ�(_W)"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "�ਫ਼-ਲਾ�ਨ �ਾ�(_W)"
 
-#: ../shell/e-shell-window-commands.c:1196
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
 msgstr "�ਫ-ਲਾ�ਨ �ਾ�"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:372
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20390,11 +19642,11 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਨਲਾ�ਨ ਹ�।\n"
 "�ਸ ਬ�ਨ ਨ�ੰ �ਫਲਾ�ਨ ਹ�ਣ ਲ� ਦਬਾ�।"
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ਫਲਾ�ਨ ਹ�ਣ ਦ� �ਾਰਵਾ� �ਧ�ਨ ਹ�।"
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:386
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20402,52 +19654,52 @@ msgstr ""
 "�ਵ�ਲ�ਸ਼ਨ �ਸ ਸਮ�� �ਫਲਾ�ਨ ਹ�।\n"
 "�ਸ ਬ�ਨ ਨ�ੰ �ਨਲਾ�ਨ �ਾਣ ਲ� ਵਰਤ��।"
 
-#: ../shell/e-shell-window.c:785
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ਲ� ਤਬਦ�ਲ"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:634
 msgid "Unknown system error."
 msgstr "�ਣ�ਾਣ ਸਿਸ�ਮ �ਲਤ� ਹ�।"
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld �ਿਬਾ"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "ਠ�� ਹ�"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "�ਲਤ �ਰ��ਮਿੰ�"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr "OAF ਤ� ਰ�ਿਸ�ਰ ਨਹ�� ਹ� ਸ�ਿ� ਹ�"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1257
 msgid "Configuration Database not found"
 msgstr "ਸੰਰ�ਨਾ ਡਾ�ਾਬ�ਸ ਨਹ�� ਲੱਭਾ ਹ�"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "ਨਵਾ�"
 
-#: ../shell/test/evolution-test-component.c:105
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr "ਨਵ�� �ਾ��"
 
-#: ../shell/test/evolution-test-component.c:106
+#: ../shell/test/evolution-test-component.c:104
 msgctxt "New"
 msgid "_Test"
 msgstr "�ਾ��(_T)"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
 msgstr "�ੱ� ਨਵ�� �ਾ�� ��ਾ� ਬਣਾ�"
 
@@ -20490,7 +19742,7 @@ msgstr ""
 "�ਰ ਸ�ਦ� ਹ�।"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20525,7 +19777,7 @@ msgstr ""
 "ਸਾਨ�ੰ �ਮ�ਦ ਹ� ਮਿੱਤਰ ਤ�ੰ ਸਾਡ� ਮ�ਹਨਤ ਦਾ �ਨੰਦ ਮਾਣ��ਾ �ਤ� �ਸ�� ਤ�ਰ� �ਸ ਸਹਿਯ�� ਦਾ\n"
 "ਤਹਿ ਦਿਲ�� ਧੰਨਵਾਦ �ਰਦ� ਹਾ�\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20533,43 +19785,43 @@ msgstr ""
 "ਧੰਨਵਾਦ\n"
 "�ਵ�ਲ�ਸ਼ਨ ��ਮ\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "ਮ�ਨ�ੰ ਮ�� ਨਾ ਦੱਸ�"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "�ਵ�ਲ�ਸ਼ਨ �ੱ� �ਾਸ ਭਾ� ਦ� ਸਰ�ਰਮ� ਨਾਲ ਸ਼�ਰ� ਹ� ਰਹ� ਹ�"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr "�ਨਲਾ�ਨ ਮ�ਡ ਵਿੱ� ਸ਼�ਰ�"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr "ਸਭ �ਵ�ਲ�ਸ਼ਨ ਭਾ� ਮ�ਬ�ਰ �ਰ�� ਬੰਦ �ਰ�"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "�ਵ�ਲ�ਸ਼ਨ ੧.੪ ਤ�� ਮ�ਬ�ਰ �ਰ�� ਵਾਪਿਸ"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr "ਸਾਰ� ਭਾ�ਾ� ਦ� ਡ�ਬੱ� ���ਪ�ੱ� �ੱ� ਫਾ�ਲ ਵਿੱ� ਭ���।"
 
-#: ../shell/main.c:497
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
 msgstr "��� ਪਲੱ�-�ਨ ਲ�ਡ ਤ�� ਰ�� ਹ�।"
 
-#: ../shell/main.c:499
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ਮ�ਲ, ਸੰਪਰ� �ਤ� �ੰਮ ਲ� �ਲ� ਪ�ਨ �ਯ�� �ਰ�।"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
 msgstr "- �ਵ�ਲ�ਸ਼ਨ PIM �ਤ� �-ਮ�ਲ �ਲਾ��"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20726,7 +19978,7 @@ msgstr ""
 "\n"
 "ਵਿਸ਼ਵਾਸ ਸ��ਿੰ� ਵਿੱ� ਸ�ਧ:"
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20735,7 +19987,7 @@ msgstr ""
 "�ਿ��ਿ ਤ�ਸ�� ਸਰ��ਫਿ��� ਪ�ਰਮਾਣਿ�ਤਾ ਤ� ਭਰ�ਸਾ� �ਰਦ� ਹ�, ਸ� ਤ�ਸ� �ਸ ਸਰ��ਫਿ��� ਤ� ਭਰ�ਸਾ �ਰ ਸ�ਦ� "
 "ਹ�, �ਦ�� ਤੱ� �ਿ ਦਿ�ਾ�� ਨਾ �ਿ� ਹ�ਵ�"
 
-#: ../smime/gui/cert-trust-dialog.c:155
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20745,8 +19997,8 @@ msgstr ""
 "ਸ�ਦ� ਹ�, �ਦ�� ਤੱ� �ਿ ਦਿ�ਾ�� ਨਾ �ਿ� ਹ�ਵ�"
 
 #: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:609
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 msgid "Select a certificate to import..."
 msgstr "�ਯਾਤ �ਰਨ ਲ� ਸਰ��ਫਿ��� ��ਣ�..."
 
@@ -20754,41 +20006,41 @@ msgstr "�ਯਾਤ �ਰਨ ਲ� ਸਰ��ਫਿ��� ��ਣ�..
 msgid "All PKCS12 files"
 msgstr "ਸਭ PKCS12 ਫਾ�ਲਾ�"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:396
-#: ../smime/gui/certificate-manager.c:623
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:625
 msgid "All files"
 msgstr "ਸਭ ਫਾ�ਲਾ�"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:486
-#: ../smime/gui/certificate-manager.c:711
+#: ../smime/gui/certificate-manager.c:275
+#: ../smime/gui/certificate-manager.c:488
+#: ../smime/gui/certificate-manager.c:713
 msgid "Certificate Name"
 msgstr "ਸਰ��ਫਿ��� ਨਾ�"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:504
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 msgid "Purposes"
 msgstr "ਮ�ਸਦ"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "�ਰਮ �ੰ�"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr "ਮਿ�ਦ"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:392
 msgid "All email certificate files"
 msgstr "ਸਭ �ਮ�ਲ ਸਰ��ਫਿ��� ਫਾ�ਲਾ�"
 
-#: ../smime/gui/certificate-manager.c:495
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ"
 
-#: ../smime/gui/certificate-manager.c:618
+#: ../smime/gui/certificate-manager.c:620
 msgid "All CA certificate files"
 msgstr "ਸਭ CA ਸਰ��ਫਿ��� ਫਾ�ਲਾ�"
 
@@ -20891,7 +20143,7 @@ msgstr ""
 "�ਿਸ� �ੰਮ ਲ� �ਸ CA ਤ� ਭਰ�ਸਾ �ਰਨ ਤ�� ਪਹਿਲਾ� ਤ�ਹਾਨ�ੰ �ਸ ਦਾ ਸਰ��ਫਿ��� ਵ�� ਲ�ਣਾ �ਾਹ�ਦਾ ਹ� �ਤ� �ਸ "
 "ਦ��� ਪਾਲਸ��� ਤ� ਹਦਾ�ਤਾ� �ਾ�� ਲਵ�।"
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "ਸਰ��ਫਿ���"
 
@@ -20967,11 +20219,11 @@ msgstr "ਸੰ�ਠਨ ��ਾ� (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 ਨਿਸ਼ਾਨ"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "SSL �ਲਾ�� ਸਰ��ਫਿ���"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "SSL ਸਰਵਰ ਸਰ��ਫਿ���"
 
@@ -21017,7 +20269,7 @@ msgstr "CA ਭਰ�ਸਾ ਸ�ਧ(_E)"
 
 #  XXX we shouldn't be popping up dialogs in this code.
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:656
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "ਸਰ��ਫਿ��� ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�"
 
@@ -21026,161 +20278,161 @@ msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "ਦਸਤ�ਤ"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "�ੰ��ਰਿਪ�"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "ਵਰ�ਨ"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "ਵਰ�ਨ 1"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "ਵਰ�ਨ 2"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "ਵਰ�ਨ ੩"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 RSA ���ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD੫ RSA ���ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 RSA ���ਰਿਪਸ਼ਨ ਨਾਲ"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA ���ਰਿਪਸ਼ਨ"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "ਸਰ��ਫਿ��� ��ੰ�� ਵਰਤ��"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "ਨ�ੱ�ਸ��ਪ ਸਰ��ਫਿ��� �ਿਸਮ"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "ਸਰ��ਫਿ��� ਪ�ਰਮਾਣ�ਿਤਾ �� ਪ�ਾਣ�ਰਤਾ"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "��ਾ� ਪ�ਾਣ�ਰਤਾ (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "�ਲ��ਰਿਥਮ ਪ�ਾਣ�ਰਤਾ"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "�ਲ��ਰਿਥਮ ਪ�ਰਾਮ��ਰ"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "ਵਿਸ਼ਾ ਸਰਵ�ਨ� �� �ਾਣ�ਾਰ�"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "ਵਿਸ਼� ਦਾ ਸਰਵ�ਨ� �� �ਲ��ਰਿਥਮ"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "ਵਿਸ਼� ਦ� ਸਰਵ�ਨ� ��"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "�ਲਤ�: �ਾਰ� ਵਾਧ� ਲ� �ਸਫਲ"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "�ਬ���� ਦਸਤ�ਤ"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "SSL ਸਰ��ਫਿ��� ਪ�ਰਮਾਣ�ਿਤਾ"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "�-ਮ�ਲ ਸਰ��ਫਿ��� ਪ�ਰਮਾਣ�ਿਤਾ"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "ਦਸਤ�ਤ"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "ਨਾ-�ਨ�ਾਰ"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "�� �ਨਸ�ਫ�ਰਮ���"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "ਡਾ�ਾ �ਨਸ�ਫ�ਰਮ���"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "��ੰ�� ��ਰਾਰਨਾਮਾ"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ�"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "CRL ਦਸਤ�ਤ�"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "ਨਾ�਼��"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "�ਾਤ� ਨਹ��"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "ਵਾਧਾ"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ �ਲ��ਰਿਥਮ"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "�ਾਰ� �ਰਤਾ"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "�ਾਰ� �ਰਤਾ ਵਿਲੱ�ਣ ID"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "ਵਿਸ਼ਾ ਵਿਲੱ�ਣ ID"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "ਸਰ��ਫਿ��� ਦਸਤ�ਤ ਮ�ੱਲ"
 
@@ -21328,7 +20580,7 @@ msgstr "��ਣ� ਸੰਪਰ� VCard ਵ��� ਸੰਭਾਲ�"
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "��ਣ� ਫ�ਲਡਰ ਦ� ਸੰਪਰ�ਾ� ਨ�ੰ VCard ਵਾ�� ਸੰਭਾਲ�"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2721
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "ਸਭ ��ਣ�"
 
@@ -21462,7 +20714,7 @@ msgid "Month"
 msgstr "ਮਹ�ਨਾ"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "�ੱ��"
 
@@ -21470,8 +20722,8 @@ msgstr "�ੱ��"
 msgid "Previews the calendar to be printed"
 msgstr "ਪਰਿੰ� �ਰਨ ਵਾਲ� ��ਲੰਡਰ ਦ� �ਲ�"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "ਪਿੱ��"
 
@@ -21780,7 +21032,7 @@ msgstr "ਮਸਲਾ ਸ�ਨ�ਹਾ ਲਿਸ�"
 msgid "_Group By Threads"
 msgstr "ਥਰਿੱਡ ਨਾਲ �ਰ�ੱਪ(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "ਸ�ਨ�ਹਾ(_M)"
@@ -22035,199 +21287,183 @@ msgid "Paste messages from the clipboard"
 msgstr "ਸ�ਨ�ਹ� �ਲਿੱਪਬ�ਰਡ ਵਿੱ��� ��ਪ�"
 
 #: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "ਫ�ਲਡਰ ਲ� ਨਵਾ� ਸ�ਨ�ਹਾ ਭ���(_t)"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "�ੱ� �ਵਾਬ ਭ���(_y)"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "ਸ�ਨ�ਹਾ ਸਰਵ�ਨ� ਫ�ਲਡਰ ਵਿੱ� ਭ���"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "ਸਰਵ�ਨ� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨ�ਹਾ �ਵਾਬ ਲ� ਭ���"
-
-#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "�ਾਸ ਸ�ਨ�ਹਾ ਵ��ਾ�(_e)"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
 msgstr "ਪਰਿੰ� ��ਤ� �ਾਣ ਵਾਲ� ਸ�ਨ�ਹ� ਦ� �ਲ�"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "�ਹ ਸ�ਨ�ਹਾ ਪਰਿੰ� �ਰ�"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr "ਵਾਪਸ(_d)"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "��ਣ� ਸ�ਨ�ਹ� �ਿਸ� ਵੱਲ ਭ���"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "���ਸ� ਨ�ੰ �ਸਲ� ��ਾਰ ਮ�ਤਾਬ� ਵ��ਾ�"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Save the selected messages as a text file"
 msgstr "ਸ�ਨ�ਹਿ�� ਨ�ੰ ���ਸ� ਫਾ�ਲ਼ ਦ� ਤ�ਰ �ੱਤ� ਸੰਭਾਲ�"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Search Folder from Mailing _List..."
 msgstr "ਮ�ਲਿੰ� ਸ��� ਤ�� ��� ਫ�ਲਡਰ(_L)..."
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
 msgstr "ਪਰਾਪਤ �ਰਤਾ ਤ�� ��� ਫ�ਲਡਰ(_t)..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr "ਵਿਸ਼� ਤ�� ��� ਫ�ਲਡਰ(_u)..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 msgstr "ਭ��ਣ ਵਾਲ� ਤ�� ��� ਫ�ਲਡਰ(_d)..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr "ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ਵਿੱ� ���ਸ� ਦ� ���"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Select _All Text"
 msgstr "ਸਭ ���ਸ� ��ਣ�(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr "�ੱ� ਸ�ਨ�ਹ� ਵਿੱ� ਸਭ ���ਸ� ��ਣ�"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "�ਪਣ� ਮ���ਦਾ ਪਰਿੰ�ਰ ਲ� ਸਫਾ ਸ��ਿੰ� ਵ��ਾ�"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "ਦਿੱਸ ਰਹ� ਸ�ਨ�ਹ� ਵਿੱ� �ਰਸਰ �ਪ�ਦ� ਵ��ਾ�"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr "ਸ�ਨ�ਹ� ਸਭ �-ਮ�ਲ ਹ�ੱਡਰਾ� ਨਾਲ ਵ��ਾ�"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "ਸ�ਨ�ਹ� ਦ� �ੱ�� �-ਮ�ਲ ਸਰ�ਤ ਵ��ਾ�"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Undelete the selected messages"
 msgstr "��ਣ� ਸ�ਨ�ਹ� ਨਾ-ਹ�ਾ� ਬਣਾ�"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "ਨਾ-�ਾਸ(_m)"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "�਼�ਮ ਬਾਹਰ(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "ਨੱਥ�(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "_Caret Mode"
 msgstr "��ਪਤ-ਲ��ਣ ਢੰ�(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "ਨਿਸ਼ਾਨ ਸਾਫ਼(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "ਸ�ਨ�ਹਾ ਹ�ਾ�(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Find in Message..."
 msgstr "ਸ�ਨ�ਹ� '� ���(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Flag Completed"
 msgstr "ਨਿਸ਼ਾਨ ਸਮਾਪਤ (_F)"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "�ਾ�(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "�ਾਸ(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "ਲਾ�ਨ ਵਿੱ�(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "�ੰ�(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "�ਿੱਤਰ ਲ�ਡ(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "ਸ�ਨ�ਹਾ ਸਰ�ਤ(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "�ੱ�� ਸ�ਨ�ਹਾ(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "�ਮ ��ਾਰ(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "�ੰ� ਨਹ��(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "ਨਵ�� �ਰ��� '� ��ਲ�ਹ�(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "ਪਿੱ�� ਸ�ਨ�ਹਾ(_P)"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
 msgstr "ਹਵਾਲਾ(_Q)"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Read"
 msgstr "ਪ��ਹਨ(_R)"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "ਸ�ਨ�ਹਾ ਸੰਭਾਲ�(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "ਨਾ-ਹ�ਾ�� ਸ�ਨ�ਹਾ(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr "ਨਾ-ਪ�ਿ�(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "�਼�ਮ(_Z)"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "�਼�ਮ �ੰਦਰ(_Z)"
 
@@ -22588,11 +21824,11 @@ msgid "With _Status"
 msgstr "ਹਾਲਤ ਨਾਲ(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
 msgid "UTC"
 msgstr "UTC"
 
@@ -22621,19 +21857,19 @@ msgstr ""
 "ਮਾ�ਸ ਦਾ �ੱਬਾ ਬ�ਨ ��ਤਰ ਦਾ ��ਾਰ ਵੱਡਾ �ਰਨ ਲ� ਵਰਤ�� �ਤ� ਸਮਾ� ��ਤਰ ��ਣ�।\n"
 "ਮਾ�ਸ ਦਾ ਸੱ�ਾ ਬ�ਨ ��ਤਰ ��ਾ�ਣ ਦ� �ੰਮ �ਵ��ਾ।"
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "ਭੰਡਾਰ"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%s ਲ� �ਲ� ਪਰਿਭਾਸ਼ਾ"
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "�ਲ� ਪਰਿਭਾਸ਼ਾ"
 
@@ -22643,17 +21879,16 @@ msgid "Define Views for \"%s\""
 msgstr "\"%s\" ਲ� �ਲ� ਪਰਿਭਾਸ਼ਿਤ"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "��ਬਲ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "ਮ��ਾ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "ਮ���ਦਾ �ਲ� ਸੰਭਾਲ�"
 
@@ -22666,17 +21901,17 @@ msgid "_Replace existing view"
 msgstr "ਮ���ਦਾ �ਲ� ਤਬਦ�ਲ(_R)"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "�ਸ�ਮ �ਲ�"
 
-#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "�ਸ�ਮ �ਲ� ਸੰਭਾਲ�"
 
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
 msgstr "�ਲ� ਪ�ਰਭਾਸ਼ਿਤ �ਰ�..."
 
@@ -22684,32 +21919,32 @@ msgstr "�ਲ� ਪ�ਰਭਾਸ਼ਿਤ �ਰ�..."
 msgid "C_urrent View"
 msgstr "ਮ���ਦਾ �ਲ�(_u)"
 
-#: ../widgets/menus/gal-view-menus.c:328
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "�ਲ� ��ਣ�: %s"
 
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
 msgstr "ਮ���ਦਾ �ਲ� �ੱ� �ਸ�ਮਾ��਼ �ਲ� ਹ�"
 
-#: ../widgets/menus/gal-view-menus.c:377
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr "�ਸ�ਮ �ਲ� ਸੰਭਾਲ�..."
 
-#: ../widgets/menus/gal-view-menus.c:382
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
 msgstr "ਮ���ਦਾ �ਸ�ਮਾ��਼ ਵਿ� ਸੰਭਾਲ�"
 
-#: ../widgets/menus/gal-view-menus.c:396
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
 msgstr "ਵਿ� ਬਣਾ� �ਾ� ਸ�ਧ"
 
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "ਫ���ਰ�"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "ਨਵ�� �ਲ� ਬਣਾ�"
 
@@ -22725,64 +21960,182 @@ msgstr "�ਲ� ਦ� �ਿਸਮ"
 msgid "Type of view:"
 msgstr "�ਲ� ਦ� �ਿਸਮ:"
 
-#: ../widgets/misc/e-attachment-bar.c:1132
-msgid "Attachment Bar"
-msgstr "ਨੱਥ� ਪੱ��"
+#: ../widgets/misc/e-attachment.c:990
+#| msgid "Attached message"
+#| msgid_plural "%d attached messages"
+msgid "Attached message"
+msgstr "���� ��ਤਾ ਸ�ਨ�ਹਾ"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:636
+#| msgid "attachment"
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "ਪਹਿਲਾ� ਹ� ਲ�ਡ �ਾਰਵਾ� �ਾਰ� ਹ�।"
+
+#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "ਪਹਿਲਾ� ਸੰਭਾਲਣ �ਾਰਵਾ� �ਾਰ� ਹ�।"
+
+#: ../widgets/misc/e-attachment.c:1923, c-format
+#| msgid "Could not load address book"
+msgid "Could not load '%s'"
+msgstr "'%s' ਲ�ਡ ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�"
+
+#: ../widgets/misc/e-attachment.c:1926, c-format
+#| msgid "Could not open the link."
+msgid "Could not load the attachment"
+msgstr "����ਮ��� ਲ�ਡ ਨਹ�� ��ਤ� �ਾ ਸ��"
+
+#: ../widgets/misc/e-attachment.c:2190, c-format
+#| msgid "Could not open source"
+msgid "Could not open '%s'"
+msgstr "'%s' ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
+
+#: ../widgets/misc/e-attachment.c:2193, c-format
+#| msgid "Could not open the link."
+msgid "Could not open the attachment"
+msgstr "����ਮ��� ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
+
+#: ../widgets/misc/e-attachment.c:2635
+#| msgid "Attachment Reminder"
+msgid "Attachment contents not loaded"
+msgstr "����ਮ��� ਸਮੱ�ਰ� ਲ�ਡ ਨਹ�� ਹ�"
+
+#: ../widgets/misc/e-attachment.c:2712, c-format
+#| msgid "Could not execute '%s': %s\n"
+msgid "Could not save '%s'"
+msgstr "'%s' ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
+
+#: ../widgets/misc/e-attachment.c:2715, c-format
+#| msgid "Select folder to save all attachments"
+msgid "Could not save the attachment"
+msgstr "����ਮ��� ਸੰਭਾਲ� ਨਹ�� �ਾ ਸ��"
+
+#: ../widgets/misc/e-attachment-dialog.c:305
+msgid "Attachment Properties"
+msgstr "����ਮ��� ਵਿਸ਼�ਸਤਾ"
+
+#: ../widgets/misc/e-attachment-dialog.c:328
+#| msgid "F_ilename:"
+msgid "_Filename:"
+msgstr "ਫਾ�ਲਨਾ�(_F):"
+
+#: ../widgets/misc/e-attachment-dialog.c:363
+#| msgid "MIME Type"
+msgid "MIME Type:"
+msgstr "MIME �ਾ�ਪ:"
+
+#: ../widgets/misc/e-attachment-handler-image.c:95
+#| msgid "Set as _Background"
+msgid "Could not set as background"
+msgstr "ਬ���ਰਾ��ਡ ਸ�ੱ� ਨਹ�� ��ਤ� �ਾ ਸ��"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#| msgid "Could not open the link."
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "����ਮ��� ਭ��� ਨਹ�� �ਾ ਸ��"
+msgstr[1] "����ਮ���ਾ� ਭ����� ਨਹ�� �ਾ ਸ����"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#| msgid "Send To:"
+msgid "_Send To..."
+msgstr "...ਨ�ੰ ਭ���(_S)..."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#| msgid "Select folder to save selected attachments..."
+msgid "Send the selected attachments somewhere"
+msgstr "��ਣ� ����ਮ��� �ਿਤ� ਭ���"
+
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+#| msgid "Loading..."
+msgid "Loading"
+msgstr "ਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹ�..."
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+#| msgid "Shading"
+msgid "Saving"
+msgstr "ਸੰਭਾਲ� �ਾ ਰਹ� ਹ�"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide _Attachment Bar"
+msgstr "����ਮ��� ਪੱ�� �ਹਲ�(_A)"
+
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show _Attachment Bar"
+msgstr "����ਮ��� ਪੱ�� ਵ���(_A)"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "ਫਾ�ਲ਼ %s ਨ�ੰ ਨੱਥ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: %s"
+#: ../widgets/misc/e-attachment-store.c:541
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgid "Add Attachment"
+msgstr "����ਮ��� ਸ਼ਾਮਲ �ਰ�"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "ਫਾ�ਲ਼ %s ਨ�ੰ ਨੱਥ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�:�ੱ� ਨਿਯਮਤ ਫਾ�ਲ਼ ਨਹ��"
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "����(_t)"
 
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "ਨੱਥ� ਵਿਸ਼�ਸਤਾ"
+#: ../widgets/misc/e-attachment-store.c:607
+#| msgid "Save attachments"
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "����ਮ��� ਸੰਭਾਲ�"
+msgstr[1] "����ਮ���ਾ� ਸੰਭਾਲ�"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "ਫਾ�ਲ਼ ਨਾ�:"
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "ਸਭ ਸੰਭਾਲ�(_a)"
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME �ਿਸਮ:"
+#: ../widgets/misc/e-attachment-view.c:326
+#| msgid "_Add attachment..."
+msgid "A_dd Attachment..."
+msgstr "����ਮ��� ਸ਼ਾਮਲ(_d)..."
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "ਨੱਥ� ਦਾ ���ਮ��ਿ� ਵ��ਾ�ਣ ਲ� ਸ��ਾ�"
+#: ../widgets/misc/e-attachment-view.c:643, c-format
+#| msgid "Open in %s..."
+msgid "Open with \"%s\""
+msgstr "\"%s\" ਨਾਲ ��ਲ�ਹ�"
+
+#: ../widgets/misc/e-attachment-view.c:646, c-format
+#| msgid "Save attachment as"
+msgid "Open this attachment in %s"
+msgstr "�ਹ ����ਮ��� %s ਵਿੱ� ��ਲ�ਹ�"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "ਮਹ�ਨਾ ��ਲੰਡਰ"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3641
-#: ../widgets/text/e-text.c:3642
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "ਰੰ� ਭਰ�"
 
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3648
-#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3656
-#: ../widgets/text/e-text.c:3657
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "GDK ਰੰ� ਭਰ�"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3663
-#: ../widgets/text/e-text.c:3664
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "ਸ�ਿਪਲ ਭਰ�"
 
@@ -22806,26 +22159,25 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:1004
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "ਨਿ�ਨਤਮ ���ਾ�"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
-#: ../widgets/table/e-table-group-container.c:1005
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "ਨਿ�ਨਤਮ ���ਾ�"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "�ਾਲ� ਥਾ�"
 
-#: ../widgets/misc/e-cell-date-edit.c:289
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "ਹ�ਣ"
 
@@ -22834,7 +22186,7 @@ msgstr "ਹ�ਣ"
 msgid "The time must be in the format: %s"
 msgstr "ਸਮ�� ਦਾ ਫਾਰਮ�� �ੰ� ਦਾ ਹ�ਣਾ ਲਾ�ਮ� ਹ�: %s"
 
-#: ../widgets/misc/e-cell-percent.c:77
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ਪ�ਰਤ�ਸ਼ਤ �ਾਸ ਤ�ਰ ਤ� ੦ ਤ� ੧੦੦ ਦ� ਦਰਮਿ�ਨ ਹ�ਣ� ਲਾ�ਮ� ਹ�"
 
@@ -22848,7 +22200,7 @@ msgstr "ਬਾਲ�ਿ�"
 
 #: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
-msgstr "��ਦਰ� ਯ�ਰਪ"
+msgstr "���ਦਰ� ਯ�ਰਪ�"
 
 #: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
@@ -22897,7 +22249,7 @@ msgstr "ਪੱ�ਮ� ਯ�ਰਪ, ਨਵਾ�"
 #: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
 #: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
-msgstr "ਮ�ਲ"
+msgstr "ਪ�ਰਾਤਨ"
 
 #: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
 #: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
@@ -22915,7 +22267,7 @@ msgstr "ਦਿੱ�"
 #: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
-msgstr "�ਣਪ�ਾਤਾ �ੱ�ਰ ਸਮ�ਹ: %s"
+msgstr "�ਣ�ਾਣ �ੱ�ਰ ਸ�ੱ�: %s"
 
 #: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
@@ -22933,144 +22285,90 @@ msgstr "ਹ�ਰ..."
 msgid "Ch_aracter Encoding"
 msgstr "�ੱ�ਰ �ੰ��ਡਿੰ�(_A)"
 
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "ਮਿਤ� �ਤ� ਸਮਾ�"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "ਮਿਤ� ਦ�ਣ ਲ� ���ਸ� �ੰਦਰਾ�"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr "��ਲੰਡਰ ਵ��ਾ�ਣ ਲ� �ਹ ਬ�ਨ ਦਬਾ�"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:379
 msgid "Drop-down combination box to select time"
 msgstr "ਸਮਾ� ��ਣਨ ਲ� ਲ��ਦਾ ਬ�ਸਾ"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "ਹ�ਣ�(_w)"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "�ੱ�(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "�ਲਤ ਤਾਰ�� ਮ�ੱਲ"
 
-#: ../widgets/misc/e-dateedit.c:1666
+#: ../widgets/misc/e-dateedit.c:1613
 msgid "Invalid Time Value"
 msgstr "�ਲਤ ਸਮਾ� ਮ�ੱਲ"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "ਫ�ਲਿ�"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "ਫ�ਲਾ� ਨ�ੰ ਫ�ਲਾ�� �ਾਵ� �ਾ� ਨਾ"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "ਫ�ਲਾ� ਦ� ਲ�ਬਲ ਦਾ ���ਸ�"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "ਹ�ਠਾ� ਰ��ਾ ਵਰਤ��"
-
-#: ../widgets/misc/e-expander.c:199
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr "���ਰ ਨਿਰਧਾਰਿਤ ��ਤਾ ਤਾ�, ���ਸ� ਵਿੱ� ਦਿੱਤਾ �ੱ�ਰ ਪ�ਰਵ�ਸ਼� �� ਨ�ੰ ਵ��ਾ��ਾ"
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "ਲ�ਬਲ ਤ� ��ਲ� ਵਿੱ��ਾਰ �ੰਤਰ ਦਿ�"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "ਲ�ਬਲ ਵਿਦ�ਿ�"
-
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "�ਮ ਫ�ਲਾ� ਲ�ਬਲ ਦ� ਥਾ� ਤ� �ੱ� ਵਿਦ�ਿ� ਵ��ਾ�"
-
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "ਫ�ਲਾ� ��ਾਰ"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "ਫ�ਲਾ� ਤ�ਰ ਦਾ ��ਾਰ"
-
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "ਸੰ��ਤ� ਥਾ�"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "ਫ�ਲਾ� ਤ�ਰ ਦ��ਲ� �ਾਲ� ਥਾ�"
-
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:750
+#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
 msgstr "ਤ�ਨ��� ���"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "��� ਸੰਭਾਲ�"
 
-#: ../widgets/misc/e-filter-bar.c:268
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "���(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 msgstr "���"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "��� ਸੰਭਾਲ�(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "ਸੰਭਾਲ� ��� ਵਿੱ� ਸ�ਧ(_E)..."
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "ਤ�ਨ��� ���(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "ਸਭ ��ਾ���"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "ਮ���ਦਾ ��ਾ���"
 
-#: ../widgets/misc/e-filter-bar.h:109
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "ਮ���ਦਾ ਫ�ਲਡਰ"
 
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "ਮ���ਦਾ ਸ�ਨ�ਹਾ"
-
-#: ../widgets/misc/e-image-chooser.c:169
+#: ../widgets/misc/e-image-chooser.c:168
 msgid "Choose Image"
 msgstr "�ਿੱਤਰ ��ਣ�"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "ਸੰਸਾਰ ਨ�ਸ਼ਾ"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:607
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -23086,102 +22384,101 @@ msgstr "�ਨਲਾ�ਨ"
 msgid "The button state is online"
 msgstr "ਬ�ਨ ਹਾਲਤ �ਨਲਾ�ਨ ਹ�"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "ਨਾਲ ਸਿ�ਰ�ਨਾ��਼:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "ਨਿੱ�� ਰਿ�ਾਰਡ ਸਿ�ਰ�ਨਾ��਼:"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "���ਾ�ਰ� ਸਿ�ਰ�ਨਾ��਼:"
 
-#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "�ਾਲ� ਸ�ਨ�ਹਾ"
 
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "ਮ��-ਵਹਾ ਮਾਡਲ"
 
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Column width"
 msgstr "�ਾਲਮ ���ਾ�"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:1021
 msgid "Search"
 msgstr "���"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
 msgid "Click here to change the search type"
 msgstr "��� �ਾ�ਪ ਬਦਲਣ ਲ� �ਲਿੱ� �ਰ�"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:637
 msgid "_Search"
 msgstr "���(_S)"
 
-#: ../widgets/misc/e-search-bar.c:609
+#: ../widgets/misc/e-search-bar.c:643
 msgid "_Find Now"
 msgstr "ਹ�ਣ ���(_F)"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:644
 msgid "_Clear"
 msgstr "ਸਾ�(_C)"
 
-#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/misc/e-search-bar.c:899
 msgid "Item ID"
-msgstr "��ਾ� ID"
+msgstr "���ਮ ID"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3563
-#: ../widgets/text/e-text.c:3564
+#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 msgid "Text"
 msgstr "���ਸ�"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1003
+#: ../widgets/misc/e-search-bar.c:1053
 msgid "Sho_w: "
-msgstr "ਵ��ਾ�(_w): "
+msgstr "ਵ���(_w): "
 
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1020
+#: ../widgets/misc/e-search-bar.c:1072
 msgid "Sear_ch: "
 msgstr "���(_c): "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1032
+#: ../widgets/misc/e-search-bar.c:1088
 msgid " i_n "
 msgstr " �ੰਦਰ(_n) "
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "�ਰਸਰ �ਤਾਰ"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "�ਰਸਰ �ਾਲਮ"
 
-#: ../widgets/misc/e-selection-model.c:209
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "��ਰਮਬੱਧ�"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "��ਣ ਢੰ�"
 
-#: ../widgets/misc/e-selection-model.c:224
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "�ਰਸਰ ਢੰ�"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr "ਹ�ਾ�ਣ ਤ�(_l):"
 
@@ -23203,21 +22500,21 @@ msgstr "<b>ਸਥਿਤ� ���</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
-msgstr "ਸਵ�-ਹ�ਾ� ਭ��� ��ਾ�(_u)"
+msgstr "ਸਵ�-ਹ�ਾ� ਭ��� ���ਮ(_u)"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
-msgstr "�ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ ਲ� ਭ��ਣ ��ਾ� ਬਣਾ�(_e)"
+msgstr "�ਾਣ�ਾਰ� ਪ�ਰਾਪਤ �ਰਨ ਲ� ਭ��ਣ ���ਮ ਬਣਾ�(_e)"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
-msgstr "ਪਹ�ੰ�� �ਤ� ��ਲ�(_v)"
+msgstr "ਪਹ�ੰ�� �ਤ� ��ਲ�ਹ�(_v)"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "ਸਧਾਰਨ ��ਣ(_r)"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -23225,7 +22522,7 @@ msgstr ""
 "���\n"
 "ਪੱਤਰ ਨਹ��"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23241,15 +22538,15 @@ msgstr ""
 "ਬਹ�ਤ ��ਪਤ\n"
 "ਸਿਰਫ਼ ਤ�ਹਾਡ� ਲ�"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "�ਵਾਬ ਲ���ਦਾ(_e)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr "ਹਾਲਤ ���(_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -23261,30 +22558,35 @@ msgstr ""
 "ਮਿ�ਰ�\n"
 "�ੱ�"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "�ਦ�� ਮਨ�਼�ਰ ਹ�ਵ�(_p):"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "�ਦ�� ਮ��ੰਮਲ(_m):"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "�ਦ�� �ਨ�ਾਰ ਹ�ਵ�(_n):"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "ਵਿੱ�(_t)"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "ਬਾ�ਦ(_A):"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "ਸਭ �ਾਣ�ਾਰ�(_A)"
 
+#: ../widgets/misc/e-send-options.glade.h:30
+#| msgid "_Classification"
+msgid "_Classification:"
+msgstr "ਵਰ���ਰਨ(_C):"
+
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
@@ -23311,46 +22613,26 @@ msgid "_When opened:"
 msgstr "�ਦ�� ��ਲ�ਹਿ� �ਾਵ�(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:258
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ਸਮਾਪਤ)"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "URL �ੱਤ� �ਾਣ ਲ� �ੱਥ� ਦਬਾ�"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "ਮਾਸ�ਰ ���ਾ�ਰ� ਸ��� ਸ�ਧ..."
-
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "�ਹਨਾ� ���ਾ�ਰ�ਾ� ਨਾਲ ਸਬੰਧਤ ���ਮਾ�(_c):"
-
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "�ਪਲੱਬਧ ���ਾ�ਰ�(_A):"
-
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "���ਾ�ਰ�"
-
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "ਪ�ਪ�ੱਪ ਲਿਸ�"
 
-#: ../widgets/table/e-cell-date.c:63
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "��ਣ� �ਾਲਮ"
@@ -23363,23 +22645,23 @@ msgstr "���ਦਰਿਤ �ਾਲਮ"
 msgid "Unselected Column"
 msgstr "ਨਾ-��ਣਿ� �ਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1794
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "�ਾਲਮ ਵਿੰਨ�"
 
-#: ../widgets/table/e-cell-text.c:1801
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "�ਾਲਮ ਹ�ਠ ਲਾ�ਨ"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "���ਾ �ਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "�ਾਲਮ ਰੰ�"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "BG ਰੰ� �ਾਲਮ"
 
@@ -23403,12 +22685,12 @@ msgstr "ਨਾ ��ਰਮਬੱਧ"
 msgid "No grouping"
 msgstr "��� �ਰ�ੱਪਿੰ� ਨਹ��"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
-msgstr "��ਤਰ ਵ��ਾ�"
+msgstr "��ਤਰ ਵ���"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "�ਪਲੱਬਧ ��ਤਰ"
 
@@ -23417,7 +22699,7 @@ msgid "A_vailable Fields:"
 msgstr "�ਪਲੱਬਧ ��ਤਰ(_v):"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "ਵੱਧਦਾ �ਰਮ"
 
@@ -23430,13 +22712,13 @@ msgid "Clear _All"
 msgstr "ਸਭ ਸਾਫ਼(_A)"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "�ੱ�ਦਾ �ਰਮ"
 
 #: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
-msgstr "�ਸ ਰਾਹ�� �ਰ�ੱਪ ��ਾ�"
+msgstr "�ਸ ਰਾਹ�� �ਰ�ੱਪ ���ਮ"
 
 #: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
@@ -23444,7 +22726,7 @@ msgstr "ਹ�ਠਾ� ਭ���(_D)"
 
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
-msgstr "ਤਾ�ਹ ਭ���(_U)"
+msgstr "�ੱਤ� ਭ���(_U)"
 
 #: ../widgets/table/e-table-config.glade.h:12
 msgid "Show _field in View"
@@ -23484,29 +22766,15 @@ msgstr "�ਲ� ਵਿੱ� ��ਤਰ ਵ���(_S)"
 
 #: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
-msgstr "�ਹ ਫ�ਲਡਰ ਲ��ਬੱਧ ਵ��ਾ�(_S):"
+msgstr "�ਹ ਫ�ਲਡਰ ਲ��ਬੱਧ ਵ���(_S):"
 
 #: ../widgets/table/e-table-config.glade.h:24
 msgid "_Sort..."
 msgstr "ਲ��ਬੱਧ(_S)..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "DnD ��ਡ"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1900
-msgid "Full Header"
-msgstr "ਪ�ਰਾ ਹ�ੱਡਰ"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
-msgstr "�ਾਲਮ ����..."
+msgstr "�ਾਲਮ ਸ਼ਾਮਲ..."
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
 msgid "Field Chooser"
@@ -23520,308 +22788,1814 @@ msgstr ""
 "�ਪਣ� ��ਬਲ ਵਿੱ� �ੱ� �ਾਲਮ ਨ�ੰ ���ਨ ਲ�, �ਸ\n"
 "ਨ�ੰ �ਸ ��ਾ �ੱਤ� ਸ�ੱ� ਦਿ�, �ਿੱਥ� ਤ�ਸ�� ਵ��ਣਾ �ਾਹ�ੰਦ� ਹ�।"
 
-#: ../widgets/table/e-table-group-container.c:344
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d ��ਾ�)"
-msgstr[1] "%s : %s (%d ��ਾ�)"
+msgstr[0] "%s : %s (%d ���ਮ)"
+msgstr[1] "%s : %s (%d ���ਮਾ�)"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d ��ਾ�)"
-msgstr[1] "%s (%d ���ਮਾ��)"
+msgstr[0] "%s (%d ���ਮ)"
+msgstr[1] "%s (%d ���ਮਾ�)"
 
-#: ../widgets/table/e-table-group-container.c:927
-#: ../widgets/table/e-table-group-container.c:928
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "ਬਦਲਵਾ� �ਤਾਰ ਰੰ�"
 
-#: ../widgets/table/e-table-group-container.c:934
-#: ../widgets/table/e-table-group-container.c:935
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "�ਿਤਿ�� �ਰਿੱਡ ਬਣਾ�"
 
-#: ../widgets/table/e-table-group-container.c:941
-#: ../widgets/table/e-table-group-container.c:942
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "ਲੰਬ�ਾਰ� �ਰਿੱਡ ਬਣਾ�"
 
-#: ../widgets/table/e-table-group-container.c:948
-#: ../widgets/table/e-table-group-container.c:949
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "ਫ��ਸ �ਿੱ��"
 
-#: ../widgets/table/e-table-group-container.c:955
-#: ../widgets/table/e-table-group-container.c:956
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "�ਰਸਰ ਮ�ਡ"
 
-#: ../widgets/table/e-table-group-container.c:962
-#: ../widgets/table/e-table-group-container.c:963
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "��ਣ ਮਾਡਲ"
 
-#: ../widgets/table/e-table-group-container.c:969
-#: ../widgets/table/e-table-group-container.c:970
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "ਮ�ੱਢਲ� ਲੰਬਾ�"
 
-#: ../widgets/table/e-table-group-container.c:976
-#: ../widgets/table/e-table-group-container.c:977
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "��ਸਾਰ �ਤਾਰ ��ਾ�"
 
-#: ../widgets/table/e-table-group-container.c:983
-#: ../widgets/table/e-table-group-container.c:984
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "ਸਥਿਰ"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1449
 msgid "Customize Current View"
 msgstr "�ਸ�ਮਾ��਼ ਮ���ਦਾ �ਲ�"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "ਵੱਧਦਾ ��ਰਮ(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "�ੱ�ਦਾ ��ਰਮ(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "��ਰ-��ਰਮਬੱਧ(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "�ਸ ��ਤਰ ਨਾਲ �ਰ�ੱਪ(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "ਬ�ਸ� ਨਾਲ �ਰ�ੱਪ(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "�ਹ �ਾਲਮ ਹ�ਾ�(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "�ਾਲਮ ਸ਼ਾਮਲ(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "��ਸਾਰ(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "ਵਧ�� ਫਿੱ�(_e)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "�ਾਲਮ ਫਾਰਮ��(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "�ਸ�ਮਾ��਼ ਮ���ਦਾ �ਲ�(_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Sort By"
 msgstr "ਲ��ਬੱਧ(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "_Custom"
 msgstr "�ਸ�ਮ(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1893
-msgid "Font Description"
-msgstr "ਫ��� ਵ�ਰਵਾ"
-
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "�ਰਮਬੱਧ �ਾਣ�ਾਰ�"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "ਲ��"
-
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "��ਬਲ ਹ�ੱਡਰ"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "��ਬਲ ਮਾਡਲ"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "�ਰਸਰ �ਤਾਰ"
 
-#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "�ਰਮਬੱਧ �ਾਣ�ਾਰ�"
+
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "ਹਮ�ਸ਼ਾ ����"
 
-#: ../widgets/table/e-table.c:3345
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "ਸ਼ਾਮਿਲ ਲ� ਦਬਾ�"
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "ਲ��"
+
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "ETree ��ਬਲ �ਡਪ�ਰ"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "ਵਾਪਸ ���"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "ਲਾ�ਨਾ� �ਿੱ�� �ਤ� +/- ਫ�ਲਾ�"
 
-#: ../widgets/text/e-text.c:2733
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "ਫ�ਲਾ� ��ਾਰ"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "ਫ�ਲਾ� ਤ�ਰ ਦਾ ��ਾਰ"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "�ੰਪ�ੱ� ਢੰ�"
 
-#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
-msgstr "��ਨਾ ਪ�ਰ�ਸ��ਸਰ"
+msgstr "�ਵ��� ਪ�ਰ�ਸ��ਸਰ"
 
-#: ../widgets/text/e-text.c:3570 ../widgets/text/e-text.c:3571
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "���ਾ"
 
-#: ../widgets/text/e-text.c:3577 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "ਵਿੰਨ�ਹ�"
 
-#: ../widgets/text/e-text.c:3584 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "�ੰ�ਰ"
 
-#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "��ਸਾਰ"
 
-#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "�ਲਿੱਪ ���ਾ�"
 
-#: ../widgets/text/e-text.c:3606 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "�ਲਿੱਪ ��ਾ�"
 
-#: ../widgets/text/e-text.c:3613 ../widgets/text/e-text.c:3614
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "�ਲਿੱਪ"
 
-#: ../widgets/text/e-text.c:3620 ../widgets/text/e-text.c:3621
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "�ਲਿੱਪ �ਤਰਭ�� ਭਰ�"
 
-#: ../widgets/text/e-text.c:3627 ../widgets/text/e-text.c:3628
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "X �ਫਸ�ੱ�"
 
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Y �ਫਸ�ੱ�"
 
-#: ../widgets/text/e-text.c:3670 ../widgets/text/e-text.c:3671
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "���ਸ� ���ਾ�"
 
-#: ../widgets/text/e-text.c:3677 ../widgets/text/e-text.c:3678
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "���ਸ� ��ਾ�"
 
-#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "�ੰਡਾ�ਾਰ ਵਰਤ��"
 
-#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "�ੰਡਾ�ਾਰ"
 
-#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "ਲਾ�ਨ ਲਪ���"
 
-#: ../widgets/text/e-text.c:3713 ../widgets/text/e-text.c:3714
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "�ੰਤਰਾਲ �ੱ�ਰ"
 
-#: ../widgets/text/e-text.c:3720 ../widgets/text/e-text.c:3721
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "�ਧਿ�ਤਮ ਲਾ�ਨਾ�"
 
-#: ../widgets/text/e-text.c:3742 ../widgets/text/e-text.c:3743
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "ਹਾਸ਼��� �ਿੱ��"
 
-#: ../widgets/text/e-text.c:3749 ../widgets/text/e-text.c:3750
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "ਨਵ���-ਲਾ�ਨਾ� ਮਨ�਼�ਰ"
 
-#: ../widgets/text/e-text.c:3756 ../widgets/text/e-text.c:3757
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "ਬ���ਰਾ��ਡ ਬਣਾ�"
 
-#: ../widgets/text/e-text.c:3763 ../widgets/text/e-text.c:3764
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "ਬ�ਨ ਬਣਾ�"
 
-#: ../widgets/text/e-text.c:3770 ../widgets/text/e-text.c:3771
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "�ਰਸਰ ਸਥਿਤ�"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3780
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "IM ਪਰਸੰ�"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "ਪ�ਪ�ੱਪ ਸੰਭਾਲ�"
 
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "����ਮਿੰ� ਬਾਰ ਬਦਲ�"
+
+#~ msgid "activate"
+#~ msgstr "����ਵ��"
+
+#~ msgid "3268"
+#~ msgstr "੩੨੬੮"
+
+#~ msgid "389"
+#~ msgstr "੩੮੯"
+
+#~ msgid "636"
+#~ msgstr "੬੩੬"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>�ਿਸਮ</b>"
+
+#~ msgid "Add Address Book"
+#~ msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਸ਼ਾਮਿਲ"
+
+#~ msgid "Anonymously"
+#~ msgstr "�ਣ�ਾਣ"
+
+#~ msgid "Basic"
+#~ msgstr "ਬ�ਸਿ�"
+
+#~ msgid "Distinguished name"
+#~ msgstr "ਵੱ�ਰਾ ਨਾ�"
+
+#~ msgid "Email address"
+#~ msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "ਸਭ ਸੰਭਵ ��� �ਧਾਰ ਵਰਤ��"
+
+#~ msgid "Search filter"
+#~ msgstr "��� ਫਿਲ�ਰ"
+
+#~ msgid "Sub"
+#~ msgstr "�ਧ�ਨ"
+
+#~ msgid "Using email address"
+#~ msgstr "�-ਮ�ਲ �ਡਰ�ੱਸ ਵਰਤ��"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "�ਦ�� ਵ� ਸੰਭਵ ਹ�ਵ�"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "�ਡਰ�ੱਸ-ਬ�ੱ� ਸ਼ਾਮਲ(_A)"
+
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN ਮ�ਸ�਼ਰ"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "ਨ�ਵਲ �ਰ�ੱਪਵਾ��਼"
+
+#~ msgid "_Notes:"
+#~ msgstr "ਸ��ਨਾ(_N):"
+
+#~ msgid "United States"
+#~ msgstr "�ਮਰ��ਾ"
+
+#~ msgid "Afghanistan"
+#~ msgstr "�ਫ�ਾਨਿਸਤਾਨ"
+
+#~ msgid "Albania"
+#~ msgstr "�ਲਬ�ਨਾ"
+
+#~ msgid "Algeria"
+#~ msgstr "�ਲ��ਰ��"
+
+#~ msgid "American Samoa"
+#~ msgstr "�ਮਰ��� ਸਾਮ�ਨਾ"
+
+#~ msgid "Andorra"
+#~ msgstr "�ਡ�ਰਾ"
+
+#~ msgid "Angola"
+#~ msgstr "�ੰ��ਲਾ"
+
+#~ msgid "Anguilla"
+#~ msgstr "�ੰ��ਲ���"
+
+#~ msgid "Antarctica"
+#~ msgstr "�ੰ�ਾਰਿ��ਾ"
+
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "������ ਤ� ਬਾਰਬ�ਡਾ"
+
+#~ msgid "Argentina"
+#~ msgstr "�ਰ�ਨ��ਨਾ"
+
+#~ msgid "Armenia"
+#~ msgstr "�ਰਮ�ਨਾ"
+
+#~ msgid "Aruba"
+#~ msgstr "�ਰ�ਬਾ"
+
+#~ msgid "Australia"
+#~ msgstr "�ਸ�ਰ�ਲ��"
+
+#~ msgid "Austria"
+#~ msgstr "�ਸ�ਰ��"
+
+#~ msgid "Azerbaijan"
+#~ msgstr "��਼ਰਬਾ��ਾਨ"
+
+#~ msgid "Bahamas"
+#~ msgstr "ਬਾਹਾਮਾਸ"
+
+#~ msgid "Bahrain"
+#~ msgstr "ਬਹਿਰਾਨ"
+
+#~ msgid "Bangladesh"
+#~ msgstr "ਬੰ�ਲਾਦ�ਸ਼"
+
+#~ msgid "Barbados"
+#~ msgstr "ਬਾਰਬਾਡਾਸ"
+
+#~ msgid "Belarus"
+#~ msgstr "ਬ�ਲਾਰ�ਸ"
+
+#~ msgid "Belgium"
+#~ msgstr "ਬ�ਲ���ਮ"
+
+#~ msgid "Belize"
+#~ msgstr "ਬ�ਲ��਼�"
+
+#~ msgid "Benin"
+#~ msgstr "ਬ�ਨਾਨ"
+
+#~ msgid "Bermuda"
+#~ msgstr "ਬਾਰਾਮ�ਡਾ"
+
+#~ msgid "Bhutan"
+#~ msgstr "ਭ��ਾਨ"
+
+#~ msgid "Bolivia"
+#~ msgstr "ਬ�ਲ�ਵ��"
+
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "ਬ�ਸ�ਨ�� ਤ� ਹਰ�਼�ਨ��ਵ�ਨਾ"
+
+#~ msgid "Botswana"
+#~ msgstr "ਬ��ਸਵਾਨਾ"
+
+#~ msgid "Bouvet Island"
+#~ msgstr "ਬ��ਵ� �ਾਪ�"
+
+#~ msgid "Brazil"
+#~ msgstr "ਬਰਾ�਼�ਲ"
+
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "ਬਰਤਾਨ�� ਭਾਰਤ� ਸਮ�ੰਦਰ� ��ਤਰ"
+
+#~ msgid "Brunei Darussalam"
+#~ msgstr "ਬਰ�ਨ� ਡਾਰ�ਸ਼ਲਾਮ"
+
+#~ msgid "Bulgaria"
+#~ msgstr "ਬ�ਲ�ਾਰ��"
+
+#~ msgid "Burkina Faso"
+#~ msgstr "ਬ�ਪ��ਨਾ ਫਾਸ�"
+
+#~ msgid "Burundi"
+#~ msgstr "ਬ�ਰ�ਮਾਡ�"
+
+#~ msgid "Cambodia"
+#~ msgstr "��ਲੰਬ��"
+
+#~ msgid "Cameroon"
+#~ msgstr "��ਮਰ�ਨ"
+
+#~ msgid "Canada"
+#~ msgstr "��ਨ�ਡਾ"
+
+#~ msgid "Cape Verde"
+#~ msgstr "��ਪ ਵਾਰਡ�"
+
+#~ msgid "Cayman Islands"
+#~ msgstr "�ਾਯਮਨ �ਾਪ�"
+
+#~ msgid "Central African Republic"
+#~ msgstr "��ਦਰ� �ਫਰ��ਾ �ਣਰਾ�਼"
+
+#~ msgid "Chad"
+#~ msgstr "�ੰਦ"
+
+#~ msgid "Chile"
+#~ msgstr "�ਿੱਲ�"
+
+#~ msgid "China"
+#~ msgstr "��ਨ"
+
+#~ msgid "Christmas Island"
+#~ msgstr "��ਰਿਸਮਿਸ �ਾਪ�"
+
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "����ਸ(�ਿਲਿੰ�) �ਾਪ�"
+
+#~ msgid "Colombia"
+#~ msgstr "��ਲੰਬ��"
+
+#~ msgid "Comoros"
+#~ msgstr "��ਮ�ਰਸ"
+
+#~ msgid "Congo"
+#~ msgstr "�ਾ���"
+
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "�ਾ���, ਲ��ਤੰਤਰ� �ਣਰਾ�਼"
+
+#~ msgid "Cook Islands"
+#~ msgstr "��ੱ� �ਾਪ�"
+
+#~ msgid "Costa Rica"
+#~ msgstr "�ਾਸ� ਰ��ਾ"
+
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "���� ਡ�ਵ�ਰ�"
+
+#~ msgid "Croatia"
+#~ msgstr "�ਰ����"
+
+#~ msgid "Cuba"
+#~ msgstr "�ਿ�ਬਾ"
+
+#~ msgid "Cyprus"
+#~ msgstr "�ਿ�ਰ�ਸ"
+
+#~ msgid "Czech Republic"
+#~ msgstr "��� �ਣਰਾ�"
+
+#~ msgid "Denmark"
+#~ msgstr "ਡ�ਨਮਾਰ�"
+
+#~ msgid "Djibouti"
+#~ msgstr "ਡ��ਬ���"
+
+#~ msgid "Dominica"
+#~ msgstr "ਡ�ਮ�ਨ��"
+
+#~ msgid "Dominican Republic"
+#~ msgstr "ਡ�ਮ�ਨ��ਨ �ਣਰਾ�਼"
+
+#~ msgid "Ecuador"
+#~ msgstr "��ਵ�ਡਰ"
+
+#~ msgid "Egypt"
+#~ msgstr "ਮਿਸਰ"
+
+#~ msgid "El Salvador"
+#~ msgstr "�ਲ ਸਾਲ�ਵਡ�ਰ"
+
+#~ msgid "Equatorial Guinea"
+#~ msgstr "ਭ�-�ੰਡ� ���ਨਾ"
+
+#~ msgid "Eritrea"
+#~ msgstr "�ਰ��ਰ�"
+
+#~ msgid "Estonia"
+#~ msgstr "�ਸ��ਨ��"
+
+#~ msgid "Ethiopia"
+#~ msgstr "�ਥ�ਪ��"
+
+#~ msgid "Falkland Islands"
+#~ msgstr "ਫਾ�ਲ�ਡ �ਾਪ�"
+
+#~ msgid "Faroe Islands"
+#~ msgstr "ਫਾਰ�� �ਾਪ�"
+
+#~ msgid "Fiji"
+#~ msgstr "ਫਿ�਼�"
+
+#~ msgid "Finland"
+#~ msgstr "ਫਿਨਲ�ਡ"
+
+#~ msgid "France"
+#~ msgstr "ਫਰਾ�ਸ"
+
+#~ msgid "French Guiana"
+#~ msgstr "ਫਰ�� ���ਨਾ"
+
+#~ msgid "French Polynesia"
+#~ msgstr "ਫਰ��� ਪ�ਲ�ਸ�ਲ�ਵ��"
+
+#~ msgid "French Southern Territories"
+#~ msgstr "ਫਰ��� ਦੱ�ਣ� ��ਤਰ"
+
+#~ msgid "Gabon"
+#~ msgstr "�ਾਬ�ਨ"
+
+#~ msgid "Gambia"
+#~ msgstr "�ਾਬ��"
+
+#~ msgid "Georgia"
+#~ msgstr "�ਾਰ���"
+
+#~ msgid "Germany"
+#~ msgstr "�ਰਮਨ�"
+
+#~ msgid "Ghana"
+#~ msgstr "�ਾਨਾ"
+
+#~ msgid "Gibraltar"
+#~ msgstr "��ਬਰਾਲ�ਾਰ"
+
+#~ msgid "Greece"
+#~ msgstr "�ਰ�ਸ"
+
+#~ msgid "Greenland"
+#~ msgstr "�ਰ�ਨਲ�ਡ"
+
+#~ msgid "Grenada"
+#~ msgstr "�ਰ�ਨਾਡਾ�"
+
+#~ msgid "Guadeloupe"
+#~ msgstr "���ਡ�ਲ�ਪ�"
+
+#~ msgid "Guam"
+#~ msgstr "���ਮ"
+
+#~ msgid "Guatemala"
+#~ msgstr "�����ਮਾਲਾ"
+
+#~ msgid "Guernsey"
+#~ msgstr "���ਮਸ�ਯਾ"
+
+#~ msgid "Guinea"
+#~ msgstr "���ਨ��"
+
+#~ msgid "Guinea-Bissau"
+#~ msgstr "���ਨ��-ਬ�ਸ�"
+
+#~ msgid "Guyana"
+#~ msgstr "���ਨਾ"
+
+#~ msgid "Haiti"
+#~ msgstr "ਹਾ���"
+
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "ਹਾਰਡ ਤ� ਮ��ਡਾਨਲਡ �ਾਪ�"
+
+#~ msgid "Holy See"
+#~ msgstr "ਹ�ਲ� ਸ�"
+
+#~ msgid "Honduras"
+#~ msgstr "ਹਾਨਡ�ਰਸ"
+
+#~ msgid "Hong Kong"
+#~ msgstr "ਹਾ�� �ਾ��"
+
+#~ msgid "Hungary"
+#~ msgstr "ਹੰ�ਰ�"
+
+#~ msgid "Iceland"
+#~ msgstr "��ਸਲ��ਡ"
+
+#~ msgid "India"
+#~ msgstr "ਭਾਰਤ"
+
+#~ msgid "Indonesia"
+#~ msgstr "�ੰਡ�ਨ�ਸ��"
+
+#~ msgid "Iran"
+#~ msgstr "�ਰਾਨ"
+
+#~ msgid "Iraq"
+#~ msgstr "�ਰਾ�"
+
+#~ msgid "Ireland"
+#~ msgstr "��ਰਲ�ਡ"
+
+#~ msgid "Isle of Man"
+#~ msgstr "�ਸਲ� �ਫ ਮ�ਨ"
+
+#~ msgid "Israel"
+#~ msgstr "��਼ਾਰਾ�ਲ"
+
+#~ msgid "Italy"
+#~ msgstr "��ਲ�"
+
+#~ msgid "Jamaica"
+#~ msgstr "��ਮਾ��ਾ"
+
+#~ msgid "Japan"
+#~ msgstr "�ਾਪਾਨ"
+
+#~ msgid "Jersey"
+#~ msgstr "�਼�ਰਸ�"
+
+#~ msgid "Jordan"
+#~ msgstr "�ਾਰਡਨ"
+
+#~ msgid "Kazakhstan"
+#~ msgstr "��਼ਾ�ਸਤਾਨ"
+
+#~ msgid "Kenya"
+#~ msgstr "��ਨ��"
+
+#~ msgid "Kiribati"
+#~ msgstr "��ਰ�ਬਾ��"
+
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "��ਰ��, ਲ��ਤੰਤਰ� �ਣਰਾ�਼"
+
+#~ msgid "Korea, Republic Of"
+#~ msgstr "��ਰ�� �ਣਰਾ�਼"
+
+#~ msgid "Kuwait"
+#~ msgstr "��ਵ�ਤ"
+
+#~ msgid "Kyrgyzstan"
+#~ msgstr "�ਿਰ�ਸਤਾਨ"
+
+#~ msgid "Laos"
+#~ msgstr "ਲਿ�ਸ"
+
+#~ msgid "Latvia"
+#~ msgstr "ਲਾ��ਵਾ�"
+
+#~ msgid "Lebanon"
+#~ msgstr "ਲ�ਬਨਾਨ"
+
+#~ msgid "Lesotho"
+#~ msgstr "ਲ�ਸ�ਥ�"
+
+#~ msgid "Liberia"
+#~ msgstr "ਲ�ਬਾਰ��"
+
+#~ msgid "Libya"
+#~ msgstr "ਲ�ਬ��"
+
+#~ msgid "Liechtenstein"
+#~ msgstr "ਲ����ਨ��"
+
+#~ msgid "Lithuania"
+#~ msgstr "ਲ�ਥ��ਨ��"
+
+#~ msgid "Luxembourg"
+#~ msgstr "ਲ਼�ਸ਼ਬਰ�"
+
+#~ msgid "Macao"
+#~ msgstr "ਮ��ਸ���"
+
+#~ msgid "Macedonia"
+#~ msgstr "ਮ��ਡ�ਨ��"
+
+#~ msgid "Madagascar"
+#~ msgstr "ਮ�ਡਾ�ਾਸ�ਰ"
+
+#~ msgid "Malawi"
+#~ msgstr "ਮਾਲਾਵ��"
+
+#~ msgid "Malaysia"
+#~ msgstr "ਮਲ�ਸ��"
+
+#~ msgid "Maldives"
+#~ msgstr "ਮਾਲਦ�ਪ"
+
+#~ msgid "Mali"
+#~ msgstr "ਮਾਲ�"
+
+#~ msgid "Malta"
+#~ msgstr "ਮਾਲ�ਾ"
+
+#~ msgid "Marshall Islands"
+#~ msgstr "ਮਾਰਸ਼ਲ �ਾਪ�"
+
+#~ msgid "Martinique"
+#~ msgstr "ਮਾਰ��ਨ��ਿ�"
+
+#~ msgid "Mauritania"
+#~ msgstr "ਮਾ�ਰ���ਨਾ"
+
+#~ msgid "Mauritius"
+#~ msgstr "ਮਾ���ਸ"
+
+#~ msgid "Mayotte"
+#~ msgstr "ਮਾ���"
+
+#~ msgid "Mexico"
+#~ msgstr "ਮ��ਸ���"
+
+#~ msgid "Micronesia"
+#~ msgstr "ਮਾ�ਰ�ਨ�ਸ਼��"
+
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "ਮ�ਲਡ�ਵਾ �ਣਰਾ�"
+
+#~ msgid "Monaco"
+#~ msgstr "ਮ�ਨਸ਼��"
+
+#~ msgid "Mongolia"
+#~ msgstr "ਮੰ��ਲ��"
+
+#~ msgid "Montserrat"
+#~ msgstr "ਮ�ਨ�ਸ਼���"
+
+#~ msgid "Morocco"
+#~ msgstr "ਮ�ਰ�ਸ਼ਸ"
+
+#~ msgid "Mozambique"
+#~ msgstr "ਮ��ਾਮਬ��ਿ�"
+
+#~ msgid "Myanmar"
+#~ msgstr "ਮਿ�ਮਾਰ"
+
+#~ msgid "Namibia"
+#~ msgstr "ਨ�ਮ�ਬ��"
+
+#~ msgid "Nauru"
+#~ msgstr "ਨ��ਰ�"
+
+#~ msgid "Nepal"
+#~ msgstr "ਨ�ਪਾਲ"
+
+#~ msgid "Netherlands"
+#~ msgstr "ਨ�ਦਰਲ��ਡ"
+
+#~ msgid "Netherlands Antilles"
+#~ msgstr "ਨ�ਦਰਲ��ਡ ���ਲਸ"
+
+#~ msgid "New Caledonia"
+#~ msgstr "ਨਵਾ� �ਾਲ�ਡ�ਨ���"
+
+#~ msgid "New Zealand"
+#~ msgstr "ਨਿ���ਲ��ਡ"
+
+#~ msgid "Nicaragua"
+#~ msgstr "ਨਿ�ਾਰ���"
+
+#~ msgid "Niger"
+#~ msgstr "ਨ��਼ਰ"
+
+#~ msgid "Nigeria"
+#~ msgstr "ਨ��਼�ਰ�"
+
+#~ msgid "Niue"
+#~ msgstr "ਨ���"
+
+#~ msgid "Norfolk Island"
+#~ msgstr "ਨ�ਰਫ�� �ਾਪ�"
+
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "�ੱਤਰ� ਮਰ�ਵ��ਨਾ �ਾਪ�"
+
+#~ msgid "Norway"
+#~ msgstr "ਨਾਰਵ�"
+
+#~ msgid "Oman"
+#~ msgstr "�ਮਾਨ"
+
+#~ msgid "Pakistan"
+#~ msgstr "ਪਾ�ਿਸਤਾਨ"
+
+#~ msgid "Palau"
+#~ msgstr "ਪਾਲਾ�"
+
+#~ msgid "Palestinian Territory"
+#~ msgstr "ਫਿਲ�ਸਤ�ਨ ਭਾ�"
+
+#~ msgid "Panama"
+#~ msgstr "ਪ�ਨਾਮਾ"
+
+#~ msgid "Papua New Guinea"
+#~ msgstr "ਪਾਪ�� ਨਵਾ� ���ਨਿ�"
+
+#~ msgid "Paraguay"
+#~ msgstr "ਪ�ਰ��ਵ�"
+
+#~ msgid "Peru"
+#~ msgstr "ਪ�ਰ�"
+
+#~ msgid "Philippines"
+#~ msgstr "ਫਿਲਿਪ�ਨ��"
+
+#~ msgid "Pitcairn"
+#~ msgstr "ਪਿ�ਸਾਰਨ"
+
+#~ msgid "Poland"
+#~ msgstr "ਪ�ਲ��ਡ"
+
+#~ msgid "Portugal"
+#~ msgstr "ਪ�ਰਤ�ਾਲ"
+
+#~ msgid "Puerto Rico"
+#~ msgstr "ਪ��ਰ�� ਰ�ਸ�"
+
+#~ msgid "Qatar"
+#~ msgstr "�ਤਰ"
+
+#~ msgid "Reunion"
+#~ msgstr "ਰ�ਯ�ਨ��ਨ"
+
+#~ msgid "Romania"
+#~ msgstr "ਰ�ਮਾਨ��"
+
+#~ msgid "Russian Federation"
+#~ msgstr "ਰ�ਸ� �ਣਰਾ�"
+
+#~ msgid "Rwanda"
+#~ msgstr "ਰਵਾ�ਡਾ�"
+
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "ਸ��� �ਿੱ�ਸ ��ਡ ਨ�ਵਿਸ"
+
+#~ msgid "Saint Lucia"
+#~ msgstr "ਸ��� ਲ�ਸ��"
+
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "ਸ��� ਵ�ਨਸ��� ��ਡ ਦ� �ਰ�ਨਾ-ਡ�ਨਸ"
+
+#~ msgid "Samoa"
+#~ msgstr "ਸਾਮ��"
+
+#~ msgid "San Marino"
+#~ msgstr "ਸਾਨ ਮਾਰ�ਨ�"
+
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "ਸਾ� ��ਮ� ��ਡ ਪ�ਰਿੰਸਪ�"
+
+#~ msgid "Saudi Arabia"
+#~ msgstr "ਸਾ�ਦ� �ਰਬ"
+
+#~ msgid "Senegal"
+#~ msgstr "ਸ�ਨ��ਾਲ"
+
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "ਸਰਬ�� ��ਡ ਮ�ਨ����ਰ�"
+
+#~ msgid "Seychelles"
+#~ msgstr "ਸ���ਿਲਸ"
+
+#~ msgid "Sierra Leone"
+#~ msgstr "ਸ��ਰ� ਲਿ�ਨ"
+
+#~ msgid "Singapore"
+#~ msgstr "ਸਿੰ�ਾਪ�ਰ"
+
+#~ msgid "Slovakia"
+#~ msgstr "ਸਲ�ਵਾ���"
+
+#~ msgid "Slovenia"
+#~ msgstr "ਸਲ�ਵ�ਨ��"
+
+#~ msgid "Solomon Islands"
+#~ msgstr "ਸ�ਲ�ਮ�ਨ �ਾਪ�"
+
+#~ msgid "Somalia"
+#~ msgstr "ਸ�ਮਾਲ��"
+
+#~ msgid "South Africa"
+#~ msgstr "ਦੱ�ਣ� �ਫਰ��ਾ"
+
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "ਦੱ�ਣ� �ਾਰ���� ਤ� ਦੱ�ਣ� ਸ�ਡਵਿੱ� �ਾਪ�"
+
+#~ msgid "Spain"
+#~ msgstr "ਸਪ�ਨ"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "ਸ�ਰ�ਲੰ�ਾ"
+
+#~ msgid "St. Helena"
+#~ msgstr "ਸ��� ਹ�ਲ�ਨ�"
+
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "ਸ��� ਪ�ਰ��ਰ ਤ� ਮ��ਿ�ਨ"
+
+#~ msgid "Sudan"
+#~ msgstr "ਸ�ਡਾਨ"
+
+#~ msgid "Suriname"
+#~ msgstr "ਸ�ਰ�ਨਾ�"
+
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "ਸਵਾਲਬਰਡ �� �ਾਨ ਮਾ�ਯਾਮ �ਾਪ�"
+
+#~ msgid "Swaziland"
+#~ msgstr "ਸਵਾ��ਲ��ਡ"
+
+#~ msgid "Sweden"
+#~ msgstr "ਸਵ�ਡਨ"
+
+#~ msgid "Switzerland"
+#~ msgstr "ਸਵਿ�ਰ�ਰਲ��ਡ"
+
+#~ msgid "Syria"
+#~ msgstr "ਸ�ਰ��"
+
+#~ msgid "Taiwan"
+#~ msgstr "ਤਾ�ਵਾਨ"
+
+#~ msgid "Tajikistan"
+#~ msgstr "ਤ�ਾ�ਸਤਾਨ"
+
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "ਤਨ�ਾਨ���, �ਣਰਾ�"
+
+#~ msgid "Thailand"
+#~ msgstr "ਥਾ�ਲ��ਡ"
+
+#~ msgid "Timor-Leste"
+#~ msgstr "��ਮ�ਰ-ਲ�ਸ��"
+
+#~ msgid "Togo"
+#~ msgstr "����"
+
+#~ msgid "Tokelau"
+#~ msgstr "����ਲਾ�"
+
+#~ msgid "Tonga"
+#~ msgstr "��ਨ�ਾ"
+
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "�ਰ�ਨ�ਡ ਤ� ��ਬਾ��"
+
+#~ msgid "Tunisia"
+#~ msgstr "��ਨ�ਸ਼��"
+
+#~ msgid "Turkey"
+#~ msgstr "ਤ�ਰ��"
+
+#~ msgid "Turkmenistan"
+#~ msgstr "ਤ�ਰ�ਸਤਾਨ"
+
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "ਤ�ਰ� ਤ� �ਾਸ��ਸ �ਾਪ�"
+
+#~ msgid "Tuvalu"
+#~ msgstr "��ਵਾਲ�"
+
+#~ msgid "Uganda"
+#~ msgstr "ਯ��ਾ�ਡਾ"
+
+#~ msgid "Ukraine"
+#~ msgstr "ਯ��ਰ�ਨ"
+
+#~ msgid "United Arab Emirates"
+#~ msgstr "ਸੰਯ��ਤ ਰਾ� �ਮ�ਰਾਤ"
+
+#~ msgid "United Kingdom"
+#~ msgstr "ਬਰਤਾਨ��"
+
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "�ਮਰ��ਾ ਦ� ���� �ਾਪ�"
+
+#~ msgid "Uruguay"
+#~ msgstr "�ਰ��ਵ�"
+
+#~ msgid "Uzbekistan"
+#~ msgstr "���ਬ�ਸਤਾਨ"
+
+#~ msgid "Vanuatu"
+#~ msgstr "ਵਾਨ���"
+
+#~ msgid "Venezuela"
+#~ msgstr "ਵ�ਨ����ਲਾ"
+
+#~ msgid "Viet Nam"
+#~ msgstr "ਵ��ਤਨਾ�"
+
+#~ msgid "Virgin Islands, British"
+#~ msgstr "ਵਿਰ�ਿਨ �ਾਪ� ਬਰਤਾਨ��"
+
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "ਵਿਰ�ਿਨ �ਾਪ�, �ਮਰ��ਾ"
+
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "ਵਾਲਿਸ਼ ਤ� ਫ���ਨਾ �ਾਪ�"
+
+#~ msgid "Western Sahara"
+#~ msgstr "ਦੱ�ਣ� ਸਹਾਰਾ"
+
+#~ msgid "Yemen"
+#~ msgstr "ਯਮਨ"
+
+#~ msgid "Zambia"
+#~ msgstr "���ਬ��"
+
+#~ msgid "Zimbabwe"
+#~ msgstr "�ਿੰਬਾਬਾਵ�"
+
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "AOL ਮ��ਾ ਸ�ਨ�ਹਾ�ਾਰ"
+
+#~ msgid "Yahoo Messenger"
+#~ msgstr "ਯਾਹ� ਸ�ਨ�ਹ�ਦਾਰ"
+
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "�ਡ�-�ਡ� ਸ�ਨ�ਹ�ਦਾਰ"
+
+#~ msgid "Service"
+#~ msgstr "ਸ�ਵਾ"
+
+#~ msgid "Username"
+#~ msgstr "ਯ��਼ਰ ਨਾ�"
+
+#~ msgid "Address _2:"
+#~ msgstr "�ਡਰ�ੱਸ _੨:"
+
+#~ msgid "Ci_ty:"
+#~ msgstr "ਸ਼ਹਿਰ(_t):"
+
+#~ msgid "Countr_y:"
+#~ msgstr "ਦ�ਸ਼(_y):"
+
+#~ msgid "Full Address"
+#~ msgstr "ਪ�ਰਾ �ਡਰ�ੱਸ"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "ਪਿੰਨ ��ਡ(_Z):"
+
+#~ msgid "Dr."
+#~ msgstr "ਡਾ."
+
+#~ msgid "Esq."
+#~ msgstr "Esq."
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "II"
+#~ msgstr "II"
+
+#~ msgid "III"
+#~ msgstr "III"
+
+#~ msgid "Jr."
+#~ msgstr "��ਨ��ਰ"
+
+#~ msgid "Miss"
+#~ msgstr "��ਮਾਰ�"
+
+#~ msgid "Mr."
+#~ msgstr "ਸ�ਰ�ਮਾਨ"
+
+#~ msgid "Mrs."
+#~ msgstr "ਸ�ਰ�ਮਤ�"
+
+#~ msgid "Ms."
+#~ msgstr "ਸ�ਰ�ਮਤ�"
+
+#~ msgid "Sr."
+#~ msgstr "ਸ�ਨ��ਰ"
+
+#~ msgid "Add IM Account"
+#~ msgstr "IM ��ਾ��� ਸ਼ਾਮਿਲ �ਰ�"
+
+#~ msgid "_Account name:"
+#~ msgstr "��ਾ��� ਨਾ�(_A):"
+
+#~ msgid "_IM Service:"
+#~ msgstr "_IM ਸ�ਵਾ:"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 ਬਿੰਦ� ਤਾਹ�ਮਾ"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "੮ ਬਿੰਦ� ਤਾਹ�ਮਾ"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "�ੰਤ ਤ� �ਾਲ� ਫਾਰਮ:"
+
+#~ msgid "Body"
+#~ msgstr "ਭਾ�"
+
+#~ msgid "Bottom:"
+#~ msgstr "ਹ�ਠਾ�:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "��ਾਰ:"
+
+#~ msgid "F_ont..."
+#~ msgstr "ਫ���(_o)..."
+
+#~ msgid "Fonts"
+#~ msgstr "ਫ���"
+
+#~ msgid "Footer:"
+#~ msgstr "ਪਦਲ��:"
+
+#~ msgid "Header/Footer"
+#~ msgstr "ਹ�ੱਡਰ/ਪਦਲ��"
+
+#~ msgid "Headings"
+#~ msgstr "ਹ�ਡਿੰ�"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "ਹਰ ਪੱਤਰ ਲ� ਹ�ਡਿੰ�"
+
+#~ msgid "Height:"
+#~ msgstr "��ਾ�:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "ਹ�ਣ� ਹਰ ਬਾ�ਦ �ਰ�"
+
+#~ msgid "Include:"
+#~ msgstr "ਸ਼ਾਮਿਲ:"
+
+#~ msgid "Landscape"
+#~ msgstr "ਲ�ਡਸ��ਪ"
+
+#~ msgid "Left:"
+#~ msgstr "�ੱਬਾ:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "ਪਾਸ� ਤ� ਪੱਤਰ ��ਬਾ�"
+
+#~ msgid "Margins"
+#~ msgstr "ਹਾਸ਼��"
+
+#~ msgid "Number of columns:"
+#~ msgstr "�ਾਲਮਾ� ਦ� �ਿਣਤ�:"
+
+#~ msgid "Options"
+#~ msgstr "��ਣ"
+
+#~ msgid "Orientation"
+#~ msgstr "ਸਥਿਤ�"
+
+#~ msgid "Page"
+#~ msgstr "ਸਫਾ"
+
+#~ msgid "Page Setup:"
+#~ msgstr "ਸ�ਾ ਨਿਰਧਾਰਨ:"
+
+#~ msgid "Paper"
+#~ msgstr "ਸਫਾ"
+
+#~ msgid "Paper source:"
+#~ msgstr "ਸ�ਾ ਸਰ�ਤ:"
+
+#~ msgid "Portrait"
+#~ msgstr "ਪ�ਰ�ਰ��"
+
+#~ msgid "Preview:"
+#~ msgstr "�ਲ�:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "ਸਲ��� �ਾ� ਨਾਲ ਪਰਿੰ� �ਰ�"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "�ਿਸਤ ਸਫਿ�� ਤ� �ਲ�"
+
+#~ msgid "Right:"
+#~ msgstr "ਸੱ�ਾ:"
+
+#~ msgid "Sections:"
+#~ msgstr "�ੰਡ:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "�ੱ� ਨਵ�� ਸ�� ਸ਼�ਰ� �ਰ�"
+
+#~ msgid "Style name:"
+#~ msgstr "ਸ਼�ਲ� ਨਾ�:"
+
+#~ msgid "Top:"
+#~ msgstr "�ਪਰ:"
+
+#~ msgid "Width:"
+#~ msgstr "���ਾ�:"
+
+#~ msgid "_Font..."
+#~ msgstr "ਫ���(_F)..."
+
+#~ msgid "Whether to use daylight savings time while displaying events."
+#~ msgstr "�� ��ਨਾ ਵ��ਾ�ਣ ਦ�ਰਾਨ ਦਿਨ-ਰਾਤ ਸੰਭਾਲਣ ਸਮਾ� ਦ� ਵਰਤ�� �ਰਨ� ਹ�।"
+
+#~ msgid "daylight savings time"
+#~ msgstr "ਦਿਨ-ਰਾਤ ਸੰਭਾਲਣ ਸਮਾ�"
+
+#~ msgid "after"
+#~ msgstr "ਬਾ�ਦ"
+
+#~ msgid "day(s)"
+#~ msgstr "ਦਿਨ"
+
+#~ msgid "end of appointment"
+#~ msgstr "ਮ�ਲਾ�ਾਤ ਦਾ �ੰਤ"
+
+#~ msgid "hour(s)"
+#~ msgstr "�ੰ��"
+
+#~ msgid "minute(s)"
+#~ msgstr "ਮਿੰ�"
+
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "ਦਿਨ-ਰਾਤ ਰ�ਸ਼ਨ� ਸਮਾ� ਲ� �ਨ���ਲ(_v)"
+
+#~ msgid "Attached message - %s"
+#~ msgstr "���� ��ਤਾ ਸ�ਨ�ਹਾ - %s"
+
+#~ msgid "<b>%d</b> Attachment"
+#~ msgid_plural "<b>%d</b> Attachments"
+#~ msgstr[0] "<b>%d</b> ਨੱਥ�"
+#~ msgstr[1] "<b>%d</b> ਨੱਥ�"
+
+#~ msgid "Hide Attachment _Bar"
+#~ msgstr "ਨੱਥ� ਪੱ�� �ਹਲ�(_B)"
+
+#~ msgid "Show Attachment _Bar"
+#~ msgstr "ਨੱਥ� ਪੱ�� ਵ��ਾ�(_B)"
+
+#~ msgid "Show Attachments"
+#~ msgstr "ਨੱਥ� ਵ��ਾ�"
+
+#~ msgid "Press space key to toggle attachment bar"
+#~ msgstr "ਨੱਥ� ਪੱ�� ਨ�ੰ ਬਦਲਣ ਲ� ਸਪ�ਸ ਸਵਿੱ� ਦਬਾ�"
+
+#~ msgid "1 day before appointment"
+#~ msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ੧ ਦਿਨ ਪਹਿਲਾ�"
+
+#~ msgid "1 hour before appointment"
+#~ msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� ੧ �ੰ�ਾ"
+
+#~ msgid "15 minutes before appointment"
+#~ msgstr "ਮ�ਲਾ�ਾਤ ਤ�� ਪਹਿਲਾ� ੧੫ ਮਿੰ�"
+
+#~ msgid "for"
+#~ msgstr "ਲ�"
+
+#~ msgid "<b>Att_endees</b>"
+#~ msgstr "<b>ਦਰਸ਼�(_e)</b>"
+
+#~ msgid "C_hange Organizer"
+#~ msgstr "ਪ�ਰਬੰਧ� ਤਬਦ�ਲ(_O):"
+
+#~ msgid "Co_ntacts..."
+#~ msgstr "ਸੰਪਰ�(_N)..."
+
+#~ msgid "forever"
+#~ msgstr "ਹਮ�ਸ਼ਾ"
+
+#~ msgid "month(s)"
+#~ msgstr "ਮਹ�ਨਾ"
+
+#~ msgid "week(s)"
+#~ msgstr "ਹਫਤਾ"
+
+#~ msgid "year(s)"
+#~ msgstr "ਸਾਲ"
+
+#~ msgid "_Save Selected"
+#~ msgstr "��ਣ� ਸੰਭਾਲ�(_S)"
+
+#~ msgid "April"
+#~ msgstr "�ਪਰ�ਲ"
+
+#~ msgid "August"
+#~ msgstr "��ਸਤ"
+
+#~ msgid "December"
+#~ msgstr "ਦਸੰਬਰ"
+
+#~ msgid "February"
+#~ msgstr "ਫਰਵਰ�"
+
+#~ msgid "January"
+#~ msgstr "�ਨਵਰ�"
+
+#~ msgid "July"
+#~ msgstr "��ਲਾ�"
+
+#~ msgid "June"
+#~ msgstr "��ਨ"
+
+#~ msgid "March"
+#~ msgstr "ਮਾਰ�"
+
+#~ msgid "May"
+#~ msgstr "ਮ�"
+
+#~ msgid "November"
+#~ msgstr "ਨਵੰਬਰ"
+
+#~ msgid "October"
+#~ msgstr "��ਤ�ਬਰ"
+
+#~ msgid "September"
+#~ msgstr "ਸਤੰਬਰ"
+
+#~ msgid "Could not open autosave file"
+#~ msgstr "���-ਸੰਭਾਲ� ਫਾ�ਲ ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��"
+
+#~ msgid "_Post-To Field"
+#~ msgstr "ਭ��ਣਾ ��ਤਰ(_P)"
+
+#~ msgid "Toggles whether the Post-To field is displayed"
+#~ msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਭ��� ��ਤਰ ਵ��ਿ� �ਾਵ�"
+
+#~ msgid "_Subject Field"
+#~ msgstr "ਵਿਸ਼ਾ ��ਤਰ(_S)"
+
+#~ msgid "Toggles whether the Subject field is displayed"
+#~ msgstr "ਬਦਲ� �ਿ �� ਵਿਸ਼ਾ ��ਤਰ ਵ��ਾ�� �ਾਵ�"
+
+#~ msgid "_To Field"
+#~ msgstr "ਵੱਲ ��ਤਰ(_T)"
+
+#~ msgid "Toggles whether the To field is displayed"
+#~ msgstr "ਤਬਦ�ਲ �ਰ� �ਿ ਵੱਲ ��ਤਰ ਵ��ਿ� �ਾਵ�"
+
+#~ msgid "ago"
+#~ msgstr "ਪਹਿਲਾ�"
+
+#~ msgid "months"
+#~ msgstr "ਮਹ�ਨ�"
+
+#~ msgid "the current time"
+#~ msgstr "ਮ���ਦਾ ਸਮਾ�"
+
+#~ msgid "the time you specify"
+#~ msgstr "ਸਮਾ� �� ਤ�ਸ�� ਨਿਰਧਾਰਿਤ ��ਤਾ ਹ�"
+
+#~ msgid "years"
+#~ msgstr "ਸਾਲ"
+
+#~ msgid "Retrieving Message..."
+#~ msgstr "ਸ�ਨ�ਹਾ ਲਿ� �ਾ ਰਿਹਾ ਹ�..."
+
+#~ msgid "C_all To..."
+#~ msgstr "�ਾਲ �ਰ�(_a)..."
+
+#~ msgid "Completed on %B %d, %Y, %l:%M %p"
+#~ msgstr "%B %d, %Y, %l:%M %p ਵ�� ਸਮਾਪਤ"
+
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "ਵੱਲ�� %B %d, %Y, %l:%M %p"
+
+#~ msgid "_Save Selected..."
+#~ msgstr "��ਣ� ਸੰਭਾਲ�(_S)..."
+
+#~ msgid "%d at_tachment"
+#~ msgid_plural "%d at_tachments"
+#~ msgstr[0] "%d ਨੱਥ�(_t)"
+#~ msgstr[1] "%d ਨੱਥ�(_t)"
+
+#~ msgid "S_ave"
+#~ msgstr "ਸੰਭਾਲ�(_a)"
+
+#~ msgid "No Attachment"
+#~ msgstr "��� ਨੱਥ� ਨਹ��"
+
+#~ msgid " (%a, %R %Z)"
+#~ msgstr " (%a, %R %Z)"
+
+#  translators: strftime format for local time equivalent in Date header display, without day
+#~ msgid " (%R %Z)"
+#~ msgstr " (%R %Z)"
+
+#~ msgid ""
+#~ "Enable side bar search feature so that you can start interactive "
+#~ "searching by typing in the text. Use is that you can easily find a folder "
+#~ "in that side bar by just typing the folder name and the selection jumps "
+#~ "automatically to that folder."
+#~ msgstr ""
+#~ "ਬਾਹ� ��� ਫ��ਰ �ਾਲ� �ਰ� ਤਾ� �ਿ ਤ�ਸ�� ���ਸ� ਵਿੱ� ਲਿ� �� ��� ਸ਼�ਰ� �ਰ ਸ��। �ਸ ਦਾ ਫਾ�ਦਾ �ਹ "
+#~ "ਹ� �ਿ ਤ�ਸ�� ਬਾਹ� ਵਿੱ� ਫ�ਲਡਰ ਨਾ� ਲਿ� �� ਹ� ��� �ਰ ਸ�� �ਤ� ��� ���ਮ��ਿ� ਹ� �ਸ ਫ�ਲਡਰ �ੱਤ� "
+#~ "�ਲ� �ਾਵ�।"
+
+#~ msgid "View/Bcc menu item is checked"
+#~ msgstr "ਵ���/Bcc ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�"
+
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "ਵ���/Bcc ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�।"
+
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "ਵ���/Cc ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�"
+
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "ਵ���/Cc ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�।"
+
+#~ msgid "View/From menu item is checked"
+#~ msgstr "ਵ���/ਵੱਲ�� ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�"
+
+#~ msgid "View/From menu item is checked."
+#~ msgstr "ਵ���/ਵੱਲ�� ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�।"
+
+#~ msgid "View/PostTo menu item is checked"
+#~ msgstr "ਵ���/ਭ��� ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�"
+
+#~ msgid "View/PostTo menu item is checked."
+#~ msgstr "ਵ���/ਭ��� ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�"
+
+#~ msgid "View/ReplyTo menu item is checked"
+#~ msgstr "ਵ���/�ਵਾਬ ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�"
+
+#~ msgid "View/ReplyTo menu item is checked."
+#~ msgstr "ਵ���/�ਵਾਬ ਮ�ਨ�ੰ ��ਾ� ��ਣ� �� ਹ�।"
+
+#~ msgid " Ch_eck for Supported Types "
+#~ msgstr " ਸਹਾ�� �ਿਸਮ ਲ� �ਾ��(_e)"
+
+#~ msgid "Ch_eck for Supported Types "
+#~ msgstr "ਸਹਾ�� �ਿਸਮ ਲ� �ਾ��(_e)"
+
+#~ msgid "Do not quote"
+#~ msgstr "��� ਨਾ �ਰ�"
+
+#~ msgid "Inline"
+#~ msgstr "ਲਾ�ਨ '�"
+
+#~ msgid "Inline (Outlook style)"
+#~ msgstr "�ਨਲਾ�ਨ (���ਲ�ੱ� ਸ�ਾ�ਲ)"
+
+#~ msgid "Quoted"
+#~ msgstr "ਹਵਾਲਾ"
+
+#~ msgid "S_OCKS Host:"
+#~ msgstr "S_OCKS ਹ�ਸ�:"
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "ਡਰਾਫ� ਫ�ਲਡਰ ��ਣ�"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "ਭ��� ਫ�ਲਡਰ ��ਣ�"
+
+#~ msgid "_Automatic proxy configuration URL:"
+#~ msgstr "���ਮ��ਿ� ਪਰਾ�ਸ� ਸੰਰ�ਨਾ URL (_a):"
+
+#~ msgid "Case _sensitive"
+#~ msgstr "�ੱ�ਰ ��ਾਰ ਪ�ਰਤ� ਸੰਵ�ਦਨਸ਼�ਲ(_S)"
+
+#~ msgid "F_ind:"
+#~ msgstr "���(_i):"
+
+#~ msgid "Find in Message"
+#~ msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ਲੱਭ�"
+
+#~ msgid "None Selected"
+#~ msgstr "��� ��ਣਿ� ਨਹ��"
+
+#~ msgid "Provides core functionality for local address books."
+#~ msgstr "ਸਥਾਨ� ��ਲੰਡਰ ਲ� ਮ�ਲ ਸਹ�ਲਤਾ� ਦਿੰਦਾ ਹ�।"
+
+#~ msgid ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+#~ msgstr "ਸ�ਨ�ਹ� ਵਿੱ� ����ਮ��� ਦ� ਸ�ਹ ਲਵ� �ਤ� �� ����ਮ��� ਨਾ ਹ�ਵ� ਤਾ� ��ਤਾਵਨ� ਦਿ�"
+
+#~ msgid ""
+#~ "A formatter plugin which displays audio attachments inline and allows you "
+#~ "to play them directly from Evolution."
+#~ msgstr ""
+#~ "�ੱ� ਫਾਰਮ�� ਪਲੱ�-�ਨ ਹ�, �� �ਿ ਨੱਥ� ਪਲੱ�-�ਨ ਨ�ੰ ਲਾ�ਨ '� ਵ��ਾ� �ਤ� �ਵ�ਲ�ਸ਼ਨ ਨ�ੰ ਸਿੱਧਾ �ਲਾ�ਣ "
+#~ "ਲ� ਸਹਾ�� ਹ�।"
+
+#~ msgid "A plugin for backing up and restore Evolution data and settings."
+#~ msgstr "�ਵ�ਲ�ਸ਼ਨ ਡਾ�ਾ �ਤ� ਸ��ਿੰ� ਬ���ੱਪ �ਤ� ਮ��-ਪਰਾਪਤ �ਰਨ ਲ� �ੱ� ਪਲੱ�-�ਨ ਹ�।"
+
+#~ msgid "CalDAV Calendar sources"
+#~ msgstr "CalDAV ��ਲੰਡਰ ਸਰ�ਤ"
+
+#~ msgid "Provides core functionality for local calendars."
+#~ msgstr "ਸਥਾਨ� ��ਲੰਡਰ ਲ� ਮ�ਲ ਸਹ�ਲਤਾ� ਦਿੰਦ� ਹ�।"
+
+#~ msgid "HTTP Calendars"
+#~ msgstr "HTTP ��ਲੰਡਰ"
+
+#~ msgid "Provides core functionality for webcal and http calendars."
+#~ msgstr "ਵ�ਬ-��ਲ �ਤ� http ��ਲੰਡਰਾ� ਲ� ਮ�ਲ ਸਹ�ਲਤਾ� ਦਿੰਦ� ਹ�।"
+
+#~ msgid "Provides core functionality for weather calendars."
+#~ msgstr "ਮ�ਸਮ ��ਲੰਡਰ ਲ� ਮ�ਲ ਸਹ�ਲਤਾ� ਦਿੰਦ� ਹ�।"
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a popup menu plugin which lets you copy "
+#~ "things to the clipboard."
+#~ msgstr ""
+#~ "�ੱ� ���ਸ� ਪਲੱ�-�ਨ, �� �ਿ ਪਾਪ�ੱਪ ਮ�ਨ� ਦ� �ਲ� ਵਿ�ਾ�ਦ� ਹ�, �� �ਿ ਤ�ਹਾਨ�ੰ �ਲਿੱਪਬ�ਰਡ ਤ�� ���਼ਾ� "
+#~ "ਦ� �ਾਪ� �ਰਨ ਲ� ਸਹਾ�� ਹ�।"
+
+#~ msgid ""
+#~ "Provides functionality for marking a calendar or an address book as the "
+#~ "default one."
+#~ msgstr "�ੱ� ��ਲੰਡਰ �ਾ� �ਡਰ�ੱਸ-ਬ�ੱ� ਲ� ਡਿਫਾਲ� ਬਣਾ�ਣ ਲ� ਸਹ�ਲਤ ਦਿੰਦ� ਹ�"
+
+#~ msgid "S_pecify the mailbox name"
+#~ msgstr "ਮ�ਲਬਾ�ਸ ਨਾ� ਦਿ�(_p)"
+
+#~ msgid ""
+#~ "A plugin that manages a collection of Exchange account specific "
+#~ "operations and features."
+#~ msgstr ""
+#~ "�ੱ� ਪਲੱ�-�ਨ, �� �ਿ ��ਸ਼���਼ ��ਾ��� ਨਾਲ ਸਬੰਧਤ �ਾਸ �ਾਰਵਾ��� �ਤ� ਫ��ਰ ਦ� ਸਮ�ਹ ਨ�ੰ ਹ��ਡਲ �ਰਦ� "
+#~ "ਹ�।"
+
+#~ msgid "Compose messages using an external editor"
+#~ msgstr "ਸ�ਨ�ਹ� ਬਾਹਰ� �ਡ��ਰ ਨਾਲ ਲਿ��"
+
+#~ msgid "Allows unsubscribing of mail folders in the side bar context menu."
+#~ msgstr "ਫ�ਲਡਰ ਲ�� ਪਰਸੰ� ਮ�ਨ� ਵਿੱ� ਪੱਤਰ ਫ�ਲਡਰ ਤ�� ਮ��ਬਰ� ਹ�ਾ�ਣ ਲ� ਸਹਾ�� ਹ�।"
+
+#~ msgid "A plugin to setup Google Calendar and Contacts."
+#~ msgstr "���ਲ ��ਲੰਡਰ �ਤ� ਸੰਪਰ� ਸ�ੱ��ੱਪ �ਰਨ ਲ� �ੱ� ਪਲੱ�-�ਨ ਹ�।"
+
+#~ msgid "Google sources"
+#~ msgstr "���ਲ ��ਲੰਡਰ"
+
+#~ msgid "A plugin to setup GroupWise calendar and contacts sources."
+#~ msgstr "�ਰ�ੱਪਵਾ��਼ ��ਲੰਡਰ �ਤ� ਸੰਪਰ� ਸਰ�ਤ ਸ�ੱ��ੱਪ �ਰਨ ਲ� �ੱ� ਪਲੱ��ਨ ਹ�।"
+
+#~ msgid "A plugin to setup hula calendar sources."
+#~ msgstr "ਹ�ਲਾ ��ਲੰਡਰ ਸਰ�ਤ ਸ�ੱ��ੱਪ �ਰਨ ਲ� �ੱ� ਪਲੱ�-�ਨ ਹ�।"
+
+#~ msgid "Hula Account Setup"
+#~ msgstr "ਹ�ਲਾ ��ਾ��� ਸ�ੱ��ੱਪ"
+
+#~ msgid "A plugin for the features in the IMAP accounts."
+#~ msgstr "IMAP ��ਾ���ਾ� ਵਿੱ� ਫ��ਰਾ� ਲ� �ੱ� ਪਲੱ��ਨ ਹ�।"
+
+#~ msgid "_Import to Calendar"
+#~ msgstr "��ਲੰਡਰ �ਯਾਤ(_I)"
+
+#~ msgid "Import ICS"
+#~ msgstr "ICS �ਯਾਤ"
+
+#~ msgid "Imports ICS attachments to calendar."
+#~ msgstr "ICS ਨੱਥ� ��ਲੰਡਰ ਲ� �ਯਾਤ �ਰ�।"
+
+#~ msgid ""
+#~ "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+#~ msgstr "�ਪਲ ��ਪ�ਡ ਨਾਲ ��ਣ� �ਾਸ�/ਮ�ਮ�/��ਲੰਡਰ/�ਡਰ�ੱਸ-ਬ�ੱ� ਨ�ੰ ਸਿ�ਰ�ਨਾ��਼ �ਰ�"
+
+#~ msgid "_Tasks :"
+#~ msgstr "�ੰਮ(_T):"
+
+#~ msgid "Memos :"
+#~ msgstr "ਮ�ਮ� :"
+
+#~ msgid "Allows disabling of accounts."
+#~ msgstr "��ਾ��� �ਯ�� �ਰਨ ਮਨ�਼�ਰ ਹ�।"
+
+#~ msgid ""
+#~ "Generates a D-Bus message or notifies the user with an icon in "
+#~ "notification area and a notification message whenever a new message has "
+#~ "arrived."
+#~ msgstr ""
+#~ "�ੱ� ਡ�-ਬੱਸ ਸ�ਨ�ਹਾ ਬਣਾ� �ਾ� ਨ���ਫਿ��ਸ਼ਨ ��ਤਰ ਵਿੱ� ਯ��਼ਰ ਨ�ੰ �ੱ� ���ਾਨ ਨਾਲ ਨ���ਫਾ� ��ਤਾ "
+#~ "�ਾ�ਦਾ ਹ� �ਤ� �ਦ�� ਨਵਾ� ਸ�ਨ�ਹਾ ��ਦਾ ਹ� ਤਾ� ਨ���ਫਿ��ਸ਼ਨ ਸ�ਨ�ਹਾ ਵ��ਾ�� �ਾ�ਦਾ ਹ�।"
+
+#~ msgid ""
+#~ "A plugin which allows the creation of meetings from the contents of a "
+#~ "mail message."
+#~ msgstr "�ੱ� ਪਲੱ�-�ਨ ਹ�, �� �ਿ �ੱ� ਪੱਤਰ ਸ�ਨ�ਹ� ਦ� ਭਾ�ਾ� ਤ�� ਮ��ਿੰ�ਾ� ਬਣਾ�ਣ ਲ� ਸਹਾ�� ਹ�।"
+
+#~ msgid "Con_vert to Meeting"
+#~ msgstr "ਮ��ਿੰ� ਲ� ਤਬਦ�ਲ(_v)"
+
+#~ msgid "Mail to meeting"
+#~ msgstr "ਮ��ਿੰ� ਲ� ਪੱਤਰ"
+
+#~ msgid ""
+#~ "A plugin which allows the creation of tasks from the contents of a mail "
+#~ "message."
+#~ msgstr "�ੱ� ਪਲੱ�-�ਨ ਹ�, �� �ਿ �ੱ� ਪੱਤਰ ਸ�ਨ�ਹ� ਦ� ਭਾ� ਤ�� �ੰਮ ਬਣਾ�ਣ ਲ� ਸਹਾ�� ਹ�।"
+
+#~ msgid "Con_vert to Task"
+#~ msgstr "�ੰਮ '� ਬਦਲ�(_v)"
+
+#~ msgid "Used for marking all the messages under a folder as read"
+#~ msgstr "�ੱ� ਫ�ਲਡਰ ਵਿੱ� ਸਭ ਸ�ਨ�ਹਿ�� ਨ�ੰ ਪ��ਹਿ�� ਬਣਾ�ਣ ਲ� ਵਰਤਿ� �ਾ�ਦਾ ਹ�"
+
+#~ msgid "A plugin which implements mono plugins."
+#~ msgstr "ਮ�ਨ� ਪਲੱ�-�ਨ ਦ� ਸ��ਿੰ� ਲ� �ੱ� ਪਲੱ�-�ਨ ਹ�।"
+
+#~ msgid "A plugin for managing which plugins are enabled or disabled."
+#~ msgstr "�ੱ� ਪਲੱ�-�ਨ, �� �ਿ ਪਲੱ�-�ਨਾ� ਨ�ੰ ਯ�� �ਤ� �ਯ�� �ਰਨ ਲ� ਸਹਾ�� ਹ�।"
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a formatter plugin which lets you choose "
+#~ "to disable HTML messages.\n"
+#~ "\n"
+#~ "This plugin is unsupported demonstration code only.\n"
+#~ msgstr ""
+#~ "�ੱ� ��ਸ� ਪਲੱ�-�ਨ, �� �ਿ ਤ�ਹਾਨ�ੰ �ੱ� ਫਾਰਮ�� ਪਲੱ�-�ਨ ਦਾ �ੰਮ ਵਿ�ਾ�ਦ� ਹ�, �� �ਿ ਤ�ਹਾਨ�ੰ HTML "
+#~ "ਪੱਤਰਾ� ਨ�ੰ �ਯ�� �ਰਨ ਲ� ਸਹਾ�� ਹ�।\n"
+#~ "\n"
+#~ "�ਹ ਪਲੱ�-�ਨ ਸਿਰਫ਼ ਨਾ-ਸਹਾ�� �ਲ� ��ਡ ਹ� ਹ�।\n"
+
+#~ msgid "Writes a log of profiling data events."
+#~ msgstr "ਡਾ�ਾ ��ਨਾਵਾ� ਨ�ੰ ਪਰ�ਫਾ�ਲ �ਰਨ ਦਾ ਲਾ� ਰੱ��।"
+
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "SpamAssassin (ਬਿਲ�-�ਨ)"
+
+#~ msgid ""
+#~ "Filters junk messages using SpamAssassin. This plugin requires "
+#~ "SpamAssassin to be installed."
+#~ msgstr ""
+#~ "SpamAssassin ਦ� ਵਰਤ�� �ਰ�� �ੰ� ਸ�ਨ�ਹ� ਫਿਲ�ਰ �ਰਦ� ਹ�। �ਹ ਪਲੱ�-�ਨ ਲ� SpamAssassin "
+#~ "�ੰਸ�ਾਲ ਹ�ਣਾ ਲਾ�਼ਮ� ਹ�।"
+
+#~ msgid "A plugin for saving all attachments or parts of a message at once."
+#~ msgstr "�ੱ� ਸ�ਨ�ਹ� ਨਾਲ ਨੱਥ� ਸਭ ਦਸਤਾਵ��਼ �ਾ� ਭਾ�ਾ� ਨ�ੰ �ੱ�� ਵਾਰ ਸੰਭਾਲਣ ਲ� �ੱ� ਪਲੱ�-�ਨ ਹ�।"
+
+#~ msgid "Save Attachments..."
+#~ msgstr "ਨੱਥ� ਸੰਭਾਲ�..."
+
+#~ msgid "Save all attachments"
+#~ msgstr "ਸਭ ਨੱਥ� ਸੰਭਾਲ�..."
+
+#~ msgid "Select save base name"
+#~ msgstr "ਸੰਭਾਲ ਮ�ਲ ਨਾ� ��ਣ�"
+
+#~ msgid "Indicates if threading of messages should fall back to subject."
+#~ msgstr "ਵ��ਾ�ਦਾ ਹ� �ਿ �� ਸ�ਨ�ਹਿ�� ਦਾ ਥਰਿੱਡ ਵਿਸ਼� ਨਾਲ ਸਬੰਧਤ ਰਹ�।"
+
+#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+#~ msgstr "�ੱ� ਸ��ਪਲ ਪਲੱ��ਨ, �� �ਿ TNEF �����ਮ��� ਨ�ੰ ਡ���ਡ �ਰਨ ਲ� yTNEF ਵਰਤਦਾ ਹ�।"
+
+#~ msgid "A plugin to setup WebDAV contacts."
+#~ msgstr "WebDAV ਸੰਪਰ� ਸ�ੱ��ੱਪ �ਰਨ ਲ� �ੱ� ਪਲੱ�-�ਨ ਹ�।"
+
+#~ msgid "Pos_t New Message to Folder"
+#~ msgstr "ਫ�ਲਡਰ ਲ� ਨਵਾ� ਸ�ਨ�ਹਾ ਭ���(_t)"
+
+#~ msgid "Post a Repl_y"
+#~ msgstr "�ੱ� �ਵਾਬ ਭ���(_y)"
+
+#~ msgid "Post a message to a Public folder"
+#~ msgstr "ਸ�ਨ�ਹਾ ਸਰਵ�ਨ� ਫ�ਲਡਰ ਵਿੱ� ਭ���"
+
+#~ msgid "Post a reply to a message in a Public folder"
+#~ msgstr "ਸਰਵ�ਨ� ਫ�ਲਡਰ ਵਿੱ� ਸ�ਨ�ਹਾ �ਵਾਬ ਲ� ਭ���"
+
+#~ msgid "Attachment Bar"
+#~ msgstr "ਨੱਥ� ਪੱ��"
+
+#~ msgid "Cannot attach file %s: %s"
+#~ msgstr "ਫਾ�ਲ਼ %s ਨ�ੰ ਨੱਥ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�: %s"
+
+#~ msgid "Cannot attach file %s: not a regular file"
+#~ msgstr "ਫਾ�ਲ਼ %s ਨ�ੰ ਨੱਥ� ਨਹ�� ��ਤਾ �ਾ ਸ�ਿ�:�ੱ� ਨਿਯਮਤ ਫਾ�ਲ਼ ਨਹ��"
+
+#~ msgid "MIME type:"
+#~ msgstr "MIME �ਿਸਮ:"
+
+#~ msgid "Suggest automatic display of attachment"
+#~ msgstr "ਨੱਥ� ਦਾ ���ਮ��ਿ� ਵ��ਾ�ਣ ਲ� ਸ��ਾ�"
+
+#~ msgid "Expanded"
+#~ msgstr "ਫ�ਲਿ�"
+
+#~ msgid "Whether or not the expander is expanded"
+#~ msgstr "ਫ�ਲਾ� ਨ�ੰ ਫ�ਲਾ�� �ਾਵ� �ਾ� ਨਾ"
+
+#~ msgid "Text of the expander's label"
+#~ msgstr "ਫ�ਲਾ� ਦ� ਲ�ਬਲ ਦਾ ���ਸ�"
+
+#~ msgid "Use underline"
+#~ msgstr "ਹ�ਠਾ� ਰ��ਾ ਵਰਤ��"
+
+#~ msgid ""
+#~ "If set, an underline in the text indicates the next character should be "
+#~ "used for the mnemonic accelerator key"
+#~ msgstr "���ਰ ਨਿਰਧਾਰਿਤ ��ਤਾ ਤਾ�, ���ਸ� ਵਿੱ� ਦਿੱਤਾ �ੱ�ਰ ਪ�ਰਵ�ਸ਼� �� ਨ�ੰ ਵ��ਾ��ਾ"
+
+#~ msgid "Space to put between the label and the child"
+#~ msgstr "ਲ�ਬਲ ਤ� ��ਲ� ਵਿੱ��ਾਰ �ੰਤਰ ਦਿ�"
+
+#~ msgid "Label widget"
+#~ msgstr "ਲ�ਬਲ ਵਿਦ�ਿ�"
+
+#~ msgid "A widget to display in place of the usual expander label"
+#~ msgstr "�ਮ ਫ�ਲਾ� ਲ�ਬਲ ਦ� ਥਾ� ਤ� �ੱ� ਵਿਦ�ਿ� ਵ��ਾ�"
+
+#~ msgid "Indicator Spacing"
+#~ msgstr "ਸੰ��ਤ� ਥਾ�"
+
+#~ msgid "Spacing around expander arrow"
+#~ msgstr "ਫ�ਲਾ� ਤ�ਰ ਦ��ਲ� �ਾਲ� ਥਾ�"
+
+#~ msgid "Current Message"
+#~ msgstr "ਮ���ਦਾ ਸ�ਨ�ਹਾ"
+
+#~ msgid "Edit Master Category List..."
+#~ msgstr "ਮਾਸ�ਰ ���ਾ�ਰ� ਸ��� ਸ�ਧ..."
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "�ਹਨਾ� ���ਾ�ਰ�ਾ� ਨਾਲ ਸਬੰਧਤ ���ਮਾ�(_c):"
+
+#~ msgid "_Available Categories:"
+#~ msgstr "�ਪਲੱਬਧ ���ਾ�ਰ�(_A):"
+
+#~ msgid "categories"
+#~ msgstr "���ਾ�ਰ�"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "DnD code"
+#~ msgstr "DnD ��ਡ"
+
+#~ msgid "Full Header"
+#~ msgstr "ਪ�ਰਾ ਹ�ੱਡਰ"
+
+#~ msgid "Font Description"
+#~ msgstr "ਫ��� ਵ�ਰਵਾ"
+
 #~ msgid "Novell Groupwise"
 #~ msgstr "ਨ�ਵਲ �ਰ�ੱਪਵਾ��਼"
 



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